Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r7005ecad003035b3a7d4e7f4a13de33dbcb00a3c -r6a0355dab8438b4a3e2c641c91e572ea1fb9d13f --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 7005ecad003035b3a7d4e7f4a13de33dbcb00a3c) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 6a0355dab8438b4a3e2c641c91e572ea1fb9d13f) @@ -417,17 +417,21 @@ self.can_interface.send(message, 0) - def cmd_send_hd_operation_mode(self, mode): + def cmd_send_hd_operation_mode(self, opMode, subMode): """ Broadcasts the current HD operation mode - @param: (int) mode + @param: (int) opMode + @param: (int) subMode @return: None """ - if not isinstance(mode, int): + if not isinstance(opMode, int): raise ValueError("Provided mode is not of type 'int'") + if not isinstance(subMode, int): + raise ValueError("Provided mode is not of type 'int'") - payload = integer_to_bytearray(mode) + payload = integer_to_bytearray(opMode) + payload += integer_to_bytearray(subMode) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, message_id=MsgIds.MSG_ID_HD_OP_MODE.value, @@ -1471,22 +1475,6 @@ self.can_interface.send(message, 0) - def cmd_send_general_response(self, message_id, accepted, reason): - """ - :param message_id: (int) the message id - :param accepted: (int) boolean accept/reject response - :param reason: (int) rejection reason - :return: none - """ - payload = integer_to_bytearray(accepted) - payload += integer_to_bytearray(reason) - - message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=message_id, - payload=payload) - - self.can_interface.send(message, 0) - def cmd_set_treatment_heparin_data(self, vCumulative): """ the Treatment Heparin Data message setter/sender method @@ -1880,8 +1868,24 @@ self.can_interface.send(message, 0) - def cmd_send_general_progress_data(self, message_id, total, countdown): + def cmd_send_general_response(self, message_id, accepted, reason, fromHD = True): """ + :param message_id: (int) the message id + :param accepted: (int) boolean accept/reject response + :param reason: (int) rejection reason + :return: none + """ + payload = integer_to_bytearray(accepted) + payload += integer_to_bytearray(reason) + + message = DenaliMessage.build_message(channel_id= DenaliChannels.hd_to_ui_ch_id if fromHD else DenaliChannels.dg_to_ui_ch_id, + message_id=message_id, + payload=payload) + + self.can_interface.send(message, 0) + + def cmd_send_general_progress_data(self, message_id, total, countdown, fromHD = True): + """ send the pretreatment filter flush progress data :param accepted: (U32) Total time in second :param reason: (U32) count down time in second @@ -1890,7 +1894,7 @@ payload = integer_to_bytearray(total) payload += integer_to_bytearray(countdown) - message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, + message = DenaliMessage.build_message(channel_id= DenaliChannels.hd_to_ui_ch_id if fromHD else DenaliChannels.dg_to_ui_ch_id, message_id=message_id, payload=payload)