Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r325ad799da3a89391779d28c8b9a7e957ac9ef84 -rc0e9f4abf5810ca49dcf3498e298905a6e0997b6
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 325ad799da3a89391779d28c8b9a7e957ac9ef84)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision c0e9f4abf5810ca49dcf3498e298905a6e0997b6)
@@ -114,7 +114,7 @@
     }
 
     // check to see if watchdog has expired
-    if ( getCPLDWatchdogExpired() == PIN_SIGNAL_LOW )
+    if ( PIN_SIGNAL_LOW == getCPLDWatchdogExpired() )
     {
         // ignore expired watchdog until after watchdog POST
         if ( ( WATCHDOG_SELF_TEST_STATE_COMPLETE == watchdogSelfTestState ) ||
@@ -168,7 +168,7 @@
             {
                 // waiting here for w.d. test period to prevent this task from checking in - watchdog should expire
             }
-            if ( getCPLDWatchdogExpired() == PIN_SIGNAL_LOW )
+            if ( PIN_SIGNAL_LOW == getCPLDWatchdogExpired() )
             {
                 F32 v24 = getIntADCVoltageConverted( INT_ADC_PRIMARY_HEATER_24_VOLTS );
 
@@ -295,7 +295,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;