Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r75e1ae332d1446dddf9b8d4ce6e8317449c57d67 -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 75e1ae332d1446dddf9b8d4ce6e8317449c57d67)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision cd5be724d5a3ba7457e761191d82f278654d7f5c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    SampleWater.c
 *
 * @author  (last)      Michael Garthwaite
-* @date    (last)      19-Jan-2023
+* @date    (last)      01-Jun-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  19-Feb-2021
@@ -28,9 +28,6 @@
 
 // ********** private definitions **********
 
-/// DG restarted alarm persistent interval
-#define DG_RESTARTED_ALARM_PERSISTENT_INTERVAL         ( ( 5 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )
-
 // ********** private data **********
 
 static BOOL sampleWaterStartRequested;                              ///< Flag indicates user has requested to start sample water.
@@ -39,11 +36,9 @@
 
 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.
-static U32 dgRestartedPersistentCount;                              ///< Persistent count for DG restarted alarm.
 
 // ********** private function prototypes **********
 
-static void hasDGRestarted( void );
 static SAMPLE_WATER_STATE_T handleWaterSampleSetupState( void );
 static SAMPLE_WATER_STATE_T handleWaterSampleState( void );
 
@@ -80,6 +75,7 @@
         cmdDGSampleWater( SAMPLE_WATER_CMD_FLUSH );
     }
     initSampleWater();
+    setCurrentSubState( (U32)SAMPLE_WATER_SETUP_STATE );
 }
 
 /*********************************************************************//**
@@ -122,6 +118,7 @@
 
     if ( priorSubState != currentSampleWaterState )
     {
+        setCurrentSubState( (U32)currentSampleWaterState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentSampleWaterState );
     }
 }
@@ -231,28 +228,6 @@
 
 /*********************************************************************//**
  * @brief
- * The hasDGRestarted function checks if DG has restarted.
- * @details Inputs: DG operation mode and operation sub-mode
- * @details Outputs: alarm if DG restarted
- * @return none
- *************************************************************************/
-static void hasDGRestarted( void )
-{
-    if ( ( DG_MODE_STAN == getDGOpMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == getDGSubMode() ) )
-    {
-        if ( dgRestartedPersistentCount++ >= DG_RESTARTED_ALARM_PERSISTENT_INTERVAL )
-        {
-            activateAlarmNoData( ALARM_ID_DG_RESTARTED_FAULT );
-        }
-    }
-    else
-    {
-        dgRestartedPersistentCount = 0;
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The handleWaterSampleSetupState function waits for filter flush period elapsed.
  * @details Inputs: flushTimerCounter
  * @details Outputs: none
@@ -269,8 +244,6 @@
         state = SAMPLE_WATER_STATE;
     }
 
-    hasDGRestarted();
-
     return state;
 }
 
@@ -303,8 +276,6 @@
         cmdDGSampleWater( SAMPLE_WATER_CMD_STOP );
     }
 
-    hasDGRestarted();
-
     return state;
 }