Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r4d7d40a27130dc813d653f044cbb856b1b7d8481 -r22f1a58ac8e419353ec004b04e7c765c1d59df2b
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 4d7d40a27130dc813d653f044cbb856b1b7d8481)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 22f1a58ac8e419353ec004b04e7c765c1d59df2b)
@@ -49,8 +49,8 @@
 
 static WATCHDOG_SELF_TEST_STATE_T watchdogSelfTestState;                        ///< Watchdog self-test current state.
 static SELF_TEST_STATUS_T         watchdogSelfTestStatus;                       ///< Watchdog self-test status.
-static U32 watchdogSelfTestTimerCount = 0;                                      ///< Watchdog self-test timer count.
-
+static U32 watchdogSelfTestTimerCount = 0;                                      ///< Watchdog self-test timer count.
+
 // ********** private function prototypes **********
 
 static void resetWDTaskCheckIns( void );
@@ -102,13 +102,13 @@
 
     // if all monitored tasks checked in, pet watchdog and clear the slate
     if ( ( TRUE == allTasksCheckedIn ) && ( didTimeout( lastWatchdogPetTime, MIN_WATCHDOG_PET_INTERVAL_MS ) ) )
-    {
-        petWatchdog();
+    {
+        petWatchdog();
         resetWDTaskCheckIns();
     }
 
     // check to see if watchdog has expired
-    if ( getCPLDWatchdogExpired() == PIN_SIGNAL_HIGH )
+    if ( PIN_SIGNAL_LOW == getCPLDWatchdogExpired() )
     {
         // ignore expired watchdog until after watchdog POST
         if ( WATCHDOG_SELF_TEST_STATE_COMPLETE == watchdogSelfTestState )
@@ -161,13 +161,13 @@
             {
                 // waiting here for w.d. test period to prevent this task from checking in - watchdog should expire
             }
-            if ( getCPLDWatchdogExpired() == PIN_SIGNAL_HIGH )
+            if ( PIN_SIGNAL_LOW == getCPLDWatchdogExpired() )
             {
                 watchdogSelfTestStatus = SELF_TEST_STATUS_PASSED;
             }
             else
             {
-                activateAlarmNoData( ALARM_ID_WATCHDOG_POST_TEST_FAILED );
+                activateAlarmNoData( ALARM_ID_DG_WATCHDOG_POST_TEST_FAILED );
                 watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
             }
             watchdogSelfTestTimerCount = getMSTimerCount();
@@ -266,7 +266,7 @@
     }
     else
     {
-        activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_TASK, task );
     }
 
     return result;