Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rddb9707d9e6e46c4b384782aeec20d41f3822996 -r2d8f95eaae3bcb7027f5e96809ddc6e9c0efbc4c
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision ddb9707d9e6e46c4b384782aeec20d41f3822996)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 2d8f95eaae3bcb7027f5e96809ddc6e9c0efbc4c)
@@ -163,7 +163,7 @@
 static void processADCRead( U32 sensorIndex, S32 adc );
 static U32 getPublishTemperatureSensorsDataInterval( void );
 static void publishTemperatureSensorsData( void );
-static void monitorTemperatureSnsrs( U32 sensorIndex );
+static void monitorTemperatureSnsrs( U32 sensorIndex, F32 temperature );
 
 /*********************************************************************//**
  * @brief
@@ -372,7 +372,7 @@
 
     if ( sensorIndex < NUM_OF_TEMPERATURE_SENSORS )
     {
-        if ( OVERRIDE_KEY == tempSensors[ sensorIndex ].temperatureValues.override )
+        if ( tempSensors[ sensorIndex ].temperatureValues.override == OVERRIDE_KEY )
         {
             temperature = tempSensors[ sensorIndex ].temperatureValues.ovData;
         }
@@ -712,7 +712,7 @@
     tempSensors[ sensorIndex ].temperatureValues.data = temperature;
 
     // Monitor the temperature value
-    monitorTemperatureSnsrs( sensorIndex );
+    monitorTemperatureSnsrs( sensorIndex, temperature );
 }
 
 /*********************************************************************//**
@@ -837,7 +837,7 @@
 {
     U32 result = tempSensorsPublishInterval.data;
 
-    if ( OVERRIDE_KEY == tempSensorsPublishInterval.override )
+    if ( tempSensorsPublishInterval.override == OVERRIDE_KEY )
     {
         result = tempSensorsPublishInterval.ovData;
     }
@@ -859,30 +859,30 @@
     {
         TEMPERATURE_SENSORS_DATA_T data;
 
-        data.inletPrimaryHeater        = getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER );
-        data.outletPrimaryHeater       = getTemperatureValue( TEMPSENSORS_OUTLET_PRIMARY_HEATER );
-        data.conductivitySensor1       = getTemperatureValue( TEMPSENSORS_CONDUCTIVITY_SENSOR_1 );
-        data.conductivitySensor2       = getTemperatureValue( TEMPSENSORS_CONDUCTIVITY_SENSOR_2 );
-        data.outletRedundant           = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
-        data.inletDialysate            = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE );
-        data.primaryHeaterThermocouple = getTemperatureValue( TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE );
-        data.trimmerHeaterThermocouple = getTemperatureValue( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE );
-        data.priamyHeaterColdjunction  = getTemperatureValue( TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION );
-        data.trimmerHeaterColdjunction = getTemperatureValue( TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION );
-        data.primaryHeaterInternal     = getTemperatureValue( TEMPSENSORS_PRIMARY_HEATER_INTERNAL );
-        data.trimmerHeaterInternal     = getTemperatureValue( TEMPSENSORS_TRIMMER_HEATER_INTERNAL );
-        data.fpgaBoard                 = getTemperatureValue( TEMPSENSORS_FPGA_BOARD_SENSOR );
-        data.loadCellA1B1              = getTemperatureValue( TEMPSENSORS_LOAD_CELL_A1_B1 );
-        data.loadCellA2B2              = getTemperatureValue( TEMPSENSORS_LOAD_CELL_A2_B2 );
-        data.internalTHDORTD           = getTemperatureValue( TEMPSENSORS_INTERNAL_THDO_RTD );
-        data.internalTDIRTD            = getTemperatureValue( TEMPSENSORS_INTERNAL_TDI_RTD );
-        data.internalCondSnsrTemp      = getTemperatureValue( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR );
-        data.primaryThermoCoupleRaw    = getFPGAPrimaryHeaterTemp();
-        data.primaryColdjuncRaw        = getFPGAPrimaryColdJunctionTemp();
-        data.trimmerThermoCoupleRaw    = getFPGATrimmerHeaterTemp();
-        data.trimmerColdjuncRaw        = getFPGATrimmerColdJunctionTemp();
-        data.cond1Raw                  = tempSensors[ TEMPSENSORS_CONDUCTIVITY_SENSOR_1 ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
-        data.cond2Raw                  = tempSensors[ TEMPSENSORS_CONDUCTIVITY_SENSOR_2 ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
+        data.inletPrimaryHeater         = getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER );
+        data.outletPrimaryHeater        = getTemperatureValue( TEMPSENSORS_OUTLET_PRIMARY_HEATER );
+        data.conductivitySensor1        = getTemperatureValue( TEMPSENSORS_CONDUCTIVITY_SENSOR_1 );
+        data.conductivitySensor2        = getTemperatureValue( TEMPSENSORS_CONDUCTIVITY_SENSOR_2 );
+        data.outletRedundant            = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT );
+        data.inletDialysate             = getTemperatureValue( TEMPSENSORS_INLET_DIALYSATE );
+        data.primaryHeaterThermocouple  = getTemperatureValue( TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE );
+        data.trimmerHeaterThermocouple  = getTemperatureValue( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE );
+        data.priamyHeaterColdjunction   = getTemperatureValue( TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION );
+        data.trimmerHeaterColdjunction  = getTemperatureValue( TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION );
+        data.primaryHeaterInternal      = getTemperatureValue( TEMPSENSORS_PRIMARY_HEATER_INTERNAL );
+        data.trimmerHeaterInternal      = getTemperatureValue( TEMPSENSORS_TRIMMER_HEATER_INTERNAL );
+        data.fpgaBoard                  = getTemperatureValue( TEMPSENSORS_FPGA_BOARD_SENSOR );
+        data.loadCellA1B1               = getTemperatureValue( TEMPSENSORS_LOAD_CELL_A1_B1 );
+        data.loadCellA2B2               = getTemperatureValue( TEMPSENSORS_LOAD_CELL_A2_B2 );
+        data.internalTHDORTD            = getTemperatureValue( TEMPSENSORS_INTERNAL_THDO_RTD );
+        data.internalTDIRTD             = getTemperatureValue( TEMPSENSORS_INTERNAL_TDI_RTD );
+        data.internalCondSnsrTemp       = getTemperatureValue( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR );
+        data.primaryThermoCoupleRaw     = getFPGAPrimaryHeaterTemp();
+        data.primaryColdjuncRaw         = getFPGAPrimaryColdJunctionTemp();
+        data.trimmerThermoCoupleRaw     = getFPGATrimmerHeaterTemp();
+        data.trimmerColdjuncRaw         = getFPGATrimmerColdJunctionTemp();
+        data.cond1Raw                   = tempSensors[ TEMPSENSORS_CONDUCTIVITY_SENSOR_1 ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
+        data.cond2Raw                   = tempSensors[ TEMPSENSORS_CONDUCTIVITY_SENSOR_2 ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
 
         broadcastTemperatureSensorsData( &data );
 
@@ -898,14 +898,17 @@
  * @details Inputs: tempSensors
  * @details Outputs: tempSensors
  * @param sensorIndex the index of the temperature sensor
+ * @param temperature the temperature value to be checked
  * @return none
  *************************************************************************/
-static void monitorTemperatureSnsrs( U32 sensorIndex )
+static void monitorTemperatureSnsrs( U32 sensorIndex, F32 temperature )
 {
-    F32 temperature = getTemperatureValue( sensorIndex );
+    // The maximum allowed temperature is different for the sensors that are in the fluid path
+    // with the ones that are not in the fluid path
+    F32 maxLimit = tempSensors[ sensorIndex ].maxAllowedTemperature;
 
     // Check both temperature and to be in range
-    if ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > tempSensors[ sensorIndex ].maxAllowedTemperature ) )
+    if ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > maxLimit ) )
     {
         // TODO investigate
         //checkPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, TRUE, sensorIndex, temperature );
@@ -934,7 +937,7 @@
 
     if ( sensorIndex < NUM_OF_TEMPERATURE_SENSORS )
     {
-        if ( TRUE == isTestingActivated() )
+        if ( isTestingActivated() )
         {
             result = TRUE;
             tempSensors[ sensorIndex ].temperatureValues.ovData   = temperature;
@@ -960,7 +963,7 @@
 
     if ( sensorIndex < NUM_OF_TEMPERATURE_SENSORS )
     {
-        if ( TRUE == isTestingActivated() )
+        if ( isTestingActivated() )
         {
             result = TRUE;
             tempSensors[ sensorIndex ].temperatureValues.override = OVERRIDE_RESET;
@@ -984,7 +987,7 @@
 {
     BOOL result = FALSE;
 
-    if ( TRUE == isTestingActivated() )
+    if ( isTestingActivated() )
     {
         U32 interval = value / TASK_PRIORITY_INTERVAL;
 
@@ -1008,7 +1011,7 @@
 {
     BOOL result = FALSE;
 
-    if ( TRUE == isTestingActivated() )
+    if ( isTestingActivated() )
     {
         result = TRUE;
         tempSensorsPublishInterval.override = OVERRIDE_RESET;