Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r28b5f2e7f757647145a82a39aca0a5f3652c68a1 -r847478dd75aac2edfe27df454ac5a644b6f30040
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 28b5f2e7f757647145a82a39aca0a5f3652c68a1)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 847478dd75aac2edfe27df454ac5a644b6f30040)
@@ -420,8 +420,13 @@
         setValveState( VPI, VALVE_STATE_CLOSED );
         // Request a tare for reservoir 1
         tareReservoir();
+#ifndef V_2_SYSTEM
         // Set the actuators to drain R1
+        setValveState( VRD1, VALVE_STATE_OPEN );
+#else
+        // Set the actuators to drain R1
         setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
         setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
 
         rsrvrFillStableTimeCounter = 0;
@@ -460,7 +465,12 @@
 
             // Set the valves to flush the recirculation line
             setValveState( VPI, VALVE_STATE_OPEN );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+            setValveState( VRD1, VALVE_STATE_CLOSED );
+#else
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
             setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
             setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
             setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
@@ -480,9 +490,17 @@
             rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
             // Request a tare for reservoir 2
             tareReservoir();
+#ifndef V_2_SYSTEM
+            // Done with draining R1, close it
+            setValveState( VRD1, VALVE_STATE_CLOSED );
             // Set the actuators to drain R2.
             // NOTE: Drain pump is already on and VDr is already on drain state
+            setValveState( VRD2, VALVE_STATE_OPEN );
+#else
+            // Set the actuators to drain R2.
+            // NOTE: Drain pump is already on and VDr is already on drain state
             setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
             state = DG_HEAT_DISINFECT_STATE_DRAIN_R2;
         }
 
@@ -521,13 +539,22 @@
     {
         if ( TRUE == isThisLastDrain )
         {
+#ifndef V_2_SYSTEM
+            setValveState( VRD1, VALVE_STATE_OPEN );
+            setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
             setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
             rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
             state = DG_HEAT_DISINFECT_STATE_DRAIN_R1;
         }
         else
         {
             signalDrainPumpHardStop();
+#ifndef V_2_SYSTEM
+            // Done with draining R2, close it
+            setValveState( VRD2, VALVE_STATE_CLOSED );
+#endif
             setValveState( VPI, VALVE_STATE_OPEN );
             stateTrialCounter = 0;
             stateTimer = getMSTimerCount();
@@ -567,7 +594,11 @@
         if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C ) &&
              ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
         {
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+#else
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
             setROPumpTargetFlowRate( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
             stateTimer = getMSTimerCount();
             stateTrialCounter = 0;
@@ -702,7 +733,11 @@
             setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
+#ifndef V_2_SYSTEM
+            setValveState( VRD1, VALVE_STATE_OPEN );
+#else
             setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
             stateTimer = getMSTimerCount();
 
@@ -752,6 +787,10 @@
     {
         // Done with draining R1
         signalDrainPumpHardStop();
+#ifndef V_2_SYSTEM
+        // Close VRD1
+        setValveState( VRD1, VALVE_STATE_CLOSED );
+#endif
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
     {
@@ -777,10 +816,18 @@
 
             // Set the valves to drain R2 and no fill
             setValveState( VPI, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+#else
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
             setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+#ifndef V_2_SYSTEM
+            setValveState( VRD2, VALVE_STATE_OPEN );
+#else
             setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
             // Start the timer for drain timeout
             stateTimer = getMSTimerCount();
@@ -824,7 +871,12 @@
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
     {
+#ifndef V_2_SYSTEM
+        setValveState( VRD1, VALVE_STATE_OPEN );
+        setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
         setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
         // Start the timer for drain timeout
         stateTimer = getMSTimerCount();
         rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
@@ -866,12 +918,21 @@
 
         // Prepare for filling the reservoirs and heating the water
         setValveState( VPI, VALVE_STATE_OPEN );
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+#else
         setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
         setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
         setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
+#ifndef V_2_SYSTEM
+        setValveState( VRD1, VALVE_STATE_CLOSED );
+        setValveState( VRD2, VALVE_STATE_OPEN );
+#else
         setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
 
         // Turn on the RO pump
         setROPumpTargetFlowRate( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
@@ -930,7 +991,11 @@
             // Set the valves to drain R2 and no fill
             setValveState( VPI, VALVE_STATE_CLOSED );
             setValveState( VBF, VALVE_STATE_OPEN );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+#else
             setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
+#endif
             setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC );
             setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
 
@@ -998,7 +1063,12 @@
             //TODO turn off CP1 and CP2
             // Set the valves to transfer hot water from R1 to R2 and fill up R2.
             setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
+#ifndef V_2_SYSTEM
+            setValveState( VRD1, VALVE_STATE_OPEN );
+            setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
             setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
             // Although there is fluid in both reservoirs, but they are set to empty
@@ -1133,8 +1203,14 @@
         // water does not enter the circulation path the membrane is cooling down
         setValveState( VPI, VALVE_STATE_CLOSED );
         setValveState( VBF, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+        setValveState( VRD1, VALVE_STATE_CLOSED );
+#else
         setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
 
+#endif
+
         stateTimer = getMSTimerCount();
         state = DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER;
     }
@@ -1196,6 +1272,9 @@
     if ( ( TRUE == didTimeout( stateTimer, DRAIN_PUMP_START_TIME_IN_MIX_DRAIN_MS ) ) && ( isDrainPumpInMixDrainOn == FALSE ) )
     {
         isDrainPumpInMixDrainOn = TRUE;
+#ifndef V_2_SYSTEM
+        setValveState( VRD1, VALVE_STATE_OPEN );
+#endif
 
         // Turn on the drain pump to drain the reservoirs in open loop mode
         setDrainPumpTargetRPM( DRAIN_PUMP_RPM_IN_MIX_DRAIN );
@@ -1208,8 +1287,15 @@
         }
         else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
+#ifndef V_2_SYSTEM
+            // Done with draining reservoir 1
+            setValveState( VRD1, VALVE_STATE_CLOSED );
             // Set the drain valve to reservoir 2
+            setValveState( VRD2, VALVE_STATE_OPEN );
+#else
+            // Set the drain valve to reservoir 2
             setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
 
             rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
             stateTimer = getMSTimerCount();
@@ -1218,7 +1304,7 @@
         else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
         {
             prevHeatDisinfectState = state;
-            state = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
+            state = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
         }
     }
 
@@ -1250,7 +1336,13 @@
 
         // Set the valves to fill up R1 and overflow to R2
         setValveState( VPI, VALVE_STATE_OPEN );
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+        // Done with draining reservoir 2
+        setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
         setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
@@ -1268,7 +1360,7 @@
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
     {
         prevHeatDisinfectState = state;
-        state = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
+        state = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
     }
 
     return state;
@@ -1301,7 +1393,11 @@
             // Set the valves to rinse R2 to R1 and drain R1
             setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
             setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
+#ifndef V_2_SYSTEM
+            setValveState( VRD1, VALVE_STATE_R1_C_TO_NC );
+#else
             setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
 
@@ -1350,6 +1446,9 @@
     {
         // Done with draining R1
         signalDrainPumpHardStop();
+#ifndef V_2_SYSTEM
+        setValveState( VRD1, VALVE_STATE_CLOSED );
+#endif
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
     {
@@ -1374,10 +1473,18 @@
 
             // De-energize all the valves and set the VDr to drain R2
             setValveState( VPI, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+#else
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
             setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+#ifndef V_2_SYSTEM
+            setValveState( VRD2, VALVE_STATE_OPEN );
+#else
             setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
 
@@ -1488,7 +1595,11 @@
         {
             // 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 );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+#else
             setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
+#endif
 
             targetRPM = DRAIN_PUMP_RPM_IN_MIX_DRAIN;
             cancellationMode = CANCELLATION_MODE_HOT;
@@ -1513,8 +1624,13 @@
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
+#ifndef V_2_SYSTEM
             // Set the drain valve to reservoir 1
+            setValveState( VRD1, VALVE_STATE_OPEN );
+#else
+            // Set the drain valve to reservoir 1
             setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
         }
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
@@ -1580,7 +1696,11 @@
     setValveState( VPI, VALVE_STATE_CLOSED );
     setValveState( VBF, VALVE_STATE_CLOSED );
     setValveState( VSP, VALVE_STATE_CLOSED );
-    setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+#else
+            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
@@ -1758,7 +1878,7 @@
             status = HEAT_DISINFECT_HEAT_UP_TIMEOUT;
         }
     }
-    else if ( isPartialDisinfectInProgress != TRUE && ThdTemp > HEAT_DISINFECT_START_TEMPERATURE_C )
+    else if ( ( isPartialDisinfectInProgress != TRUE ) && ( ThdTemp > HEAT_DISINFECT_START_TEMPERATURE_C ) )
     {
         // The temperature of the coldest spot is in range to start the disinfect timer
         heatDisinfectTimer           = getMSTimerCount();