Index: tests/test_flush.py =================================================================== diff -u -re6bbe766a98c5e0d4e8e3cd57efa5b5895bb4672 -r09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d --- tests/test_flush.py (.../test_flush.py) (revision e6bbe766a98c5e0d4e8e3cd57efa5b5895bb4672) +++ tests/test_flush.py (.../test_flush.py) (revision 09cbb74248e9fb44ea81b9a2131d81e96e4a9d8d) @@ -8,7 +8,7 @@ # @file test_flush.py # # @author (last) Dara Navaei -# @date (last) 28-Jun-2021 +# @date (last) 10-Nov-2021 # @author (original) Dara Navaei # @date (original) 16-Apr-2021 # @@ -24,13 +24,19 @@ def get_flush_mode_info(): + """ info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, Op, {}, ' 'Sub, {}, History, {}, ' .format(dg.flush.flush_state, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time, dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top, dg.events.get_dg_events(1, 0), dg.events.get_dg_nth_event(2), dg.events.get_dg_events(2, 70))) + """ + info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, ' + .format(dg.flush.flush_state, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time, + dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top)) + def get_concentrate_pumps_info(): info = ('Bicarb_tgt_speed, {:5.3f}, Bicarb_speed, {:5.3f}, Acid_tgt_speed, {:5.3f}, Acid_speed, {:5.3f}, ' @@ -84,10 +90,10 @@ 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}, 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.measured_flow_rate_lpm, dg.ro_pump.feedback_duty_cycle_pct)) return info