Index: dialin/ui/dg_simulator.py =================================================================== diff -u -rf39effbe4c532bc0a472afec5596f2943b22f459 -r6bfc6bc4ee70c49a01626f3388dffa4c6814d3f5 --- dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision f39effbe4c532bc0a472afec5596f2943b22f459) +++ dialin/ui/dg_simulator.py (.../dg_simulator.py) (revision 6bfc6bc4ee70c49a01626f3388dffa4c6814d3f5) @@ -57,36 +57,6 @@ MsgIdsDialin.MSG_DIALIN_ID_UI_SYSTEM_USAGE_REQUEST.value, self._handler_system_usage_response) - def cmd_send_dg_post_single_result(self, result: int, test_num: int) -> None: - """ - Reports a single result for power on self test - @param result: success or fail, where success = 1, 0 = fail - @param test_num: the test index [0-n] - @return: None - """ - payload = integer_to_bytearray(result) - payload += integer_to_bytearray(test_num) - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_DG_POST_SINGLE_TEST_RESULT.value, - payload=payload) - - self.can_interface.send(message, 0) - - def cmd_send_dg_post_final_result(self, result: int) -> None: - """ - Reports a final result for power on self test - @param result: success or fail, where success = 1, 0 = fail - @return: None - """ - payload = integer_to_bytearray(result) - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dg_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_DG_POST_FINAL_TEST_RESULT.value, - payload=payload) - - self.can_interface.send(message, 0) - def _handler_system_usage_response(self, message: dict) -> None: """ Handles a request for system usage @@ -577,6 +547,27 @@ self.can_interface.send(message, 0) + def cmd_send_dg_post(self, item: int, passed: bool, done: bool = False) -> None: + """ + send hd post message the single(item) or the final(done) + :param item: the post state/item index + :param passed: the post result single or final + :param done: if this is the final post message this should be true + :return: None + """ + payload = integer_to_bytearray(passed) + if not done: + payload += integer_to_bytearray(item) + + message = DenaliMessage.build_message(channel_id= DenaliChannels.dg_sync_broadcast_ch_id, + message_id= MsgIds.MSG_ID_DG_POST_FINAL_TEST_RESULT.value if done + else MsgIds.MSG_ID_DG_POST_SINGLE_TEST_RESULT.value, + payload=payload) + + self.can_interface.send(message, 0) + + # ------------------------------------------------ GENERAL MESSAGES ------------------------------------------------ + def cmd_send_dg_disinfect_progress_time_checmical(self, total: int, countdown: int) -> None: """ the broadcast progress chemical disinfect time Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r143b55a0ae82aa3481f560a33696fb8e7dae4056 -r6bfc6bc4ee70c49a01626f3388dffa4c6814d3f5 --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 143b55a0ae82aa3481f560a33696fb8e7dae4056) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 6bfc6bc4ee70c49a01626f3388dffa4c6814d3f5) @@ -86,36 +86,6 @@ self.treatment_parameter_rejections = TreatmentParameterRejections() - def cmd_send_hd_post_single_result(self, result: int, test_num: int) -> None: - """ - Reports a single result for power on self test - @param result: success or fail, where success = 1, 0 = fail - @param test_num: the test index [0-n] - @return: None - """ - payload = integer_to_bytearray(result) - payload += integer_to_bytearray(test_num) - - message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_HD_POST_SINGLE_TEST_RESULT.value, - payload=payload) - - self.can_interface.send(message, 0) - - def cmd_send_hd_post_final_result(self, result: int) -> None: - """ - Reports a final result for power on self test - @param result: success or fail, where success = 1, 0 = fail - @return: None - """ - payload = integer_to_bytearray(result) - - message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=MsgIds.MSG_ID_HD_POST_FINAL_TEST_RESULT.value, - payload=payload) - - self.can_interface.send(message, 0) - def _handler_system_usage_response(self, message: dict) -> None: """ Handles a request for system usage @@ -1882,6 +1852,25 @@ self.can_interface.send(message, 0) + def cmd_send_hd_post(self, item: int, passed: bool, done: bool = False) -> None: + """ + send hd post message the single(item) or the final(done) + :param item: the post state/item index + :param passed: the post result single or final + :param done: if this is the final post message this should be true + :return: None + """ + payload = integer_to_bytearray(passed) + if not done: + payload += integer_to_bytearray(item) + + message = DenaliMessage.build_message(channel_id= DenaliChannels.hd_sync_broadcast_ch_id, + message_id= MsgIds.MSG_ID_HD_POST_FINAL_TEST_RESULT.value if done + else MsgIds.MSG_ID_HD_POST_SINGLE_TEST_RESULT.value, + payload=payload) + + self.can_interface.send(message, 0) + # ------------------------------------------------ GENERAL MESSAGES ------------------------------------------------ def cmd_send_hd_general_response(self, message_id: int, accepted: int, reason: int,