Index: leahi_dialin/dd/modules/piston_pump.py =================================================================== diff -u -rd9c41496bfba02f66b6b38a8ecae8c017f160235 -ra286de55ce0a6fd3388ddcd68d6c9aecd00a2500 --- leahi_dialin/dd/modules/piston_pump.py (.../piston_pump.py) (revision d9c41496bfba02f66b6b38a8ecae8c017f160235) +++ leahi_dialin/dd/modules/piston_pump.py (.../piston_pump.py) (revision a286de55ce0a6fd3388ddcd68d6c9aecd00a2500) @@ -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/fp/modules/levels.py =================================================================== diff -u -rd9c41496bfba02f66b6b38a8ecae8c017f160235 -ra286de55ce0a6fd3388ddcd68d6c9aecd00a2500 --- leahi_dialin/fp/modules/levels.py (.../levels.py) (revision d9c41496bfba02f66b6b38a8ecae8c017f160235) +++ leahi_dialin/fp/modules/levels.py (.../levels.py) (revision a286de55ce0a6fd3388ddcd68d6c9aecd00a2500) @@ -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/temperatures.py =================================================================== diff -u -red7b0b3a37ce5a6b7a8c81c5d7d37785949abdf5 -ra286de55ce0a6fd3388ddcd68d6c9aecd00a2500 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision ed7b0b3a37ce5a6b7a8c81c5d7d37785949abdf5) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision a286de55ce0a6fd3388ddcd68d6c9aecd00a2500) @@ -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 -r9ac39d94327325e5b882318bc0e5126668eec66e -ra286de55ce0a6fd3388ddcd68d6c9aecd00a2500 --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 9ac39d94327325e5b882318bc0e5126668eec66e) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision a286de55ce0a6fd3388ddcd68d6c9aecd00a2500) @@ -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",