Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 82b7c4c94b0f8b3f8a3d3d2e41384a7a7d497215)
@@ -87,6 +87,8 @@
 *************************************************************************/
 void execSampleWater( void )
 {
+    SAMPLE_WATER_STATE_T priorSubState = currentSampleWaterState;
+
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) )
     {
@@ -113,6 +115,11 @@
                 break;
         }
     }
+
+    if ( priorSubState != currentSampleWaterState )
+    {
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentSampleWaterState );
+    }
 }
 
 /*********************************************************************//**