Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rdc7d3658ccc03992b4f093e36d05cfc8bf5e0598 -r956bf7dbc9e63c875428495061dbdbcdbb8cacb0
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision dc7d3658ccc03992b4f093e36d05cfc8bf5e0598)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 956bf7dbc9e63c875428495061dbdbcdbb8cacb0)
@@ -19,6 +19,7 @@
 #include "CPLD.h"
 #include "DrainPump.h"
 #include "Heaters.h"
+#include "ModeFault.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
 #include "Reservoirs.h"
@@ -94,10 +95,17 @@
     // re-initialize standby mode each time we transition to standby mode
     initStandbyMode();
 
+    //deenergizeActuators();
+
     // set initial actuator states
     setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
     setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
+#ifndef V_2_SYSTEM
+    setValveState( VRD1, VALVE_STATE_CLOSED );
+    setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
     setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
     setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
@@ -115,9 +123,6 @@
     // UV off
     turnOffUVReactor( INLET_UV_REACTOR );
     turnOffUVReactor( OUTLET_UV_REACTOR );
-
-    resetReservoirLoadCellsOffset( DG_RESERVOIR_1 );
-    resetReservoirLoadCellsOffset( DG_RESERVOIR_2 );
 }
 
 /*********************************************************************//**
@@ -184,7 +189,11 @@
         flushFilterRequest = FALSE;
         filterFlushStartTime = getMSTimerCount();
         setValveState( VPI, VALVE_STATE_OPEN );
-        setValveState( VPD, VALVE_STATE_OPEN );      // TODO: VPD drain state is closed for V3
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+#else
+        setValveState( VPD, VALVE_STATE_OPEN );  // TODO: VPD drain state is closed for V3
+#endif
         state = DG_STANDBY_MODE_STATE_FLUSH_FILTER;
     }
     else if ( TRUE == pendingStartDGRequest )
@@ -216,7 +225,7 @@
     if ( FILTER_FLUSH_DATA_PUBLISH_INTERVAL <= filterFlushPublishTimerCounter++ )
     {
         U32 const timeout = FILTER_FLUSH_TIME_MS / MS_PER_SECOND;
-        U32 const countdown = ( ( getMSTimerCount() - filterFlushStartTime ) / MS_PER_SECOND );
+        U32 const countdown = timeout - ( calcTimeSince( filterFlushStartTime ) / MS_PER_SECOND );
         filterFlushPublishTimerCounter = 0;
 
         broadcastFilterFlushData( timeout, countdown );
@@ -249,7 +258,11 @@
     if ( TRUE == endSampleWaterRequest )
     {
         setValveState( VPI, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+#else
         setValveState( VPD, VALVE_STATE_CLOSED );
+#endif
         state = DG_STANDBY_MODE_STATE_IDLE;
     }
 
@@ -271,8 +284,14 @@
     // After HD requests to stop or 10 seconds has elapsed, close and return to idle state
     if ( ( TRUE == stopSampleWaterRequest ) || ( TRUE == didTimeout( waterSampleStartTime, MAX_WATER_SAMPLE_TIME_MS ) ) )
     {
+        stopSampleWaterRequest = FALSE;
         setValveState( VSP, VALVE_STATE_CLOSED );
+
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+#else
         setValveState( VPD, VALVE_STATE_OPEN );     // TODO: VPD drain state is closed for V3
+#endif
         state = DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE;
     }
 
@@ -362,24 +381,69 @@
 
 /*********************************************************************//**
  * @brief
+ * The startDGFlush function starts DG flush mode.
+ * @details Inputs: standbyState
+ * @details Outputs: none
+ * @return: TRUE if the switch was successful, otherwise FALSE
+ *************************************************************************/
+BOOL startDGFlush( void )
+{
+    BOOL result = FALSE;
+
+    // If DG is in standby mode or in the solo mode and the standby mode is in Idle state, request DG flush
+    if ( ( DG_MODE_STAN == getCurrentOperationMode() && DG_STANDBY_MODE_STATE_IDLE == standbyState ) ||
+           DG_MODE_SOLO == getCurrentOperationMode() )
+    {
+        requestNewOperationMode( DG_MODE_FLUS );
+
+        result = TRUE;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The startDGHeatDisinfect function starts heat disinfect mode.
  * @details Inputs: standbyState
  * @details Outputs: none
  * @return: TRUE if the switch was successful
  *************************************************************************/
 BOOL startDGHeatDisinfect( void )
 {
-    BOOL result = FALSE;
+    BOOL status = FALSE;
 
-    // If DG is in standby mode and the standby mode is in Idle state, request DG heat disinfection
-    //if ( DG_MODE_STAN == getCurrentOperationMode() && DG_STANDBY_MODE_STATE_IDLE == standbyState )
+    // If DG is in standby mode and the standby mode is in Idle state or if DG is in solo mode, request DG heat disinfect
+    if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ||
+         ( DG_MODE_SOLO == getCurrentOperationMode() ) )
     {
         requestNewOperationMode( DG_MODE_HEAT );
+        status = TRUE;
+    }
 
-        result = TRUE;
+    return status;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The startDGChemicalDisinfect function starts chemical disinfect mode.
+ * @details Inputs: standbyState
+ * @details Outputs: none
+ * @return: TRUE if the switch was successful
+ *************************************************************************/
+BOOL startDGChemicalDisinfect( void )
+{
+    BOOL status = FALSE;
+
+    // If DG is in standby mode and the standby mode is in Idle, request chemical disinfect
+    // Chemical disinfect cannot be run in solo mode because the user has to confirm that the acid is inserted or removed
+    //if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) TODO un-comment this line. This is commented to be able to run chemical without HD for development
+    {
+        requestNewOperationMode( DG_MODE_CHEM );
+        status = TRUE;
     }
 
-    return result;
+    return status;
 }
 
 /*********************************************************************//**