Index: tst_ui_logs/test.py =================================================================== diff -u -r044fabf4de4f9d3943f38b04f6bfbcfdde1b7b21 -rde171e50e4254cd7bcfa63e40fc2f696a392b1b9 --- tst_ui_logs/test.py (.../test.py) (revision 044fabf4de4f9d3943f38b04f6bfbcfdde1b7b21) +++ tst_ui_logs/test.py (.../test.py) (revision de171e50e4254cd7bcfa63e40fc2f696a392b1b9) @@ -212,7 +212,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") @@ -232,7 +231,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") @@ -263,11 +261,10 @@ 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): @@ -410,6 +407,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]) @@ -480,11 +490,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") @@ -512,7 +518,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") @@ -678,7 +683,7 @@ #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, channel_id=DenaliChannels.ui_to_hd_ch_id) - verify_log(msg_id = MsgIds.MSG_ID_USER_REQUEST_ALARM_SILENCE.value, msg = "AlarmSilence") + #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, @@ -753,6 +758,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") @@ -1054,7 +1061,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") @@ -1169,10 +1175,10 @@ 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) + 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