Index: tst_ui_logs/test.py =================================================================== diff -u -re95be95d8fc8d27d895dd0d3a80314a012de5968 -r63a0a3ee0d3dfbc986a5688b3a632d751884e387 --- tst_ui_logs/test.py (.../test.py) (revision e95be95d8fc8d27d895dd0d3a80314a012de5968) +++ tst_ui_logs/test.py (.../test.py) (revision 63a0a3ee0d3dfbc986a5688b3a632d751884e387) @@ -774,202 +774,68 @@ dg_simulator.cmd_send_dg_disinfect_progress_time_checmical(total = 120, countdown = 60) verify_log(msg_id = MsgIds.MSG_ID_DG_CHEM_DISINFECT_TIME_DATA.value, msg = "DisinfectDGChemicalTime", param = [120,60]) - #Check-In - #ID:0x0700 - hd_simulator.cmd_send_hd_general_response(message_id=7, accepted=1, reason=0) - verify_log(msg_id = MsgIds.MSG_ID_UI_CHECK_IN.value, msg = "None") + #0x6900 + hd_simulator.cmd_send_hd_general_response(message_id = 105, accepted = 1, reason = 1, has_parameters = True, parameters_payload = [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]) + verify_log(msg_id = MsgIds.MSG_ID_HD_SYRINGE_PUMP_DATA.value) - #Power - #ID:0x0100 - #hd_simulator.cmd_send_hd_general_response(message_id=1, accepted=1, reason=0) - #verify_log(msg_id = MsgIds.MSG_ID_OFF_BUTTON_PRESS.value, msg = "PowerOff", param = [1]) + #0xA400 + hd_simulator.cmd_send_hd_general_response(message_id=164, accepted=1, reason=1, is_pure_data= False, has_parameters = True, parameters_payload = [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1] ) + verify_log(msg_id = MsgIds.MSG_ID_HD_EVENT.value, msg = "General") - #Alarm - #ID:0x4E00 - hd_simulator.cmd_send_hd_general_response(message_id=78, accepted=1, reason=0) - verify_log(msg_id = MsgIds.MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD.value, msg = "None") + #0xA500 + dg_simulator.cmd_send_dg_general_response(message_id=165, accepted=1, reason=1, is_pure_data= False, has_parameters = True, parameters_payload = [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1] ) + verify_log(msg_id = MsgIds.MSG_ID_DG_EVENT.value, msg = "General") - #ID:0x3200 - hd_simulator.cmd_send_hd_general_response(message_id=50, accepted=1, reason=0) - verify_log(msg_id = MsgIds.MSG_ID_USER_REQUEST_ALARM_SILENCE.value, msg = "None") + #0x9900 + hd_simulator.cmd_send_serial_hd_data(serial = 'AGHHG1234GHJABC') + verify_log(msg_id = MsgIds.MSG_ID_HD_SERIAL_NUMBER.value, msg = "Serial", param = ['AGHHG1234GHJABC']) - #ID:0x4000 - hd_simulator.cmd_send_hd_general_response(message_id=64, accepted=1, reason=0) - verify_log(msg_id = MsgIds.MSG_ID_UI_ALARM_USER_ACTION.value, msg = "None") + #0x8800 + dg_simulator.cmd_send_serial_dg_data(serial = 'AGHHG1234GHJABC') + verify_log(msg_id = MsgIds.MSG_ID_DG_SERIAL_NUMBER.value, msg = "Serial", param = ['AGHHG1234GHJABC']) - #ID:0x9700 - hd_simulator.cmd_send_hd_general_response(message_id=151, accepted=1, reason=0) - verify_log(msg_id = MsgIds.MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST.value, msg = "None") + #0x1F00 + hd_simulator.cmd_send_hd_general_response(message_id=31, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = [255, 118, 215, 58]) + verify_log(msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value) - #UF Vol - #ID:0x1000 - hd_simulator.cmd_send_hd_general_response(message_id=16 , accepted=1, reason=0) ##doubt - verify_log(msg_id = MsgIds.MSG_ID_USER_UF_PAUSE_RESUME_REQUEST.value, msg = "None") + #0x2400 + hd_simulator.cmd_send_hd_general_response(message_id=36, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = [1,2,2]) + verify_log(msg_id = MsgIds.MSG_ID_DRAIN_PUMP_DATA.value, msg = "DrainPump") - #ID:0x1100 - hd_simulator.cmd_send_hd_general_response(message_id=17 , accepted=1, reason=0) #895 line - verify_log(msg_id = MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST.value, msg = "None") + #0x2700 + hd_simulator.cmd_send_hd_general_response(message_id=39, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = [2,2]) + verify_log(msg_id = MsgIds.MSG_ID_DG_OP_MODE.value, msg = "OpMode") - #ID:0x1500 - hd_simulator.cmd_send_hd_general_response(message_id=21, accepted=1, reason=0) - verify_log(msg_id = MsgIds.MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE.value, msg = "None") + #0x2D00 + hd_simulator.cmd_send_hd_general_response(message_id=45, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = [1,2,3,4,5,6,7,8,9,10,11,12,13]) + verify_log(msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, msg = "Temperatures") - #Saline - #ID:0x1200 - hd_simulator.cmd_send_hd_general_response(message_id=18, accepted=1, reason=0) - verify_log(msg_id = MsgIds.MSG_ID_USER_SALINE_BOLUS_REQUEST.value, msg = "None") + #0x1300 + hd_simulator.cmd_send_hd_general_response(message_id=19, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = [1,2,3,4,5,6,7,8,9,1,2,3,4,5,6,7,8,9,1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,3,4]) + verify_log(msg_id = MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE.value, msg = "AdjustUFEdit") - #Heparin - #ID:0x4B00 - hd_simulator.cmd_send_hd_general_response(message_id=75, accepted=1, reason=0) - verify_log(msg_id = MsgIds.MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST.value, msg = "None") + #0xF1FF + hd_simulator.cmd_send_hd_general_response(message_id=65521, accepted=0, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = [1,2,3,4,5,6,7,8,9,1,2,3,4,5,6,7,8,9,1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,3,4,1,1,1,1,1]) + verify_log(msg_id = MsgIds.MSG_ID_HD_DEBUG_EVENT.value, msg = "Debug") - #Duration - #ID:0x1600 - hd_simulator.cmd_send_hd_general_response(message_id=22, accepted=1, reason=0) - verify_log(msg_id = MsgIds.MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST.value, msg = "None") + #0xF2FF + dg_simulator.cmd_send_dg_general_response(message_id=65522, accepted=0, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = [1,2,3,4,5,6,7,8,9,1,2,3,4,5,6,7,8,9,1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,3,4,1,1,1,1,1]) + verify_log(msg_id = MsgIds.MSG_ID_DG_DEBUG_EVENT.value, msg = "Debug") - #Blood / Dialysate - #ID:0x1700 - hd_simulator.cmd_send_hd_general_response(message_id=23, accepted=1, reason=0) - verify_log(msg_id = MsgIds.MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST.value, msg = "None") + #0x3600 + hd_simulator.cmd_send_hd_general_response(message_id=54, accepted=0, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = [1,2,3,4,5,6,7,8,9,1,2,3,4,5,6,7,8,9,1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,3,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,2,4,3,5,6,5,4,3,1,1,1,1,1,1,2,1,3,2,1,2,3,1]) + verify_log(msg_id = MsgIds.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE.value, msg= "ParametersValidation") - #PRS-58: In-Line Blood Pressure Limits - #ID:0x4600 - hd_simulator.cmd_send_hd_general_response(message_id=70, accepted=1, reason=0) - verify_log(msg_id = MsgIds.MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST.value, msg = "None") + #0x5000 + hd_simulator.cmd_send_hd_general_response(message_id=80, accepted=1, reason=0, is_pure_data = False, has_parameters = True, parameters_payload = [1,2,3,4,5,1,2,3,2,1,1]) + verify_log(msg_id = MsgIds.MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE.value, msg = "AdjustUFInit") - #ID:0x9A00 - hd_simulator.cmd_send_hd_general_response(message_id=154, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST.value, msg = "None") + #0x0900 + hd_simulator.cmd_send_hd_general_response(message_id = 9, accepted = 1, reason = 5, is_pure_data = True, has_parameters = True, parameters_payload = [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]) + verify_log(msg_id = MsgIds.MSG_ID_PRESSURE_OCCLUSION_DATA.value, msg = "Pressure/Occlusion") - #ID:0x5200 - hd_simulator.cmd_send_hd_general_response(message_id=82, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_UI_RINSEBACK_CMD.value, msg = "None") - - #ID:0x5400 - hd_simulator.cmd_send_hd_general_response(message_id=84, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_UI_RECIRC_CMD.value, msg = "None") - - #ID:0x5700 - hd_simulator.cmd_send_hd_general_response(message_id=87, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_UI_TX_END_CMD.value, msg = "None") - - #ID:0x6D00 - hd_simulator.cmd_send_hd_general_response(message_id=109, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_UI_HD_SET_RTC_REQUEST.value, msg = "None") - - #ID:0x6F00 - hd_simulator.cmd_send_hd_general_response(message_id=111, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_UI_DG_SET_RTC_REQUEST.value, msg = "None") - - #ID:0x1C00 - hd_simulator.cmd_send_hd_general_response(message_id=28, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_REQUEST_FW_VERSIONS.value, msg = "None") - - #ID:0x9F00 - hd_simulator.cmd_send_hd_general_response(message_id=159, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_HD_UI_VERSION_INFO_RESPONSE.value, msg = "None") - - #ID:0x8900 - hd_simulator.cmd_send_hd_general_response(message_id=137, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_UI_REQUEST_SERVICE_INFO.value, msg = "None") + utils.tstDone() - #ID:0x3800 - hd_simulator.cmd_send_hd_general_response(message_id=56, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_UI_INITIATE_TREATMENT_REQUEST.value, msg = "None") - - #ID:0x3500 - hd_simulator.cmd_send_hd_general_response(message_id=53, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value, msg = "None") - - #ID:0x3B00 - hd_simulator.cmd_send_hd_general_response(message_id=59, accepted=0, reason=1) - verify_log(msg_id = MsgIds.MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS.value, msg = "None") - - #ID:0xA000 - hd_simulator.cmd_send_hd_general_response(message_id=160, accepted=0, reason=1) - verify_log(msg_id = 0xA0, msg = "None") - - #Invalid message id - #ID:0xB100 - hd_simulator.cmd_send_hd_general_response(message_id=177, accepted=0, reason=1) - verify_log(msg_id = 0xB1, msg = "None") - - #ID: 0x5D00 - #Water sample request - hd_simulator.cmd_send_hd_general_response(message_id=93, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_SAMPLE_WATER_CMD.value, msg = "None") - - #ID: 0x5F00 - #Water sample result - hd_simulator.cmd_send_hd_general_response(message_id=95, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_SAMPLE_WATER_RESULT.value, msg = "None") - #ID: 0x6800 - #Consumable Installation confirm - hd_simulator.cmd_send_hd_general_response(message_id=104, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM.value, msg = "None") - - #ID: 0x6200 - #Disposable Installation Confirm - hd_simulator.cmd_send_hd_general_response(message_id=98, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_INSTALLATION_CONFIRM.value, msg = "None") - - #ID:0x3C00 - #Prime start request - hd_simulator.cmd_send_hd_general_response(message_id=60, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_START_PRIME_REQUEST.value, msg = "None") - - #ID: 0x6400 - #Patient Connection Begin Request - hd_simulator.cmd_send_hd_general_response(message_id=100, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_PATIENT_CONNECTION_BEGIN_REQUEST.value, msg = "None") - - #ID: 0x4F00 - #Pre UF Volume Adjustment Request - hd_simulator.cmd_send_hd_general_response(message_id=79, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER.value, msg = "None") - #ID: 0x6600 - #Patient Connection Confirm Request - hd_simulator.cmd_send_hd_general_response(message_id=102, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_PATIENT_CONNECTION_CONFIRM.value, msg = "None") - - #ID: 0x7100 - #Start treatment request - hd_simulator.cmd_send_hd_general_response(message_id=113, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_START_TREATMENT_REQUEST.value, msg = "None") - - #ID: 0x4A00 - #Patient Disconnection Confirm Request - hd_simulator.cmd_send_hd_general_response(message_id=74, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM.value, msg = "None") - - #ID:0x7300 - #Disposable Removal Confirm Request - hd_simulator.cmd_send_hd_general_response(message_id=115, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM.value, msg = "None") - - #ID:0x7500 - #Treatment Log Data Request - hd_simulator.cmd_send_hd_general_response(message_id=117, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST.value, msg = "None") - - #ID:0X7F00 - #Disinfect Request - hd_simulator.cmd_send_hd_general_response(message_id=127, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_DISINFECT_REQUEST.value, msg = "None") - - #ID: 0x8100 - #Chemical Disinfect User Confirm - hd_simulator.cmd_send_hd_general_response(message_id=129, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_CHEM_DISINFECT_CONFIRM.value, msg = "None") - - #ID: 0x9200 - #UI POST final test result - hd_simulator.cmd_send_hd_general_response(message_id=146, accepted=0, reason = 1) - verify_log(msg_id= MsgIds.MSG_ID_UI_POST_FINAL_TEST_RESULT.value, msg = "None") - - \ No newline at end of file