Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rebbb1f85550a1f9b8f946655f7b2b63f76fbf67d -r28b5f2e7f757647145a82a39aca0a5f3652c68a1
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision ebbb1f85550a1f9b8f946655f7b2b63f76fbf67d)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 28b5f2e7f757647145a82a39aca0a5f3652c68a1)
@@ -117,7 +117,6 @@
 static U32 elapsedTime = 0;                                                                                     ///< Elapsed time variable.
 static U32 internalHeatersConversionTimer = 0;                                                                  ///< Conversion timer variable to calculate the heaters internal temperature.
 
-static F32 tempValuesForPublication [ NUM_OF_TEMPERATURE_SENSORS ];                                             ///< Temperature sensors data publication array.
 static U32 dataPublicationTimerCounter;                                                                         ///< Temperature sensors data publish timer counter.
 static OVERRIDE_U32_T tempSensorsPublishInterval = { TEMP_SENSORS_DATA_PUBLISH_INTERVAL,
                                                      TEMP_SENSORS_DATA_PUBLISH_INTERVAL, 0, 0 };                ///< Temperature sensors publish time interval override.
@@ -239,7 +238,7 @@
     // FPGA board temperature conversion coefficient
     tempSensors[ TEMPSENSORS_FPGA_BOARD_SENSOR ].conversionCoeff            = 503.975 / (F32)TWELVE_BIT_RESOLUTION;
 
-    F32 const conversionCoeff = 1.0 / 13584.0;
+    F32 const conversionCoeff                                               = 1.0 / 13584.0;
 
     // Board temperature sensors conversion coefficient
     tempSensors[ TEMPSENSORS_LOAD_CELL_A1_B1 ].conversionCoeff              =  conversionCoeff;
@@ -283,8 +282,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_TEMPERATURE_SENSORS_INVALID_SELF_TEST_STATE,
-                                       tempSensorsSelfTestState );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_TEMPERATURE_SENSORS_INVALID_SELF_TEST_STATE, tempSensorsSelfTestState );
             tempSensorsSelfTestState = TEMPSENSORS_SELF_TEST_COMPLETE;
             break;
     }
@@ -519,7 +517,8 @@
 {
     if ( TRUE == isADCReadValid( sensorIndex, fpgaError, fpgaCount ) )
     {
-        processADCRead( sensorIndex, (S32)adc );
+        S16 convert = (S16)adc;
+        processADCRead( sensorIndex, (S32)convert );
     }
 }
 
@@ -548,9 +547,9 @@
     BOOL isFPGAErrorZero = fpgaError == 0;
     BOOL isFPGACountChanging = tempSensors[ sensorIndex ].readCount != fpgaCount;
 
-    if ( isFPGAErrorZero )
+    if ( TRUE == isFPGAErrorZero )
     {
-        if ( isFPGACountChanging )
+        if ( TRUE == isFPGACountChanging )
         {
             tempSensors[ sensorIndex ].readCount = fpgaCount;
             isADCValid = TRUE;
@@ -667,7 +666,7 @@
     BOOL const isLessThanZero = tpiADC <= 0;
     BOOL const isGreaterThanFullScale = tpiADC >= TEMP_SENSORS_ADC_MAX_COUNT;
 
-    if ( isLessThanZero || isGreaterThanFullScale )
+    if ( ( TRUE == isLessThanZero ) || ( TRUE == isGreaterThanFullScale ) )
     {
         tempSensorsSelfTestResult = SELF_TEST_STATUS_FAILED;
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TEMPERATURE_SENSORS_FAULT, TEMPSENSORS_SELF_TEST_ADC_CHECK );
@@ -693,7 +692,7 @@
         elapsedTime = getMSTimerCount();
     }
     // A delay to let FPGA to boot up
-    else if ( didTimeout( elapsedTime, ADC_FPGA_READ_DELAY ) )
+    else if ( TRUE == didTimeout( elapsedTime, ADC_FPGA_READ_DELAY ) )
     {
         elapsedTime = 0;
         state = TEMPSENSORS_EXEC_STATE_GET_ADC_VALUES;
@@ -793,15 +792,35 @@
 {
     if ( ++dataPublicationTimerCounter >= getPublishTemperatureSensorsDataInterval() )
     {
-        U32 i;
+        TEMPERATURE_SENSORS_DATA_T data;
 
-        // Populate all the temperature values
-        for ( i = 0; i < NUM_OF_TEMPERATURE_SENSORS; i++ )
-        {
-            tempValuesForPublication[ i ] = getTemperatureValue ( i );
-        }
+        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     = tempSensors[ TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
+        data.primaryColdjuncRaw         = tempSensors[ TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
+        data.trimmerThermoCoupleRaw     = tempSensors[ TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
+        data.trimmerColdjuncRaw         = tempSensors[ TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION ].rawADCReads[ MAX_NUM_OF_RAW_ADC_SAMPLES - 1 ];
+        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( (U08*)(&tempValuesForPublication), NUM_OF_TEMPERATURE_SENSORS * sizeof(F32) );
+        broadcastTemperatureSensorsData( &data );
+
         dataPublicationTimerCounter = 0;
     }
 }