Fisheye: Tag 7f45e52be52e11e33178e6a0eb86c67806e6921e refers to a dead (removed) revision in file `firmware/App/Controllers/UVReactors.c'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7f45e52be52e11e33178e6a0eb86c67806e6921e refers to a dead (removed) revision in file `firmware/App/Controllers/UVReactors.h'. Fisheye: No comparison available. Pass `N' to diff? Index: firmware/App/Modes/ModeChemicalDisinfect.c =================================================================== diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/App/Modes/ModeChemicalDisinfect.c (.../ModeChemicalDisinfect.c) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) +++ firmware/App/Modes/ModeChemicalDisinfect.c (.../ModeChemicalDisinfect.c) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -40,7 +40,6 @@ #include "TaskGeneral.h" #include "TemperatureSensors.h" #include "Timers.h" -#include "UVReactors.h" #include "Valves.h" /** @@ -624,7 +623,6 @@ setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VPI, VALVE_STATE_OPEN ); setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO ); - turnOnUVReactor( INLET_UV_REACTOR ); stateTrialCounter = 0; stateTimer = getMSTimerCount(); @@ -664,8 +662,6 @@ // Start heating the water while we are flushing setHeaterTargetTemperature( DG_PRIMARY_HEATER, CHEM_DISINFECT_HEATER_CONTROL_TEMPERATURE_C ); startHeater( DG_PRIMARY_HEATER ); - // The UV reactors will be on for the entire disinfect cycle - turnOnUVReactor( OUTLET_UV_REACTOR ); setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, DEPRIME_ACID_LINE_ACID_CONC_PUMP_SPEED_MLPM ); // Turn on the concentrate pumps requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID ); @@ -903,7 +899,6 @@ setValveState( VRO, VALVE_STATE_R1_C_TO_NO ); setValveState( VRD1, VALVE_STATE_CLOSED ); setValveState( VRD2, VALVE_STATE_CLOSED ); - turnOffUVReactor( OUTLET_UV_REACTOR ); rsrvr1Status = DG_RESERVOIR_BELOW_TARGET; rsrvr2Status = DG_RESERVOIR_BELOW_TARGET; chemDisinfectReservoirTime = 0; @@ -1133,8 +1128,6 @@ setValveState( VRO, VALVE_STATE_R1_C_TO_NO ); setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO ); - turnOffUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); signalROPumpHardStop(); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); // Prepare to drain reservoir 1 Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c =================================================================== diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/App/Modes/ModeChemicalDisinfectFlush.c (.../ModeChemicalDisinfectFlush.c) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) +++ firmware/App/Modes/ModeChemicalDisinfectFlush.c (.../ModeChemicalDisinfectFlush.c) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -36,7 +36,6 @@ #include "TaskGeneral.h" #include "TemperatureSensors.h" #include "Timers.h" -#include "UVReactors.h" #include "Valves.h" /** @@ -468,7 +467,6 @@ setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO ); setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VPI, VALVE_STATE_OPEN ); - turnOnUVReactor( INLET_UV_REACTOR ); stateTimer = getMSTimerCount(); state = DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DRAIN; } @@ -510,7 +508,6 @@ // Turn on the bicarb line pump with forward direction, to flush the line that contains acid from the disinfect setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONC_PUMP_CP2_FLUSH_SPEED_ML_PER_MIN ); requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB ); - turnOnUVReactor( OUTLET_UV_REACTOR ); stateTimer = getMSTimerCount(); state = DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DISINFECTANT_LINE; } @@ -721,8 +718,6 @@ { // The sample flush message has been received. signalROPumpHardStop(); - turnOffUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); setValveState( VPI, VALVE_STATE_CLOSED ); Index: firmware/App/Modes/ModeFault.c =================================================================== diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) +++ firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -27,7 +27,6 @@ #include "RTC.h" #include "SystemCommMessages.h" #include "Utilities.h" -#include "UVReactors.h" #include "Valves.h" #include "CPLD.h" @@ -161,10 +160,6 @@ *************************************************************************/ void deenergizeActuators( BOOL parkPumps ) { - // Turn off the UV reactors - turnOffUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); - // De-energize all the valves setValveStateDelayed( VPI, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); setValveStateDelayed( VBF, VALVE_STATE_CLOSED, DELAY_VALVE_MS ); Index: firmware/App/Modes/ModeFill.c =================================================================== diff -u -ra7236428780daa67552e2b1e0b4b05a4f1ffbe82 -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision a7236428780daa67552e2b1e0b4b05a4f1ffbe82) +++ firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -39,7 +39,6 @@ #include "TemperatureSensors.h" #include "Timers.h" #include "Utilities.h" -#include "UVReactors.h" #include "Valves.h" /** @@ -327,8 +326,6 @@ #endif getFillChemicalCondRecord( &chemicalsCond ); - turnOnUVReactor( INLET_UV_REACTOR ); - turnOnUVReactor( OUTLET_UV_REACTOR ); // NOTE: The target flow rate should be set prior to setting the start primary heater // because the initial guess in the heaters driver needs the target flow to calculate Index: firmware/App/Modes/ModeFlush.c =================================================================== diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/App/Modes/ModeFlush.c (.../ModeFlush.c) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) +++ firmware/App/Modes/ModeFlush.c (.../ModeFlush.c) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -34,7 +34,6 @@ #include "SystemCommMessages.h" #include "TaskGeneral.h" #include "Timers.h" -#include "UVReactors.h" #include "Valves.h" /** @@ -424,7 +423,6 @@ setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO ); setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO ); - turnOnUVReactor( INLET_UV_REACTOR ); state = DG_FLUSH_STATE_FLUSH_DRAIN; } @@ -439,10 +437,6 @@ setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO ); setROPumpTargetFlowRateLPM( FINAL_DRAIN_RO_PUMP_FLOW_LPM, RO_PUMP_MAX_PRESSURE_PSI ); - // Turn on the UV reactors - turnOnUVReactor( INLET_UV_REACTOR ); - turnOnUVReactor( OUTLET_UV_REACTOR ); - flushUIState = FLUSH_UI_STATE_FLUSH_RECIRCULATION_PATH; state = DG_FLUSH_STATE_FLUSH_CIRCULATION_DRAIN_LINE; } @@ -474,10 +468,6 @@ setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC ); setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLOW_RATE_LPM, RO_PUMP_MAX_PRESSURE_PSI ); - // Turn on the UV reactors - turnOnUVReactor( INLET_UV_REACTOR ); - turnOnUVReactor( OUTLET_UV_REACTOR ); - stateTimerStart = getMSTimerCount(); state = DG_FLUSH_STATE_FLUSH_DIALYSATE; } @@ -692,11 +682,6 @@ setValveState( VRO, VALVE_STATE_R1_C_TO_NO ); setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM ); - // Turn off the UV reactors prior to transitioning to drain states. - // In the drain states, there is not fluid flowing in the RO section so the reactors are turned off - turnOffUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); - // Close VPi and VPd to drain setValveState(VPI, VALVE_STATE_CLOSED); setValveState(VPD, VALVE_STATE_DRAIN_C_TO_NO); Index: firmware/App/Modes/ModeGenIdle.c =================================================================== diff -u -r7d0fd5ed6b9db0479af90477e5108f6d3fa8df17 -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision 7d0fd5ed6b9db0479af90477e5108f6d3fa8df17) +++ firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -35,7 +35,6 @@ #include "TaskGeneral.h" #include "TemperatureSensors.h" #include "Timers.h" -#include "UVReactors.h" #include "Valves.h" /** @@ -130,10 +129,6 @@ requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, cp1parkStatus ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, cp2parkStatus ); - // UV reactors on - turnOnUVReactor( INLET_UV_REACTOR ); - turnOnUVReactor( OUTLET_UV_REACTOR ); - // NOTE: The target flow rate should be set prior to setting the start primary heater // because the initial guess in the heaters driver needs the target flow to calculate // the new PWMs for the main and small primary heaters Index: firmware/App/Modes/ModeHeatDisinfect.c =================================================================== diff -u -re6c60e07b450ec8d58e87bf13d45f96efab54d8b -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision e6c60e07b450ec8d58e87bf13d45f96efab54d8b) +++ firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -37,7 +37,6 @@ #include "TaskGeneral.h" #include "TemperatureSensors.h" #include "Timers.h" -#include "UVReactors.h" #include "Valves.h" /** @@ -659,7 +658,6 @@ #endif { // Done with draining R2, close it - turnOnUVReactor( INLET_UV_REACTOR ); setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO ); setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VPI, VALVE_STATE_OPEN ); @@ -940,8 +938,6 @@ // Done with filing turn off the RO pump signalROPumpHardStop(); stopHeater( DG_PRIMARY_HEATER ); - turnOffUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); // Set the valves to drain R2 and no fill setValveState( VPI, VALVE_STATE_CLOSED ); setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO ); @@ -1041,7 +1037,6 @@ setValveState( VRF, VALVE_STATE_R1_C_TO_NC ); setValveState( VRD1, VALVE_STATE_CLOSED ); setValveState( VRD2, VALVE_STATE_CLOSED ); - turnOnUVReactor( INLET_UV_REACTOR ); // Turn on the RO pump setROPumpTargetFlowRateLPM( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI ); @@ -1101,7 +1096,6 @@ // Once reservoir 2 is full, set the actuators for recirculation if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status ) { - turnOffUVReactor( INLET_UV_REACTOR ); setValveState( VPI, VALVE_STATE_CLOSED ); setValveState( VBF, VALVE_STATE_OPEN ); setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO ); @@ -1479,7 +1473,6 @@ if ( FALSE == passiveCoolHeatDisStatus.isPassiveHeatDisRqustd ) { setValveState( VPI, VALVE_STATE_OPEN ); - turnOnUVReactor( INLET_UV_REACTOR ); } setValveState( VRD1, VALVE_STATE_OPEN ); Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c =================================================================== diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/App/Modes/ModeHeatDisinfectActiveCool.c (.../ModeHeatDisinfectActiveCool.c) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) +++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c (.../ModeHeatDisinfectActiveCool.c) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -33,7 +33,6 @@ #include "TaskGeneral.h" #include "TemperatureSensors.h" #include "Timers.h" -#include "UVReactors.h" #include "Valves.h" /** @@ -615,7 +614,6 @@ // The fluid is hot so this is a mix drain. Set the VPd to direct the cold inlet fluid to drain setValveState( VPI, VALVE_STATE_OPEN ); setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO ); - turnOnUVReactor( INLET_UV_REACTOR ); targetRPM = ROF_ACTIVE_COOL_INITIAL_TARGET_DRAIN_RPM; cancellationMode = CANCELLATION_MODE_HOT; @@ -824,9 +822,6 @@ setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOnUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); @@ -853,9 +848,6 @@ setValveState( VRD2, VALVE_STATE_OPEN ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOnUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); @@ -881,9 +873,6 @@ setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VRI, VALVE_STATE_R2_C_TO_NC ); setValveState( VRF, VALVE_STATE_R1_C_TO_NC ); - // UV reactors - turnOnUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, ACID_PUMP_SPEED_ML_PER_MIN ); setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_SPEED_ML_PER_MIN ); @@ -909,9 +898,6 @@ setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOnUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, ACID_PUMP_SPEED_ML_PER_MIN ); setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_SPEED_ML_PER_MIN ); @@ -937,9 +923,6 @@ setValveState( VRD2, VALVE_STATE_OPEN ); setValveState( VRI, VALVE_STATE_R2_C_TO_NC ); setValveState( VRF, VALVE_STATE_R1_C_TO_NC ); - // UV reactors - turnOnUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, ACID_PUMP_SPEED_ML_PER_MIN ); setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_SPEED_ML_PER_MIN ); @@ -965,9 +948,6 @@ setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOnUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, ACID_PUMP_SPEED_ML_PER_MIN ); setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_SPEED_ML_PER_MIN ); @@ -993,9 +973,6 @@ setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOffUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID , NO_PARK_CONC_PUMPS ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB , NO_PARK_CONC_PUMPS ); @@ -1019,9 +996,6 @@ setValveState( VRD2, VALVE_STATE_OPEN ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOffUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -39,7 +39,6 @@ #include "TaskGeneral.h" #include "TemperatureSensors.h" #include "Thermistors.h" -#include "UVReactors.h" #include "WatchdogMgmt.h" /** @@ -100,7 +99,6 @@ resetNVDataMgmtPOSTState(); resetAccelPOSTState(); resetPressuresPOSTState(); - resetUVReactorsPOSTState(); resetWatchdogPOSTState(); resetSafetyShutdownPOSTState(); @@ -208,18 +206,8 @@ break; case DG_POST_STATE_UV_REACTORS: -#ifndef _RELEASE_ - if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UV_REACTORS ) != SW_CONFIG_ENABLE_VALUE ) -#endif - { - testStatus = execUVReactorsSelfTest(); - } -#ifndef _RELEASE_ - else - { - testStatus = SELF_TEST_STATUS_PASSED; - } -#endif + // TODO REMOVE ONCE DECIDED TO PROCEED + testStatus = SELF_TEST_STATUS_PASSED; postState = handlePOSTStatus( testStatus ); break; Index: firmware/App/Modes/ModeROPermeateSample.c =================================================================== diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/App/Modes/ModeROPermeateSample.c (.../ModeROPermeateSample.c) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) +++ firmware/App/Modes/ModeROPermeateSample.c (.../ModeROPermeateSample.c) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -36,7 +36,6 @@ #include "TaskGeneral.h" #include "TemperatureSensors.h" #include "Timers.h" -#include "UVReactors.h" #include "Valves.h" @@ -740,9 +739,6 @@ setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOffUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); @@ -769,9 +765,6 @@ setValveState( VRD2, VALVE_STATE_OPEN ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOffUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); @@ -797,9 +790,6 @@ setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOnUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); @@ -825,9 +815,6 @@ setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOnUVReactor( INLET_UV_REACTOR ); - turnOnUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); @@ -853,9 +840,6 @@ setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOnUVReactor( INLET_UV_REACTOR ); - turnOnUVReactor( OUTLET_UV_REACTOR ); // Set the concentrate pumps speed setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, ACID_PUMP_SPEED_ML_PER_MIN ); setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_SPEED_ML_PER_MIN ); @@ -884,9 +868,6 @@ setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOnUVReactor( INLET_UV_REACTOR ); - turnOnUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); @@ -922,9 +903,6 @@ setValveState( VRD2, VALVE_STATE_CLOSED ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOnUVReactor( INLET_UV_REACTOR ); - turnOnUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); @@ -964,9 +942,6 @@ setValveState( VRD2, VALVE_STATE_OPEN ); setValveState( VRI, VALVE_STATE_R1_C_TO_NO ); setValveState( VRF, VALVE_STATE_R2_C_TO_NO ); - // UV reactors - turnOffUVReactor( INLET_UV_REACTOR ); - turnOffUVReactor( OUTLET_UV_REACTOR ); // Concentrate pumps requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -re6c60e07b450ec8d58e87bf13d45f96efab54d8b -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision e6c60e07b450ec8d58e87bf13d45f96efab54d8b) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -55,7 +55,6 @@ #include "Utilities.h" #include "Valves.h" #include "WatchdogMgmt.h" -#include "UVReactors.h" /** * @addtogroup SystemCommMessages @@ -2960,13 +2959,7 @@ // Set turn on/off command switch ( payload.state.u32 ) { - case TURN_OFF: - result = turnOffUVReactor( (UV_REACTORS_T)payload.index ); - break; - - case TURN_ON: - result = turnOnUVReactor( (UV_REACTORS_T)payload.index ); - break; + // TODO REMOVE THE FUNCTION IS DECIDED TO PROCEED } } @@ -2985,21 +2978,12 @@ *************************************************************************/ void handleTestUVReactorsDataPublishIntervalOverride( MESSAGE_T *message ) { - TEST_OVERRIDE_PAYLOAD_T payload; BOOL result = FALSE; // verify payload length if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen ) { - memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) ); - if ( FALSE == payload.reset ) - { - result = testSetReactorsDataPublishInterval( payload.state.u32 ); - } - else - { - result = testResetReactorsDataPublishInterval(); - } + // TODO REMOVE IF DECIDED TO PROCEED. } // respond to request @@ -3017,21 +3001,12 @@ *************************************************************************/ void handleTestUVReactorsHealthOverride( MESSAGE_T *message ) { - TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; BOOL result = FALSE; // verify payload length if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen ) { - memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) ); - if ( FALSE == payload.reset ) - { - result = testSetUVReactorHealthOverride( payload.index, payload.state.u32 ); - } - else - { - result = testResetUVReactorHealthOverride( payload.index ); - } + // TODO REMOVE IF DECIDED TO PROCEED. } // respond to request Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -re6c60e07b450ec8d58e87bf13d45f96efab54d8b -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision e6c60e07b450ec8d58e87bf13d45f96efab54d8b) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -32,7 +32,6 @@ #include "Switches.h" #include "TemperatureSensors.h" #include "Thermistors.h" -#include "UVReactors.h" #include "Voltages.h" /** Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -34,7 +34,6 @@ #include "SystemCommMessages.h" #include "TaskGeneral.h" #include "Thermistors.h" -#include "UVReactors.h" #include "Voltages.h" #include "WatchdogMgmt.h" @@ -112,9 +111,6 @@ // manage time-based reservoir tasks execReservoirs(); - // Manage UV reactors controller - execUVReactors(); - // Manage switches monitor execSwitches(); Index: firmware/source/sys_main.c =================================================================== diff -u -rd9c2c8e146f20a2acefb9ac1f6497536fb2c404e -r7f45e52be52e11e33178e6a0eb86c67806e6921e --- firmware/source/sys_main.c (.../sys_main.c) (revision d9c2c8e146f20a2acefb9ac1f6497536fb2c404e) +++ firmware/source/sys_main.c (.../sys_main.c) (revision 7f45e52be52e11e33178e6a0eb86c67806e6921e) @@ -93,7 +93,6 @@ #include "Thermistors.h" #include "Timers.h" #include "Utilities.h" -#include "UVReactors.h" #include "Valves.h" #include "Voltages.h" #include "WatchdogMgmt.h" @@ -194,7 +193,6 @@ initVoltagesMonitor(); initROPump(); initDrainPump(); - initUVReactors(); initAccel(); initRTC(); initSwitches();