Index: tst_ui_logs/test.py =================================================================== diff -u -rb9d731198b3850486ec49eb1dbe08814dc895f83 -r5fcae0bb8a2191cbc69c72efa28174720f7fad62 --- tst_ui_logs/test.py (.../test.py) (revision b9d731198b3850486ec49eb1dbe08814dc895f83) +++ tst_ui_logs/test.py (.../test.py) (revision 5fcae0bb8a2191cbc69c72efa28174720f7fad62) @@ -31,7 +31,7 @@ from dialin.common.msg_ids import MsgIds from dialin.common.hd_defs import HDOpSubModes, HDOpModes from dialin.common import msg_defs -from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray, short_to_bytearray, unsigned_integer_to_bytearray, integer_to_bit_array +from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray, short_to_bytearray, unsigned_integer_to_bytearray, integer_to_bit_array, unsigned_short_to_bytearray, unsigned_byte_to_bytearray, unsigned_byte_to_bytearray hd_simulator = HDSimulator() dg_simulator = DGSimulator() @@ -113,8 +113,8 @@ verify_log(msg_id = MsgIds.MSG_ID_SALINE_BOLUS_DATA.value, msg = "Saline", param = [2,90.0,67.2]) #0x4D00 - hd_simulator.cmd_set_treatment_heparin_data(cumulative = 4) - verify_log(msg_id = MsgIds.MSG_ID_HD_HEPARIN_DATA_BROADCAST.value, msg = "Heparin", param = [4]) + hd_simulator.cmd_set_treatment_heparin_data(cumulative = 54.7) + verify_log(msg_id = MsgIds.MSG_ID_HD_HEPARIN_DATA_BROADCAST.value, msg = "Heparin", param = [54.7]) #0x3300 hd_simulator.cmd_send_accelerometer_hd_data(x = 12.3, y = 22.2, z = 4.0, @@ -125,16 +125,16 @@ #0x3A00 #TODO: Payload values need to been changed after discussion payload = unsigned_integer_to_bytearray(1) - payload += unsigned_integer_to_bytearray(1) + payload += unsigned_integer_to_bytearray(6) 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(11) + payload += float_to_bytearray(9.2) + payload += short_to_bytearray(8) payload += short_to_bytearray(5) payload += short_to_bytearray(4) - payload += unsigned_integer_to_bytearray(3) - payload += unsigned_integer_to_bytearray(5) + payload += unsigned_integer_to_bytearray(35) + payload += unsigned_integer_to_bytearray(50) 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") @@ -148,7 +148,7 @@ payload += unsigned_integer_to_bytearray(0) payload += float_to_bytearray(5.5) payload += float_to_bytearray(1.5) - payload += integer_to_bytearray(1) + payload += integer_to_bytearray(155) payload += float_to_bytearray(7.5) payload += float_to_bytearray(2.5) payload += float_to_bytearray(1.5) @@ -160,43 +160,43 @@ #0x6A00 - payload = unsigned_integer_to_bytearray(1) + payload = unsigned_integer_to_bytearray(74) hd_simulator.cmd_send_hd_general_response(message_id=106, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id = MsgIds.MSG_ID_HD_FLUID_LEAK_STATE.value, msg = "~HD_Fluid_Leak_Data") #0x6C00 - hd_simulator.cmd_send_hd_blood_leak_data(blood_leak_status = 0, blood_leak_state = 1, - blood_leak_zero_status_counter = 2, blood_leak_counter = 3, - blood_leak_zeroed_status = 2, blood_leak_detect_set_point = 1, - blood_leak_detect_level = 1, blood_leak_st_count = 1, - blood_leak_led_intensity = 2, blood_leak_register_counter = 3) - verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_LEAK_DATA.value, msg = "BloodLeak", param = [0,1,2,3,2,1,1,1,2,3]) + hd_simulator.cmd_send_hd_blood_leak_data(blood_leak_status = 1, blood_leak_state = 1, + blood_leak_zero_status_counter = 4, blood_leak_counter = 3, + blood_leak_zeroed_status = 5, blood_leak_detect_set_point = 9, + blood_leak_detect_level = 1, blood_leak_st_count = 3, + blood_leak_led_intensity = 7, blood_leak_register_counter = 12) + verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_LEAK_DATA.value, msg = "BloodLeak", param = [1,1,4,3,5,9,1,3,7,12]) #0x9300 - hd_simulator.cmd_send_hd_air_bubble_data(venous_air_bubble_status = 2, venous_air_bubble_state = 0) - verify_log(msg_id = MsgIds.MSG_ID_HD_BUBBLES_DATA.value, msg = "AirBubble", param = [2,0]) + hd_simulator.cmd_send_hd_air_bubble_data(venous_air_bubble_status = 2, venous_air_bubble_state = 5) + verify_log(msg_id = MsgIds.MSG_ID_HD_BUBBLES_DATA.value, msg = "AirBubble", param = [2,5]) #0x7B00 payload = float_to_bytearray(1.1) payload += float_to_bytearray(2.1) - payload += float_to_bytearray(4) - payload += float_to_bytearray(3) - payload += float_to_bytearray(7) - payload += float_to_bytearray(6) - payload += float_to_bytearray(1) - payload += float_to_bytearray(2) - payload += float_to_bytearray(3) - payload += float_to_bytearray(4) - payload += float_to_bytearray(1) + payload += float_to_bytearray(4.7) + payload += float_to_bytearray(32.3) + payload += float_to_bytearray(17.2) + payload += float_to_bytearray(6.3) + payload += float_to_bytearray(14.4) + payload += float_to_bytearray(28.2) + payload += float_to_bytearray(37.3) + payload += float_to_bytearray(49.2) + payload += float_to_bytearray(11.2) hd_simulator.cmd_send_hd_general_response(message_id=123, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_VOLTAGES_DATA.value, msg="~HD_Voltages_Data") #0x7D00 payload = unsigned_integer_to_bytearray(10) - payload += float_to_bytearray(3) - payload += float_to_bytearray(2) + payload += float_to_bytearray(31.2) + payload += float_to_bytearray(68.7) payload += float_to_bytearray(0.5) - payload += unsigned_integer_to_bytearray(2) + payload += integer_to_bytearray(1) hd_simulator.cmd_send_hd_general_response(message_id=125, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_ALARM_INFORMATION.value, msg="~HD_Alarm_Information") @@ -207,32 +207,32 @@ verify_log(msg_id=MsgIds.MSG_ID_HD_SWITCHES_DATA.value, msg="~HD_Switches_Data") #0x9D00 - payload = float_to_bytearray(1) - payload += float_to_bytearray(1) - payload += float_to_bytearray(3) - payload += float_to_bytearray(2) - payload += float_to_bytearray(5) - payload += float_to_bytearray(1) + payload = float_to_bytearray(11.2) + payload += float_to_bytearray(100.8) + 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") #0xA300 - payload = float_to_bytearray(3) - payload += float_to_bytearray(4) - payload += float_to_bytearray(10) - payload += unsigned_integer_to_bytearray(1) + payload = float_to_bytearray(33.3) + payload += float_to_bytearray(44.4) + payload += float_to_bytearray(10.9) + payload += unsigned_integer_to_bytearray(7) 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") #0xA800 payload = unsigned_integer_to_bytearray(1) - payload += float_to_bytearray(4) - payload += float_to_bytearray(10) - payload += float_to_bytearray(1) - payload += float_to_bytearray(2) + payload += float_to_bytearray(4.2) + payload += float_to_bytearray(10.3) + payload += float_to_bytearray(1.2) + payload += float_to_bytearray(2.4) payload += unsigned_integer_to_bytearray(1) payload += unsigned_integer_to_bytearray(133) - payload += float_to_bytearray(13) + 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") @@ -249,36 +249,37 @@ #0x5C00 for s_mode in range(NUMBER_OF_OPMODE): - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode = s_mode, water_sample_state = 0, consumables_self_test_state = 0, - no_cartridge_self_test_state = 0, installation_state = 0, - dry_self_test_state = 0, prime_state = 0, - recirculate_state = 0, patient_connection_state = 0) - verify_log(msg_id = MsgIds.MSG_ID_PRE_TREATMENT_STATE.value, msg = "PreTreatmentStates",param = [s_mode,0,0,0,0,0,0,0,0]) + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode = s_mode, water_sample_state = 1, consumables_self_test_state = 2, + no_cartridge_self_test_state = 3, installation_state = 4, + dry_self_test_state = 5, prime_state = 6, + recirculate_state = 7, patient_connection_state = 8) + verify_log(msg_id = MsgIds.MSG_ID_PRE_TREATMENT_STATE.value, msg = "PreTreatmentStates",param = [s_mode,1,2,3,4,5,6,7,8]) #0x0F00 for s_mode in range(NUMBER_OF_TREATMENTMODES): - hd_simulator.cmd_set_treatment_states_data(sub_mode = s_mode, uf_state = 0, saline_state = 0, heparin_state = 0, - rinseback_state = 0, recirculate_state = 0, blood_prime_state = 0, - treatment_end_state = 0, treatment_stop_state = 0, dialysis_state = 0) - verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_STATE.value, msg = "TreatmentStates", param = [s_mode,0,0,0,0,0,0,0,0,0]) + hd_simulator.cmd_set_treatment_states_data(sub_mode = s_mode, uf_state = 1, saline_state = 2, heparin_state = 3, + rinseback_state = 4, recirculate_state = 5, blood_prime_state = 6, + treatment_end_state = 7, treatment_stop_state = 8, dialysis_state = 9) + 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 = integer_to_bytearray(1) + 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") #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 = 0, chemical_mode = 0) - verify_log(msg_id = MsgIds.MSG_ID_HD_DISINFECT_STANDBY_DATA.value, msg = "DisinfectStates", param = [s_mode,0,0,0]) + hd_simulator.cmd_send_hd_disinfection_state(sub_mode = s_mode, flush_mode = 1, heat_mode = 2, chemical_mode = 3) + verify_log(msg_id = MsgIds.MSG_ID_HD_DISINFECT_STANDBY_DATA.value, msg = "DisinfectStates", param = [s_mode,1,2,3]) #0x9A00 UI-HD #0x9B00 # hd_simulator.cmd_send_hd_disinfect_response(accepted = True, reason =1) payload = integer_to_bytearray(1) - payload += integer_to_bytearray(2) + payload += unsigned_integer_to_bytearray(4) hd_simulator.cmd_send_hd_general_response(message_id=155, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) # verify_log(msg_id=MsgIds.MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE.value, msg="~HD_Set_Standby_Disinfect_State_Response") @@ -287,34 +288,34 @@ #0x5200 UI-HD #0x5300 - hd_simulator.cmd_send_treatment_adjust_rinseback_response(accepted = 1, reason = 0) - verify_log(msg_id = MsgIds.MSG_ID_HD_RINSEBACK_CMD_RESPONSE.value, msg = "AdjustRinseback", param = [1,0]) + 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 = 0) - verify_log(msg_id = MsgIds.MSG_ID_HD_RECIRC_CMD_RESPONSE.value, msg = "AdjustRecirculate", param = [1,0]) + 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 = False) - verify_log(msg_id = MsgIds.MSG_ID_HD_RINSEBACK_PROGRESS.value, msg = "Rinseback", param = [2.4,1.9,1,4,8,False]) + 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 hd_simulator.cmd_send_treatment_recirculate_data(timeout_total = 200, timeout_count_down = 100) verify_log(msg_id = MsgIds.MSG_ID_HD_RECIRC_PROGRESS.value, msg = "Recirculate", param = [200,100]) #Treatment End(sub-mode) #0x5800 - hd_simulator.cmd_send_treatment_adjust_end_response(accepted = 1, reason = 0) - verify_log(msg_id = MsgIds.MSG_ID_HD_TX_END_CMD_RESPONSE.value, msg = "AdjustTxEnd", param = [1,0]) + hd_simulator.cmd_send_treatment_adjust_end_response(accepted = 1, reason = 5) + verify_log(msg_id = MsgIds.MSG_ID_HD_TX_END_CMD_RESPONSE.value, msg = "AdjustTxEnd", param = [1,5]) #Treatment Blood Prime(sub-mode) #0x5900 #there is an additional parameter in the log hd_simulator.cmd_send_treatment_blood_prime_data(target = 22.2, current = 33.3) - verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS.value, msg = "BloodPrime", param = [22.2,33.3, 0.0]) + verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS.value, msg = "BloodPrime", param = [22.2,33.3,0]) #Treatment Stop(sub-mode) #0x4900 @@ -330,12 +331,12 @@ verify_log(msg_id = MsgIds.MSG_ID_RTC_EPOCH.value, msg = "~HD_RTC_Epoch_Data") #0x6E00 - hd_simulator.cmd_send_set_rtc_response(response = 1, reason = 0) - verify_log(msg_id = MsgIds.MSG_ID_HD_UI_SET_RTC_RESPONSE.value, msg = "AdjustHDDateTime", param = [1,0]) + hd_simulator.cmd_send_set_rtc_response(response = 0, reason = 1) + verify_log(msg_id = MsgIds.MSG_ID_HD_UI_SET_RTC_RESPONSE.value, msg = "AdjustHDDateTime", param = [0,1]) #0x7000 - dg_simulator.cmd_send_set_rtc_response(response = 1, reason = 0) - verify_log(msg_id = MsgIds.MSG_ID_DG_UI_SET_RTC_RESPONSE.value, msg = "AdjustDGDateTime", param = [1,0]) + dg_simulator.cmd_send_set_rtc_response(response = 0, reason = 1) + verify_log(msg_id = MsgIds.MSG_ID_DG_UI_SET_RTC_RESPONSE.value, msg = "AdjustDGDateTime", param = [0,1]) #Power #0x0100 @@ -345,7 +346,7 @@ #0x0E00 hd_simulator.cmd_send_broadcast_poweroff_imminent() verify_log(msg_id = MsgIds.MSG_ID_POWER_OFF_WARNING.value, msg = "ShuttingDown") - + #Events #0xA400 for value in CONDITIONS: @@ -391,31 +392,29 @@ #Versions #0x1D00 - hd_simulator.cmd_send_version_hd_data(major=1, minor=1, micro=0, build=4, - fpga_id=5, fpga_major=1, fpga_minor=2, fpga_lab=3, - compatibility_rev=6) + hd_simulator.cmd_send_version_hd_data(major=1, minor=1, micro=0, build=4, fpga_id=5, fpga_major=1, fpga_minor=2, fpga_lab=3, compatibility_rev=6) verify_log(msg_id = MsgIds.MSG_ID_HD_VERSION.value, msg = "VersionRsp", param = [1,1,0,4,5,1,2,3,6]) #0x1E00 - dg_simulator.cmd_send_version_dg_data(major=1, minor=1, micro=0, build=4, - fpga_id=5, fpga_major=1, fpga_minor=2, fpga_lab=3, - compatibility_rev=6) + dg_simulator.cmd_send_version_dg_data(major=1, minor=1, micro=0, build=4, fpga_id=5, fpga_major=1, fpga_minor=2, fpga_lab=3, compatibility_rev=6) verify_log(msg_id = MsgIds.MSG_ID_DG_VERSION.value, msg = "VersionRsp", param = [1,1,0,4,5,1,2,3,6]) #0x9E00 hd_simulator.cmd_send_hd_request_ui_version() verify_log(msg_id = MsgIds.MSG_ID_HD_UI_VERSION_INFO_RESPONSE.value, msg = "VersionReq") #0x2000 - dg_simulator.cmd_set_dg_pressures_data(ro_inlet_pressure = 0.0, ro_outlet_pressure = 1.0, drain_inlet_pressure = 2.0, drain_outlet_pressure = 3.0) - verify_log(msg_id = MsgIds.MSG_ID_DG_PRESSURES_DATA.value, msg = "Pressures", param = [0.0, 1.0, 2.0, 3.0]) + dg_simulator.cmd_set_dg_pressures_data(ro_inlet_pressure = 200.0, ro_outlet_pressure = 100.0, drain_inlet_pressure = 295.0, drain_outlet_pressure = 300.0) + verify_log(msg_id = MsgIds.MSG_ID_DG_PRESSURES_DATA.value, msg = "Pressures", param = [200.0, 100.0, 295.0, 300.0]) #0x2800 - dg_simulator.cmd_set_dg_reservoir_data(active_reservoir = 0, fill_to_vol_ml = 1, drain_to_vol_ml = 2) - verify_log(msg_id = MsgIds.MSG_ID_DG_RESERVOIRS_DATA.value, msg = "Reservoir", param = [0, 1, 2]) + 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]) #0x2A00 #there is a parameter mismatch here as the log contains a series of boolean values instead of one integer + payload = unsigned_short_to_bytearray(0) + dg_simulator.cmd_send_dg_general_response(message_id=42, 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_valves_states(valves_states = 3) verify_log(msg_id = MsgIds.MSG_ID_DG_VALVES_STATES.value, msg = "ValvesStates") @@ -428,7 +427,7 @@ dg_simulator.cmd_set_dg_load_cell_readings_data(reservoir1_primary = 1.0, reservoir1_backup = 2.0,reservoir2_primary = 3.0, reservoir2_backup = 4.0) verify_log(msg_id = MsgIds.MSG_ID_LOAD_CELL_READINGS.value, msg = "LoadCell", param = [1.0,2.0,3.0,4.0]) - #0x2D00 + #0x2D00(broadcast) payload = float_to_bytearray(2.22) payload += float_to_bytearray(1.45) payload += float_to_bytearray(4.67) @@ -456,6 +455,7 @@ payload += unsigned_integer_to_bytearray(22) dg_simulator.cmd_send_dg_general_response(message_id=45, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, msg = "Temperatures") + #0x3100 dg_simulator.cmd_send_dg_conductivity_data(ro_rejection_ratio = 1.0, cpi_conductivity = 2.0, cpo_conductivity = 3.0, cd1_conductivity = 4.0, @@ -479,6 +479,10 @@ 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) 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") @@ -506,6 +510,7 @@ 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") @@ -519,9 +524,11 @@ verify_log(msg_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE.value, msg="~DG_Fluid_Leak_Data") #0x7A00 - payload = integer_to_bytearray(5) - payload += integer_to_bytearray(60) - payload += integer_to_bytearray(30) + payload = unsigned_integer_to_bytearray(11) + payload += unsigned_integer_to_bytearray(21) + payload += unsigned_integer_to_bytearray(31) + payload += float_to_bytearray(41.2) + payload += unsigned_integer_to_bytearray(51) dg_simulator.cmd_send_dg_general_response(message_id=122, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_DG_FLUSH_DATA.value, msg="~DG_Flush_Data") @@ -560,7 +567,6 @@ #0xA100 payload = integer_to_bytearray(1) payload += integer_to_bytearray(0) - payload += integer_to_bytearray(1) dg_simulator.cmd_send_dg_general_response(message_id=161, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_DG_SWITCHES_DATA.value, msg="~DG_Switches_Data") @@ -627,7 +633,7 @@ 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_short_to_bytearray(72) hd_simulator.cmd_send_hd_general_response(message_id=2, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.hd_alarm_broadcast_ch_id) verify_log(msg_id = MsgIds.MSG_ID_ALARM_STATUS.value, msg = "AlarmStatus") @@ -640,7 +646,7 @@ 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 += integer_to_bytearray(0) hd_simulator.cmd_send_hd_general_response(message_id=3, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.dg_alarm_broadcast_ch_id) hd_alarm.cmd_set_alarm_triggered(alarm_id = 1, field_descriptor_1 = 1, data_field_1 = 2.4, field_descriptor_2 = 3, data_field_2 = 22.5, priority = 5, rank = 6, clear_top = 7) @@ -655,7 +661,7 @@ #0x7C00 payload = unsigned_integer_to_bytearray(1) - payload += unsigned_integer_to_bytearray(2) + payload += unsigned_integer_to_bytearray(1) hd_simulator.cmd_send_hd_general_response(message_id=124, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) verify_log(msg_id = MsgIds.MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE.value, msg = "AdjustHDAlarmVolume") @@ -704,44 +710,39 @@ hd_simulator.cmd_set_treatment_adjust_ultrafiltration_confirm_rejected(reason = 1) verify_log(msg_id = MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE.value, msg = "AdjustUFConfirm") - #Saline - + #Saline #0x1400 - hd_simulator.cmd_set_saline_bolus_response(accepted = 0, reason = 1, target = 2) - verify_log(msg_id = MsgIds.MSG_ID_USER_SALINE_BOLUS_RESPONSE.value, msg = "AdjustSaline", param = [0,1,2]) + hd_simulator.cmd_set_saline_bolus_response(accepted = 1, reason = 1, target = 2) + verify_log(msg_id = MsgIds.MSG_ID_USER_SALINE_BOLUS_RESPONSE.value, msg = "AdjustSaline", param = [1,1,2]) #Heparin #0x4C00 - hd_simulator.cmd_set_heparin_pause_resume_response(accepted = 0, reason = 1) - verify_log(msg_id = MsgIds.MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE.value, msg = "AdjustHeparin", param = [0,1]) + hd_simulator.cmd_set_heparin_pause_resume_response(accepted = 1, reason = 1) + verify_log(msg_id = MsgIds.MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE.value, msg = "AdjustHeparin", param = [1,1]) - #Duration - + #Duration #0x1B00 - hd_simulator.cmd_send_treatment_adjust_duration_response(accepted = 0, reason = 1, - duration = 2, ultrafiltration = 3.0) - verify_log(msg_id = MsgIds.MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE.value, msg = "AdjustDuration", param = [0, 1, 2, 3.0]) + hd_simulator.cmd_send_treatment_adjust_duration_response(accepted = 1, reason = 1,duration = 22, ultrafiltration = 17.0) + verify_log(msg_id = MsgIds.MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE.value, msg = "AdjustDuration", param = [1, 1, 22, 17.0]) - #Blood / Dialysate - + #Blood / Dialysate #0x1800 - hd_simulator.cmd_send_treatment_adjust_blood_dialysate_response(accepted = 0, reason = 1, - blood_rate = 2, dialysate_flow_rate = 3) - verify_log(msg_id = MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE.value, msg = "AdjustBloodDialysate", param = [0, 1, 2, 3]) + hd_simulator.cmd_send_treatment_adjust_blood_dialysate_response(accepted = 1, reason = 1,blood_rate = 2, dialysate_flow_rate = 3) + verify_log(msg_id = MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE.value, msg = "AdjustBloodDialysate", param = [1, 1, 2, 3]) #PRS-58: In-Line Blood Pressure Limits #0x4700 - hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted = 0, reason = 1, - arterial_low = 2, arterial_high = 3, - venous_low = 4, venous_high = 5) - verify_log(msg_id = MsgIds.MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE.value, msg = "AdjustPressuresLimits", param = [0, 1, 2, 3, 4, 5]) + hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted = 1, reason = 1,arterial_low = 2, arterial_high = 3, venous_low = 4, venous_high = 5) + verify_log(msg_id = MsgIds.MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE.value, msg = "AdjustPressuresLimits", param = [1, 1, 2, 3, 4, 5]) #Service Information #0x8A00 # hd_simulator._handler_system_usage_response() - hd_simulator.cmd_send_hd_general_response(message_id=138, accepted=0, reason=1) + payload = integer_to_bytearray(1619628663) + payload += integer_to_bytearray(1619887863) + hd_simulator.cmd_send_hd_general_response(message_id=138, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_SERVICE_SCHEDULE_DATA.value, msg="ServiceDate") #0x8C00 @@ -769,6 +770,7 @@ #0x2200 payload = unsigned_integer_to_bytearray(6) payload += unsigned_integer_to_bytearray(8) + payload += float_to_bytearray(8.8) hd_simulator.cmd_send_hd_general_response(message_id=34, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds. MSG_ID_DG_FILL_CMD.value, msg="~DG_Fill_Cmd") @@ -936,17 +938,13 @@ #Start Treatment #ID:0x7200 hd_simulator.cmd_send_pre_treatment_continue_to_treament_response(accepted = 1, reason = 0) - verify_log(msg_id = MsgIds.MSG_ID_HD_START_TREATMENT_RESPONSE.value, msg = "AdjustPatientConnectionConfirm", param = [1,0]) + verify_log(msg_id = MsgIds.MSG_ID_HD_START_TREATMENT_RESPONSE.value, msg = "AdjustPatientConnectionConfirm", param = [1,0]) - - #Post-Treatment #ID:0x7400 hd_simulator.cmd_send_post_treatment_disposable_removal_confirm_response(accepted = 1, reason = 0) - verify_log(msg_id = MsgIds.MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE.value, msg = "AdjustDisposablesRemovalConfirm", param = [1,0]) + verify_log(msg_id = MsgIds.MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE.value, msg = "AdjustDisposablesRemovalConfirm", param = [1,0]) - - #Treatment Log #ID:0x7600 #parameter mismatch: the last parameter (water_sample_test_result) value is always 1000 regardless of the argument passed @@ -988,13 +986,12 @@ verify_log(msg_id = MsgIds.MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE.value, msg = "AdjustTreatmentLog") #ID:0x9400 - hd_simulator.cmd_send_treatment_log_data(blood_flow_rate = 1, dialysate_flow_rate = 1, uf_rate = 1.0, - arterial_pressure = 0.0, venous_pressure = 1.0) - verify_log(msg_id = MsgIds.MSG_ID_HD_TREATMENT_LOG_PERIODIC_DATA.value, msg = "TreatmentLogAvrge", param = [1,1,1.0,0.0,1.0]) + hd_simulator.cmd_send_treatment_log_data(blood_flow_rate = 67, dialysate_flow_rate = 81, uf_rate = 12.0, arterial_pressure = 72.0, venous_pressure = 90.0) + verify_log(msg_id = MsgIds.MSG_ID_HD_TREATMENT_LOG_PERIODIC_DATA.value, msg = "TreatmentLogAvrge", param = [67,81,12.0,72.0,90.0]) #ID:0x9500 - hd_simulator.cmd_send_treatment_log_alarm(alarm_id = 1, parameter1 = 0.0, parameter2 = 1.0) - verify_log(msg_id = MsgIds.MSG_ID_HD_TREATMENT_LOG_ALARM_EVENT.value, msg = "TreatmentLogAlarm", param = [1,0.0,1.0]) + hd_simulator.cmd_send_treatment_log_alarm(alarm_id = 1, parameter1 = 4.0, parameter2 = 1.0) + verify_log(msg_id = MsgIds.MSG_ID_HD_TREATMENT_LOG_ALARM_EVENT.value, msg = "TreatmentLogAlarm", param = [1,4.0,1.0]) #ID:0x9600 hd_simulator.cmd_send_treatment_log_event(event_id = 1, old_value = 1.0, new_value = 0.0) @@ -1022,28 +1019,35 @@ verify_log(msg_id = MsgIds.MSG_ID_DG_CHEM_DISINFECT_TIME_DATA.value, msg = "DisinfectDGChemicalTime", param = [120,60]) #0x9900 + payload = unsigned_byte_to_bytearray(8) + hd_simulator.cmd_send_hd_general_response(message_id=153, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.hd_alarm_broadcast_ch_id) hd_simulator.cmd_send_serial_hd_data(serial = 'AGHHG1234GHJABC') verify_log(msg_id = MsgIds.MSG_ID_HD_SERIAL_NUMBER.value, msg = "Serial", param = ['AGHHG1234GHJABC']) #0x8800 + payload = unsigned_byte_to_bytearray(8) + dg_simulator.cmd_send_dg_general_response(message_id=136, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) dg_simulator.cmd_send_serial_dg_data(serial = 'AGHHG1234GHJABC') verify_log(msg_id = MsgIds.MSG_ID_DG_SERIAL_NUMBER.value, msg = "Serial", param = ['AGHHG1234GHJABC']) #0x1F00 - payload = float_to_bytearray(1.2) - payload += float_to_bytearray(1.2) - payload += float_to_bytearray(1.2) - payload += unsigned_integer_to_bytearray(2) + payload = float_to_bytearray(11.2) + payload += float_to_bytearray(21.2) + payload += float_to_bytearray(31.2) + payload += unsigned_integer_to_bytearray(42) + payload += float_to_bytearray(51.2) + payload += float_to_bytearray(61.2) + payload += float_to_bytearray(71.2) dg_simulator.cmd_send_dg_general_response(message_id=31, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) verify_log(msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value, msg = "ROPump") - verify_log(msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value) #0x2400 - payload = unsigned_integer_to_bytearray(1) - payload += unsigned_integer_to_bytearray(1) - payload += unsigned_integer_to_bytearray(1) - payload += unsigned_integer_to_bytearray(1) + payload = unsigned_integer_to_bytearray(14) + 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") @@ -1053,7 +1057,7 @@ dg_simulator.cmd_send_dg_general_response(message_id=39, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) verify_log(msg_id = MsgIds.MSG_ID_DG_OP_MODE.value, msg = "OpMode") - #0x2D00 + #0x2D00(request) payload = float_to_bytearray(11.500) payload += float_to_bytearray(11.500) payload += float_to_bytearray(11.500)