Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -r417631131615f93f77d6d1bfe44c385a8eab6d5b
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 417631131615f93f77d6d1bfe44c385a8eab6d5b)
@@ -7,8 +7,8 @@
 *
 * @file    WatchdogMgmt.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      17-Jan-2023
+* @author  (last)      Bill Bracken
+* @date    (last)      14-Mar-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -116,12 +116,14 @@
     if ( PIN_SIGNAL_LOW == getCPLDWatchdogExpired() )
     {
         // ignore expired watchdog until after watchdog POST
-        if ( ( WATCHDOG_SELF_TEST_STATE_COMPLETE == watchdogSelfTestState ) ||
-             ( getCurrentOperationMode() != DG_MODE_INIT ) )
-        {
-#ifndef DEBUG_ENABLED
+        if ( getCurrentOperationMode() != DG_MODE_INIT )
+        {
+            /* DEBUG WARNING
+             * It may be necessary to comment out the following
+             * line to prevent the  alarm from occurring while
+             * debugging.
+             */
             activateAlarmNoData( ALARM_ID_DG_WATCHDOG_EXPIRED );
-#endif
         }
     }
 }
@@ -206,6 +208,11 @@
                         watchdogSelfTestStatus = SELF_TEST_STATUS_PASSED;
                     }
                 }
+                else
+                {
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_WATCHDOG_POST_TEST_FAILED, 4 );
+                    watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
+                }
                 result = watchdogSelfTestStatus;
                 watchdogSelfTestState = WATCHDOG_SELF_TEST_STATE_COMPLETE;
             }