Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -ra8d919375cdb830f52e82e2d1c72c8153f5f58ca -r67021fbc633259e8e1bce76749dbef7d0cb51998
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision a8d919375cdb830f52e82e2d1c72c8153f5f58ca)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 67021fbc633259e8e1bce76749dbef7d0cb51998)
@@ -108,7 +108,7 @@
     }
 
     // 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,7 +161,7 @@
             {
                 // 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;
             }
@@ -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;