Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r025612ad77fe630889a364586de54bffe5262d56 -r1af5c9d200064f18e2727e896f74308e683492a7
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 025612ad77fe630889a364586de54bffe5262d56)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 1af5c9d200064f18e2727e896f74308e683492a7)
@@ -34,8 +34,8 @@
 #define WATCHDOG_POST_TIMEOUT_MS            500                                 ///< Watchdog POST timeout in ms.
 #define WATCHDOG_RECOVERY_TIME_MS           750                                 ///< Watchdog recovery time in ms.
 
-#define MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED   5.0                                 ///< Maximum voltage on 24V line when watchdog is expired.  // TODO - check w/ Systems.  Takes time for V to bleed off.  Had to raise to 5V.
-#define MIN_24V_LEVEL_ON_WATCHDOG_RECOVER   22.6                                ///< Minimum voltage on 24V line when watchdog is recovered.
+#define MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED   5.0F                                ///< Maximum voltage on 24V line when watchdog is expired.  // TODO - check w/ Systems.  Takes time for V to bleed off.  Had to raise to 5V.
+#define MIN_24V_LEVEL_ON_WATCHDOG_RECOVER   22.6F                               ///< Minimum voltage on 24V line when watchdog is recovered.
 
 /// List of watchdog states.
 typedef enum Button_Self_Test_States
@@ -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 );