Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r2e21405574597474db0ebae86cdd7fa2d517f71c -rad6b3443575d3f6bbac52237866e19a212d36bc1
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 2e21405574597474db0ebae86cdd7fa2d517f71c)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision ad6b3443575d3f6bbac52237866e19a212d36bc1)
@@ -330,11 +330,11 @@
     initPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS );
 
     // Initialize the FPGA persistent alarms
-    initFPGAPersistentAlarm( TWO_WIRE_ADC_TEMP_SENSORS, ALARM_ID_DG_TWO_WIRE_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS);
-    initFPGAPersistentAlarm( THD_ADC_TEMP_SENSORS, ALARM_ID_DG_THD_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS);
-    initFPGAPersistentAlarm( TDI_ADC_TEMP_SENSORS, ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS);
-    initFPGAPersistentAlarm( TRO_ADC_TEMP_SENSORS, ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS);
-    initFPGAPersistentAlarm( BARO_SENSOR, ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS);
+    initFPGAPersistentAlarm( FPGA_PERS_ERROR_TWO_WIRE_ADC_TEMP_SENSORS, ALARM_ID_DG_TWO_WIRE_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS);
+    initFPGAPersistentAlarm( FPGA_PERS_ERROR_THD_ADC_TEMP_SENSORS, ALARM_ID_DG_THD_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS);
+    initFPGAPersistentAlarm( FPGA_PERS_ERROR_TDI_ADC_TEMP_SENSORS, ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS);
+    initFPGAPersistentAlarm( FPGA_PERS_ERROR_TRO_ADC_TEMP_SENSORS, ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS);
+    initFPGAPersistentAlarm( FPGA_PERS_ERROR_BARO_SENSOR, ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS, TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS);
 }
 
 /*********************************************************************//**
@@ -455,7 +455,7 @@
  *************************************************************************/
 F32 getTemperatureValue( U32 sensorIndex )
 {
-    F32 temperature = 0.0;
+    F32 temperature = 0.0F;
 
     if ( sensorIndex < NUM_OF_TEMPERATURE_SENSORS )
     {
@@ -515,7 +515,7 @@
  *************************************************************************/
 static F32 getADC2TempConversion( F32 avgADC, U32 gain, U32 refResistance, U32 zeroDegResistance, F32 adcConversionCoeff )
 {
-    F32 temperature = 0.0;
+    F32 temperature = 0.0F;
 
     if ( fabs( adcConversionCoeff ) <= NEARLY_ZERO )
     {
@@ -823,7 +823,7 @@
     errorCount = (U32)getFPGARTDErrorCount();
     readCount  = (U32)getFPGARTDReadCount();
 
-    checkFPGAPersistentAlarms( TWO_WIRE_ADC_TEMP_SENSORS, errorCount, readCount );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TWO_WIRE_ADC_TEMP_SENSORS, errorCount, readCount );
     processTempSnsrsADCRead( TEMPSENSORS_INLET_PRIMARY_HEATER,      getFPGATPiTemp() );
     processTempSnsrsADCRead( TEMPSENSORS_OUTLET_PRIMARY_HEATER,     getFPGATPoTemp() );
     processTempSnsrsADCRead( TEMPSENSORS_CONDUCTIVITY_SENSOR_1,     getFPGACD1Temp() );
@@ -837,7 +837,7 @@
         errorCount = (U32)getFPGATHdErrorCount();
         readCount  = (U32)getFPGATHdReadCount();
 
-        checkFPGAPersistentAlarms( THD_ADC_TEMP_SENSORS, errorCount, readCount );
+        checkFPGAPersistentAlarms( FPGA_PERS_ERROR_THD_ADC_TEMP_SENSORS, errorCount, readCount );
         processTempSnsrsADCRead( TEMPSENSORS_HEAT_DISINFECT,   getFPGATHdTemp() );
         processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_THD_RTD, getFPGATHdInternalTemp() );
 
@@ -849,21 +849,21 @@
         errorCount                      = getFPGABaroErrorCount();
         readCount                       = getFPGABaroReadCount();
 
-        checkFPGAPersistentAlarms( BARO_SENSOR, errorCount, readCount );
+        checkFPGAPersistentAlarms( FPGA_PERS_ERROR_BARO_SENSOR, errorCount, readCount );
         processTempSnsrsADCRead( TEMPSENSORS_BAROMETRIC_TEMP_SENSOR, getFPGABaroTemperature() );
     }
 
     errorCount = (U32)getFPGATRoErrorCount();
     readCount  = (U32)getFPGATRoReadCount();
 
-    checkFPGAPersistentAlarms( TRO_ADC_TEMP_SENSORS, errorCount, readCount );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TRO_ADC_TEMP_SENSORS, errorCount, readCount );
     processTempSnsrsADCRead( TEMPSENSORS_OUTLET_REDUNDANT, getFPGATRoTemp() );
     processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_TRO_RTD, getFPGATRoInternalTemp() );
 
     errorCount = (U32)getFPGATDiErrorCount();
     readCount  = (U32)getFPGATDiReadCount();
 
-    checkFPGAPersistentAlarms( TDI_ADC_TEMP_SENSORS, errorCount, readCount );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TDI_ADC_TEMP_SENSORS, errorCount, readCount );
     processTempSnsrsADCRead( TEMPSENSORS_INLET_DIALYSATE,  getFPGATDiTemp() );
     processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_TDI_RTD, getFPGATDiInternalTemp() );
 
@@ -1100,7 +1100,7 @@
     {
         if ( TRUE == isTestingActivated() )
         {
-            result = TRUE;
+            result                                                = TRUE;
             tempSensors[ sensorIndex ].temperatureValues.ovData   = temperature;
             tempSensors[ sensorIndex ].temperatureValues.override = OVERRIDE_KEY;
         }
@@ -1126,7 +1126,7 @@
     {
         if ( TRUE == isTestingActivated() )
         {
-            result = TRUE;
+            result                                                = TRUE;
             tempSensors[ sensorIndex ].temperatureValues.override = OVERRIDE_RESET;
             tempSensors[ sensorIndex ].temperatureValues.ovData   = tempSensors[ sensorIndex ].temperatureValues.ovInitData;
         }