Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r2140a55e7bba381ec3b62aa2af47b967c8adaa31 -rf9a866abfc44db38c01cb795fea894cce1042eec
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 2140a55e7bba381ec3b62aa2af47b967c8adaa31)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision f9a866abfc44db38c01cb795fea894cce1042eec)
@@ -109,13 +109,13 @@
     allTasksCheckedIn = haveAllTasksCheckedIn();
 
     // If all monitored tasks checked in, pet watchdog and clear the slate
-    if ( ( TRUE == allTasksCheckedIn ) && ( didTimeout( lastWatchdogPetTime, MIN_WATCHDOG_PET_INTERVAL_MS ) ) )
+    if ( ( TRUE == allTasksCheckedIn ) && ( TRUE == didTimeout( lastWatchdogPetTime, MIN_WATCHDOG_PET_INTERVAL_MS ) ) )
     {
         petWatchdog();
         resetWDTaskCheckIns();
     }
     // 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 ) ||
@@ -171,7 +171,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_24V_ACTUATORS );
                 F32 audioCurrent = getFPGABackupAlarmAudioCurrent();
@@ -206,7 +206,7 @@
         case WATCHDOG_SELF_TEST_STATE_RECOVER:
             if ( TRUE == didTimeout( watchdogSelfTestTimerCount, WATCHDOG_RECOVERY_TIME_MS ) )
             {   // Verify watchdog expired signal no longer active
-                if ( getCPLDWatchdogExpired() == PIN_SIGNAL_HIGH )
+                if ( PIN_SIGNAL_HIGH == getCPLDWatchdogExpired() )
                 {
                     F32 v24 = getIntADCVoltageConverted( INT_ADC_24V_ACTUATORS );
                     F32 audioCurrent = getFPGABackupAlarmAudioCurrent();