Index: tst_ui_logs/test.py =================================================================== diff -u -rbe9b0ce670321a5cfb5549ef65f0c4b19df5e554 -re23104717da970c4ca6c99abd3916467d5745a76 --- tst_ui_logs/test.py (.../test.py) (revision be9b0ce670321a5cfb5549ef65f0c4b19df5e554) +++ tst_ui_logs/test.py (.../test.py) (revision e23104717da970c4ca6c99abd3916467d5745a76) @@ -114,17 +114,17 @@ verify_log(msg_id = MsgIds.MSG_ID_HD_ACCELEROMETER_DATA.value, msg = "Accel", param = [12.3,22.2,4.0,14.0,30.2,10.5,11.0,22.1,5.5]) #0x3A00 - payload = unsigned_integer_to_bytearray(2) + payload = unsigned_integer_to_bytearray(1) payload += unsigned_integer_to_bytearray(1) - payload += unsigned_integer_to_bytearray(1) - payload += integer_to_bytearray(12) - payload += integer_to_bytearray(33) - payload += float_to_bytearray(1.1) - payload += integer_to_bytearray(26) - payload += integer_to_bytearray(223542) - payload += integer_to_bytearray(212) + payload += unsigned_integer_to_bytearray(MsgIds.MSG_ID_HD_VALVES_DATA.value) + payload += short_to_bytearray(3) + payload += short_to_bytearray(4) + payload += float_to_bytearray(3) + payload += short_to_bytearray(7) + payload += short_to_bytearray(5) + payload += short_to_bytearray(4) payload += unsigned_integer_to_bytearray(3) - payload += unsigned_integer_to_bytearray(7) + payload += unsigned_integer_to_bytearray(5) hd_simulator.cmd_send_hd_general_response(message_id=58, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_VALVES_DATA.value, msg="~HD_Valves_Data") @@ -210,7 +210,7 @@ payload = float_to_bytearray(3) payload += float_to_bytearray(4) payload += float_to_bytearray(10) - payload += float_to_bytearray(1) + payload += unsigned_integer_to_bytearray(1) hd_simulator.cmd_send_hd_general_response(message_id=163, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_FANS_DATA.value, msg="~HD_Fans_Data") @@ -335,11 +335,11 @@ #Events #0xA400 - payload = unsigned_integer_to_bytearray(1) + payload = unsigned_integer_to_bytearray(MsgIds.MSG_ID_HD_EVENT.value) payload += unsigned_integer_to_bytearray(1) - payload += byte_to_bytearray(1) + payload += integer_to_bytearray(5) payload += unsigned_integer_to_bytearray(1) - payload += byte_to_bytearray(1) + payload += integer_to_bytearray(5) hd_simulator.cmd_send_hd_general_response(message_id=164, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_EVENT.value, msg="General") @@ -646,53 +646,71 @@ verify_log(msg_id = MsgIds.MSG_ID_DG_DRAIN_CMD.value, msg = "~DG_Drain_Cmd") #0x1900 + payload = float_to_bytearray(10.5) + payload += unsigned_integer_to_bytearray(2) + payload += float_to_bytearray(1.5) + payload += unsigned_integer_to_bytearray(6) + payload += float_to_bytearray(20.5) hd_simulator.cmd_send_hd_general_response(message_id=25, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS.value, msg = "~DG_Dialysate_Tgt_Temps") + verify_log(msg_id=MsgIds.MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS.value, msg="~DG_Dialysate_Tgt_Temps") #0x2600 - hd_simulator.cmd_send_hd_general_response(message_id=38, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_STARTING_STOPPING_TREATMENT_CMD.value, msg = "~DG_Cmd") + payload = unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id=38, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + verify_log(msg_id=MsgIds.MSG_ID_STARTING_STOPPING_TREATMENT_CMD.value, msg="~DG_Cmd") #0x2900 - hd_simulator.cmd_send_hd_general_response(message_id=41, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_DG_SAMPLE_WATER_CMD.value, msg = "~DG_Sample_Water_Cmd") + payload = unsigned_integer_to_bytearray(2) + hd_simulator.cmd_send_hd_general_response(message_id=41, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + verify_log(msg_id=MsgIds.MSG_ID_DG_SAMPLE_WATER_CMD.value, msg="~DG_Sample_Water_Cmd") #0x2B00 - hd_simulator.cmd_send_hd_general_response(message_id=43, accepted=0, reason=1) - verify_log(msg_id = MsgIds. MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD.value, msg = "~DG_Trimmer_Htr_Cmd") + payload = unsigned_integer_to_bytearray(1) + payload += float_to_bytearray(20.5) + hd_simulator.cmd_send_hd_general_response(message_id=43, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + verify_log(msg_id=MsgIds. MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD.value, msg="~DG_Trimmer_Htr_Cmd") #0x3000 - hd_simulator.cmd_send_hd_general_response(message_id=48, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT.value, msg = "~DG_Heat_Disinfect_Cmd") + payload = unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id=48, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + verify_log(msg_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT.value, msg="~DG_Heat_Disinfect_Cmd") #0x5B00 - hd_simulator.cmd_send_hd_general_response(message_id=91, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_DG_CHANGE_VALVE_SETTING_CMD.value, msg = "~DG_Chg_Valves_Cmd") + payload = unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id=91, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + verify_log(msg_id=MsgIds.MSG_ID_DG_CHANGE_VALVE_SETTING_CMD.value, msg="~DG_Chg_Valves_Cmd") #0x5100 - hd_simulator.cmd_send_hd_general_response(message_id=81, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_DG_COMMAND_RESPONSE.value, msg = "~DG_Cmd_Rsp") + payload = unsigned_integer_to_bytearray(1) + payload += unsigned_integer_to_bytearray(0) + payload += unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id=81, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + verify_log(msg_id = MsgIds.MSG_ID_DG_COMMAND_RESPONSE.value, msg="~DG_Cmd_Rsp") #0x7800 - hd_simulator.cmd_send_hd_general_response(message_id=120, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_DG_START_STOP_CHEM_DISINFECT.value, msg = "~DG_Chem_Disinfect_Cmd") + payload = unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id=120, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + verify_log(msg_id=MsgIds.MSG_ID_DG_START_STOP_CHEM_DISINFECT.value, msg="~DG_Chem_Disinfect_Cmd") #0x7900 - hd_simulator.cmd_send_hd_general_response(message_id=121, accepted=0, reason=1) + payload = unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id=121, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id = MsgIds.MSG_ID_DG_START_STOP_FLUSH.value, msg = "~DG_Flush_Cmd") #0xA900 - hd_simulator.cmd_send_hd_general_response(message_id=169, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS.value, msg = "~DG_Mixing_Ratio_Fill_Prep_Request") + hd_simulator.cmd_send_hd_general_response(message_id=169, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=None) + verify_log(msg_id=MsgIds.MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS.value, msg="~DG_Mixing_Ratio_Fill_Prep_Request") #FW Debug #0xF1FF - hd_simulator.cmd_send_hd_general_response(message_id=65521, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_HD_DEBUG_EVENT.value, msg = "Debug") + payload = byte_to_bytearray(65) + hd_simulator.cmd_send_hd_general_response(message_id=65521, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + verify_log(msg_id=MsgIds.MSG_ID_HD_DEBUG_EVENT.value, msg="Debug") #0xF2FF - dg_simulator.cmd_send_dg_general_response(message_id=65522, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_DG_DEBUG_EVENT.value, msg = "Debug") + payload = byte_to_bytearray(66) + dg_simulator.cmd_send_dg_general_response(message_id=65522, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + verify_log(msg_id=MsgIds.MSG_ID_DG_DEBUG_EVENT.value, msg="Debug") #Initiate (Create/Select) a Treatment #ID:0x3900 @@ -702,8 +720,27 @@ #Treatment Parameters Validation #ID:0x3600 (API is not reflecting with rejection messages) #hd_simulator.cmd_send_treatment_parameter_validation_response([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34]) - hd_simulator.cmd_send_hd_general_response(message_id=54, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE.value, msg= "Validate New Create Treatment Response") + 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 += unsigned_integer_to_bytearray(16) + payload += unsigned_integer_to_bytearray(17) + payload += unsigned_integer_to_bytearray(18) + payload += unsigned_integer_to_bytearray(19) + hd_simulator.cmd_send_hd_general_response(message_id=54, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + verify_log(msg_id=MsgIds.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE.value, msg="Validate New Create Treatment Response") #Pre-Treatment Water Sample (sub-mode) #ID:0x5E00 @@ -722,8 +759,10 @@ #Pre-Treatment Disposable Installation (sub-mode) #TODO: Msg_Ids need to be update as per patch file #ID:0xAD00(API is missing, also message id is not present in msgs.py file - hd_simulator.cmd_send_hd_general_response(message_id=173, accepted=0, reason=1) - #verify_log(msg_id = MsgIds.MSG_ID_HD_UI_DISPOSABLE_INSTALLATION_RESPONSE.value, msg = "AdjustDisposablesConfirm", param = [0,1]) + payload = unsigned_integer_to_bytearray(1) + payload += unsigned_integer_to_bytearray(0) + hd_simulator.cmd_send_hd_general_response(message_id=173, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) + #verify_log(msg_id = MsgIds.MSG_ID_HD_UI_DISPOSABLE_INSTALLATION_RESPONSE.value, msg = "AdjustDisposablesConfirm", param = [0,1]) #Pre-Treatment Dry Self-Test (sub-mode) #ID:0x6300 @@ -739,17 +778,20 @@ hd_simulator.cmd_send_pre_treatment_disposables_prime_progress_data(timeout = 120, countdown = 60) verify_log(msg_id = MsgIds.MSG_ID_HD_PRIMING_STATUS_DATA.value, msg = "DisposablesPrime", param = [120,60]) - - #Pre-Treatment Patient Connection Begin #ID:0x6500 - hd_simulator.cmd_send_hd_general_response(message_id=101, accepted=1, reason=0) - verify_log(msg_id = MsgIds.MSG_ID_HD_PATIENT_CONNECTION_BEGIN_RESPONSE.value, msg = "Patient Connection Begin Response") + payload = unsigned_integer_to_bytearray(1) + payload += unsigned_integer_to_bytearray(0) + hd_simulator.cmd_send_hd_general_response(message_id=101, accepted=1, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) + verify_log(msg_id=MsgIds.MSG_ID_HD_PATIENT_CONNECTION_BEGIN_RESPONSE.value, msg="Patient Connection Begin Response") #Pre-Treatment Ultrafiltration (Init) Volume Adjustment #ID:0x5000 - hd_simulator.cmd_send_hd_general_response(message_id=80, accepted=1, reason=0) - verify_log(msg_id = MsgIds.MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE.value, msg = "Pre UF Volume Adjustment Response") + payload = unsigned_integer_to_bytearray(1) + payload += unsigned_integer_to_bytearray(0) + payload += float_to_bytearray(11.500) + hd_simulator.cmd_send_hd_general_response(message_id=80, accepted=1, reason=0, is_pure_data = False, has_parameters=True, parameters_payload=payload) + verify_log(msg_id=MsgIds.MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE.value, msg="Pre UF Volume Adjustment Response") #Pre-Treatment Patient Connection Confirm #ID:0x6700