Index: dialin/dg/hd_proxy.py =================================================================== diff -u -r1ffb0072e3f77a63879c5ef9c615fa7d1f7cb67a -re17e247e7f5186cccc4b188617d5ff19b1c62178 --- dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision 1ffb0072e3f77a63879c5ef9c615fa7d1f7cb67a) +++ dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision e17e247e7f5186cccc4b188617d5ff19b1c62178) @@ -8,7 +8,7 @@ # @file hd_proxy.py # # @author (last) Micahel Garthwaite -# @date (last) 15-Aug-2023 +# @date (last) 17-Aug-2023 # @author (original) Sean # @date (original) 15-Apr-2020 # @@ -60,7 +60,7 @@ payload = res + dc message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_SWITCH_RESERVOIR_CMD.value, + message_id=MsgIds.MSG_ID_DG_SWITCH_RESERVOIR_CMD_REQUEST.value, payload=payload) self.logger.debug("switch reservoirs cmd sent to DG") @@ -92,7 +92,7 @@ payload = integer_to_bytearray(volume) + integer_to_bytearray(start) + float_to_bytearray(tgt_fill_flow_lpm) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_FILL_CMD.value, + message_id=MsgIds.MSG_ID_DG_FILL_CMD_REQUEST.value, payload=payload) self.logger.debug("fill cmd sent to DG") @@ -130,7 +130,7 @@ payload = vol + tare + rinse + st message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_DRAIN_CMD.value, + message_id=MsgIds.MSG_ID_DG_DRAIN_CMD_REQUEST.value, payload=payload) self.logger.debug("drain cmd sent to DG") @@ -171,7 +171,7 @@ payload = start + act + bct message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_STARTING_STOPPING_TREATMENT_CMD.value, + message_id=MsgIds.MSG_ID_STARTING_STOPPING_TREATMENT_CMD_REQUEST.value, payload=payload) self.logger.debug(cmd_str + "DG cmd sent to DG") @@ -243,7 +243,7 @@ """ payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_SAMPLE_WATER_CMD.value, + message_id=MsgIds.MSG_ID_DG_SAMPLE_WATER_CMD_REQUEST.value, payload=payload) self.logger.debug("Sending sample water command") self.can_interface.send(message, 0) @@ -264,7 +264,7 @@ 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_HEAT_DISINFECT.value, + message_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD_REQUEST.value, payload=payload) self.logger.debug(cmd_str + " DG heat disinfect") @@ -326,7 +326,7 @@ 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_FLUSH.value, + message_id=MsgIds.MSG_ID_DG_START_STOP_FLUSH_CMD_REQUEST.value, payload=payload) self.logger.debug(cmd_str + " DG flush") @@ -442,7 +442,7 @@ @return: non-zero integer if successful, False otherwise """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_HD_REQUEST_DG_ALARMS.value) + message_id=MsgIds.MSG_ID_HD_DG_ALARMS_REQUEST.value) self.logger.debug("Command to re-send all active DG alarms acknowledged.") Index: dialin/hd/ui_proxy.py =================================================================== diff -u -ra434f6545892b6b025bbf2e5e0556f84507bf441 -re17e247e7f5186cccc4b188617d5ff19b1c62178 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision a434f6545892b6b025bbf2e5e0556f84507bf441) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision e17e247e7f5186cccc4b188617d5ff19b1c62178) @@ -8,7 +8,7 @@ # @file ui_proxy.py # # @author (last) Micahel Garthwaite -# @date (last) 14-Aug-2023 +# @date (last) 17-Aug-2023 # @author (original) Sean # @date (original) 15-Apr-2020 # @@ -131,17 +131,17 @@ self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE.value, self._handler_blood_and_dialysate_change_response) - self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES.value, + self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES_DATA.value, self._handler_treatment_param_ranges) - self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_VERSION.value, + self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_VERSION_REPONSE.value, self._handler_hd_version) - self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value, + self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST.value, self._handler_treatment_param_settings) self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE.value, self._handler_treatment_param_settings_response) self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_USER_SALINE_BOLUS_RESPONSE.value, self._handler_saline_bolus_response) - self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER.value, + self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id, MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER_REQUEST.value, self._handler_uf_volume_setting_response) self.can_interface.register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id, MsgIds.MSG_ID_HD_RINSEBACK_CMD_RESPONSE.value, self._handler_rinseback_cmd_response) @@ -1132,7 +1132,7 @@ payload = major + minor + micro + build + compatibility message = DenaliMessage.build_message(channel_id=DenaliChannels.ui_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_REQUEST_FW_VERSIONS.value, + message_id=MsgIds.MSG_ID_FW_VERSIONS_REQUEST.value, payload=payload) self.logger.debug("Sending ui request for version to HD") @@ -1149,7 +1149,7 @@ payload = integer_to_bytearray(volume) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD.value, + message_id=MsgIds.MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD_REQUEST.value, payload=payload) self.logger.debug("Sending ui request to set alarm audio volume to level " + str(volume) + " to HD") @@ -1165,7 +1165,7 @@ payload = float_to_bytearray(uf_volume) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER.value, + message_id=MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER_REQUEST.value, payload=payload) self.logger.debug("Sending ui request to set ultrafiltration volume parameter of " + str(uf_volume) + " to HD") @@ -1232,7 +1232,7 @@ adjust = integer_to_bytearray(adj) payload = volume + adjust message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE.value, + message_id=MsgIds.MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE_REQUEST.value, payload=payload) self.logger.debug("Sending UF settings change request.") @@ -1411,7 +1411,7 @@ payload = bld + dia + dur + hps + sal + acc + bic + dzr + hpr + bpi + rbf + apw + vpw + vpa + hdr + hbv + tmp message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value, + message_id=MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST.value, payload=payload) self.logger.debug("Sending treatment parameters to HD.") @@ -1433,7 +1433,7 @@ payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS.value, + message_id=MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS_REQUEST.value, payload=payload) self.logger.debug("Sending confirm treatment parameters message.") @@ -1495,7 +1495,7 @@ payload = cmd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_RINSEBACK_CMD.value, + message_id=MsgIds.MSG_ID_UI_RINSEBACK_CMD_REQUEST.value, payload=payload) self.logger.debug("Sending rinseback command " + str(action) + " to HD.") @@ -1522,7 +1522,7 @@ payload = cmd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_RECIRC_CMD.value, + message_id=MsgIds.MSG_ID_UI_RECIRC_CMD_REQUEST.value, payload=payload) self.logger.debug("Sending recirculate command " + str(action) + " to HD.") @@ -1546,7 +1546,7 @@ payload = cmd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_TX_END_CMD.value, + message_id=MsgIds.MSG_ID_UI_TX_END_CMD_REQUEST.value, payload=payload) self.logger.debug("Sending treatment end command " + str(action) + " to HD.") @@ -1572,7 +1572,7 @@ opt = integer_to_bytearray(option) payload = opt message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_ALARM_USER_ACTION.value, + message_id=MsgIds.MSG_ID_UI_ALARM_USER_ACTION_REQUEST.value, payload=payload) self.logger.debug("Sending user alarm response option " + str(option) + " to HD.") @@ -1593,7 +1593,7 @@ cmd = integer_to_bytearray(toggle) payload = cmd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_USER_REQUEST_ALARM_SILENCE.value, + message_id=MsgIds.MSG_ID_USER_ALARM_SILENCE_REQUEST.value, payload=payload) self.logger.debug("Sending user alarm response option " + str(toggle) + " to HD.") @@ -1613,7 +1613,7 @@ payload = integer_to_bytearray(cmd) message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_SAMPLE_WATER_CMD.value, + message_id=MsgIds.MSG_ID_UI_SAMPLE_WATER_CMD_REQUEST.value, payload=payload) self.logger.debug("Sending user sample water command " + str(cmd) + " to HD.") @@ -1646,7 +1646,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM.value) + message_id=MsgIds.MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM_REQUEST.value) self.logger.debug("Sending user consumable installation confirm to HD.") self.can_interface.send(message, 0) @@ -1659,7 +1659,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_INSTALLATION_CONFIRM.value) + message_id=MsgIds.MSG_ID_UI_INSTALLATION_CONFIRM_REQUEST.value) self.logger.debug("Sending user disposable installation confirm to HD.") self.can_interface.send(message, 0) @@ -1698,7 +1698,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_PATIENT_CONNECTION_CONFIRM.value) + message_id=MsgIds.MSG_ID_UI_PATIENT_CONNECTION_CONFIRM_REQUEST.value) self.logger.debug("Sending user continue to treatment request to HD.") self.can_interface.send(message, 0) @@ -1724,7 +1724,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM.value) + message_id=MsgIds.MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM_REQUEST.value) self.logger.debug("Sending user patient disconnection confirm msg to HD.") self.can_interface.send(message, 0) @@ -1737,7 +1737,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM.value) + message_id=MsgIds.MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM_REQUEST.value) self.logger.debug("Sending user disposable removal confirm msg to HD.") self.can_interface.send(message, 0) @@ -1763,7 +1763,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_SERVICE_TIME.value) + message_id=MsgIds.MSG_ID_HD_SET_SERVICE_TIME_REQUEST.value) self.logger.debug("Setting HD service time.") self.can_interface.send(message, 0) @@ -1776,7 +1776,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_DG_SET_SERVICE_TIME.value) + message_id=MsgIds.MSG_ID_DG_SET_SERVICE_TIME_REQUEST.value) self.logger.debug("Setting DG service time.") self.can_interface.send(message, 0)