Index: firmware/App/Controllers/Thermistors.c
===================================================================
diff -u -r760ad8f1018cdba6f60397c698659a70774c5191 -re6453f6070bec116e1f1e3a553eb2c6a7aac1f9d
--- firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision 760ad8f1018cdba6f60397c698659a70774c5191)
+++ firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision e6453f6070bec116e1f1e3a553eb2c6a7aac1f9d)
@@ -20,6 +20,7 @@
 #include "FPGA.h"
 #include "InternalADC.h"
 #include "MessageSupport.h"
+#include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "SystemCommMessages.h"
 #include "Thermistors.h"
@@ -268,27 +269,27 @@
  *************************************************************************/
 static void monitorThermistors( void )
 {
-    THERMISTORS_TEMP_SENSORS_T thermistor;
-    THERMISTORS_TEMP_SENSORS_T alarmID;
+    THERMISTORS_TEMP_SENSORS_T sensorId;
+    THERMISTORS_TEMP_SENSORS_T sensorInAlarm = THERMISTOR_ONBOARD_NTC;
     F32 temperature        = 0.0F;
     BOOL isTempOutOfRange  = FALSE;
     F32  alarmTemperature  = 0.0F;
 
-    for ( thermistor = THERMISTOR_ONBOARD_NTC; thermistor < NUM_OF_THERMISTORS; thermistor++ )
+    for ( sensorId = THERMISTOR_ONBOARD_NTC; sensorId < NUM_OF_THERMISTORS; sensorId++ )
     {
-        temperature = getThermistorTemperatureValue( thermistor );
+        temperature = getThermistorTemperatureValue( sensorId );
 
         // Check if thermistor is out of range
         if ( ( ( temperature < MIN_ALLOWED_TEMPERATURE ) || ( temperature > MAX_ALLOWED_TEMPERATURE ) )   &&
              ( getCurrentOperationMode() != DG_MODE_INIT ) )
         {
             isTempOutOfRange = TRUE;
-            alarmID          = thermistor;
+            sensorInAlarm    = sensorId;
             alarmTemperature = temperature;
         }
    }
 
-   checkPersistentAlarm( ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE, isTempOutOfRange, alarmID, alarmTemperature);
+   checkPersistentAlarm( ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE, isTempOutOfRange, sensorInAlarm, alarmTemperature);
 
 }