Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -r79b494c344417ba6865db01ad5f456e439bec1b2
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 79b494c344417ba6865db01ad5f456e439bec1b2)
@@ -497,6 +497,29 @@
 
 /*********************************************************************//**
  * @brief
+ * The signalAbortWaterSampling function handles an HD request to abort water
+ * sampling (return to standby idle state).
+ * @details Inputs: none
+ * @details Outputs: standby mode variable initialized
+ * @return TRUE if request accepted, FALSE if not
+ *************************************************************************/
+BOOL signalAbortWaterSampling( void )
+{
+    BOOL result = FALSE;
+
+    if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( standbyState != DG_STANDBY_MODE_STATE_IDLE ) )
+    {
+        result = TRUE;
+        initStandbyMode();
+        setValveState( VSP, VALVE_STATE_CLOSED );
+        setValveState( VPI, VALVE_STATE_CLOSED );
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The startDGFlush function starts DG flush mode.
  * @details Inputs: standbyState
  * @details Outputs: none