Index: tests/dg_tests.py =================================================================== diff -u -ra7f6b7938acc3b1e5e8dd9b8d5f8237a3b298e6b -r6d6c2318a81c130b7875bfad31424e56fd8f59f2 --- tests/dg_tests.py (.../dg_tests.py) (revision a7f6b7938acc3b1e5e8dd9b8d5f8237a3b298e6b) +++ tests/dg_tests.py (.../dg_tests.py) (revision 6d6c2318a81c130b7875bfad31424e56fd8f59f2) @@ -73,6 +73,7 @@ hd.dialysate_outlet_flow.measured_dialysate_outlet_uf_volume)) return info + def get_hd_occlusion_pressures_info(): info = ('Art_pres, {:5.3f}, Venous_pres, {:5.3f}, Blood_pump_pres, {}, DialIn_pres, {}, DialOut_pres, {}, ' .format(hd.pressure_occlusion.arterial_pressure, hd.pressure_occlusion.venous_pressure, @@ -154,9 +155,11 @@ def get_ro_info(): info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, Tgt_flow, {:5.3f}, Dia_flow, {:5.3f}, ' + 'Feedback_PWM, {:5.3f}, ' .format(dg.ro_pump.ro_pump_state, dg.pressures.ro_pump_inlet_pressure, dg.pressures.ro_pump_outlet_pressure, dg.ro_pump.pwm_duty_cycle_pct, - dg.ro_pump.measured_flow_rate_lpm, dg.ro_pump.target_flow_lpm, dg.dialysate_flow_sensor.flow_rate)) + dg.ro_pump.measured_flow_rate_lpm, dg.ro_pump.target_flow_lpm, dg.dialysate_flow_sensor.flow_rate, + dg.ro_pump.feedback_duty_cycle_pct)) return info @@ -562,7 +565,7 @@ hd.cmd_log_in_to_hd() sleep(1) - # run_heat_disinfect() + run_heat_disinfect() # run_chemical_disinfect() @@ -578,6 +581,3 @@ # test_dg_fans_alarms() - while True: - print(get_hd_occlusion_pressures_info(), get_hd_fans_info()) - sleep(1)