Index: tst_ui_logs/test.py =================================================================== diff -u -rb3a2501fe111c15feb725a9afce9aea3f05d7129 -ra7b32a5b9681500759793219cf62f3ec66a13154 --- tst_ui_logs/test.py (.../test.py) (revision b3a2501fe111c15feb725a9afce9aea3f05d7129) +++ tst_ui_logs/test.py (.../test.py) (revision a7b32a5b9681500759793219cf62f3ec66a13154) @@ -215,7 +215,6 @@ payload += float_to_bytearray(33.7) payload += float_to_bytearray(92.8) payload += float_to_bytearray(95.6) - payload += float_to_bytearray(101.3) hd_simulator.cmd_send_hd_general_response(message_id=157, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_TEMPERATURES_DATA.value, msg="~HD_Temperature_Data") @@ -235,7 +234,6 @@ payload += float_to_bytearray(2.4) payload += unsigned_integer_to_bytearray(1) payload += unsigned_integer_to_bytearray(133) - payload += float_to_bytearray(13.6) hd_simulator.cmd_send_hd_general_response(message_id=168, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_RESERVOIRS_DATA.value, msg="~HD_Reservoirs_Data") @@ -266,18 +264,17 @@ verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_STATE.value, msg = "TreatmentStates", param = [s_mode,1,2,3,4,5,6,7,8,9]) #0x7700 -# for s_mode in range(3): - payload = unsigned_integer_to_bytearray(5) - payload += unsigned_integer_to_bytearray(6) - hd_simulator.cmd_send_hd_general_response(message_id=119, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_HD_POST_TREATMENT_STATE.value, msg="PostTreatmentStates") + + for s_mode in range(NUMBER_OF_TREATMENTMODES): + hd_simulator.cmd_send_hd_general_response(message_id=119, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + verify_log(msg_id=MsgIds.MSG_ID_HD_POST_TREATMENT_STATE.value, msg="PostTreatmentStates") #0x7E00 for s_mode in range(NUMBER_OF_TREATMENTMODES): 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) @@ -288,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 @@ -416,6 +410,19 @@ verify_log(msg_id = MsgIds.MSG_ID_DG_PRESSURES_DATA.value, msg = "Pressures", param = [200.0, 100.0, 295.0, 300.0]) #0x2800 + payload = unsigned_integer_to_bytearray(1) + payload += unsigned_integer_to_bytearray(47) + payload += unsigned_integer_to_bytearray(27) + payload += unsigned_integer_to_bytearray(17) + payload += unsigned_integer_to_bytearray(7) + payload += float_to_bytearray(10.0) + payload += float_to_bytearray(36.6) + payload += float_to_bytearray(35.5) + payload += float_to_bytearray(35.9) + payload += float_to_bytearray(36.0) + payload += float_to_bytearray(35.0) + payload += float_to_bytearray(29.0) + dg_simulator.cmd_send_dg_general_response(message_id=40, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) dg_simulator.cmd_set_dg_reservoir_data(active_reservoir = 5, fill_to_vol_ml = 10, drain_to_vol_ml = 2) verify_log(msg_id = MsgIds.MSG_ID_DG_RESERVOIRS_DATA.value, msg = "Reservoir", param = [5, 10, 2]) @@ -486,11 +493,7 @@ payload = float_to_bytearray(2.22) payload += float_to_bytearray(1.45) payload += float_to_bytearray(4.67) - payload += float_to_bytearray(5.93) - payload += unsigned_integer_to_bytearray(14) - payload += unsigned_integer_to_bytearray(16) - payload += float_to_bytearray(14.67) - payload += float_to_bytearray(52.93) + payload += float_to_bytearray(5.93) dg_simulator.cmd_send_dg_general_response(message_id=66, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_DG_CONCENTRATE_PUMP_DATA.value, msg="~DG_Concentrate_Pump_Data") @@ -518,7 +521,6 @@ payload += float_to_bytearray(5.3) payload += float_to_bytearray(8.1) payload += float_to_bytearray(6.7) - payload += unsigned_integer_to_bytearray(11) dg_simulator.cmd_send_dg_general_response(message_id=72, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_DG_FANS_DATA.value, msg="~DG_Fans_Data") @@ -683,8 +685,8 @@ #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) - verify_log(msg_id = MsgIds.MSG_ID_USER_REQUEST_ALARM_SILENCE.value, msg = "AlarmSilence") + 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 hd_alarm.cmd_send_active_list_response(accept = True, reason = 1, @@ -759,6 +761,8 @@ #0x8C00 # dg_simulator._handler_system_usage_response() + payload = integer_to_bytearray(1661167136) + payload += integer_to_bytearray(1661167101) dg_simulator.cmd_send_dg_general_response(message_id=140, accepted=0, reason=1) verify_log(msg_id=MsgIds.MSG_ID_DG_SERVICE_SCHEDULE_DATA.value, msg="ServiceDate") @@ -1060,7 +1064,6 @@ payload += unsigned_integer_to_bytearray(17) payload += unsigned_integer_to_bytearray(19) payload += unsigned_integer_to_bytearray(12) - payload += float_to_bytearray(13.7) dg_simulator.cmd_send_dg_general_response(message_id=36, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) verify_log(msg_id = MsgIds.MSG_ID_DRAIN_PUMP_DATA.value, msg = "DrainPump") @@ -1138,5 +1141,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 = float_to_bytearray(-300.00) + payload += float_to_bytearray(+100.00) + payload += float_to_bytearray(-100.00) + payload += float_to_bytearray(+400.00) + 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()