Index: dialin/common/msg_ids.py =================================================================== diff -u -rcd5a3a2636c040f0592664edbc712efc58e07c16 -rb025f74639dce5ad9f4a0c735493c7e1aab8afd3 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision cd5a3a2636c040f0592664edbc712efc58e07c16) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision b025f74639dce5ad9f4a0c735493c7e1aab8afd3) @@ -423,7 +423,7 @@ MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET = 0xA04F MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE = 0xA050 MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA051 - MSG_ID_BAD_FILL_STATES_PUBLISH_INTERVAL_OVERRIDE = 0xA052 + MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE = 0xA052 MSG_ID_DG_GET_USAGE_INFO_RECORD = 0xA053 MSG_ID_DG_SET_USAGE_INFO_RECORD = 0xA054 MSG_ID_DG_SEND_USAGE_INFO_RECORD = 0xA055 Index: dialin/dg/gen_idle.py =================================================================== diff -u -r818d439ae9c03d90902013ae07872e4e58f52890 -rb025f74639dce5ad9f4a0c735493c7e1aab8afd3 --- dialin/dg/gen_idle.py (.../gen_idle.py) (revision 818d439ae9c03d90902013ae07872e4e58f52890) +++ dialin/dg/gen_idle.py (.../gen_idle.py) (revision b025f74639dce5ad9f4a0c735493c7e1aab8afd3) @@ -41,35 +41,70 @@ self.can_interface = can_interface self.logger = logger # The current bad fill sub-state - self.sub_state = 0 + self.bad_fill_state = 0 + self.bad_fill_signal = 0 + self.target_fill_volume_ml = 0 + self.gen_idle_state = 0 if self.can_interface is not None: channel_id = DenaliChannels.dg_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DG_BAD_FILL_SUB_STATE.value + msg_id = MsgIds.MSG_ID_DG_GEN_IDLE_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self._handler_bad_fill_sub_state_sync) + self._handler_gen_idle_sync) - def get_sub_state(self): + def get_bad_fill_sub_state(self): """ Gets current bad fill sub-state - @param: sub state: (int) state index + @param: none @return: The current bad fill sub-state """ - return self.sub_state + return self.bad_fill_state - @publish(['sub_state']) - def _handler_bad_fill_sub_state_sync(self, message): + def get_gen_idle_sub_state(self): """ - Handles published bad fill sub-states message. + Gets current gen idle sub-state - @param message: published bad fill sub-states message + @param: none + @return: The current gen idle sub state + """ + return self.gen_idle_state + + def get_gen_idle_target_fill(self): + """ + Gets current gen idle target fill + + @param: none + @return: The current bad fill sub-state + """ + return self.target_fill_volume_ml + + def get_bad_fill_signal(self): + """ + Gets current bad fill signal + + @param: none + @return: The current bad fill signal + """ + return self.bad_fill_signal + + @publish(["gen_idle_state", "target_fill_volume_ml", "bad_fill_signal", "bad_fill_state"]) + def _handler_gen_idle_sync(self, message): + """ + Handles published gen idle sub-states message. + + @param message: published gen idle sub-states message @return: none """ - state = struct.unpack(' int: """ @@ -91,10 +126,10 @@ payload = reset_byte_array + ms_byte_array message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, - message_id=MsgIds.MSG_ID_BAD_FILL_STATES_PUBLISH_INTERVAL_OVERRIDE.value, + message_id=MsgIds.MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE.value, payload=payload) - self.logger.debug("override bad fill sub-states data broadcast interval") + self.logger.debug("override gen idle sub-states data broadcast interval") # Send message received_message = self.can_interface.send(message)