Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r5adaa0ae1236d34fca1fc8def7fa107ec470115e -rd3819286869611f9c02add72a0f8e321598fdf42
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 5adaa0ae1236d34fca1fc8def7fa107ec470115e)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision d3819286869611f9c02add72a0f8e321598fdf42)
@@ -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,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();
@@ -255,14 +255,7 @@
 
     if ( task < NUM_OF_TASKS )
     {
-        if ( OVERRIDE_KEY == watchdogTaskCheckedIn[ task ].override )
-        {
-            result = (BOOL)watchdogTaskCheckedIn[ task ].ovData;
-        }
-        else
-        {
-            result = (BOOL)watchdogTaskCheckedIn[ task ].data;
-        }
+        result = (BOOL)getU32OverrideValue( &watchdogTaskCheckedIn[ task ] );
     }
     else
     {