Index: tests/dg_heat_disinfect_test.py =================================================================== diff -u -r400e03c12e615a00c4e0a770471209fd82e184b8 -r8b1cfa3f0a1be1130d7ffd5761df7c0a1c3a5164 --- tests/dg_heat_disinfect_test.py (.../dg_heat_disinfect_test.py) (revision 400e03c12e615a00c4e0a770471209fd82e184b8) +++ tests/dg_heat_disinfect_test.py (.../dg_heat_disinfect_test.py) (revision 8b1cfa3f0a1be1130d7ffd5761df7c0a1c3a5164) @@ -14,6 +14,7 @@ from dialin.dg.temperature_sensors import TemperatureSensorsNames from time import sleep + def run_ro_pump_test(): f = open("RO_Pump_Low.log", "w") @@ -40,15 +41,15 @@ def get_heat_disinfect_mode_info(): - info = ('State, {}, Overall_time, {}, State_elapsed_time, {},' + info = ('State, {}, Overall_time, {}, State_elapsed_time, {}, ' .format(HeatDisinfectStates(dg.heat_disinfect.current_state).name, dg.heat_disinfect.overall_elapsed_time, dg.heat_disinfect.state_elapsed_time)) return info def get_dg_valves_states(): - info = ('VPi, {}, VSP, {}, VPd, {}, VBf, {}, VPo, {}, VDr, {}, VRc, {}, VRo, {}, VRd, {}, VRi, {}, VRf, {},' + info = ('VPi, {}, VSP, {}, VPd, {}, VBf, {}, VPo, {}, VDr, {}, VRc, {}, VRo, {}, VRd, {}, VRi, {}, VRf, {}, ' .format(dg.valves.valve_states_enum[dg.valves.VALVE_PRESSURE_INLET], dg.valves.valve_states_enum[dg.valves.VALVE_SAMPLING_PORT], dg.valves.valve_states_enum[dg.valves.VALVE_PRODUCTION_DRAIN], @@ -65,29 +66,50 @@ def get_drain_states_info(): - info = ('Drain, {}, DAC, {}, PRd, {:5.3f}, PDr, {:5.3f}'.format(DrainPumpStates(dg.drain_pump.drain_pump_state).name, + info = ('Drain, {}, DAC, {}, PRd, {:5.3f}, PDr, {:5.3f} '. + format(DrainPumpStates(dg.drain_pump.drain_pump_state).name, dg.drain_pump.dac_value, dg.pressures.drain_pump_inlet_pressure, dg.pressures.drain_pump_outlet_pressure)) return info def get_load_cells_info(): - info = ('Primary_A1, {:5.3f}, Primary_B1, {:5.3f},'.format(dg.load_cells.load_cell_A1, dg.load_cells.load_cell_B1)) + info = ('Primary_A1, {:5.3f}, Primary_B1, {:5.3f}, '.format(dg.load_cells.load_cell_A1, dg.load_cells.load_cell_B1)) return info 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}, ' .format(dg.ro_pump.ro_pump_state, dg.pressures.ro_pump_outlet_pressure, dg.pressures.ro_pump_outlet_pressure, dg.ro_pump.pwm_duty_cycle_pct, dg.ro_pump.measured_flow_rate_lpm)) return info +def get_heaters_info(): + + info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Trimmer_DC, {:5.3f}, '. + format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.small_primary_heater_duty_cycle, + dg.heaters.trimmer_heater_duty_cycle)) + return info + + +def get_temperature_sensors_info(): + + info = ('TPi, {:5.3f}, TPo, {:5.3f}, TD1, {:5.3f}, TD2, {:5.3f}, TRo, {:5.3f}, TDi, {:5.3f}, ' + .format(dg.temperature_sensors.temperature_sensors(TemperatureSensorsNames.INLET_PRIMARY_HEATER.name), + dg.temperature_sensors.temperature_sensors(TemperatureSensorsNames.OUTLET_PRIMARY_HEATER.name), + dg.temperature_sensors.temperature_sensors(TemperatureSensorsNames.CONDUCTIVITY_SENSOR_1.name), + dg.temperature_sensors.temperature_sensors(TemperatureSensorsNames.CONDUCTIVITY_SENSOR_2.name), + dg.temperature_sensors.temperature_sensors(TemperatureSensorsNames.OUTLET_DIALYSATE_REDUNDANT.name), + dg.temperature_sensors.temperature_sensors(TemperatureSensorsNames.INLET_DIALYSATE.name))) + return info + + def run_heat_disinfect(): - f = open("Heat_disinfection.log", "w") + f = open("Heat_disinfect.log", "w") dg.heat_disinfect.cmd_start_stop_heat_disinfect() try: while True: @@ -97,8 +119,10 @@ load_cell = get_load_cells_info() valves = get_dg_valves_states() ro = get_ro_info() + temp = get_temperature_sensors_info() + heaters = get_heaters_info() - var = disinfect + ' ' + drain + ' ' + load_cell + ' ' + ro + ' ' + valves + '\r' + var = disinfect + load_cell + drain + ro + temp + heaters + valves + '\r' print(var) f.write(var)