Index: tests/dg_tests.py =================================================================== diff -u -r5dc79b5e29a9cd78d5991525472859238f1df8ae -r4321c6a08162f15464cdae9419688eaad53aa890 --- tests/dg_tests.py (.../dg_tests.py) (revision 5dc79b5e29a9cd78d5991525472859238f1df8ae) +++ tests/dg_tests.py (.../dg_tests.py) (revision 4321c6a08162f15464cdae9419688eaad53aa890) @@ -110,22 +110,26 @@ state = 0 state_elapsed_time = 0 overall_elapsed_time = 0 + nelson_support = 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 + nelson_support = NelsonSupportModes(dg.heat_disinfect.heat_nelson_support).name 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 + nelson_support = NelsonSupportModes(dg.heat_disinfect.heat_nelson_support).name info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_RO_77, {}, Disinfect_RO_82, {}, ' 'Disinfect_R_77, {}, Disinfect_R_82, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, UI_state, {}, ' + 'Nelson_support, {}, ' .format(state, overall_elapsed_time, state_elapsed_time, dg.heat_disinfect.disinfect_ro_77_time_s, dg.heat_disinfect.disinfect_ro_82_time_s, dg.heat_disinfect.disinfect_r_77_time_s, dg.heat_disinfect.disinfect_r_82_time_s, dg.heat_disinfect.r1_level, dg.heat_disinfect.r2_level, - hd.alarms.alarm_top, - DGHeatDisinfectUIStates(dg.heat_disinfect.heat_disinfect_ui_state).name)) + hd.alarms.alarm_top, DGHeatDisinfectUIStates(dg.heat_disinfect.heat_disinfect_ui_state).name, + nelson_support)) return info @@ -491,13 +495,13 @@ heaters = get_heaters_info() dg_fans = get_dg_fans_info() conc_pumps = get_concentrate_pumps_info() - blood_leak = '0' #get_blood_leak_info() + blood_leak = get_blood_leak_info() hd_pumps = get_hd_pumps_info() fill_info = get_dg_fill_info() - idle_bad_fill = 0 #get_dg_idle_bad_fill_info() + idle_bad_fill = get_dg_idle_bad_fill_info() uv = get_uv_reactors_info() hd_fans = get_hd_fans_info() - hd_pressures = '0' #get_hd_occlusion_pressures_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 + \ @@ -605,49 +609,6 @@ 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) @@ -702,30 +663,36 @@ # print(event) -def test_dvt_drain_pump(): - dg.drain_pump.cmd_drain_pump_set_rpm(2000) +def run_nelson_support_modes(): + + dg.heat_disinfect.cmd_set_nelson_support_mode(NelsonSupportModes.NELSON_HEAT_DISINFECT.value) + + f = open("/home/fw/projects/dialin/tests/Nelson_Support.log", "w") + try: while True: - print(get_drain_states_info(), get_temperature_sensors_info(), get_dg_fans_info()) - sleep(1) - except KeyboardInterrupt: - dg.drain_pump.cmd_drain_pump_set_rpm(0) + disinfect = get_heat_disinfect_mode_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() + uv = get_uv_reactors_info() + dg_fans = get_dg_fans_info() + hd_fans = get_hd_fans_info() + conc = get_concentrate_pumps_info() -def test_hd_valves(): - while True: + var = disinfect + load_cell + drain + ro + temp + heaters + uv + dg_fans + hd_fans + valves + conc + '\r' - #VALVE_POSITION_A_INSERT_EJECT = 1 - #VALVE_POSITION_B_OPEN = 2 - #VALVE_POSITION_C_CLOSE = 3 - # + print(var) + f.write(var) + sleep(1) - hd.valves.cmd_set_hd_valve_position(3,3) - sleep(2) - hd.valves.cmd_set_hd_valve_position(3,2) - sleep(2) - hd.valves.cmd_set_hd_valve_position(3,1) - sleep(2) + except KeyboardInterrupt: + dg.hd_proxy.cmd_start_stop_dg_heat_disinfect(start=False) + f.close() if __name__ == "__main__": @@ -748,10 +715,12 @@ # cmd_set_disinfect_ui_screen() - collect_treatment_data() + #collect_treatment_data() #collect_hd_treatment() + run_nelson_support_modes() + #while True: # print(get_hd_fans_info(), get_dg_fans_info(), get_temperature_sensors_info()) # print(get_dg_valves_states()) @@ -761,21 +730,11 @@ # print(dg.rtc.get_rtc_epoch(), hd.rtc.get_rtc_epoch()) # sleep(1) - #test_dg_fans_alarms() - - #test_dvt_drain_pump() - - #test_conc_pumps() - #ui = HDSimulator() #ui.cmd_send_hd_operation_mode(3, 1) - #test_hd_valves() - #hd.ui.cmd_ui_set_dg_service_time() - #dg.heaters.cmd_heater_duty_cycle_override(1, 10, reset=1) - #hd.cmd_hd_software_reset_request() #dg.cmd_dg_software_reset_request()