Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r19a8bf98a7154e24c35da25225d4b55bf70ddd09 -rf9a866abfc44db38c01cb795fea894cce1042eec
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 19a8bf98a7154e24c35da25225d4b55bf70ddd09)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision f9a866abfc44db38c01cb795fea894cce1042eec)
@@ -52,14 +52,12 @@
 
 // ********** private data **********
 
-static U32  lastWatchdogPetTime = 0;                                                        ///< Timestamp (ms counter) since last watchdog pet.
+static U32 lastWatchdogPetTime;                                                             ///< Timestamp (ms counter) since last watchdog pet.
+static OVERRIDE_U32_T watchdogTaskCheckedIn[ NUM_OF_TASKS ];                                ///< Array of flags indicating whether individual tasks have checked in with watchdog manager.
+static WATCHDOG_SELF_TEST_STATE_T watchdogSelfTestState;                                    ///< Current watchdog self-test state.
+static SELF_TEST_STATUS_T watchdogSelfTestStatus;                                           ///< Watchdog self-test state timer counter.
+static U32 watchdogSelfTestTimerCount;
 
-static OVERRIDE_U32_T watchdogTaskCheckedIn[ NUM_OF_TASKS ];                                ///< Array of flags indicating whether individual tasks have checked in with watchdog manager.
-
-static WATCHDOG_SELF_TEST_STATE_T watchdogSelfTestState = WATCHDOG_SELF_TEST_STATE_START;   ///< Current watchdog self-test state.
-static SELF_TEST_STATUS_T         watchdogSelfTestStatus;                                   ///< Watchdog self-test state timer counter.
-static U32 watchdogSelfTestTimerCount = 0;
-
 // ********** private function prototypes **********
 
 static void resetWDTaskCheckIns( void );
@@ -78,17 +76,18 @@
 {
     U32 i;
 
-    lastWatchdogPetTime = 0;
-    watchdogSelfTestState = WATCHDOG_SELF_TEST_STATE_START;
-    watchdogSelfTestStatus = SELF_TEST_STATUS_IN_PROGRESS;
-    watchdogSelfTestTimerCount = 0;
+    lastWatchdogPetTime        = 0;
+    watchdogSelfTestState      = WATCHDOG_SELF_TEST_STATE_START;
+    watchdogSelfTestStatus     = SELF_TEST_STATUS_IN_PROGRESS;
+    watchdogSelfTestTimerCount = 0;
+
     // Initialize task check-ins to false
     for ( i = 0; i < NUM_OF_TASKS; i++ )
     {
-        watchdogTaskCheckedIn[ i ].data = FALSE;
-        watchdogTaskCheckedIn[ i ].ovData = FALSE;
+        watchdogTaskCheckedIn[ i ].data       = FALSE;
+        watchdogTaskCheckedIn[ i ].ovData     = FALSE;
         watchdogTaskCheckedIn[ i ].ovInitData = FALSE;
-        watchdogTaskCheckedIn[ i ].override = OVERRIDE_RESET;
+        watchdogTaskCheckedIn[ i ].override   = OVERRIDE_RESET;
     }
 }
 
@@ -110,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 ) ||
@@ -172,15 +171,15 @@
             {
                 // 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();
 
                 // Verify 24V is down when w.d. expired
                 if ( v24 > MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED )
                 {
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 2.0, v24 );
+                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 2.0F, v24 );
                     watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                 }
                 // Verify backup alarm audio is on when w.d. expired
@@ -190,7 +189,7 @@
                     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
 #endif
                     {
-                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 3.0, audioCurrent );
+                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 3.0F, audioCurrent );
                         watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                     }
                 }
@@ -207,15 +206,15 @@
         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();
 
                     // Verify 24V is down when w.d. recovered
                     if ( v24 < MIN_24V_LEVEL_ON_WATCHDOG_RECOVER )
                     {
-                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 4.0, v24 );
+                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 4.0F, v24 );
                         watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                     }
                     // Verify backup alarm audio is on when w.d. recovered
@@ -225,7 +224,7 @@
                         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) != SW_CONFIG_ENABLE_VALUE )
 #endif
                         {
-                            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 5.0, audioCurrent );
+                            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 5.0F, audioCurrent );
                             watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                         }
                     }