Index: tests/dg_tests.py =================================================================== diff -u -r248afd4f09cc4ee8b6cc3f042256e43044dfc65f -racd09d02879e8add4cf7f694f5db8e423a76c341 --- tests/dg_tests.py (.../dg_tests.py) (revision 248afd4f09cc4ee8b6cc3f042256e43044dfc65f) +++ tests/dg_tests.py (.../dg_tests.py) (revision acd09d02879e8add4cf7f694f5db8e423a76c341) @@ -1,14 +1,14 @@ ########################################################################### # -# Copyright (c) 2022-2022 Diality Inc. - All Rights Reserved. +# Copyright (c) 2022-2023 Diality Inc. - All Rights Reserved. # # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # # @file dg_tests.py # # @author (last) Dara Navaei -# @date (last) 18-Oct-2022 +# @date (last) 21-Dec-2022 # @author (original) Dara Navaei # @date (original) 16-Jan-2022 # @@ -21,6 +21,7 @@ from dialin.common.dg_defs import DGHeatDisinfectStates, DGHeatDisinfectUIStates from dialin.dg.heat_disinfect import HeatCancellationModes from dialin.common.dg_defs import DGChemicalDisinfectStates, DGChemDisinfectUIStates +from dialin.common.dg_defs import DGChemDisinfectFlushStates, DGChemDisinfectFlushUIStates from dialin.dg.chemical_disinfect import ChemCancellationModes from dialin.dg.drain_pump import DrainPumpStates from dialin.dg.thermistors import ThermistorsNames @@ -29,7 +30,8 @@ from dialin.hd.temperatures import HDTemperaturesNames from dialin.dg.concentrate_pumps import DGConcentratePumpsStates from dialin.dg.uv_reactors import ReactorsNames -from dialin.common.hd_defs import HDOpModes, HDStandbyStates, PreTreatmentWetSelfTestStates, PostTreatmentStates +from dialin.common.hd_defs import HDOpModes, HDStandbyStates, PreTreatmentWetSelfTestStates, PostTreatmentStates, \ + PreTreatmentDrySelfTestsStates from dialin.hd.post_treatment import HDPostTreatmentDrainStates from dialin.common.dg_defs import DGEventList from dialin.common.hd_defs import HDEventList @@ -41,10 +43,11 @@ from dialin.dg.pressures import DGPressures from dialin.dg.conductivity_sensors import ConductivitySensorsEnum from dialin.dg.voltages import DGMonitoredVoltages +from dialin.dg.valves import DGValveNames from dialin.hd.valves import HDValves from dialin.hd.voltages import HDMonitoredVoltages from dialin.hd.pretreatment import PreTreatmentRsrvrState -from dialin.common.dg_defs import DGFlushStates +from dialin.common.dg_defs import DGFlushStates, DGHeatDisinfectActiveCoolStates from time import sleep from datetime import datetime import sys @@ -66,42 +69,62 @@ hd.alarms.alarm_top)) return info +def get_chemical_disinfect_flush_mode_info(): + info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, r1, {:5.1f}, r2, {:5.1f}, ' + 'Target_rinse_count, {}, Rinse_count, {}, Top_alarm, {}, UI_state, {},' + .format(DGChemDisinfectFlushStates(dg.chemical_disinfect_flush.flush_state).name, + dg.chemical_disinfect_flush.overall_elapsed_time, dg.chemical_disinfect_flush.state_elapsed_time, + dg.chemical_disinfect_flush.r1, dg.chemical_disinfect_flush.r2, + dg.chemical_disinfect_flush.target_rinse_count, dg.chemical_disinfect_flush.rinse_count, + hd.alarms.alarm_top, dg.chemical_disinfect_flush.flush_UI_state)) + return info def get_heat_disinfect_mode_info(): + state = 0 + state_elapsed_time = 0 + overall_elapsed_time = 0 + if dg.dg_operation_mode == 9: + state = DGHeatDisinfectStates(dg.heat_disinfect.heat_disinfect_state).name + overall_elapsed_time = dg.heat_disinfect.overall_elapsed_time + state_elapsed_time = dg.heat_disinfect.state_elapsed_time + elif dg.dg_operation_mode == 12: + state = DGHeatDisinfectActiveCoolStates(dg.heat_disinfect_active_cool.heat_disinfect_active_cool_state).name + overall_elapsed_time = dg.heat_disinfect_active_cool.overall_elapsed_time + state_elapsed_time = dg.heat_disinfect_active_cool.state_elapsed_time + info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, ' '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, + .format(state, overall_elapsed_time, state_elapsed_time, dg.heat_disinfect.heat_disinfect_count_down_time, dg.heat_disinfect.r1_level, dg.heat_disinfect.r2_level, hd.alarms.alarm_top, - DGHeatDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name)) + DGHeatDisinfectUIStates(dg.heat_disinfect.heat_disinfect_ui_state).name)) return info def get_flush_mode_info(): info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, ' .format(DGFlushStates(dg.flush.flush_state).name, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time, dg.flush.flush_drain_line_volume_l, hd.alarms.alarm_top)) - return info - def get_hd_run_info(): info = ('HD_op_mode, {}, HD_sub_mode, {}, Top_alarm, {}, Target_UF_ml, {:5.3f}, Meas_UF_ml, {:5.3f}, ' 'Wet_test_state, {}, Post_tx_state, {}, Post_tx_drain_state, {}, Prime_state, {}, Pre_Tx_rsrvr_state, {}, ' + 'Pre_Tx_dry_state, {}, ' .format(HDOpModes(hd.hd_operation_mode).name, hd.hd_operation_sub_mode, hd.alarms.alarm_top, hd.dialysate_outlet_flow.reference_dialysate_outlet_uf_volume, hd.dialysate_outlet_flow.measured_dialysate_outlet_uf_volume, PreTreatmentWetSelfTestStates(hd.pretreatment.pre_treatment_wet_self_test_state).name, PostTreatmentStates(hd.post_treatment.post_treatment_sub_mode).name, HDPostTreatmentDrainStates(hd.post_treatment.post_treatment_drain_state).name, hd.pretreatment.pre_treatment_prime_state, - PreTreatmentRsrvrState(hd.pretreatment.pre_treatment_reservoir_state).name)) + PreTreatmentRsrvrState(hd.pretreatment.pre_treatment_reservoir_state).name, + PreTreatmentDrySelfTestsStates(hd.pretreatment.pre_treatment_dry_self_test_state).name)) return info def get_hd_occlusion_pressures_info(): - info = ('Art_pres, {:5.3f}, Venous_pres, {:5.3f}, Blood_pump_pres, {}, DialIn_pres, {}, DialOut_pres, {}, ' + info = ('Art_pres, {:5.3f}, Venous_pres, {:5.3f}, Blood_pump_pres, {:5.3f}, DialIn_pres, {}, DialOut_pres, {}, ' .format(hd.pressure_occlusion.arterial_pressure, hd.pressure_occlusion.venous_pressure, hd.pressure_occlusion.blood_pump_occlusion, hd.pressure_occlusion.dialysate_inlet_pump_occlusion, hd.pressure_occlusion.dialysate_outlet_pump_occlusion)) @@ -133,50 +156,45 @@ def get_dg_run_info(): - # info = ('DG_op_mode, {}, DG_sub_mode, {}, Op, {}, Sub, {}, '.format(DGOperationModes(dg.dg_operation_mode).name, - # dg.dg_operation_sub_mode, - # dg.events.get_dg_events(DGEventList(1).value, 3), - # dg.events.get_dg_events(DGEventList(2).value, 3))) - info = ('DG_op_mode, {}, DG_op_mode_num, {}, DG_sub_mode, {}, '.format(DGOperationModes(dg.dg_operation_mode).name, dg.dg_operation_mode, dg.dg_operation_sub_mode)) 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, {}, VRi, {}, VRf, {}, ' 'VRD1, {}, VRD2, {}, ' - .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], - dg.valves.valve_states_enum[dg.valves.VALVE_BYPASS_FILTER], - dg.valves.valve_states_enum[dg.valves.VALVE_PRESSURE_OUTLET], - dg.valves.valve_states_enum[dg.valves.VALVE_DRAIN], - dg.valves.valve_states_enum[dg.valves.VALVE_RECIRCULATE], - dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_OUTLET], - dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN], - dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_INLET], - dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_FILL], - dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_1], - dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_2])) + .format(dg.valves.valve_states_enum[DGValveNames.VALVE_PRESSURE_INLET.value], + dg.valves.valve_states_enum[DGValveNames.VALVE_SAMPLING_PORT.value], + dg.valves.valve_states_enum[DGValveNames.VALVE_PRODUCTION_DRAIN.value], + dg.valves.valve_states_enum[DGValveNames.VALVE_BYPASS_FILTER.value], + dg.valves.valve_states_enum[DGValveNames.VALVE_PRESSURE_OUTLET.value], + dg.valves.valve_states_enum[DGValveNames.VALVE_DRAIN.value], + dg.valves.valve_states_enum[DGValveNames.VALVE_RECIRCULATE.value], + dg.valves.valve_states_enum[DGValveNames.VALVE_RESERVOIR_OUTLET.value], + dg.valves.valve_states_enum[DGValveNames.VALVE_RESERVOIR_INLET.value], + dg.valves.valve_states_enum[DGValveNames.VALVE_RESERVOIR_FILL.value], + dg.valves.valve_states_enum[DGValveNames.VALVE_RESERVOIR_DRAIN_1.value], + dg.valves.valve_states_enum[DGValveNames.VALVE_RESERVOIR_DRAIN_2.value])) return info def get_drain_states_info(): - info = ('Drain, {}, DAC, {}, Tgt_RPM, {}, Curr_RPM, {}, PRd, {:5.3f}, PDr, {:5.3f}, Drain_curr_A, {:5.3f}, ' - 'Drain_dir, {}, ' + info = ('Drain, {}, DAC, {}, Tgt_RPM, {}, Curr_RPM, {}, PRd, {:5.3f}, PDr, {:5.3f}, Baro, {:5.3f}, ' + 'Drain_curr_A, {:5.3f}, Drain_dir, {}, ' .format(DrainPumpStates(dg.drain_pump.drain_pump_state).name, dg.drain_pump.dac_value, dg.drain_pump.target_drain_pump_rpm, dg.drain_pump.current_drain_pump_rpm, dg.pressures.drain_pump_inlet_pressure, dg.pressures.drain_pump_outlet_pressure, - dg.drain_pump.drain_pump_current_A, dg.drain_pump.drain_pump_direction)) + dg.pressures.barometric_pressure, dg.drain_pump.drain_pump_current_A, + dg.drain_pump.drain_pump_direction)) return info def get_load_cells_info(): - info = ('A1, {:5.3f}, A2, {:5.3f}, B1, {:5.3f}, B2, {:5.3f}, '. - format(dg.load_cells.load_cell_A1, dg.load_cells.load_cell_A2, dg.load_cells.load_cell_B1, - dg.load_cells.load_cell_B2)) + info = ('A1, {:5.3f}, A2, {:5.3f}, B1, {:5.3f}, B2, {:5.3f}, ' + .format(dg.load_cells.load_cell_A1, dg.load_cells.load_cell_A2, dg.load_cells.load_cell_B1, + dg.load_cells.load_cell_B2)) return info @@ -204,8 +222,7 @@ info = ('Pri_main_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, Trimmer_state, {}, ' 'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, Primary_eff, {:5.3f}, ' 'Primary_calc_temp, {:5.3f}, Trimmer_calc_temp, {:5.3f}, Primary_power, {:5.3f}, ' - 'Primary_volt, {:5.3f}, Primary_sec_volt, {:5.3f},' - ' Trimmer_volt, {:5.3f}, ' + 'Primary_volt, {:5.3f}, Primary_sec_volt, {:5.3f}, Trimmer_volt, {:5.3f}, Trimmer_use_last_dc, {}, ' .format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.primary_heater_state, dg.heaters.trimmer_heater_duty_cycle, dg.heaters.trimmer_heater_state, dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature, @@ -214,19 +231,22 @@ dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_POWER_PRIM_HTR_V.value], dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_GND_MAIN_PRIM_HTR_V.value], dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_GND_SMALL_PRIM_HTR_V.value], - dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_GND_TRIM_HTR_V.value])) + dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_GND_TRIM_HTR_V.value], + dg.heaters.trimmer_use_last_duty_cycle)) return info def get_temperature_sensors_info(): info = ('TPi, {:5.3f}, THd, {:5.3f}, TPo, {:5.3f}, TD1, {:5.3f}, TD2, {:5.3f}, TRo, {:5.3f}, TDi, {:5.3f}, ' + 'Baro_temp, {:5.3f}, ' .format(dg.temperatures.temperatures[DGTemperaturesNames.INLET_PRIMARY_HEATER.name], dg.temperatures.temperatures[DGTemperaturesNames.HEAT_DISINFECT.name], dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name], dg.temperatures.temperatures[DGTemperaturesNames.CONDUCTIVITY_SENSOR_1.name], dg.temperatures.temperatures[DGTemperaturesNames.CONDUCTIVITY_SENSOR_2.name], dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name], - dg.temperatures.temperatures[DGTemperaturesNames.INLET_DIALYSATE.name])) + dg.temperatures.temperatures[DGTemperaturesNames.INLET_DIALYSATE.name], + dg.temperatures.temperatures[DGTemperaturesNames.BARO_TEMP_SENSOR.name])) return info @@ -271,20 +291,25 @@ info = ('Bicarb_curr_speed, {:5.3f}, Bicarb_speed, {:5.3f}, Acid_curr_speed, {:5.3f}, Acid_speed, {:5.3f}, ' 'CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, CP1_state, {}, CP2_state, {}, CPi_status, {}, CPo_status, {}, ' 'CD1_status, {}, CD2_status, {}, CP1_pulse, {:5.3f}, CP2_pulse, {:5.3f}, Acid_tgt_speed, {:5.3f}, ' - 'Bicarb_tgt_speed, {:5.3f}, ' + 'Bicarb_tgt_speed, {:5.3f}, CP1_parked, {}, CP1_park_fault, {}, CP2_parked, {}, CP2_park_fault, {}, ' .format(dg.concentrate_pumps.concentrate_pump_cp2_current_set_speed, dg.concentrate_pumps.concentrate_pump_cp2_measured_speed, dg.concentrate_pumps.concentrate_pump_cp1_current_set_speed, dg.concentrate_pumps.concentrate_pump_cp1_measured_speed, - dg.conductivity_sensors.conductivity_sensor_cpo, dg.conductivity_sensors.conductivity_sensor_cd1, + dg.conductivity_sensors.conductivity_sensor_cpo, + dg.conductivity_sensors.conductivity_sensor_cd1, dg.conductivity_sensors.conductivity_sensor_cd2, DGConcentratePumpsStates(dg.concentrate_pumps.concentrate_pump_cp1_current_state).name, DGConcentratePumpsStates(dg.concentrate_pumps.concentrate_pump_cp2_current_state).name, dg.conductivity_sensors.cpi_sensor_status, dg.conductivity_sensors.cpo_sensor_status, dg.conductivity_sensors.cd1_sensor_status, dg.conductivity_sensors.cd2_sensor_status, dg.concentrate_pumps.cp1_temp_pulse, dg.concentrate_pumps.cp2_temp_pulse, dg.concentrate_pumps.concentrate_pump_cp1_target_speed, - dg.concentrate_pumps.concentrate_pump_cp2_target_speed)) + dg.concentrate_pumps.concentrate_pump_cp2_target_speed, + dg.concentrate_pumps.concentrate_pump_cp1_parked, + dg.concentrate_pumps.concentrate_pump_cp1_park_fault, + dg.concentrate_pumps.concentrate_pump_cp2_parked, + dg.concentrate_pumps.concentrate_pump_cp2_park_fault)) return info @@ -315,8 +340,11 @@ return info -def get_hd_valves_info(): - info = ('Air_trap' ) +def get_hd_air_trap_info(): + info = ('Air_trap_high_level, {}, Air_trap_low_level, {}, Air_trap_valve, {}, Air_bubble_status, {}, ' + .format(hd.air_trap.upper_level, hd.air_trap.lower_level, hd.valves.hd_air_trap_status, + hd.air_bubbles.air_bubbles_status)) + return info def get_dg_idle_bad_fill_info(): @@ -437,31 +465,14 @@ fill_info = get_dg_fill_info() idle_bad_fill = get_dg_idle_bad_fill_info() uv = get_uv_reactors_info() + hd_fans = get_hd_fans_info() + hd_pressures = get_hd_occlusion_pressures_info() + air_trap = get_hd_air_trap_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 + uv + '\r' + temp + heaters + conc_pumps + dg_fans + valves + blood_leak + hd_pumps + fill_info + uv + hd_fans + \ + hd_pressures + air_trap + '\r' - if hd.alarms.get_alarm_state(97) and start is False: - dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD2.value, 13700.00) - sleep(0.2) - dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD1.value, 11600.00) - start = True - - """ - var = str(datetime.now()) + ', ' + hd_run + dg_run + load_cell + drain + ro + conc_pumps + valves + \ - idle_bad_fill + fill_info + '\r' - - if dg.dg_operation_mode == 6 and dg.dg_operation_sub_mode == 4 and start is False: - #dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD2.value, 12000.00) - dg.pressures.cmd_pressure_override(dg.pressures.PRESSURE_SENSOR_RO_PUMP_INLET, 14) - start = True - - if start is True: - counter += 1 - - if 10 < counter < 14: - dg.pressures.cmd_pressure_override(dg.pressures.PRESSURE_SENSOR_RO_PUMP_INLET, 14, reset=1) - """ print(var) f.write(var) sleep(sleep_time) @@ -470,36 +481,13 @@ f.close() -def collect_hd_treatment(): - f = open("/home/fw/projects/dialin/tests/treatment_run_hd.log", "w") - - #hd.cmd_hd_software_reset_request() - - hd.dialysate_inlet_flow.cmd_dialysate_inlet_flow_broadcast_interval_override(50) - sleep(1) - hd.dialysate_outlet_flow.cmd_dialysate_outlet_flow_broadcast_interval_override(50) - sleep(1) - hd.voltages.cmd_monitored_voltages_broadcast_interval_override(50) - - try: - while True: - hd_run = get_hd_run_info() - pumps_info = get_hd_pumps_info() - voltages = get_voltages_info() - var = hd_run + pumps_info + voltages + '\r' - print(var) - f.write(var) - sleep(0.05) - except KeyboardInterrupt: - f.close() - - def run_heat_disinfect(): complete_counter = 1 f = open("/home/fw/projects/dialin/tests/Heat_disinfect.log", "w") #dg.heaters.cmd_heaters_broadcast_interval_override(50) #sleep(1) dg.hd_proxy.cmd_start_stop_dg_heat_disinfect() + #dg.hd_proxy.cmd_start_stop_dg_heat_disinfect_active_cool() try: while True: @@ -538,6 +526,8 @@ except KeyboardInterrupt: dg.hd_proxy.cmd_start_stop_dg_heat_disinfect(start=False) + sleep(0.2) + dg.hd_proxy.cmd_start_stop_dg_heat_disinfect_active_cool(start=False) f.close() @@ -557,9 +547,10 @@ ro = get_ro_info() temp = get_temperature_sensors_info() heaters = get_heaters_info() - fans = get_dg_fans_info() + #fans = get_dg_fans_info() - var = disinfect + load_cell + conc + drain + ro + temp + heaters + fans + valves + '\r' + #var = disinfect + load_cell + conc + drain + ro + temp + heaters + fans + valves + '\r' + var = disinfect + load_cell + conc + drain + ro + temp + heaters + valves + '\r' print(var) f.write(var) @@ -580,7 +571,49 @@ dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect(start=False) f.close() +def run_chem_disinfect_flush_mode(): + complete_counter = 1 + f = open("/home/fw/projects/dialin/tests/chem_disinfect_flush_mode.log", "w") + dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush() + #dg.cmd_dg_software_reset_request() + try: + while True: + flush = get_chemical_disinfect_flush_mode_info() + load_cell = get_load_cells_info() + drain = get_drain_states_info() + ro = get_ro_info() + temp = get_temperature_sensors_info() + conc = get_concentrate_pumps_info() + valves = get_dg_valves_states() + + var = flush + load_cell + drain + ro + + temp + conc + valves + '\r' + + print(var) + f.write(var) + sleep(1) + + # If the mode came back to standby or standby solo + if dg.dg_operation_mode == 3 or dg.dg_operation_mode == 4: + + # Write a few more complete states to make sure the complete state items are recorded + if complete_counter == 3: + f.close() + #events = dg.events.get_dg_events(2, 60) + #for event in events: + # print(event) + break + + complete_counter += 1 + + except KeyboardInterrupt: + dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush(start=False) + f.close() + #events = dg.events.get_dg_events(2, 50) + #for event in events: + # print(event) + + def cmd_set_disinfect_ui_screen(): hd = HD() sleep(0.5) @@ -608,7 +641,6 @@ valves = get_dg_valves_states() var = flush + uv_reactors + load_cell + drain + ro + conc + valves + '\r' - print(var) f.write(var) sleep(1) @@ -646,25 +678,6 @@ dg.drain_pump.cmd_drain_pump_set_rpm(0) -def test_conc_pumps(): - dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(0, True) - sleep(1) - #dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(1, True) - # sleep(1) - dg.concentrate_pumps.cmd_concentrate_pump_target_speed_override(0, 35) - #sleep(1) - #dg.concentrate_pumps.cmd_concentrate_pump_target_speed_override(1, 20) - - try: - while True: - print(get_concentrate_pumps_info()) - sleep(1) - except KeyboardInterrupt: - dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(0, False) - sleep(0.5) - dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(1, False) - - def test_hd_valves(): while True: @@ -695,16 +708,19 @@ #run_chemical_disinfect() + run_chem_disinfect_flush_mode() + #run_dg() # cmd_set_disinfect_ui_screen() - #collect_treatment_data() + collect_treatment_data() #collect_hd_treatment() #while True: - # print(get_temperature_sensors_info(), get_dg_fans_info()) + #print(get_hd_fans_info(), get_dg_fans_info(), get_temperature_sensors_info()) + # print(get_dg_valves_states()) # sleep(1) #while True: @@ -722,20 +738,6 @@ #test_hd_valves() - #while True: - # print(get_heaters_info()) - # sleep(1) + #hd.ui.cmd_ui_set_dg_service_time() - #dg.ro_pump.cmd_set_ro_flow_rate(0.6) - #dg.flow_sensors.cmd_measured_flow_sensor_value_lpm_override(1, 0.8, reset=1) - - #while True: - - # print(get_ro_info()) - # sleep(1) - - dg.heaters.cmd_set_primary_and_trimmer_heaters_target_temperature(primary_target_temp=40, trimmer_target_temp=52) - sleep(1) - dg.heaters.cmd_start_stop_trimmer_heater(0) -