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.