Index: firmware/App/Controllers/PermeateTank.c =================================================================== diff -u -re8a090df33223455312adc5ad494a3b5e2507f00 -rd79faa7118db6d048ce3433224b3e5a478c97a98 --- firmware/App/Controllers/PermeateTank.c (.../PermeateTank.c) (revision e8a090df33223455312adc5ad494a3b5e2507f00) +++ firmware/App/Controllers/PermeateTank.c (.../PermeateTank.c) (revision d79faa7118db6d048ce3433224b3e5a478c97a98) @@ -320,25 +320,25 @@ case PERMEATE_TANK_FILL_STATE: setValveState( M4_VALV,VALVE_STATE_OPEN ); + setValveState( M12_VALV, VALVE_STATE_OPEN ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_OPEN ); setValveState( P33_VALV, VALVE_STATE_OPEN ); // TODO - Change valves to handle RO rejection config setValveState( P34_VALV, VALVE_STATE_CLOSED ); // Current set to Medium recovery for alpha HW setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_OPEN ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); tankFillDelayTime = getMSTimerCount(); break; case PERMEATE_TANK_FULL_STATE: setValveState( M4_VALV, VALVE_STATE_CLOSED ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_OPEN ); setValveState( P33_VALV, VALVE_STATE_OPEN ); setValveState( P34_VALV, VALVE_STATE_OPEN ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); tankFullDelayTime = getMSTimerCount(); tankFullAlarmTimeout = getMSTimerCount(); break; Index: firmware/App/Modes/FPModes/FPModeFault.c =================================================================== diff -u -r6f961c6e113a4076ba9d5f97e078a398a8976d7c -rd79faa7118db6d048ce3433224b3e5a478c97a98 --- firmware/App/Modes/FPModes/FPModeFault.c (.../FPModeFault.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) +++ firmware/App/Modes/FPModes/FPModeFault.c (.../FPModeFault.c) (revision d79faa7118db6d048ce3433224b3e5a478c97a98) @@ -283,13 +283,13 @@ if ( TRUE == isDrainEnabled ) { setValveState( M4_VALV, VALVE_STATE_CLOSED ); + setValveState( M12_VALV, VALVE_STATE_OPEN ); setValveState( P6_VALV, VALVE_STATE_OPEN ); setValveState( P11_VALV, VALVE_STATE_OPEN ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_OPEN ); setValveState( P39_VALV, VALVE_STATE_OPEN ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); } else { Index: firmware/App/Modes/FPModes/FPModeStandby.c =================================================================== diff -u -r6f961c6e113a4076ba9d5f97e078a398a8976d7c -rd79faa7118db6d048ce3433224b3e5a478c97a98 --- firmware/App/Modes/FPModes/FPModeStandby.c (.../FPModeStandby.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) +++ firmware/App/Modes/FPModes/FPModeStandby.c (.../FPModeStandby.c) (revision d79faa7118db6d048ce3433224b3e5a478c97a98) @@ -66,13 +66,13 @@ initFPStandbyMode(); setValveState( M4_VALV,VALVE_STATE_CLOSED ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV,VALVE_STATE_CLOSED ); setValveState( P11_VALV,VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV,VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV,VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); signalROPumpHardStop(); Index: firmware/App/Modes/FPModes/FlushConcentrate.c =================================================================== diff -u -re8a090df33223455312adc5ad494a3b5e2507f00 -rd79faa7118db6d048ce3433224b3e5a478c97a98 --- firmware/App/Modes/FPModes/FlushConcentrate.c (.../FlushConcentrate.c) (revision e8a090df33223455312adc5ad494a3b5e2507f00) +++ firmware/App/Modes/FPModes/FlushConcentrate.c (.../FlushConcentrate.c) (revision d79faa7118db6d048ce3433224b3e5a478c97a98) @@ -203,13 +203,13 @@ { case CONC_FLUSH_IN_PROGRESS: setValveState( M4_VALV, VALVE_STATE_OPEN ); + setValveState( M12_VALV, VALVE_STATE_OPEN ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_OPEN ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_OPEN ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); startPermeateTankControl(); if ( TRUE == isBoostPumpInstalled() ) { @@ -225,13 +225,13 @@ if ( FALSE == isConcentrateFlushComplete() ) { setValveState( M4_VALV, VALVE_STATE_CLOSED ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); if ( TRUE == isBoostPumpInstalled() ) { Index: firmware/App/Modes/FPModes/FlushFilter.c =================================================================== diff -u -re8a090df33223455312adc5ad494a3b5e2507f00 -rd79faa7118db6d048ce3433224b3e5a478c97a98 --- firmware/App/Modes/FPModes/FlushFilter.c (.../FlushFilter.c) (revision e8a090df33223455312adc5ad494a3b5e2507f00) +++ firmware/App/Modes/FPModes/FlushFilter.c (.../FlushFilter.c) (revision d79faa7118db6d048ce3433224b3e5a478c97a98) @@ -191,13 +191,13 @@ { case FILTER_FLUSH_IN_PROGRESS: setValveState( M4_VALV, VALVE_STATE_OPEN ); + setValveState( M12_VALV, VALVE_STATE_OPEN ); setValveState( P6_VALV, VALVE_STATE_OPEN ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_OPEN ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); filterFlushTimer = getMSTimerCount(); break; @@ -206,13 +206,13 @@ if ( FALSE == isFilterFlushComplete() ) { setValveState( M4_VALV, VALVE_STATE_CLOSED ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); } break; Index: firmware/App/Modes/FPModes/FlushPermeate.c =================================================================== diff -u -re8a090df33223455312adc5ad494a3b5e2507f00 -rd79faa7118db6d048ce3433224b3e5a478c97a98 --- firmware/App/Modes/FPModes/FlushPermeate.c (.../FlushPermeate.c) (revision e8a090df33223455312adc5ad494a3b5e2507f00) +++ firmware/App/Modes/FPModes/FlushPermeate.c (.../FlushPermeate.c) (revision d79faa7118db6d048ce3433224b3e5a478c97a98) @@ -208,13 +208,13 @@ { case PERM_FLUSH_IN_PROGRESS: setValveState( M4_VALV, VALVE_STATE_OPEN ); + setValveState( M12_VALV, VALVE_STATE_OPEN ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_OPEN ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_OPEN ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); startPermeateTankControl(); if ( TRUE == isBoostPumpInstalled() ) { @@ -232,13 +232,13 @@ if ( FALSE == isPermeateFlushComplete() ) { setValveState( M4_VALV, VALVE_STATE_CLOSED ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); if ( TRUE == isBoostPumpInstalled() ) { Index: firmware/App/Modes/FPModes/InletPressureCheck.c =================================================================== diff -u -re8a090df33223455312adc5ad494a3b5e2507f00 -rd79faa7118db6d048ce3433224b3e5a478c97a98 --- firmware/App/Modes/FPModes/InletPressureCheck.c (.../InletPressureCheck.c) (revision e8a090df33223455312adc5ad494a3b5e2507f00) +++ firmware/App/Modes/FPModes/InletPressureCheck.c (.../InletPressureCheck.c) (revision d79faa7118db6d048ce3433224b3e5a478c97a98) @@ -200,13 +200,13 @@ { case INLET_PRES_CHECK_IN_PROGRESS: setValveState( M4_VALV, VALVE_STATE_CLOSED ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); if ( TRUE == isBoostPumpInstalled() ) { @@ -221,13 +221,13 @@ if ( FALSE == isInletPressureCheckCompleted() ) { setValveState( M4_VALV, VALVE_STATE_CLOSED ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); if ( TRUE == isBoostPumpInstalled() ) { Index: firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c =================================================================== diff -u -re8a090df33223455312adc5ad494a3b5e2507f00 -rd79faa7118db6d048ce3433224b3e5a478c97a98 --- firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c (.../ModeGenPermeateDefeatured.c) (revision e8a090df33223455312adc5ad494a3b5e2507f00) +++ firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c (.../ModeGenPermeateDefeatured.c) (revision d79faa7118db6d048ce3433224b3e5a478c97a98) @@ -140,24 +140,24 @@ { case FP_GENP_DEF_SUPPLY_WATER: setValveState( M4_VALV, VALVE_STATE_OPEN ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); break; case FP_GENP_DEF_PAUSED: setValveState( M4_VALV, VALVE_STATE_CLOSED ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); break; default: Index: firmware/App/Modes/FPModes/ModePreGenPermeate.c =================================================================== diff -u -re8a090df33223455312adc5ad494a3b5e2507f00 -rd79faa7118db6d048ce3433224b3e5a478c97a98 --- firmware/App/Modes/FPModes/ModePreGenPermeate.c (.../ModePreGenPermeate.c) (revision e8a090df33223455312adc5ad494a3b5e2507f00) +++ firmware/App/Modes/FPModes/ModePreGenPermeate.c (.../ModePreGenPermeate.c) (revision d79faa7118db6d048ce3433224b3e5a478c97a98) @@ -187,13 +187,13 @@ case FP_PRE_GENP_VERIFY_WATER: setValveState( M4_VALV, VALVE_STATE_OPEN ); + setValveState( M12_VALV, VALVE_STATE_OPEN ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_OPEN ); setValveState( P33_VALV, VALVE_STATE_OPEN ); // TODO - Change valves to handle RO rejection config setValveState( P34_VALV, VALVE_STATE_CLOSED ); // Current set to Medium recovery for alpha HW setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_OPEN ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); if ( TRUE == isBoostPumpInstalled() ) { Index: firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c =================================================================== diff -u -r5398b91c33e6fd39a74dbe132e50120965ef4107 -rd79faa7118db6d048ce3433224b3e5a478c97a98 --- firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c (.../ModePreGenPermeateDefeatured.c) (revision 5398b91c33e6fd39a74dbe132e50120965ef4107) +++ firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c (.../ModePreGenPermeateDefeatured.c) (revision d79faa7118db6d048ce3433224b3e5a478c97a98) @@ -151,37 +151,37 @@ { case FP_PRE_GENP_DEF_FLUSH: setValveState( M4_VALV, VALVE_STATE_OPEN ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); preGenPermeateDefFlushTimer = getMSTimerCount(); break; case FP_PRE_GENP_DEF_INLET_WATER_CHECK: setValveState( M4_VALV, VALVE_STATE_OPEN ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); preGenPermeateDefWaterCheckTimer = getMSTimerCount(); break; case FP_PRE_GENP_DEF_PAUSED: setValveState( M4_VALV, VALVE_STATE_CLOSED ); + setValveState( M12_VALV, VALVE_STATE_CLOSED ); setValveState( P6_VALV, VALVE_STATE_CLOSED ); setValveState( P11_VALV, VALVE_STATE_CLOSED ); setValveState( P33_VALV, VALVE_STATE_CLOSED ); setValveState( P34_VALV, VALVE_STATE_CLOSED ); setValveState( P37_VALV, VALVE_STATE_CLOSED ); setValveState( P39_VALV, VALVE_STATE_CLOSED ); - setValveState( P43_VALV, VALVE_STATE_CLOSED ); break; default: