Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -ra053cecf0673654e2bc03e9a34ff15845c8cff93 -r8b09199bae9870a8d63d4be9636ef66c849f8531
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision a053cecf0673654e2bc03e9a34ff15845c8cff93)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 8b09199bae9870a8d63d4be9636ef66c849f8531)
@@ -8,7 +8,7 @@
 * @file    SelfTests.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      03-Jan-2023
+* @date    (last)      11-Jan-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -288,6 +288,8 @@
  *************************************************************************/
 void execNoCartSelfTests( void )
 {
+    NO_CART_SELF_TESTS_STATE_T priorSubState = currentNoCartSelfTestsState;
+
     // execute no cartridge self-tests state machine
     switch ( currentNoCartSelfTestsState )
     {
@@ -335,6 +337,10 @@
     // Self-tests flags should be handled by now, reset if flags not handled with current state
     resetSelfTestsFlags();
 
+    if ( priorSubState != currentNoCartSelfTestsState )
+    {
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentNoCartSelfTestsState );
+    }
     // Publish current self-test time data
     if ( calcTimeSince( selfTestPreviousPublishDataTime ) >= SELF_TEST_TIME_DATA_PUB_INTERVAL )
     {
@@ -415,6 +421,8 @@
  *************************************************************************/
 void execDrySelfTests( void )
 {
+    DRY_SELF_TESTS_STATE_T priorSubState = currentDrySelfTestsState;
+
     // execute dry self-tests state machine
     switch ( currentDrySelfTestsState )
     {
@@ -511,6 +519,10 @@
     // Self-tests flags should be handled by now, reset if flags not handled with current state
     resetSelfTestsFlags();
 
+    if ( priorSubState != currentDrySelfTestsState )
+    {
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentDrySelfTestsState );
+    }
     // Publish current self-test time data
     if ( calcTimeSince( selfTestPreviousPublishDataTime ) >= SELF_TEST_TIME_DATA_PUB_INTERVAL )
     {
@@ -589,6 +601,8 @@
  *************************************************************************/
 void execWetSelfTests( void )
 {
+    WET_SELF_TESTS_STATE_T priorSubState = currentWetSelfTestsState;
+
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) == SW_CONFIG_ENABLE_VALUE )
     {
@@ -658,6 +672,11 @@
 
     // Self-tests flags should be handled by now, reset if flags not handled with current state
     resetSelfTestsFlags();
+
+    if ( priorSubState != currentWetSelfTestsState )
+    {
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentWetSelfTestsState );
+    }
 }
 
 /*********************************************************************//**