Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -rbac0a2d09d57dc27cfa2f2a596d57fdcbed392ee -r1d7d95e8ec37a124e2ccfeb4b462aa023dfffba7 --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision bac0a2d09d57dc27cfa2f2a596d57fdcbed392ee) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 1d7d95e8ec37a124e2ccfeb4b462aa023dfffba7) @@ -86,16 +86,18 @@ # register handler for DD operation mode broadcast messages if self.can_interface is not None: channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_OP_MODE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_dd_op_mode_data = MsgIds.MSG_ID_DD_OP_MODE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_op_mode_data, self._handler_dd_op_mode_sync) + self.msg_id_dd_version_response = MsgIds.MSG_ID_DD_VERSION_RESPONSE.value self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_DD_VERSION_RESPONSE.value, + self.msg_id_dd_version_response, self._handler_dd_version_response_sync) + self.msg_id_dd_debug_event = MsgIds.MSG_ID_DD_DEBUG_EVENT.value self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_DD_DEBUG_EVENT.value, + self.msg_id_dd_debug_event, self._handler_dd_debug_event_sync) # create properties @@ -137,7 +139,7 @@ self.td_proxy = TDProxy(self.can_interface, self.logger) - @publish(["dd_debug_events_timestamp","dd_debug_events"]) + @publish(["msg_id_dd_debug_event", "dd_debug_events_timestamp","dd_debug_events"]) def _handler_dd_debug_event_sync(self, message, timestamp = 0.0): payload = message['message'] @@ -168,7 +170,7 @@ """ self.dd_logged_in = logged_in - @publish(["dd_op_mode_timestamp","dd_operation_mode", "dd_operation_sub_mode"]) + @publish(["msg_id_dd_op_mode_data", "dd_op_mode_timestamp","dd_operation_mode", "dd_operation_sub_mode"]) def _handler_dd_op_mode_sync(self, message, timestamp = 0.0): """ Handles published DD operation mode messages. Current DD operation mode @@ -186,7 +188,7 @@ self.dd_operation_sub_mode = smode[0] self.dd_op_mode_timestamp = timestamp - @publish(["dd_version, dd_fpga_version"]) + @publish(["msg_id_dd_version_response", "dd_version, dd_fpga_version"]) def _handler_dd_version_response_sync(self,message, timestamp = 0.0): """ Handler for response from DD regarding its version.