Index: tests/dg_tests.py =================================================================== diff -u -r4180ef16e74251c6eb83501a396aaa9a0a892b6b -r79e55000ceaa2a703259880c1244e577f83fcc0f --- tests/dg_tests.py (.../dg_tests.py) (revision 4180ef16e74251c6eb83501a396aaa9a0a892b6b) +++ tests/dg_tests.py (.../dg_tests.py) (revision 79e55000ceaa2a703259880c1244e577f83fcc0f) @@ -76,13 +76,14 @@ 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, {}, ' + 'Wet_test_state, {}, Post_tx_state, {}, Post_tx_drain_state, {}, Prime_state, {}, ' .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, - 0, #PreTreatmentWetSelfTesStates(hd.pretreatment.pre_treatment_wet_self_test_state).name, + PreTreatmentWetSelfTesStates(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)) + HDPostTreatmentDrainStates(hd.post_treatment.post_treatment_drain_state).name, + hd.pretreatment.pre_treatment_prime_state)) return info @@ -630,17 +631,17 @@ # cmd_set_disinfect_ui_screen() - #collect_treatment_data() + collect_treatment_data() #collect_hd_treatment() # test_hd_fans_alarms() # test_dg_fans_alarms() - while True: - # print(get_hd_fans_info()) - print(hd.hd_debug_events) - sleep(1) + #while True: + # print(get_dg_fans_info()) + #print(hd.hd_debug_events) + # sleep(1) #dg.ro_pump.cmd_ro_pump_measured_flow_rate_override(0.0, reset=1)