Index: tst_ui_logs/test.py =================================================================== diff -u -rd3fdd4b20a1ebaf8b74db43c677234eb29ab11d0 -r145a6334b27f9980d4e32a2edc2f5e8739a54c77 --- tst_ui_logs/test.py (.../test.py) (revision d3fdd4b20a1ebaf8b74db43c677234eb29ab11d0) +++ tst_ui_logs/test.py (.../test.py) (revision 145a6334b27f9980d4e32a2edc2f5e8739a54c77) @@ -274,7 +274,7 @@ hd_simulator.cmd_send_hd_disinfection_state(sub_mode = s_mode, flush_mode = 0, heat_mode = 1, chemical_mode = 2) verify_log(msg_id = MsgIds.MSG_ID_HD_DISINFECT_STANDBY_DATA.value, msg = "DisinfectStates") - #0x9A00 UI-HD + #0x9B00 # hd_simulator.cmd_send_hd_disinfect_response(accepted = True, reason =1) @@ -285,21 +285,18 @@ #RINSEBACK - #0x5200 UI-HD - #0x5300 hd_simulator.cmd_send_treatment_adjust_rinseback_response(accepted = 1, reason = 1) verify_log(msg_id = MsgIds.MSG_ID_HD_RINSEBACK_CMD_RESPONSE.value, msg = "AdjustRinseback", param = [1,1]) - #0x5400 + #0x5500 hd_simulator.cmd_send_treatment_adjust_recirculate_response(accepted = 1, reason = 1) verify_log(msg_id = MsgIds.MSG_ID_HD_RECIRC_CMD_RESPONSE.value, msg = "AdjustRecirculate", param = [1,1]) #0x5600 - hd_simulator.cmd_send_treatment_rinseback_data(target_vol = 2.4, current_vol = 1.9, flow_rate = 1, timeout = 4, - timeout_countdown = 8, is_completed = True) + hd_simulator.cmd_send_treatment_rinseback_data(target_vol = 2.4, current_vol = 1.9, flow_rate = 1, timeout = 4, timeout_countdown = 8, is_completed = True) verify_log(msg_id = MsgIds.MSG_ID_HD_RINSEBACK_PROGRESS.value, msg = "Rinseback", param = [2.4,1.9,1,4,8,True]) #0x5A00 @@ -315,7 +312,7 @@ #0x5900 #there is an additional parameter in the log hd_simulator.cmd_send_treatment_blood_prime_data(target = 22.2, current = 0.6) - verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS.value, msg = "BloodPrime", param = [22.2,0.6,0.0]) + verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS.value, msg = "BloodPrime", param = [22.2,0.6]) #Treatment Stop(sub-mode) #0x4900 @@ -680,7 +677,7 @@ #0x3200 #TODO: Payload values need to been changed after discussion payload = unsigned_integer_to_bytearray(6) - dg_simulator.cmd_send_dg_general_response(message_id=50, accepted=0, reason=1, is_pure_data= False, has_parameters = True, parameters_payload = payload) + dg_simulator.cmd_send_dg_general_response(message_id=50, accepted=0, reason=1, is_pure_data= False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.ui_to_hd_ch_id) verify_log(msg_id = MsgIds.MSG_ID_USER_REQUEST_ALARM_SILENCE.value, msg = "AlarmSilence") #0x9800 @@ -1135,5 +1132,172 @@ hd_simulator.cmd_send_hd_general_response(message_id=182, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=None) #verify_log(msg_id = MsgIds.MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST.value, msg = "ServiceMode") + #0x4000 + payload = unsigned_integer_to_bytearray(3) + hd_simulator.cmd_send_hd_general_response(message_id=64, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x9700 + hd_simulator.cmd_send_hd_general_response(message_id=151, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x1000 + hd_simulator.cmd_send_hd_general_response(message_id=16, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x1100 + payload = float_to_bytearray(0.500) + hd_simulator.cmd_send_hd_general_response(message_id=17, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x1500 + payload = float_to_bytearray(0.380) + payload += unsigned_byte_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id=21, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x1200 + payload = unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id=18, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x4B00 + payload = unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id=75, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x1600 + payload = unsigned_integer_to_bytearray(240) + hd_simulator.cmd_send_hd_general_response(message_id=22, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x1700 + payload = unsigned_integer_to_bytearray(250) + payload += unsigned_integer_to_bytearray(200) + hd_simulator.cmd_send_hd_general_response(message_id=23, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x4600 + payload = unsigned_integer_to_bytearray(-300) + payload +=unsigned_integer_to_bytearray(+100) + payload +=unsigned_integer_to_bytearray(-100) + payload +=unsigned_integer_to_bytearray(+400) + hd_simulator.cmd_send_hd_general_response(message_id=70, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x9A00 + hd_simulator.cmd_send_hd_general_response(message_id=154, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x5200 + payload = unsigned_integer_to_bytearray(9) + hd_simulator.cmd_send_hd_general_response(message_id=82, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x5400 + payload = unsigned_integer_to_bytearray(3) + hd_simulator.cmd_send_hd_general_response(message_id=84, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x5700 + payload = unsigned_integer_to_bytearray(0) + hd_simulator.cmd_send_hd_general_response(message_id=87, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x6D00 + payload = unsigned_integer_to_bytearray(60) + hd_simulator.cmd_send_hd_general_response(message_id=109, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x6D00 + payload = unsigned_integer_to_bytearray(60) + hd_simulator.cmd_send_hd_general_response(message_id=111, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_dg_ch_id ) + + #0x1C00 + payload = unsigned_byte_to_bytearray(1) + payload += unsigned_byte_to_bytearray(0) + payload += unsigned_byte_to_bytearray(0) + payload += unsigned_short_to_bytearray(10) + payload += unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id=28, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_sync_broadcast_ch_id ) + + #0x9F00 + payload = unsigned_byte_to_bytearray(1) + payload += unsigned_byte_to_bytearray(0) + payload += unsigned_byte_to_bytearray(0) + payload += unsigned_short_to_bytearray(10) + payload += unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id=159, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x8900 + hd_simulator.cmd_send_hd_general_response(message_id=137, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_sync_broadcast_ch_id ) + + #0xA000 + hd_simulator.cmd_send_hd_general_response(message_id=160, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_sync_broadcast_ch_id ) + + #0x3800 + payload = unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id= 56, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x3500 + payload = unsigned_integer_to_bytearray(1) + payload += unsigned_integer_to_bytearray(2) + payload += unsigned_integer_to_bytearray(3) + payload += unsigned_integer_to_bytearray(4) + payload += unsigned_integer_to_bytearray(5) + payload += unsigned_integer_to_bytearray(6) + payload += unsigned_integer_to_bytearray(7) + payload += unsigned_integer_to_bytearray(8) + payload += unsigned_integer_to_bytearray(9) + payload += unsigned_integer_to_bytearray(10) + payload += unsigned_integer_to_bytearray(11) + payload += unsigned_integer_to_bytearray(12) + payload += unsigned_integer_to_bytearray(13) + payload += unsigned_integer_to_bytearray(14) + payload += unsigned_integer_to_bytearray(15) + payload += float_to_bytearray(1.0) + payload += float_to_bytearray(1.3) + payload += float_to_bytearray(37.0) + hd_simulator.cmd_send_hd_general_response(message_id=53, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id) + + #0x3B00 + payload = unsigned_integer_to_bytearray(0) + hd_simulator.cmd_send_hd_general_response(message_id=59, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x5D00 + payload = unsigned_integer_to_bytearray(0) + hd_simulator.cmd_send_hd_general_response(message_id=93, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x5F00 + payload = unsigned_integer_to_bytearray(0) + hd_simulator.cmd_send_hd_general_response(message_id=95, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x6800 + hd_simulator.cmd_send_hd_general_response(message_id=104, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x6200 + hd_simulator.cmd_send_hd_general_response(message_id=98, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x3C00 + hd_simulator.cmd_send_hd_general_response(message_id=60, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x6400 + hd_simulator.cmd_send_hd_general_response(message_id=100, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x4F00 + payload = float_to_bytearray(0.400) + hd_simulator.cmd_send_hd_general_response(message_id=79, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x6600 + hd_simulator.cmd_send_hd_general_response(message_id=102, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x7100 + hd_simulator.cmd_send_hd_general_response(message_id=113, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x4A00 + hd_simulator.cmd_send_hd_general_response(message_id=74, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x7300 + hd_simulator.cmd_send_hd_general_response(message_id=115, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x7500 + hd_simulator.cmd_send_hd_general_response(message_id=117, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x7F00 + for s_mode in range(3): + hd_simulator.cmd_send_hd_general_response(message_id=127, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id) + + #0x8100 + hd_simulator.cmd_send_hd_general_response(message_id=129, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None,channel_id= DenaliChannels.ui_to_hd_ch_id ) + + #0x9200 + payload = unsigned_integer_to_bytearray(0) + hd_simulator.cmd_send_hd_general_response(message_id=146, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_sync_broadcast_ch_id ) + utils.tstDone()