Index: tests/dg_tests.py =================================================================== diff -u -rb380516aac6b6b68f3d1532cba02b54facb23020 -re049454cdcc0fe9e4beccc9d87a8f60d97d47b4c --- tests/dg_tests.py (.../dg_tests.py) (revision b380516aac6b6b68f3d1532cba02b54facb23020) +++ tests/dg_tests.py (.../dg_tests.py) (revision e049454cdcc0fe9e4beccc9d87a8f60d97d47b4c) @@ -29,7 +29,8 @@ from dialin.hd.temperatures import HDTemperaturesNames from dialin.dg.concentrate_pumps import DGConcentratePumpsStates from dialin.dg.uv_reactors import ReactorsNames -from dialin.common.hd_defs import HDOpModes, HDStandbyStates, PreTreatmentWetSelfTestStates, PostTreatmentStates +from dialin.common.hd_defs import HDOpModes, HDStandbyStates, PreTreatmentWetSelfTestStates, PostTreatmentStates, \ + PreTreatmentDrySelfTestsStates from dialin.hd.post_treatment import HDPostTreatmentDrainStates from dialin.common.dg_defs import DGEventList from dialin.common.hd_defs import HDEventList @@ -90,14 +91,18 @@ def get_hd_run_info(): info = ('HD_op_mode, {}, HD_sub_mode, {}, Top_alarm, {}, Target_UF_ml, {:5.3f}, Meas_UF_ml, {:5.3f}, ' 'Wet_test_state, {}, Post_tx_state, {}, Post_tx_drain_state, {}, Prime_state, {}, Pre_Tx_rsrvr_state, {}, ' + 'Pre_Tx_dry_state, {}, Arterial_press, {:5.3f}, Venous_press, {:5.3f}, Blood_press, {:5.3f}, ' .format(HDOpModes(hd.hd_operation_mode).name, hd.hd_operation_sub_mode, hd.alarms.alarm_top, hd.dialysate_outlet_flow.reference_dialysate_outlet_uf_volume, hd.dialysate_outlet_flow.measured_dialysate_outlet_uf_volume, PreTreatmentWetSelfTestStates(hd.pretreatment.pre_treatment_wet_self_test_state).name, PostTreatmentStates(hd.post_treatment.post_treatment_sub_mode).name, HDPostTreatmentDrainStates(hd.post_treatment.post_treatment_drain_state).name, hd.pretreatment.pre_treatment_prime_state, - PreTreatmentRsrvrState(hd.pretreatment.pre_treatment_reservoir_state).name)) + PreTreatmentRsrvrState(hd.pretreatment.pre_treatment_reservoir_state).name, + PreTreatmentDrySelfTestsStates(hd.pretreatment.pre_treatment_dry_self_test_state).name, + hd.pressure_occlusion.arterial_pressure, hd.pressure_occlusion.venous_pressure, + hd.pressure_occlusion.blood_pump_occlusion)) return info @@ -698,14 +703,14 @@ # cmd_set_disinfect_ui_screen() - #collect_treatment_data() + collect_treatment_data() #collect_hd_treatment() - while True: + #while True: #print(get_hd_fans_info(), get_dg_fans_info(), get_temperature_sensors_info()) - print(get_dg_valves_states()) - sleep(1) + # print(get_dg_valves_states()) + # sleep(1) #while True: # print(dg.rtc.get_rtc_epoch(), hd.rtc.get_rtc_epoch()) Index: tests/hd_nvm_scripts.py =================================================================== diff -u -rb380516aac6b6b68f3d1532cba02b54facb23020 -re049454cdcc0fe9e4beccc9d87a8f60d97d47b4c --- tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision b380516aac6b6b68f3d1532cba02b54facb23020) +++ tests/hd_nvm_scripts.py (.../hd_nvm_scripts.py) (revision e049454cdcc0fe9e4beccc9d87a8f60d97d47b4c) @@ -33,7 +33,7 @@ # Use cmd_update_hd_sw_config_record() set the changes back to firmware # This function requires an address for the excel report. Use the absolute address of your excel report like the # example below - hd.sw_configs.cmd_update_hd_sw_config_record('/home/fw/projects/HD_NV_Records/2022-11-03-HD-SW-CONFIGS-Record.xlsx') + hd.sw_configs.cmd_update_hd_sw_config_record('/home/fw/projects/HD_NV_Records/2022-11-22-HD-SW-CONFIGS-Record.xlsx') # Use this function to reset the configuration records to all be 0 #hd.sw_configs.cmd_reset_hd_sw_config_record()