Index: tests/dg_heat_and_chemical_disinfect_test.py =================================================================== diff -u -rb85f0e224e74d44979c955528b0c81935710a189 -re524ce9de21e745291c9bdd6cd0c86268c03331b --- tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision b85f0e224e74d44979c955528b0c81935710a189) +++ tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision e524ce9de21e745291c9bdd6cd0c86268c03331b) @@ -30,11 +30,11 @@ from time import sleep from datetime import datetime import sys + sys.path.append("..") def get_chemical_disinfect_mode_info(): - info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, ' 'Cancellation_mode, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Current_rinse_count, {}, ' 'Total_rinse_count, {}, UI_state, {}, ' @@ -49,7 +49,6 @@ def get_concentrate_pumps_info(): - info = ('Bicarb_tgt_speed, {:5.3f}, Bicarb_speed, {:5.3f}, CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, ' .format(dg.concentrate_pumps.concentrate_pump_cp2_current_set_speed, dg.concentrate_pumps.concentrate_pump_cp2_measured_speed, @@ -59,7 +58,6 @@ 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, {} ' .format(DGHeatDisinfectStates(dg.heat_disinfect.heat_disinfect_state).name, @@ -71,16 +69,17 @@ 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_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_sub_mode, {}, '.format(DGOperationModes(dg.dg_operation_mode).name, + dg.dg_operation_sub_mode)) return info def get_dg_valves_states(): - info = ('VPi, {}, VSP, {}, VPd, {}, VBf, {}, VPo, {}, VDr, {}, VRc, {}, VRo, {}, VRd, {}, VRi, {}, VRf, {}, ' 'VRD1, {}, VRD2, {}, ' .format(dg.valves.valve_states_enum[dg.valves.VALVE_PRESSURE_INLET], @@ -100,7 +99,6 @@ def get_drain_states_info(): - info = ('Drain, {}, DAC, {}, Tgt_RPM, {}, Curr_RPM, {}, PRd, {:5.3f}, PDr, {:5.3f}, '. 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, @@ -110,15 +108,13 @@ 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)) return info def get_ro_info(): - info = ('RO, {}, PPi, {:5.3f}, PPo, {:5.3f}, PWM, {:5.3f}, Flow, {:5.3f}, Tgt_flow, {:5.3f}, Temp_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, @@ -127,35 +123,34 @@ def get_heaters_with_no_temp_info(): - info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_state, {}, Trimmer_DC, {:5.3f}, ' 'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '. format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.small_primary_heater_duty_cycle, - dg.heaters.primary_heater_state, dg.heaters.trimmer_heater_duty_cycle, + dg.heaters.primary_heater_state, dg.heaters.trimmer_heater_duty_cycle, dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature)) return info def get_heaters_info(): - info = ('Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Pri_state, {}, Pri_int_temp, {:5.3f}, Prim_CJ_temp, {:5.3f}, ' 'Prim_TC_temp, {:5.3f}, Trimmer_DC, {:5.3f}, Trim_int_temp, {:5.3f}, Trim_CJ_temp, {:5.3f}, ' 'Trim_TC_temp, {:5.3f}, Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '. format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.small_primary_heater_duty_cycle, dg.heaters.primary_heater_state, dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_INTERNAL.name], - dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_COLD_JUNCTION.name], + dg.temperature_sensors.temperature_sensors[ + TemperatureSensorsNames.PRIMARY_HEATER_COLD_JUNCTION.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.PRIMARY_HEATER_THERMOCOUPLE.name], dg.heaters.trimmer_heater_duty_cycle, dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_INTERNAL.name], - dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_COLD_JUNCTION.name], + dg.temperature_sensors.temperature_sensors[ + TemperatureSensorsNames.TRIMMER_HEATER_COLD_JUNCTION.name], dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.TRIMMER_HEATER_THERMOCOUPLE.name], dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature)) 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], @@ -167,7 +162,6 @@ def get_dg_fans_info(): - info = ('Target_fans_DC, {:5.3f}, Inlet1_RPM, {:5.3f}, Outlet1_RPM, {:5.3f}, Inlet2_RPM, {:5.3f}, ' 'Outlet2_RPM, {:5.3f}, Inlet3_RPM, {:5.3f}, Outlet3_RPM, {:5.3f}, Board_temp, {:5.3f}, ' 'Power_supply_1, {:5.3f}, Power_supply_2, {:5.3f}, FPGA_temp, {:5.3f}, Load_cell_A1_B1, {:5.3f}, ' @@ -184,7 +178,6 @@ def get_hd_fans_info(): - info = ('HD_Fan_DC, {:5.3f}, Target_HD_RPM, {:5.3f}, Inlet1_RPM, {:5.3f}, HD_Board_temp, {:5.3f}, ' 'HD_Power_supply, {:5.3f}, HD_FPGA_temp, {:5.3f}, PBA_ADC_temp, {:5.3f}, Venous_temp, {:5.3f}, ' .format(hd.fans.duty_cycle, hd.fans.target_rpm, hd.fans.inlet_1_rpm, @@ -197,22 +190,19 @@ def get_uv_reactors_info(): - info = ('Inlet_status, {}, Outlet_status, {}, ' .format(dg.uv_reactors.inlet_uv_reactor_state, dg.uv_reactors.outlet_uv_reactor_state)) return info def cmd_test_heaters(): - f = open("/home/fw/projects/dialin/tests/test_heaters.log", "w") dg.hd_proxy.cmd_start_stop_dg() sleep(0.1) try: while True: - """ command = input() @@ -278,7 +268,6 @@ def run_dg(): - counter = 1 timer = 0.1 sleep_time = 1 @@ -301,7 +290,7 @@ valves = get_dg_valves_states() var = str(datetime.now()) + ', ' + str(run_number) + ', ' + str(recirc_delay) + ', ' + dg_run + \ - temperature + heaters + load_cell + drain + ro + fans + valves + '\r' + temperature + heaters + load_cell + drain + ro + fans + valves + '\r' print(var) f.write(var) @@ -311,8 +300,8 @@ f.close() break - elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ - dg.dg_operation_sub_mode == 2 and counter == 1: + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and \ + dg.dg_operation_sub_mode == 2 and counter == 1: if recirc_delay < 5: recirc_delay += 1 @@ -321,27 +310,27 @@ dg.hd_proxy.cmd_switch_reservoirs(reservoirID=1) timer += 1 - if timer > ((1/sleep_time) * 1): + if timer > ((1 / sleep_time) * 1): timer = 1 recirc_delay = 1 counter += 1 - elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ - dg.dg_operation_sub_mode == 2 and counter == 2: + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and \ + dg.dg_operation_sub_mode == 2 and counter == 2: dg.hd_proxy.cmd_drain(tare_load_cell=True) counter += 1 timer = 1 - elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ - dg.dg_operation_sub_mode == 2 and counter == 3: + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and \ + dg.dg_operation_sub_mode == 2 and counter == 3: timer += 1 if timer > 4: dg.hd_proxy.cmd_fill(volume=1700) counter += 1 - elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ - dg.dg_operation_sub_mode == 2 and counter == 4: + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and \ + dg.dg_operation_sub_mode == 2 and counter == 4: counter = 1 run_number += 1 @@ -354,7 +343,6 @@ def run_ro_pump_duty_cycles(): - counter = 1 timer = 0.1 sleep_time = 1 @@ -382,7 +370,7 @@ valves = get_dg_valves_states() var = str(datetime.now()) + ', ' + str(run_number) + ', ' + str(ro_dc) + ', ' + dg_run + \ - temperature + heaters + load_cell + drain + ro + uv_reactors + fans + valves + '\r' + temperature + heaters + load_cell + drain + ro + uv_reactors + fans + valves + '\r' print(var) f.write(var) @@ -392,8 +380,8 @@ f.close() break - elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ - dg.dg_operation_sub_mode == 2 and counter == 1: + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and \ + dg.dg_operation_sub_mode == 2 and counter == 1: if recirc_delay < 1: recirc_delay += 1 @@ -403,27 +391,27 @@ timer += 1 - if timer > ((1/sleep_time) * 1): + if timer > ((1 / sleep_time) * 1): timer = 1 recirc_delay = 1 counter += 1 - elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ - dg.dg_operation_sub_mode == 2 and counter == 2: + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and \ + dg.dg_operation_sub_mode == 2 and counter == 2: dg.hd_proxy.cmd_drain(tare_load_cell=True) counter += 1 timer = 1 - elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ - dg.dg_operation_sub_mode == 2 and counter == 3: + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and \ + dg.dg_operation_sub_mode == 2 and counter == 3: timer += 1 if timer > 4: dg.hd_proxy.cmd_fill(volume=1700) counter += 1 - elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\ - dg.dg_operation_sub_mode == 2 and counter == 4: + elif DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and \ + dg.dg_operation_sub_mode == 2 and counter == 4: counter = 1 run_number += 1 ro_dc += ro_dc_step @@ -437,8 +425,31 @@ pass -def run_heat_disinfect(): +def collect_treatment_data(): + f = open("/home/fw/projects/dialin/tests/treatment_run.log", "w") + try: + while True: + dg_run = get_dg_run_info() + drain = get_drain_states_info() + load_cell = get_load_cells_info() + valves = get_dg_valves_states() + ro = get_ro_info() + temp = get_temperature_sensors_info() + heaters = get_heaters_info() + dg_fans = get_dg_fans_info() + + var = dg_run + load_cell + drain + ro + temp + heaters + dg_fans + valves + '\r' + + print(var) + f.write(var) + sleep(1) + except KeyboardInterrupt: + dg.hd_proxy.cmd_start_stop_dg(start=False) + f.close() + + +def run_heat_disinfect(): complete_counter = 1 f = open("/home/fw/projects/dialin/tests/Heat_disinfect.log", "w") dg.hd_proxy.cmd_start_stop_heat_disinfect() @@ -467,10 +478,10 @@ # If it is the first call, stop heat disinfect if complete_counter == 1: dg.hd_proxy.cmd_start_stop_heat_disinfect(start=False) - + # Write a few more complete states to make sure the complete state items are recorded elif complete_counter == 3: - #pass + # pass f.close() break @@ -482,7 +493,6 @@ def run_chemical_disinfect(): - complete_counter = 1 f = open("/home/fw/projects/dialin/tests/chemical_disinfect.log", "w") dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect() @@ -511,7 +521,7 @@ # Write a few more complete states to make sure the complete state items are recorded if complete_counter == 3: - #pass + # pass f.close() break @@ -523,7 +533,6 @@ def cmd_set_disinfect_ui_screen(): - hd = HD() sleep(0.5) hd.ui.cmd_ui_set_standby_submode_to_disinfect() @@ -534,24 +543,25 @@ if __name__ == "__main__": - dg = DG(log_level='DEBUG') dg.cmd_log_in_to_dg() sleep(1) hd = HD(log_level='DEBUG') hd.cmd_log_in_to_hd() sleep(1) - run_heat_disinfect() + # run_heat_disinfect() - #run_chemical_disinfect() + # run_chemical_disinfect() - #run_dg() + # run_dg() - #run_ro_pump_duty_cycles() + # run_ro_pump_duty_cycles() - #cmd_set_disinfect_ui_screen() + # cmd_set_disinfect_ui_screen() - #cmd_test_heaters() + # cmd_test_heaters() + collect_treatment_data() +