Index: dialin/common/hd_defs.py =================================================================== diff -u -r75d8984d2074be9262e4e78d9e10da4895cef0e5 -r189355ba34cabb60dcb53e54614b7b87c2129245 --- dialin/common/hd_defs.py (.../hd_defs.py) (revision 75d8984d2074be9262e4e78d9e10da4895cef0e5) +++ dialin/common/hd_defs.py (.../hd_defs.py) (revision 189355ba34cabb60dcb53e54614b7b87c2129245) @@ -77,6 +77,21 @@ POST_STATE_FAILED = 24 # POST self-tests failed state NUM_OF_POST_STATES = 25 # Number of initialize & POST mode states +@unique +class StandbyStates(DialinEnum): + STANDBY_START_STATE = 0, # Start standby (home actuators). + STANDBY_WAIT_FOR_TREATMENT_STATE = 1 # Wait for treatment. + STANDBY_WAIT_FOR_DISINFECT_STATE = 2 # Wait for UI to send disinfect option. + STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE - 3 # Wait for DG flush command response. + STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE = 4 # Wait for DG flush to start. + STANDBY_DG_FLUSH_IN_PROGRESS_STATE = 5 # DG flush operation is in progress + STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE = 6 # Wait for DG heat disinfect command response. + STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE = 7 # Wait for DG heat disinfect to start. + STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE = 8 # DG heat disinfect operation is in progress. + STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE = 9 # Wait for DG chemical disinfect command response. + STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE = 10 # Wait for DG chemical disinfect to start. + STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE = 11 # DG chemical disinfect operation is in progress + NUM_OF_STANDBY_STATES = 12 # Number of standby states (sub-modes) @unique class PreTreatmentSubModes(DialinEnum): Index: dialin/hd/blood_flow.py =================================================================== diff -u -r8d5d5b02311dd549eb659be06a14d3972d725ee7 -r189355ba34cabb60dcb53e54614b7b87c2129245 --- dialin/hd/blood_flow.py (.../blood_flow.py) (revision 8d5d5b02311dd549eb659be06a14d3972d725ee7) +++ dialin/hd/blood_flow.py (.../blood_flow.py) (revision 189355ba34cabb60dcb53e54614b7b87c2129245) @@ -522,8 +522,12 @@ @return: 1 if successful, zero otherwise """ + pwm = float_to_bytearray(pwm_pct) + payload = pwm + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_SET_PWM.value) + message_id=MsgIds.MSG_ID_HD_BLOOD_PUMP_SET_PWM.value, + payload=payload) self.logger.debug("Setting blood pump PWM") Index: dialin/hd/dialysate_inlet_flow.py =================================================================== diff -u -r60299303c0465f4519217d1a26fd5404f0f8f067 -r189355ba34cabb60dcb53e54614b7b87c2129245 --- dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision 60299303c0465f4519217d1a26fd5404f0f8f067) +++ dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision 189355ba34cabb60dcb53e54614b7b87c2129245) @@ -481,8 +481,12 @@ @return: 1 if successful, zero otherwise """ + pwm = float_to_bytearray(pwm_pct) + payload = pwm + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_IN_SET_PWM.value) + message_id=MsgIds.MSG_ID_HD_DIAL_IN_SET_PWM.value, + payload=payload) self.logger.debug("Setting dialysate inlet pump PWM") Index: dialin/hd/dialysate_outlet_flow.py =================================================================== diff -u -r60299303c0465f4519217d1a26fd5404f0f8f067 -r189355ba34cabb60dcb53e54614b7b87c2129245 --- dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 60299303c0465f4519217d1a26fd5404f0f8f067) +++ dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 189355ba34cabb60dcb53e54614b7b87c2129245) @@ -596,8 +596,12 @@ @return: 1 if successful, zero otherwise """ + pwm = float_to_bytearray(pwm_pct) + payload = pwm + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_DIAL_OUT_SET_PWM.value) + message_id=MsgIds.MSG_ID_HD_DIAL_OUT_SET_PWM.value, + payload=payload) self.logger.debug("Setting dialysate outlet pump PWM")