Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r1a6556b9b25ce9822e4f9a5d1fd51b488e48aa03 -rae7ff6466ac1225cb5998990cc5163edc53ce003
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 1a6556b9b25ce9822e4f9a5d1fd51b488e48aa03)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision ae7ff6466ac1225cb5998990cc5163edc53ce003)
@@ -30,12 +30,12 @@
 
 // ********** private data **********
 
-static BOOL sampleWaterStartRequested;
-static BOOL sampleWaterStopRequested;
-static BOOL sampleWaterEntered;
+static BOOL sampleWaterStartRequested;                              ///< Flag indicates user has requested to start sample water.
+static BOOL sampleWaterStopRequested;                               ///< Flag indicates user has requested to stop sample water.
+static BOOL sampleWaterResultEntered;                               ///< Flag indicates user has entered sample water result.
 
-static SAMPLE_WATER_STATE_T currentSampleWaterState;
-static BOOL sampleWaterResult;
+static SAMPLE_WATER_STATE_T currentSampleWaterState;                ///< Current state of sample water sub-mode.
+static BOOL sampleWaterResult;                                      ///< The result entered by user after testing water sample.
 
 // ********** private function prototypes **********
 
@@ -53,7 +53,7 @@
 {
     sampleWaterStartRequested = FALSE;
     sampleWaterStopRequested = FALSE;
-    sampleWaterEntered = FALSE;
+    sampleWaterResultEntered = FALSE;
 
     currentSampleWaterState = SAMPLE_WATER_SETUP_STATE;
     sampleWaterResult = FALSE;
@@ -92,6 +92,9 @@
             currentSampleWaterState = handleWaterSampleState();
             break;
 
+        case SAMPLE_WATER_COMPLETE_STATE:
+            break;
+
         default:
             // TODO: alarm
             break;
@@ -112,12 +115,12 @@
 
 /*********************************************************************//**
  * @brief
- * The isSampleWaterPassed function returns the result of sample water.
+ * The getSampleWaterResult function returns the result from sample water testing.
  * @details Inputs: sampleWaterPassed
  * @details Outputs: none
  * @return TRUE if sample water result passed, otherwise FALSE
  *************************************************************************/
-BOOL isSampleWaterPassed( void )
+BOOL getSampleWaterResult( void )
 {
     return sampleWaterResult;
 }
@@ -183,7 +186,7 @@
  *************************************************************************/
 void setSampleWaterResult( BOOL result )
 {
-    sampleWaterEntered = TRUE;
+    sampleWaterResultEntered = TRUE;
     sampleWaterResult = result;
 }
 
@@ -219,15 +222,11 @@
 {
     SAMPLE_WATER_STATE_T state = SAMPLE_WATER_STATE;
 
-    if ( TRUE == sampleWaterEntered )
+    if ( TRUE == sampleWaterResultEntered )
     {
-        sampleWaterEntered = FALSE;
+        state = SAMPLE_WATER_COMPLETE_STATE;
+        sampleWaterResultEntered = FALSE;
         cmdDGSampleWater( SAMPLE_WATER_CMD_END );
-
-        if ( FALSE == sampleWaterResult )
-        {
-            // TODO: Trigger fault
-        }
     }
 
     if ( TRUE == sampleWaterStartRequested )