Index: tests/dg_tests.py =================================================================== diff -u -r0120cd8f496738353050ea02dbcc11724d1351c7 -r737b74f1e453051c715488266747a80c2d16eb03 --- tests/dg_tests.py (.../dg_tests.py) (revision 0120cd8f496738353050ea02dbcc11724d1351c7) +++ tests/dg_tests.py (.../dg_tests.py) (revision 737b74f1e453051c715488266747a80c2d16eb03) @@ -69,7 +69,7 @@ def get_heat_disinfect_mode_info(): info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, ' - 'R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, UI_state, {} ' + 'R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, UI_state, {}, ' .format(DGHeatDisinfectStates(dg.heat_disinfect.heat_disinfect_state).name, dg.heat_disinfect.overall_elapsed_time, dg.heat_disinfect.state_elapsed_time, dg.heat_disinfect.heat_disinfect_count_down_time, dg.heat_disinfect.r1_level, @@ -180,11 +180,12 @@ def get_ro_info(): - info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, ' + info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, Tgt_flow, {:5.3f}, ' 'Feedback_PWM, {:5.3f}, Flow_with_conc_pumps, {:5.3f}, Dialysate_flow, {: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.flow_sensors.measured_ro_flow_LPM, dg.ro_pump.feedback_duty_cycle_pct, + dg.flow_sensors.measured_ro_flow_LPM, dg.ro_pump.target_flow_lpm, + dg.ro_pump.feedback_duty_cycle_pct, dg.flow_sensors.measured_ro_flow_with_cp_LPM, dg.flow_sensors.measured_dialysate_flow_LPM)) return info @@ -313,6 +314,7 @@ dg.dialysate_fill.total_volume)) return info + def get_hd_valves_info(): info = ('Air_trap' ) @@ -688,7 +690,7 @@ #run_heat_disinfect() - run_flush_mode() + #run_flush_mode() #run_chemical_disinfect()