Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rb2279059f1aa781e973ff6487a33c85615cedb4d -re6453f6070bec116e1f1e3a553eb2c6a7aac1f9d
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision b2279059f1aa781e973ff6487a33c85615cedb4d)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision e6453f6070bec116e1f1e3a553eb2c6a7aac1f9d)
@@ -1025,15 +1025,15 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        TEMPERATURE_SENSORS_T i;
-        TEMPERATURE_SENSORS_T alarmIndex;
-        F32 temperature                  = 0.0F;
-        BOOL isTemperatureOutOfRange     = FALSE;
-        F32 alarmTemperature             = 0.0F;
+        TEMPERATURE_SENSORS_T sensorId;
+        TEMPERATURE_SENSORS_T sensorInAlarm = TEMPSENSORS_INLET_PRIMARY_HEATER;
+        F32 temperature                     = 0.0F;
+        BOOL isTemperatureOutOfRange        = FALSE;
+        F32 alarmTemperature                = 0.0F;
 
-        for ( i = TEMPSENSORS_INLET_PRIMARY_HEATER; i < NUM_OF_TEMPERATURE_SENSORS; i++ )
+        for ( sensorId = TEMPSENSORS_INLET_PRIMARY_HEATER; sensorId < NUM_OF_TEMPERATURE_SENSORS; sensorId++ )
         {
-           switch ( i )
+           switch ( sensorId )
            {
                case TEMPSENSORS_INLET_PRIMARY_HEATER:
                case TEMPSENSORS_HEAT_DISINFECT:
@@ -1052,14 +1052,14 @@
                case TEMPSENSORS_BAROMETRIC_TEMP_SENSOR:
                    // All the temperature sensors are monitored except the heaters' temperature sensors.
                    // The heaters' temperature sensors are only broadcast for information
-                   temperature = getTemperatureValue( i );
+                   temperature = getTemperatureValue( sensorId );
 
                    // Check both temperature and to be in range
-                   if ( ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > tempSensors[ i ].maxAllowedTemp ) ) &&
+                   if ( ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > tempSensors[ sensorId ].maxAllowedTemp ) ) &&
                           ( getCurrentOperationMode() != DG_MODE_INIT ) )
                    {
                        isTemperatureOutOfRange |= TRUE;
-                       alarmIndex               = i;
+                       sensorInAlarm            = sensorId;
                        alarmTemperature         = temperature;
                    }
                    break;
@@ -1071,7 +1071,7 @@
 
         }
 
-        checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, isTemperatureOutOfRange, alarmIndex, alarmTemperature );
+        checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, isTemperatureOutOfRange, sensorInAlarm, alarmTemperature );
     }
 }