Index: dialin/common/dg_defs.py =================================================================== diff -u -r85b6bd09e702411ec5fe9dbb945b9e906cbdc309 -r5ad119d3c74691c68121dfeb27a6c6c575111819 --- dialin/common/dg_defs.py (.../dg_defs.py) (revision 85b6bd09e702411ec5fe9dbb945b9e906cbdc309) +++ dialin/common/dg_defs.py (.../dg_defs.py) (revision 5ad119d3c74691c68121dfeb27a6c6c575111819) @@ -182,12 +182,8 @@ DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH = 17 # Heat disinfect, cancel mode basic path state DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH = 18 # Heat disinfect, cancel mode water path state DG_HEAT_DISINFECT_STATE_COMPLETE = 19 # Heat disinfect, complete state - DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_IDLE = 20 # Heat disinfect, nocturnal cool idle state - DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_CHECK_WATER_TEMP = 21 # Heat disinfect, nocturnal cool check water temp state - DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_DRAIN_R1 = 22 # Heat disinfect, nocturnal cool drain R1 state - DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_DRAIN_R2 = 23 # Heat disinfect, nocturnal cool drain R2 state - DG_NELSON_HEAT_DISINFECT_STATE_FILL_R1_WITH_WATER = 24 # Heat disinfect, Nelson support state - NUM_OF_DG_HEAT_DISINFECT_STATES = 25 # Number of heat disinfect mode states + DG_NELSON_HEAT_DISINFECT_STATE_FILL_R1_WITH_WATER = 20 # Heat disinfect, Nelson support state + NUM_OF_DG_HEAT_DISINFECT_STATES = 21 # Number of heat disinfect mode states @unique @@ -299,28 +295,28 @@ @unique class DGEventList(DialinEnum): - DG_EVENT_STARTUP = 0 # DG startup event - DG_EVENT_OP_MODE_CHANGE = 1 # DG Op mode change event - DG_EVENT_SUB_MODE_CHANGE = 2 # DG Op sub-mode change event - DG_EVENT_CONCENTRATE_CAP_SWITCH_CHANGE = 3 # DG concentrate cap switch change - DG_EVENT_DIALYSATE_CAP_SWITCH_CHANGE = 4 # DG dialysate cap switch change - DG_EVENT_CPU_RAM_ERROR_STATUS = 5 # DG processor RAM error - DG_EVENT_CAL_RECORD_UPDATE = 6 # DG new calibration record updated - DG_EVENT_SYSTEM_RECORD_UPDATE = 7 # DG new system record has been updated - DG_EVENT_SERVICE_UPDATE = 8 # DG new service record has been updated - DG_EVENT_USAGE_INFO_UPDATE = 9 # DG new usage information has been updated - DG_EVENT_SW_CONFIG_UPDATE = 10 # DG new software configuration has been updated - DG_EVENT_SCHEDULED_RUNS_UPDATE = 11 # DG new scheduled runs information has been updated - DG_EVENT_HEATERS_INFO_UPDATE = 12 # DG new heaters information has been updated - DG_EVENT_AVG_DIALYSATE_FILL_COND_VALUES = 13 # DG average dialysate fill conductivity values - DG_EVENT_RESERVOIR_FILL_VALUES = 14 # DG reservoir fill base reservoir weight and filled volume values - DG_EVENT_OPERATION_STATUS = 15 # DG operation status event - DG_EVENT_TEMPERATURE_DRIFT = 16 # DG temperature drift event - DG_EVENT_BICARB_CHECK_RESULT = 17 # DG bicarb check result - DG_EVENT_ACID_CHECK_RESULT = 18 # DG acid check result - DG_EVENT_COND1_VS_COND2_DIFF_RESULT = 19 # DG CD1 (acid) vs. CD2 (bicarb) different result - DG_EVENT_NOCTURNAL_HEAT_DISINFECT_STATUS = 20 # DG nocturnal heat disinfect status - NUM_OF_DG_EVENT_IDS = 21 # Total number of DG events + DG_EVENT_STARTUP = 0 # DG startup event + DG_EVENT_OP_MODE_CHANGE = 1 # DG Op mode change event + DG_EVENT_SUB_MODE_CHANGE = 2 # DG Op sub-mode change event + DG_EVENT_CONCENTRATE_CAP_SWITCH_CHANGE = 3 # DG concentrate cap switch change + DG_EVENT_DIALYSATE_CAP_SWITCH_CHANGE = 4 # DG dialysate cap switch change + DG_EVENT_CPU_RAM_ERROR_STATUS = 5 # DG processor RAM error + DG_EVENT_CAL_RECORD_UPDATE = 6 # DG new calibration record updated + DG_EVENT_SYSTEM_RECORD_UPDATE = 7 # DG new system record has been updated + DG_EVENT_SERVICE_UPDATE = 8 # DG new service record has been updated + DG_EVENT_USAGE_INFO_UPDATE = 9 # DG new usage information has been updated + DG_EVENT_SW_CONFIG_UPDATE = 10 # DG new software configuration has been updated + DG_EVENT_SCHEDULED_RUNS_UPDATE = 11 # DG new scheduled runs information has been updated + DG_EVENT_HEATERS_INFO_UPDATE = 12 # DG new heaters information has been updated + DG_EVENT_AVG_DIALYSATE_FILL_COND_VALUES = 13 # DG average dialysate fill conductivity values + DG_EVENT_RESERVOIR_FILL_VALUES = 14 # DG reservoir fill base reservoir weight and filled volume values + DG_EVENT_OPERATION_STATUS = 15 # DG operation status event + DG_EVENT_TEMPERATURE_DRIFT = 16 # DG temperature drift event + DG_EVENT_BICARB_CHECK_RESULT = 17 # DG bicarb check result + DG_EVENT_ACID_CHECK_RESULT = 18 # DG acid check result + DG_EVENT_COND1_VS_COND2_DIFF_RESULT = 19 # DG CD1 (acid) vs. CD2 (bicarb) different result + DG_EVENT_PASSIVE_COOL_HEAT_DISINFECT_STATUS = 20 # DG nocturnal heat disinfect status + NUM_OF_DG_EVENT_IDS = 21 # Total number of DG events @unique Index: dialin/common/msg_ids.py =================================================================== diff -u -rc3e5871a44f3b43cf8d4b0fab6022d3c6897649a -r5ad119d3c74691c68121dfeb27a6c6c575111819 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision c3e5871a44f3b43cf8d4b0fab6022d3c6897649a) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision 5ad119d3c74691c68121dfeb27a6c6c575111819) @@ -224,7 +224,7 @@ MSG_ID_DG_START_STOP_RO_PERMEATE_SAMPLE_MODE_CMD_REQUEST = 0xC9 MSG_ID_DG_RO_PERMEATE_SAMPLE_DATA = 0xCA MSG_ID_HD_SEND_RO_PERMEATE_SAMPLE_DISPENSE_REQUEST_TO_DG = 0xCB - MSG_ID_DG_START_STOP_NOCTURNAL_HEAT_DISINFECT = 0xCC + MSG_ID_DG_START_STOP_PASSIVE_COOL_HEAT_DISINFECT = 0xCC MSG_ID_DG_SEND_RO_PERMEATE_SAMPLE_DISPENSE_READY_TO_HD = 0xCD MSG_ID_DG_DRAIN_MODE_DATA = 0xCE MSG_ID_UI_INSTITUTIONAL_RECORD_REQUEST = 0xCF Index: dialin/dg/hd_proxy.py =================================================================== diff -u -r8e919412fc64235b5ae4d57dd523b8cfb1e4e4cb -r5ad119d3c74691c68121dfeb27a6c6c575111819 --- dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision 8e919412fc64235b5ae4d57dd523b8cfb1e4e4cb) +++ dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision 5ad119d3c74691c68121dfeb27a6c6c575111819) @@ -279,11 +279,11 @@ self.logger.debug("Timeout!!!!") return False - def cmd_start_stop_nocturnal_dg_heat_disinfect(self, start: bool = True) -> int: + def cmd_start_stop_dg_passive_cool_heat_disinfect(self, start: bool = True) -> int: """ - Constructs and sends the start/stop nocturnal DG heat disinfect command + Constructs and sends the start/stop DG passive cool heat disinfect command - @param start: (bool) True = start nocturnal heat disinfect, False = stop nocturnal heat disinfect. + @param start: (bool) True = start passive cool heat disinfect, False = stop passive cool heat disinfect. @return: non-zero integer if successful, False otherwise """ # 1 is to start @@ -295,10 +295,10 @@ cmd_str = "Stopping" payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_START_STOP_NOCTURNAL_HEAT_DISINFECT.value, + message_id=MsgIds.MSG_ID_DG_START_STOP_PASSIVE_COOL_HEAT_DISINFECT.value, payload=payload) - self.logger.debug(cmd_str + " nocturnal DG heat disinfect") + self.logger.debug(cmd_str + " DG passive cool heat disinfect") received_message = self.can_interface.send(message) Index: dialin/dg/heat_disinfect.py =================================================================== diff -u -r85b6bd09e702411ec5fe9dbb945b9e906cbdc309 -r5ad119d3c74691c68121dfeb27a6c6c575111819 --- dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision 85b6bd09e702411ec5fe9dbb945b9e906cbdc309) +++ dialin/dg/heat_disinfect.py (.../heat_disinfect.py) (revision 5ad119d3c74691c68121dfeb27a6c6c575111819) @@ -46,10 +46,6 @@ DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH = 17 DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH = 18 DG_HEAT_DISINFECT_STATE_COMPLETE = 19 - DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_IDLE = 20 - DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_CHECK_WATER_TEMP = 21 - DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_DRAIN_R1 = 22 - DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_DRAIN_R2 = 23 @unique Index: tests/dg_tests.py =================================================================== diff -u -r85b6bd09e702411ec5fe9dbb945b9e906cbdc309 -r5ad119d3c74691c68121dfeb27a6c6c575111819 --- tests/dg_tests.py (.../dg_tests.py) (revision 85b6bd09e702411ec5fe9dbb945b9e906cbdc309) +++ tests/dg_tests.py (.../dg_tests.py) (revision 5ad119d3c74691c68121dfeb27a6c6c575111819) @@ -536,7 +536,7 @@ # sleep(1) #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect() #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect_active_cool() - dg.hd_proxy.cmd_start_stop_nocturnal_dg_heat_disinfect() + dg.hd_proxy.cmd_start_stop_dg_passive_cool_heat_disinfect() try: while True: