Index: tests/dg_tests.py =================================================================== diff -u -rd8c3144d4fc5612981aa1bcee798a7c4756295bd -r5dc79b5e29a9cd78d5991525472859238f1df8ae --- tests/dg_tests.py (.../dg_tests.py) (revision d8c3144d4fc5612981aa1bcee798a7c4756295bd) +++ tests/dg_tests.py (.../dg_tests.py) (revision 5dc79b5e29a9cd78d5991525472859238f1df8ae) @@ -19,7 +19,7 @@ from dialin.hd.hemodialysis_device import HD from dialin.ui.hd_simulator import HDSimulator from dialin.common.dg_defs import DGHeatDisinfectStates, DGHeatDisinfectUIStates -from dialin.dg.heat_disinfect import HeatCancellationModes +from dialin.dg.heat_disinfect import HeatCancellationModes, NelsonSupportModes from dialin.common.dg_defs import DGChemicalDisinfectStates, DGChemDisinfectUIStates from dialin.common.dg_defs import DGChemDisinfectFlushStates, DGChemDisinfectFlushUIStates from dialin.dg.chemical_disinfect import ChemCancellationModes @@ -59,25 +59,28 @@ state = 0 state_elapsed_time = 0 overall_elapsed_time = 0 + nelson_support = 0 if dg.dg_operation_mode == 10: state = DGChemicalDisinfectStates(dg.chemical_disinfect.chemical_disinfect_state).name overall_elapsed_time = dg.chemical_disinfect.overall_elapsed_time state_elapsed_time = dg.chemical_disinfect.state_elapsed_time + nelson_support = NelsonSupportModes(dg.heat_disinfect.heat_nelson_support).name elif dg.dg_operation_mode == 11: state = DGChemDisinfectFlushStates(dg.chemical_disinfect_flush.flush_state).name overall_elapsed_time = dg.chemical_disinfect_flush.overall_elapsed_time state_elapsed_time = dg.chemical_disinfect_flush.state_elapsed_time + nelson_support = NelsonSupportModes(dg.chemical_disinfect.chem_nelson_support).name 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, {}, Top_alarm, {}, ' + 'Total_rinse_count, {}, UI_state, {}, Top_alarm, {}, Nelson_support_mode, {}, ' .format(state, overall_elapsed_time, state_elapsed_time, dg.chemical_disinfect.chemical_disinfect_elapsed_time, ChemCancellationModes(dg.chemical_disinfect.cancellation_mode).name, dg.chemical_disinfect.r1_level, dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count, 0, #dg.chemical_disinfect_flush.target_rinse_count, DGChemDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name, - hd.alarms.alarm_top)) + hd.alarms.alarm_top, nelson_support)) return info @@ -308,8 +311,9 @@ 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)) + info = ('Inlet_status, {}, Outlet_status, {}, Inlet_health, {}, Outlet_health, {}, ' + .format(dg.uv_reactors.inlet_uv_reactor_state, dg.uv_reactors.outlet_uv_reactor_state, + dg.uv_reactors.inlet_uv_reactor_health, dg.uv_reactors.outlet_uv_reactor_health)) return info @@ -463,6 +467,7 @@ #dg.heaters.cmd_heaters_broadcast_interval_override(50) #sleep(1) + #dg.uv_reactors.cmd_uv_reactors_data_broadcast_interval_override(50) #dg.voltages.cmd_monitored_voltages_broadcast_interval_override(50) #dg.concentrate_pumps.cmd_concentrate_pump_broadcast_interval_override(50) #sleep(1) @@ -486,13 +491,13 @@ heaters = get_heaters_info() dg_fans = get_dg_fans_info() conc_pumps = get_concentrate_pumps_info() - blood_leak = get_blood_leak_info() + blood_leak = '0' #get_blood_leak_info() hd_pumps = get_hd_pumps_info() fill_info = get_dg_fill_info() - idle_bad_fill = get_dg_idle_bad_fill_info() + idle_bad_fill = 0 #get_dg_idle_bad_fill_info() uv = get_uv_reactors_info() hd_fans = get_hd_fans_info() - hd_pressures = get_hd_occlusion_pressures_info() + hd_pressures = '0' #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 + \ @@ -731,7 +736,7 @@ hd.cmd_log_in_to_hd() sleep(1) - run_heat_disinfect() + #run_heat_disinfect() #run_flush_mode() @@ -743,7 +748,7 @@ # cmd_set_disinfect_ui_screen() - #collect_treatment_data() + collect_treatment_data() #collect_hd_treatment()