Index: leahi_dialin/dd/modules/alarms.py =================================================================== diff -u -rd5d173f098022abd74435f48a30961c7be89d184 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/alarms.py (.../alarms.py) (revision d5d173f098022abd74435f48a30961c7be89d184) +++ leahi_dialin/dd/modules/alarms.py (.../alarms.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -42,8 +42,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_alarm_broadcast_ch_id - msg_id = MsgIds.MSG_ID_ALARM_TRIGGERED.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_alarm_triggered) + self.msg_id_dd_alarm_triggered = MsgIds.MSG_ID_ALARM_TRIGGERED.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_alarm_triggered, self._handler_alarm_triggered) self.dd_alarm_triggered_timestamp = 0.0 # alarm states based on received TD alarm activation and alarm clear messages @@ -82,7 +82,7 @@ self.alarm_data_type[event_data_type] = struct_unpack_type - @publish(["dd_alarm_triggered_timestamp", "alarm_states", "alarm_conditions", "alarm_data", + @publish(["msg_id_dd_alarm_triggered", "dd_alarm_triggered_timestamp", "alarm_states", "alarm_conditions", "alarm_data", "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags"]) def _handler_alarm_triggered(self, message, timestamp = 0.0): """ Index: leahi_dialin/dd/modules/balancing_chamber.py =================================================================== diff -u -ra313166ac02fdc81a9d2b24eca45cded18fd468e -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision a313166ac02fdc81a9d2b24eca45cded18fd468e) +++ leahi_dialin/dd/modules/balancing_chamber.py (.../balancing_chamber.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -43,8 +43,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_BAL_CHAMBER_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_bal_chamber = MsgIds.MSG_ID_DD_BAL_CHAMBER_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_bal_chamber, self._handler_balancing_chamber_sync) self.execution_state = 0 @@ -57,7 +57,8 @@ self.bal_chamber_switch_only_state = 0 self.dd_bal_chamber_timestamp = 0 - @publish(["dd_bal_chamber_timestamp", + @publish(["msg_id_dd_bal_chamber", + "dd_bal_chamber_timestamp", "execution_state", "switching_state", "switching_frequency", "switching_period", "bal_chamber_fill_in_progress", Index: leahi_dialin/dd/modules/blood_leak.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -48,13 +48,13 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_BLOOD_LEAK_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_blood_leak_data = MsgIds.MSG_ID_DD_BLOOD_LEAK_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_blood_leak_data, self._handler_blood_leak_sync) channel_id = DenaliChannels.dd_to_dialin_ch_id - msg_id = MsgIds.MSG_ID_DD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_send_blood_leak_emb_mode_response = MsgIds.MSG_ID_DD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_send_blood_leak_emb_mode_response, self._handler_blood_leak_emb_mode_cmd_resp) self.hd_blood_leak_status_timestamp = 0.0 @@ -106,7 +106,7 @@ else: self.logger.debug("Invalid command!") - @publish(['hd_blood_leak_status_timestamp', 'blood_leak_status', 'blood_leak_state', + @publish(['msg_id_dd_blood_leak_data', 'hd_blood_leak_status_timestamp', 'blood_leak_status', 'blood_leak_state', 'blood_leak_error_persistent_ctr', 'blood_leak_serial_comm_state', 'blood_leak_intensity', 'blood_leak_blood_detect', 'blood_leak_intensity_moving_average', 'blood_leak_time_since_last_zero_ms', 'blood_leak_in_range_drift_status', 'blood_leak_upper_range_drift_status']) @@ -295,7 +295,7 @@ else: self.logger.debug("Invalid command!") - @publish(['hd_blood_leak_emb_mode_response_timestamp', 'blood_leak_emb_mode_cmd_response']) + @publish(['msg_id_dd_send_blood_leak_emb_mode_response', 'hd_blood_leak_emb_mode_response_timestamp', 'blood_leak_emb_mode_cmd_response']) def _handler_blood_leak_emb_mode_cmd_resp(self, message, timestamp=0.0): """ Handles published blood leak status messages. Blood leak status is captured Index: leahi_dialin/dd/modules/concentrate_pump.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -43,8 +43,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_conc_pump_data = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_conc_pump_data, self._handler_concentrate_pumps_sync) self.dd_concentrate_pumps = { @@ -85,7 +85,7 @@ self.dd_concentrate_pump_timestamp = 0.0 - @publish(["dd_concentrate_pump_timestamp", "dd_concentrate_pumps"]) + @publish(["msg_id_dd_conc_pump_data", "dd_concentrate_pump_timestamp", "dd_concentrate_pumps"]) def _handler_concentrate_pumps_sync(self, message, timestamp=0.0): """ Handles published concentrate pumps' data messages. Concentrate pumps' speed data are captured Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -45,8 +45,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_conductivity_data = MsgIds.MSG_ID_DD_CONDUCTIVITY_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_conductivity_data, self._handler_conductivity_sensors_sync) self.dd_conductivity = { @@ -59,7 +59,7 @@ self.dd_conductivity_timestamp = 0.0 - @publish(["dd_conductivity_timestamp", "dd_conductivity"]) + @publish(["msg_id_dd_conductivity_data", "dd_conductivity_timestamp", "dd_conductivity"]) def _handler_conductivity_sensors_sync(self, message, timestamp=0.0): """ Handles published DD conductivity sensor data messages. DD Conductivity sensor data are captured Index: leahi_dialin/dd/modules/dd_test_configs.py =================================================================== diff -u -rdb4edbea32c4cf60d80710bd0eb56728706ac8c8 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/dd_test_configs.py (.../dd_test_configs.py) (revision db4edbea32c4cf60d80710bd0eb56728706ac8c8) +++ leahi_dialin/dd/modules/dd_test_configs.py (.../dd_test_configs.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -46,8 +46,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_to_dialin_ch_id - msg_id = MsgIds.MSG_ID_DD_SEND_TEST_CONFIGURATION.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_send_test_config = MsgIds.MSG_ID_DD_SEND_TEST_CONFIGURATION.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_send_test_config, self._handler_dd_test_config_sync) def cmd_get_test_config_status(self, config: int): @@ -145,7 +145,7 @@ self.logger.debug("Timeout!!!!") return False - @publish(['dd_test_configs']) + @publish(['msg_id_dd_send_test_config', 'dd_test_configs']) def _handler_dd_test_config_sync(self, message, timestamp=0.0): """ Handles published test configuration status messages. Index: leahi_dialin/dd/modules/dialysate_pump.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -45,8 +45,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DIALYSATE_PUMPS_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_dialysate_pumps_data = MsgIds.MSG_ID_DIALYSATE_PUMPS_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_dialysate_pumps_data, self._handler_dialysate_pumps_sync) self.dd_dialysate_pumps = { @@ -78,7 +78,7 @@ self.dd_dialysate_pump_timestamp = 0 - @publish(["dd_dialysate_pump_timestamp", "dd_dialysate_pumps"]) + @publish(["msg_id_dd_dialysate_pumps_data", "dd_dialysate_pump_timestamp", "dd_dialysate_pumps"]) def _handler_dialysate_pumps_sync(self, message, timestamp=0.0): """ Handles published dialysate pumps' data messages. Dialysate pumps' speed data are captured Index: leahi_dialin/dd/modules/gen_dialysate.py =================================================================== diff -u -r4356d86fbeba5afa08ebe258b9ad271f345e1b82 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 4356d86fbeba5afa08ebe258b9ad271f345e1b82) +++ leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -43,8 +43,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_GEN_DIALYSATE_MODE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_gen_dialysate_mode_data = MsgIds.MSG_ID_DD_GEN_DIALYSATE_MODE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_gen_dialysate_mode_data, self._handler_gen_dialysate_sync) self.execution_state = 0 @@ -58,7 +58,8 @@ self.dialysate_good_to_deliver = 0 self.dd_gen_dialysate_timestamp = 0 - @publish(["dd_gen_dialysate_timestamp", + @publish(["msg_id_dd_gen_dialysate_mode_data", + "dd_gen_dialysate_timestamp", "execution_state", "dialysate_delivery_in_progress", "d6_level", "d63_level", "d46_level", Index: leahi_dialin/dd/modules/heaters.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -80,10 +80,10 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_HEATERS_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_heaters_sync) + self.msg_id_dd_heaters_data = MsgIds.MSG_ID_DD_HEATERS_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_heaters_data, self._handler_heaters_sync) - @publish(["dd_heaters_timestamp", "dd_heaters"]) + @publish(["msg_id_dd_heaters_data", "dd_heaters_timestamp", "dd_heaters"]) def _handler_heaters_sync(self, message, timestamp=0.0): """ Handles published DD heaters message Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -46,8 +46,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_LEVEL_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_levels_sync) + self.msg_id_dd_level_data = MsgIds.MSG_ID_DD_LEVEL_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_level_data, self._handler_levels_sync) self.dd_level_sensors = { DDLevelSensorEnum.D6_LEVEL.name: 0, @@ -58,7 +58,7 @@ self.dd_levels_timestamp = 0 - @publish(["dd_levels_timestamp", "dd_level_sensor"]) + @publish(["msg_id_dd_level_data", "dd_levels_timestamp", "dd_level_sensor"]) def _handler_levels_sync(self, message, timestamp=0.0): """ Handles published levels message Index: leahi_dialin/dd/modules/piston_pump.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/piston_pump.py (.../piston_pump.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/dd/modules/piston_pump.py (.../piston_pump.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -45,8 +45,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_PISTON_PUMP_CONTROL_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_piston_pump_control_data = MsgIds.MSG_ID_DD_PISTON_PUMP_CONTROL_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_piston_pump_control_data, self._handler_piston_pumps_sync) self.dd_piston_pumps = { @@ -70,7 +70,7 @@ self.dd_piston_pump_timestamp = 0.0 - @publish(["dd_piston_pump_timestamp", "dd_piston_pumps"]) + @publish(["msg_id_dd_piston_pump_control_data", "dd_piston_pump_timestamp", "dd_piston_pumps"]) def _handler_piston_pumps_sync(self, message, timestamp=0.0): """ Handles published piston pumps' data messages. Piston pumps' data are captured Index: leahi_dialin/dd/modules/post_gen_dialysate.py =================================================================== diff -u -r84343d0460bb04169cf6fedb023b5eaf332bfc65 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/post_gen_dialysate.py (.../post_gen_dialysate.py) (revision 84343d0460bb04169cf6fedb023b5eaf332bfc65) +++ leahi_dialin/dd/modules/post_gen_dialysate.py (.../post_gen_dialysate.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -43,13 +43,14 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_post_gen_dialysate_state_data = MsgIds.MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_post_gen_dialysate_state_data, self._handler_post_gen_dialysate_sync) self.execution_state = 0 self.post_gen_state_timestamp = 0 + @publish(["msg_id_dd_post_gen_dialysate_state_data", "execution_state", "post_gen_state_timestamp"]) def _handler_post_gen_dialysate_sync(self, message, timestamp=0.0): """ Handles published post gen dialysate data messages. Index: leahi_dialin/dd/modules/pre_gen_dialysate.py =================================================================== diff -u -rbcee4d024cee5855b3662785cad1c6834c5dc858 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/pre_gen_dialysate.py (.../pre_gen_dialysate.py) (revision bcee4d024cee5855b3662785cad1c6834c5dc858) +++ leahi_dialin/dd/modules/pre_gen_dialysate.py (.../pre_gen_dialysate.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -43,13 +43,13 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_pre_gen_dialysate_state_data = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_pre_gen_dialysate_state_data, self._handler_pre_gen_state_sync) channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_pre_gen_dialysate_request_data = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_pre_gen_dialysate_request_data, self._handler_pre_gen_request_sync) self.execution_state = 0 @@ -62,6 +62,7 @@ self.pre_gen_acid = 0 self.pre_gen_bicarb = 0 + @publish(["msg_id_dd_pre_gen_dialysate_state_data", "execution_state", "pre_gen_state_timestamp"]) def _handler_pre_gen_state_sync(self, message, timestamp=0.0): """ Handles published pre gen dialysate data messages. @@ -75,7 +76,9 @@ self.pre_gen_state_timestamp = timestamp - + @publish(["msg_id_dd_pre_gen_dialysate_request_data", "pre_gen_request_timestamp", + "pre_gen_start", "pre_gen_dial_rate", "pre_gen_dial_temp", + "pre_gen_acid", "pre_gen_bicarb"]) def _handler_pre_gen_request_sync(self, message, timestamp=0.0): """ Handles published pre gen dialysate request messages. Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -44,8 +44,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_PRESSURES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_pressures_data = MsgIds.MSG_ID_DD_PRESSURES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_pressures_data, self._handler_pressures_sync) self.dd_pressures = { @@ -81,7 +81,7 @@ self.dd_pressures_timestamp = 0 - @publish(["dd_pressures_timestamp", "dd_pressures"]) + @publish(["msg_id_dd_pressures_data", "dd_pressures_timestamp", "dd_pressures"]) def _handler_pressures_sync(self, message,timestamp=0.0): """ Handles published DD pressure data messages. DD Pressure data are captured Index: leahi_dialin/dd/modules/spent_chamber_fill.py =================================================================== diff -u -r1d437b93d4547966c5f4d0352b7e4eb74ff58547 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/spent_chamber_fill.py (.../spent_chamber_fill.py) (revision 1d437b93d4547966c5f4d0352b7e4eb74ff58547) +++ leahi_dialin/dd/modules/spent_chamber_fill.py (.../spent_chamber_fill.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -41,16 +41,17 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_SPENT_CHAMBER_FILL_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_spent_chamber_fill_data = MsgIds.MSG_ID_DD_SPENT_CHAMBER_FILL_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_spent_chamber_fill_data, self._handler_spent_chamber_fill_sync) self.execution_state = 0 self.switching_period = 0 self.total_spent_chamber_fill_counter = 0 self.dd_spent_chamber_timestamp = 0 - @publish(["dd_spent_chamber_timestamp", + @publish(["msg_id_dd_spent_chamber_fill_data", + "dd_spent_chamber_timestamp", "execution_state", "switching_period", "total_spent_chamber_fill_counter"]) def _handler_spent_chamber_fill_sync(self, message, timestamp=0.0): Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r8652ceb8c5807e317feb1b846f9c0292f842cfbe -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 8652ceb8c5807e317feb1b846f9c0292f842cfbe) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -56,11 +56,11 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_TEMPERATURE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_temperature_data = MsgIds.MSG_ID_DD_TEMPERATURE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_temperature_data, self._handler_temperature_sensors_sync) - @publish(["dd_temperatures_timestamp", "dd_temperatures"]) + @publish(["msg_id_dd_temperature_data", "dd_temperatures_timestamp", "dd_temperatures"]) def _handler_temperature_sensors_sync(self, message,timestamp=0.0): """ Handles published DD temperature sensors message Index: leahi_dialin/dd/modules/ultrafiltration.py =================================================================== diff -u -r256ffed682a9c78ee890a3f3132eb6c6518e7ee8 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/ultrafiltration.py (.../ultrafiltration.py) (revision 256ffed682a9c78ee890a3f3132eb6c6518e7ee8) +++ leahi_dialin/dd/modules/ultrafiltration.py (.../ultrafiltration.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -43,8 +43,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_UF_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_uf_data = MsgIds.MSG_ID_DD_UF_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_uf_data, self._handler_ultrafiltration_sync) self.uf_exec_state = 0 @@ -53,7 +53,7 @@ self.is_uf_requested = 0 self.uf_timestamp = 0.0 - @publish(["uf_timestamp", "uf_exec_state","uf_rate","compensated_uf_rate","is_uf_requested"]) + @publish(["msg_id_dd_uf_data", "uf_timestamp", "uf_exec_state","uf_rate","compensated_uf_rate","is_uf_requested"]) def _handler_ultrafiltration_sync(self, message, timestamp=0.0): """ Handles published ultrafiltration data messages. Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -61,8 +61,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_VALVES_STATES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_valves_sync) + self.msg_id_dd_valves_states_data = MsgIds.MSG_ID_DD_VALVES_STATES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_valves_states_data, self._handler_valves_sync) self.valve_states_all = 0x00000000 self.d14_valv = {"id": DDValveNames.D14_VALV.value, "state": DEENERGIZED} @@ -171,7 +171,7 @@ else: return DEENERGIZED - @publish([ + @publish(["msg_id_dd_valves_states_data", "dd_valves_states_timestamp", "valve_states_all", "d14_valv", Index: leahi_dialin/fp/modules/alarms.py =================================================================== diff -u -rd5d173f098022abd74435f48a30961c7be89d184 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/fp/modules/alarms.py (.../alarms.py) (revision d5d173f098022abd74435f48a30961c7be89d184) +++ leahi_dialin/fp/modules/alarms.py (.../alarms.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -42,8 +42,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_alarm_broadcast_ch_id - msg_id = MsgIds.MSG_ID_ALARM_TRIGGERED.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_alarm_triggered) + self.msg_id_fp_alarm_triggered = MsgIds.MSG_ID_ALARM_TRIGGERED.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_alarm_triggered, self._handler_alarm_triggered) self.fp_alarm_triggered_timestamp = 0.0 # alarm states based on received TD alarm activation and alarm clear messages @@ -82,8 +82,8 @@ self.alarm_data_type[event_data_type] = struct_unpack_type - @publish(["fp_alarm_triggered_timestamp", "alarm_states", "alarm_conditions", "alarm_data", - "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags"]) + @publish(["msg_id_fp_alarm_triggered", "fp_alarm_triggered_timestamp", "alarm_states", "alarm_conditions", + "alarm_data", "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags"]) def _handler_alarm_triggered(self, message, timestamp = 0.0): """ Handles published FP alarm activation messages. Index: leahi_dialin/fp/modules/boost_pump.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/fp/modules/boost_pump.py (.../boost_pump.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/fp/modules/boost_pump.py (.../boost_pump.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -42,8 +42,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_BOOST_PUMP_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_fp_boost_pump_data = MsgIds.MSG_ID_FP_BOOST_PUMP_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_boost_pump_data, self._handler_pump_sync) self.boost_pump_timestamp = 0.0 self.boost_pump = { @@ -60,7 +60,7 @@ } } - @publish(["boost_pump_timestamp", "boost_pump" ]) + @publish(["msg_id_fp_boost_pump_data", "boost_pump_timestamp", "boost_pump" ]) def _handler_pump_sync(self, message, timestamp=0.0): """ Handles published FP ro pump data messages. FP ro pump data is captured Index: leahi_dialin/fp/modules/conductivity_sensors.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -43,8 +43,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_fp_conductivity_data = MsgIds.MSG_ID_FP_CONDUCTIVITY_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_conductivity_data, self._handler_conductivity_sensors_sync) self.fp_conductivity_timestamp = 0.0 @@ -53,7 +53,7 @@ FPConductivitySensorsEnum.P18_COND.name: 0.0 } - @publish(["fp_conductivity_timestamp", "fp_conductivity"]) + @publish(["msg_id_fp_conductivity_data", "fp_conductivity_timestamp", "fp_conductivity"]) def _handler_conductivity_sensors_sync(self, message, timestamp=0.0): """ Handles published FP conductivity sensor data messages. Conductivity sensor data are captured Index: leahi_dialin/fp/modules/flow_sensors.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -45,8 +45,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_FLOW_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_flow_sensor_sync) + self.msg_id_fp_flow_data = MsgIds.MSG_ID_FP_FLOW_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_flow_data, self._handler_flow_sensor_sync) self.fp_flows = { FPFlowSensorNames.P7_FLOW.name: { @@ -61,7 +61,7 @@ self.fp_flow_timestamp = 0 - @publish(["fp_flows_timestamp", "fp_flows"]) + @publish(["msg_id_fp_flow_data", "fp_flows_timestamp", "fp_flows"]) def _handler_flow_sensor_sync(self, message, timestamp=0.0): """ Handles published flow sensor message Index: leahi_dialin/fp/modules/fp_test_configs.py =================================================================== diff -u -rdb4edbea32c4cf60d80710bd0eb56728706ac8c8 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/fp/modules/fp_test_configs.py (.../fp_test_configs.py) (revision db4edbea32c4cf60d80710bd0eb56728706ac8c8) +++ leahi_dialin/fp/modules/fp_test_configs.py (.../fp_test_configs.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -46,8 +46,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_to_dialin_ch_id - msg_id = MsgIds.MSG_ID_FP_SEND_TEST_CONFIGURATION.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_fp_send_test_config = MsgIds.MSG_ID_FP_SEND_TEST_CONFIGURATION.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_send_test_config, self._handler_fp_test_config_sync) def cmd_get_test_config_status(self, config: int): @@ -146,7 +146,7 @@ self.logger.debug("Timeout!!!!") return False - @publish(['fp_test_configs']) + @publish(['msg_id_fp_send_test_config', 'fp_test_configs']) def _handler_fp_test_config_sync(self, message, timestamp=0.0): """ Handles published test configuration status messages. Index: leahi_dialin/fp/modules/levels.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/fp/modules/levels.py (.../levels.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/fp/modules/levels.py (.../levels.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -46,15 +46,15 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_LEVEL_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_levels_sync) + self.msg_id_fp_level_data = MsgIds.MSG_ID_FP_LEVEL_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_level_data, self._handler_levels_sync) self.fp_levels = { FPFloaterLevelSensorNames.P25_LEVEL.name: 0 } self.fp_levels_timestamp = 0 - @publish(["fp_levels_timestamp", + @publish(["msg_id_fp_level_data", "fp_levels_timestamp", "fp_levels",]) def _handler_levels_sync(self, message, timestamp=0.0): """ Index: leahi_dialin/fp/modules/permeate_tank.py =================================================================== diff -u -r1c0302ebcb0d4d70249ab0932f43b0143e19a1d9 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/fp/modules/permeate_tank.py (.../permeate_tank.py) (revision 1c0302ebcb0d4d70249ab0932f43b0143e19a1d9) +++ leahi_dialin/fp/modules/permeate_tank.py (.../permeate_tank.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -43,13 +43,14 @@ if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_PERMEATE_TANK_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_fp_permeate_tank_data = MsgIds.MSG_ID_FP_PERMEATE_TANK_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_permeate_tank_data, self._handler_permeate_tank_sync) self.permeate_tank_state = 0 self.permeate_tank_timestamp = 0.0 + @publish(["msg_id_fp_permeate_tank_data", "permeate_tank_state", "permeate_tank_timestamp", ]) def _handler_permeate_tank_sync(self, message, timestamp=0.0): """ Handles permeate tank data messages. Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -42,8 +42,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_PRESSURES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_fp_pressures_data = MsgIds.MSG_ID_FP_PRESSURES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_pressures_data, self._handler_pressure_sync) self.fp_pressures = { @@ -60,7 +60,7 @@ self.fp_pressure_timestamp = 0.0 - @publish(["fp_pressure_timestamp", "fp_pressures"]) + @publish(["msg_id_fp_pressures_data", "fp_pressure_timestamp", "fp_pressures"]) def _handler_pressure_sync(self, message, timestamp=0.0): """ Handles published FP pressure sensor data messages. Pressure data are captured Index: leahi_dialin/fp/modules/ro_pump.py =================================================================== diff -u -r956757fac807b52aec078e84127089db5dff069f -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.py) (revision 956757fac807b52aec078e84127089db5dff069f) +++ leahi_dialin/fp/modules/ro_pump.py (.../ro_pump.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -42,8 +42,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_RO_PUMP_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_fp_ro_pump_data = MsgIds.MSG_ID_FP_RO_PUMP_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_ro_pump_data, self._handler_pump_sync) self.ro_pump = { @@ -62,7 +62,7 @@ self.ro_pump_timestamp = 0.0 - @publish(["ro_pump_timestamp", "ro_pump" ]) + @publish(["msg_id_fp_ro_pump_data", "ro_pump_timestamp", "ro_pump" ]) def _handler_pump_sync(self, message, timestamp=0.0): """ Handles published FP ro pump data messages. FP ro pump data is captured Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -r77740bc2ccace473a471515cadd4bc1353360cd6 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -37,8 +37,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_TEMPERATURE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_fp_temperature_data = MsgIds.MSG_ID_FP_TEMPERATURE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_temperature_data, self._handler_temperature_sensors_sync) self.fp_temperature_sensors_timestamp = 0 @@ -57,7 +57,7 @@ FPTemperaturesNames.P16_TEMP.name: 0.0, } - @publish(["fp_temperatures_timestamp", "fp_temperatures"]) + @publish(["msg_id_fp_temperature_data", "fp_temperatures_timestamp", "fp_temperatures"]) def _handler_temperature_sensors_sync(self, message,timestamp=0.0): """ Handles published FP temperature sensors message Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u -r77740bc2ccace473a471515cadd4bc1353360cd6 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -56,8 +56,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_VALVES_STATES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_valves_sync) + self.msg_id_fp_valves_states_data = MsgIds.MSG_ID_FP_VALVES_STATES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_valves_states_data, self._handler_valves_sync) self.valve_states_all = 0x0000 self.m4_valv = {"id": FPValveNames.M4_VALV.value, "state": DEENERGIZED} @@ -127,6 +127,7 @@ return DEENERGIZED @publish([ + "msg_id_fp_valves_states_data", "fp_valves_states_timestamp", "valve_states_all", "m4_valv", Index: leahi_dialin/td/modules/air_pump.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -44,8 +44,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.td_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_TD_AIR_PUMP_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_air_pump_data = MsgIds.MSG_ID_TD_AIR_PUMP_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_air_pump_data, self._handler_air_pump_sync) self.td_air_pump = { @@ -57,7 +57,7 @@ self.td_air_pump_timestamp = 0.0 - @publish(["td_air_pump_timestamp", "td_air_pump"]) + @publish(["msg_id_td_air_pump_data", "td_air_pump_timestamp", "td_air_pump"]) def _handler_air_pump_sync(self, message, timestamp=0.0): """ Handles published air pump data messages. Index: leahi_dialin/td/modules/air_trap.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -48,8 +48,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.td_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_TD_AIR_TRAP_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_air_trap_data = MsgIds.MSG_ID_TD_AIR_TRAP_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_air_trap_data, self._handler_air_trap_sync) self.air_trap_level_sensors = { @@ -69,7 +69,8 @@ self.air_control = 0 self.td_air_trap_timestamp = 0.0 - @publish(["td_air_trap_timestamp", + @publish(["msg_id_td_air_trap_data", + "td_air_trap_timestamp", "air_trap_level_sensors", "air_trap_valve_states", "air_control"]) Index: leahi_dialin/td/modules/alarms.py =================================================================== diff -u -rd5d173f098022abd74435f48a30961c7be89d184 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision d5d173f098022abd74435f48a30961c7be89d184) +++ leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -77,23 +77,23 @@ if self.can_interface is not None: channel_id = DenaliChannels.td_alarm_broadcast_ch_id - msg_id = MsgIds.MSG_ID_ALARM_STATUS_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_alarm_status_data = MsgIds.MSG_ID_ALARM_STATUS_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_alarm_status_data, self._handler_alarms_status_sync) channel_id = DenaliChannels.td_alarm_broadcast_ch_id - msg_id = MsgIds.MSG_ID_ALARM_TRIGGERED.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_alarm_triggered = MsgIds.MSG_ID_ALARM_TRIGGERED.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_alarm_triggered, self._handler_alarm_trigger) - msg_id = MsgIds.MSG_ID_ALARM_CLEARED.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_alarm_cleared = MsgIds.MSG_ID_ALARM_CLEARED.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_alarm_cleared, self._handler_alarm_clear) - msg_id = MsgIds.MSG_ID_ALARM_CONDITION_CLEARED.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_alarm_condition_cleared = MsgIds.MSG_ID_ALARM_CONDITION_CLEARED.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_alarm_condition_cleared, self._handler_alarm_condition_clear) channel_id = DenaliChannels.td_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_TD_ALARM_INFORMATION_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_alarm_info_data = MsgIds.MSG_ID_TD_ALARM_INFORMATION_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_alarm_info_data, self._handler_alarm_information_sync) self.td_alarm_status_timestamp = 0.0 @@ -161,7 +161,7 @@ for x in range(500): self.alarm_states[x] = False - @publish(["td_alarm_status_timestamp", "alarms_priority_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags"]) + @publish(["msg_id_td_alarm_status_data", "td_alarm_status_timestamp", "alarms_priority_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags"]) def _handler_alarms_status_sync(self, message, timestamp=0.0): """ Handles published alarms status messages. alarms status data are captured @@ -178,8 +178,8 @@ self.td_alarm_status_timestamp = timestamp - @publish(["td_alarm_triggered_timestamp", "alarm_states", "alarm_conditions", "alarm_data", - "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags"]) + @publish(["msg_id_td_alarm_triggered", "td_alarm_triggered_timestamp", "alarm_states", "alarm_conditions", + "alarm_data", "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags"]) def _handler_alarm_trigger(self, message, timestamp=0.0): """ Handles published TD alarm activation messages. @@ -218,7 +218,7 @@ self.last_alarm_data_2 = data_2[0] self.td_alarm_triggered_timestamp = timestamp - @publish(["TD_alarm_cleared_timestamp", "alarm_states", "alarm_conditions"]) + @publish(["msg_id_td_alarm_cleared", "TD_alarm_cleared_timestamp", "alarm_states", "alarm_conditions"]) def _handler_alarm_clear(self, message, timestamp=0.0): """ Handles published TD alarm clear messages. @@ -231,7 +231,7 @@ self.alarm_conditions[alarm_id[0]] = False self.td_alarm_cleared_timestamp = timestamp - @publish(["td_alarm_clr_condition_timestamp", "alarm_conditions", "alarm_conditions"]) + @publish(["msg_id_td_alarm_condition_cleared", "td_alarm_clr_condition_timestamp", "alarm_conditions", "alarm_conditions"]) def _handler_alarm_condition_clear(self, message, timestamp=0.0): """ Handles published TD alarm clear alarm condition messages. @@ -243,8 +243,9 @@ self.alarm_conditions[alarm_id[0]] = False self.td_alarm_clr_condition_timestamp = timestamp - @publish(["td_alarm_information_timestamp", "alarm_volume", "alarm_audio_curr_hg", "alarm_audio_curr_lg", "alarm_backup_audio_curr", - "safety_shutdown_active", "ac_power_lost", "alarm_table_button_blockers", "alarm_state_button_blockers"]) + @publish(["msg_id_td_alarm_info_data", "td_alarm_information_timestamp", "alarm_volume", "alarm_audio_curr_hg", + "alarm_audio_curr_lg", "alarm_backup_audio_curr", "safety_shutdown_active", "ac_power_lost", + "alarm_table_button_blockers", "alarm_state_button_blockers"]) def _handler_alarm_information_sync(self, message, timestamp=0.0): """ Handles published TD alarm information broadcast messages. Index: leahi_dialin/td/modules/blood_flow.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -41,8 +41,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.td_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_TD_BLOOD_PUMP_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_blood_pump_data = MsgIds.MSG_ID_TD_BLOOD_PUMP_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_blood_pump_data, self._handler_blood_flow_sync) self.td_blood_flow_timestamp = 0.0 self.h4_motor = { @@ -57,7 +57,7 @@ TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name: 0 } - @publish(["td_blood_flow_timestamp", "h4_motor"]) + @publish(["msg_id_td_blood_pump_data", "td_blood_flow_timestamp", "h4_motor"]) def _handler_blood_flow_sync(self, message, timestamp=0.0): """ Handles published blood flow data messages. Blood flow data are captured Index: leahi_dialin/td/modules/bubble_detector.py =================================================================== diff -u -r6ffa85d20aa8cd0d8c21e89283eb07035df46bc2 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision 6ffa85d20aa8cd0d8c21e89283eb07035df46bc2) +++ leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -55,8 +55,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.td_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_TD_BUBBLES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_bubbles_data = MsgIds.MSG_ID_TD_BUBBLES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_bubbles_data, self._handler_air_bubbles_data_sync) self.td_air_bubbles_timestamp = 0.0 @@ -69,7 +69,7 @@ } } - @publish(["td_air_bubbles_timestamp", "h18_bubble_detector"]) + @publish(["msg_id_td_bubbles_data", "td_air_bubbles_timestamp", "h18_bubble_detector"]) def _handler_air_bubbles_data_sync(self, message, timestamp=0.0): """ Handles published air bubbles data messages. Air bubble status and state are captured. Index: leahi_dialin/td/modules/ejector.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -44,8 +44,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.td_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_TD_EJECTOR_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_ejector_data = MsgIds.MSG_ID_TD_EJECTOR_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_ejector_data, self._handler_ejector_sync) self.h5_motor = { @@ -56,7 +56,7 @@ } self.td_ejector_timestamp = 0 - @publish(["td_ejector_timestamp", "h5_motor"]) + @publish(["msg_id_td_ejector_data", "td_ejector_timestamp", "h5_motor"]) def _handler_ejector_sync(self, message, timestamp=0.0): """ Handles published ejector data messages. Index: leahi_dialin/td/modules/pressure_sensors.py =================================================================== diff -u -r956757fac807b52aec078e84127089db5dff069f -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 956757fac807b52aec078e84127089db5dff069f) +++ leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -41,8 +41,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.td_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_TD_PRESSURE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_pressure_data = MsgIds.MSG_ID_TD_PRESSURE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_pressure_data, self._handler_pressure_sync) self.td_pressure_timestamp = 0.0 @@ -66,6 +66,7 @@ self.tmp_max_limit = 0.0 @publish([ + "msg_id_td_pressure_data", "td_pressure_timestamp", "td_pressure_sensors", "pressure_limits_state", Index: leahi_dialin/td/modules/switches.py =================================================================== diff -u -r956757fac807b52aec078e84127089db5dff069f -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/td/modules/switches.py (.../switches.py) (revision 956757fac807b52aec078e84127089db5dff069f) +++ leahi_dialin/td/modules/switches.py (.../switches.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -44,14 +44,14 @@ if self.can_interface is not None: channel_id = DenaliChannels.td_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_TD_SWITCHES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_switches_data = MsgIds.MSG_ID_TD_SWITCHES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_switches_data, self._handler_switches_sync) self.td_switches_status = {TDSwitchesNames.H9_FRONT_DOOR.name: TDSwitchStatus.CLOSED.value} self.td_switches_timestamp = 0.0 - @publish(["td_switches_timestamp", "td_switches_status"]) + @publish(["msg_id_td_switches_data", "td_switches_timestamp", "td_switches_status"]) def _handler_switches_sync(self, message, timestamp=0.0): """ Handles published TD switches data messages. Switches data are captured for reference. Index: leahi_dialin/td/modules/td_test_configs.py =================================================================== diff -u -rac344e50f31d776075a64f775b38244531f880d6 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/td/modules/td_test_configs.py (.../td_test_configs.py) (revision ac344e50f31d776075a64f775b38244531f880d6) +++ leahi_dialin/td/modules/td_test_configs.py (.../td_test_configs.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -46,8 +46,8 @@ if self.can_interface is not None: channel_id = DenaliChannels.td_to_dialin_ch_id - msg_id = MsgIds.MSG_ID_TD_SEND_TEST_CONFIGURATION.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_send_test_config = MsgIds.MSG_ID_TD_SEND_TEST_CONFIGURATION.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_send_test_config, self._handler_td_test_config_sync) def cmd_get_test_config_status(self, config: int): @@ -146,7 +146,7 @@ self.logger.debug("Timeout!!!!") return False - @publish(['td_test_configs']) + @publish(['msg_id_td_send_test_config', 'td_test_configs']) def _handler_td_test_config_sync(self, message, timestamp=0.0): """ Handles published test configuration status messages. Index: leahi_dialin/td/modules/treatment.py =================================================================== diff -u -r956757fac807b52aec078e84127089db5dff069f -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/td/modules/treatment.py (.../treatment.py) (revision 956757fac807b52aec078e84127089db5dff069f) +++ leahi_dialin/td/modules/treatment.py (.../treatment.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -41,23 +41,23 @@ if self.can_interface is not None: channel_id = DenaliChannels.td_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_TD_TREATMENT_PARAM_RANGES.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_treatment_param_ranges = MsgIds.MSG_ID_TD_TREATMENT_PARAM_RANGES.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_treatment_param_ranges, self._handler_treatment_param_ranges_sync) - msg_id = MsgIds.MSG_ID_TD_SALINE_BOLUS_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_saline_bolus_data = MsgIds.MSG_ID_TD_SALINE_BOLUS_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_saline_bolus_data, self._handler_saline_bolus_sync) - msg_id = MsgIds.MSG_ID_TD_ULTRAFILTRATION_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_uf_data = MsgIds.MSG_ID_TD_ULTRAFILTRATION_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_uf_data, self._handler_uf_sync) - msg_id = MsgIds.MSG_ID_TD_TREATMENT_TIME_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_treatment_time_data = MsgIds.MSG_ID_TD_TREATMENT_TIME_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_treatment_time_data, self._handler_treatment_time_sync) - msg_id = MsgIds.MSG_ID_TD_TREATMENT_STATE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_treatment_state_data = MsgIds.MSG_ID_TD_TREATMENT_STATE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_treatment_state_data, self._handler_treatment_state_sync) - msg_id = MsgIds.MSG_ID_TD_RSP_CURRENT_TREATMENT_PARAMETERS.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_rsp_current_treatment_parameters = MsgIds.MSG_ID_TD_RSP_CURRENT_TREATMENT_PARAMETERS.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_rsp_current_treatment_parameters, self._handler_resp_treatment_parameters_sync) # Treatment param ranges data @@ -123,7 +123,7 @@ self.uf_vol = 0.0 self.tx_param_req_timestamp = 0 - @publish(["min_tx_time","max_tx_time","min_uf_volume","max_uf_volume", + @publish(["msg_id_td_treatment_param_ranges", "min_tx_time","max_tx_time","min_uf_volume","max_uf_volume", "min_dial_rate","max_dial_rate","tx_params_timestamp"]) def _handler_treatment_param_ranges_sync(self, message, timestamp=0.0): """ @@ -148,7 +148,7 @@ self.tx_params_timestamp = timestamp - @publish(["tgt_saline_volume","cum_saline_volume","bol_saline_volume", + @publish(["msg_id_td_saline_bolus_data", "tgt_saline_volume","cum_saline_volume","bol_saline_volume", "saline_bolus_state","saline_bolus_timestamp"]) def _handler_saline_bolus_sync(self, message, timestamp=0.0): """ @@ -169,7 +169,7 @@ self.saline_bolus_timestamp = timestamp - @publish(["set_uf_volume","tgt_uf_rate","uf_volume_delivered", + @publish(["msg_id_td_uf_data", "set_uf_volume","tgt_uf_rate","uf_volume_delivered", "uf_state","uf_timestamp"]) def _handler_uf_sync(self, message, timestamp=0.0): """ @@ -190,7 +190,7 @@ self.uf_timestamp = timestamp - @publish(["tx_time_prescribed","tx_time_elapsed","tx_time_remaining", + @publish(["msg_id_td_treatment_time_data", "tx_time_prescribed","tx_time_elapsed","tx_time_remaining", "tx_time_timestamp"]) def _handler_treatment_time_sync(self, message, timestamp=0.0): """ @@ -209,7 +209,7 @@ self.tx_time_timestamp = timestamp - @publish(["tx_sub_mode","blood_prime_state","dialysis_state","isolated_uf_state", + @publish(["msg_id_td_treatment_state_data", "tx_sub_mode","blood_prime_state","dialysis_state","isolated_uf_state", "tx_stop_state","rinseback_state","tx_recirc_state","tx_end_state","tx_state_timestamp"]) def _handler_treatment_state_sync(self, message, timestamp=0.0): """ @@ -238,8 +238,8 @@ self.tx_state_timestamp = timestamp - @publish(["blood_flow_rate", "dialysate_flow_rate", "tx_duration", "saline_bolus_volume", - "hep_stop_time", "hep_time", "acid_con", "bicarb_con", + @publish(["msg_id_td_rsp_current_treatment_parameters", "blood_flow_rate", "dialysate_flow_rate", "tx_duration", + "saline_bolus_volume", "hep_stop_time", "hep_time", "acid_con", "bicarb_con", "dialyzer_type", "bp_interval", "rb_flow_rate", "rb_volume", "art_pressure_window","venous_pressure_window","venous_asymm_window","tmp_limit_window", "dialysate_temp", "hep_dispense_rate", "hep_bolus_vol", "uf_vol"]) Index: leahi_dialin/td/modules/valves.py =================================================================== diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/td/modules/valves.py (.../valves.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) +++ leahi_dialin/td/modules/valves.py (.../valves.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -64,16 +64,16 @@ if self.can_interface is not None: channel_id = DenaliChannels.td_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_TD_VALVES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_valves_data = MsgIds.MSG_ID_TD_VALVES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_valves_data, self._handler_valves_sync) self.td_valves_timestamp = 0.0 # A dictionary of the valves with the status self.valves_status = {TDValvesEnum.H1_VALV.name: {}, TDValvesEnum.H19_VALV.name: {}} - @publish(["td_valves_timestamp","valves_status"]) + @publish(["msg_id_td_valves_data", "td_valves_timestamp","valves_status"]) def _handler_valves_sync(self, message: dict, timestamp=0.0) -> None: """ Handles published valves data messages. TD valves data are captured Index: leahi_dialin/td/modules/voltages.py =================================================================== diff -u -r956757fac807b52aec078e84127089db5dff069f -r6fa8a72c463310fd943270135aebfcb10d7a1210 --- leahi_dialin/td/modules/voltages.py (.../voltages.py) (revision 956757fac807b52aec078e84127089db5dff069f) +++ leahi_dialin/td/modules/voltages.py (.../voltages.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) @@ -7,7 +7,7 @@ # # @file voltages.py # -# @author (last) Micahel Garthwaite +# @author (last) Michael Garthwaite # @date (last) 03-Mar-2023 # @author (original) Sean Nash # @date (original) 15-Apr-2021 @@ -42,14 +42,14 @@ if self.can_interface is not None: channel_id = DenaliChannels.td_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_TD_VOLTAGES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_voltages_data = MsgIds.MSG_ID_TD_VOLTAGES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_voltages_data, self._handler_monitored_voltages_sync) self.monitored_voltages = [0.0] * TDMonitoredVoltages.NUM_OF_MONITORED_VOLTAGE_LINES.value self.td_voltages_timestamp = 0.0 - @publish(["td_voltages_timestamp","monitored_voltages"]) + @publish(["msg_id_td_voltages_data", "td_voltages_timestamp","monitored_voltages"]) def _handler_monitored_voltages_sync(self, message, timestamp=0.0): """ Handles published TD monitored voltages data messages. Voltage data are captured