Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -re0cdf49eb0f54239e5d765282e0952cea7ded1bd -r1af5c9d200064f18e2727e896f74308e683492a7
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision e0cdf49eb0f54239e5d765282e0952cea7ded1bd)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 1af5c9d200064f18e2727e896f74308e683492a7)
@@ -121,7 +121,7 @@
              ( getCurrentOperationMode() != DG_MODE_INIT ) )
         {
 #ifndef DEBUG_ENABLED
-            activateAlarmNoData( ALARM_ID_WATCHDOG_EXPIRED );
+            activateAlarmNoData( ALARM_ID_DG_WATCHDOG_EXPIRED );
 #endif
         }
     }
@@ -191,7 +191,7 @@
         case WATCHDOG_SELF_TEST_STATE_RECOVER:
             if ( TRUE == didTimeout( watchdogSelfTestTimerCount, WATCHDOG_RECOVERY_TIME_MS ) )
             {
-                if ( getCPLDWatchdogExpired() == PIN_SIGNAL_HIGH )
+                if ( PIN_SIGNAL_HIGH == getCPLDWatchdogExpired() )
                 {
                     F32 v24 = getIntADCVoltageConverted( INT_ADC_PRIMARY_HEATER_24_VOLTS );