Index: tests/dg_tests.py =================================================================== diff -u -r6c9c54b00503ff8124ba864ec846d1866e58b8b7 -r5ec51022d4c81fba0406aecfbb9b5cdfe4f7d068 --- tests/dg_tests.py (.../dg_tests.py) (revision 6c9c54b00503ff8124ba864ec846d1866e58b8b7) +++ tests/dg_tests.py (.../dg_tests.py) (revision 5ec51022d4c81fba0406aecfbb9b5cdfe4f7d068) @@ -180,6 +180,13 @@ return info +def get_new_ro_info(): + info = ('New_flow, {:5.3f}, Tgt_flow, {:5.3f}, New_flow_with_conc_pumps, {:5.3f}, New_dialysate_flow, {:5.3f}, ' + .format(dg.dialysate_flow_sensor.new_ro_flow, dg.dialysate_flow_sensor.new_dialysate_flow, + dg.dialysate_flow_sensor.new_ro_flow_with_conc, dg.dialysate_flow_sensor.new_dialysate_flow)) + return info + + def get_heaters_with_no_temp_info(): info = ('Pri_main_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, Trim_state, {}, ' 'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '. @@ -393,6 +400,7 @@ load_cell = get_load_cells_info() valves = get_dg_valves_states() ro = get_ro_info() + new_ro = get_new_ro_info() temp = get_temperature_sensors_info() heaters = get_heaters_info() dg_fans = get_dg_fans_info() @@ -403,7 +411,7 @@ idle_bad_fill = get_dg_idle_bad_fill_info() var = str(datetime.now()) + ', ' + hd_run + dg_run + hd_rsrvrs + dg_rsrvrs + load_cell + drain + ro + \ - temp + heaters + conc_pumps + dg_fans + valves + blood_leak + hd_pumps + fill_info + idle_bad_fill + '\r' + new_ro + temp + heaters + conc_pumps + dg_fans + valves + blood_leak + hd_pumps + fill_info + '\r' if hd.alarms.get_alarm_state(97) and start is False: dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD2.value, 13700.00) @@ -641,6 +649,10 @@ # print(get_temperature_sensors_info(), get_dg_fans_info()) # sleep(1) + #while True: + # print(get_new_ro_info(), get_ro_info()) + # sleep(1) + # test_dg_fans_alarms() #test_dvt_drain_pump()