Index: tests/dg_tests.py =================================================================== diff -u -r626654c5a906ee4dd622907d5ac34b7b8fc0dfc8 -r51ccf9db3b88bc2ca473b511bf9b98f40d343bf1 --- tests/dg_tests.py (.../dg_tests.py) (revision 626654c5a906ee4dd622907d5ac34b7b8fc0dfc8) +++ tests/dg_tests.py (.../dg_tests.py) (revision 51ccf9db3b88bc2ca473b511bf9b98f40d343bf1) @@ -59,28 +59,26 @@ 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.chemical_disinfect.chem_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, {}, Nelson_support_mode, {}, ' + 'Total_rinse_count, {}, UI_state, {}, Top_alarm, {}, ' .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, nelson_support)) + hd.alarms.alarm_top)) return info @@ -110,26 +108,22 @@ 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, - nelson_support)) + hd.alarms.alarm_top, DGHeatDisinfectUIStates(dg.heat_disinfect.heat_disinfect_ui_state).name)) return info @@ -665,15 +659,15 @@ def run_nelson_support_modes(): - dg.heat_disinfect.cmd_set_nelson_support_mode(NelsonSupportModes.NELSON_CHEM_DISINFECT.value) + dg.heat_disinfect.cmd_set_nelson_support_mode(NelsonSupportModes.NELSON_POS_CONTROL_HEAT_DISINFECT.value) f = open("/home/fw/projects/dialin/tests/Nelson_Support.log", "w") try: while True: - #disinfect = get_heat_disinfect_mode_info() - disinfect = get_chemical_disinfect_mode_info() + disinfect = get_heat_disinfect_mode_info() + #disinfect = get_chemical_disinfect_mode_info() drain = get_drain_states_info() load_cell = get_load_cells_info() valves = get_dg_valves_states()