Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r95eefee71702fbf031025dc35ebaf553dfb050b7 -r1af5c9d200064f18e2727e896f74308e683492a7
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 95eefee71702fbf031025dc35ebaf553dfb050b7)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 1af5c9d200064f18e2727e896f74308e683492a7)
@@ -183,7 +183,7 @@
     if ( TRUE == isNewCalibrationRecordAvailable() )
     {
         getNVRecord2Driver( GET_CAL_LOAD_CELL_SENSORS, (U08*)&loadCellsCalRecord, sizeof( DG_LOAD_CELLS_CAL_RECORD_T ),
-                            NUM_OF_CAL_DATA_LOAD_CELLS, ALARM_ID_DG_LOAD_CELLS_INVALID_CALIBRATION );
+                            NUM_OF_CAL_DATA_LOAD_CELLS, ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD );
 
         // Zero the current tare values when new calibration data is available
         loadcells[ LOAD_CELL_RESERVOIR_1_PRIMARY ].autoCalOffset = 0.0;
@@ -275,7 +275,7 @@
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
 
     BOOL calStatus = getNVRecord2Driver( GET_CAL_LOAD_CELL_SENSORS, (U08*)&loadCellsCalRecord, sizeof( DG_LOAD_CELLS_CAL_RECORD_T ),
-                                                  NUM_OF_CAL_DATA_LOAD_CELLS, ALARM_ID_DG_LOAD_CELLS_INVALID_CALIBRATION );
+                                                  NUM_OF_CAL_DATA_LOAD_CELLS, ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD );
 
     if ( TRUE == calStatus )
     {
Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r95eefee71702fbf031025dc35ebaf553dfb050b7 -r1af5c9d200064f18e2727e896f74308e683492a7
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 95eefee71702fbf031025dc35ebaf553dfb050b7)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 1af5c9d200064f18e2727e896f74308e683492a7)
@@ -117,8 +117,8 @@
         measuredPressureReadingsSum[ i ] = 0;
     }
 
-    pressuresState = PRESSURE_INIT_STATE;
-    pressuresSelfTestState = PRESSURE_SELF_TEST_STATE_START;
+    pressuresState                       = PRESSURE_INIT_STATE;
+    pressuresSelfTestState               = PRESSURE_SELF_TEST_STATE_START;
     pressuresDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
 
     initPersistentAlarm( ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD, INLET_WATER_PRESSURE_PERSISTENCE_PERIOD );
@@ -389,7 +389,7 @@
 
     for ( i = 0; i < PRESSURE_SENSORS_ADC_CHECK_ARRAY_LEN; i++ )
     {
-        sensorADC  = sensorsADC[ i ];
+        sensorADC = sensorsADC[ i ];
 
         if ( ( 0 == sensorADC ) || ( sensorADC >= INT_ADC_FULL_SCALE_BITS ) )
         {
Index: firmware/App/DGCommon.h
===================================================================
diff -u -r95eefee71702fbf031025dc35ebaf553dfb050b7 -r1af5c9d200064f18e2727e896f74308e683492a7
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 95eefee71702fbf031025dc35ebaf553dfb050b7)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 1af5c9d200064f18e2727e896f74308e683492a7)
@@ -44,7 +44,7 @@
 //    #define HEATERS_DEBUG                   1            // Not needed
 //    #define PRESSURES_DEBUG                 1            // Not needed
  //   #define IGNORE_DRAIN_PUMP_MONITOR       1            // Build switch
- //   #define IGNORE_HEATERS_MONITOR          1              // Build switch
+    #define IGNORE_HEATERS_MONITOR          1              // Build switch
     #define IGNORE_RO_PUMP_MONITOR          1              // Build switch
     #define DISABLE_RO_RATIO_CHECK          1              // Implement
 //    #define DISABLE_COND_SENSOR_CHECK       1    // Disabled for Tom    // Implement
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r66cc826068b54bc436cde0fae70a05ba6c1ac974 -r1af5c9d200064f18e2727e896f74308e683492a7
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 66cc826068b54bc436cde0fae70a05ba6c1ac974)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1af5c9d200064f18e2727e896f74308e683492a7)
@@ -672,7 +672,7 @@
 {
     if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC ) )
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_COMM_TOO_MANY_BAD_CRCS, 2 );  // 2 for DG
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_COMM_TOO_MANY_BAD_CRCS, 2 );  // 2 for DG
     }
 }
 
@@ -781,7 +781,7 @@
 
                 memcpy( &msgID, &pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
 #ifndef DISABLE_ACK_ALARM
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
 #endif
                 pendingAckList[ i ].used = FALSE;  // take pending message off of list
             }
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 );