Index: firmware/App/Controllers/Thermistors.c
===================================================================
diff -u -r62a4d7b976107f7ac4d5013ce06f38f4a0bf65bd -rf9b3862d01ce6c64bd05b8649e69b44fa155b8e0
--- firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision 62a4d7b976107f7ac4d5013ce06f38f4a0bf65bd)
+++ firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision f9b3862d01ce6c64bd05b8649e69b44fa155b8e0)
@@ -16,12 +16,12 @@
 
 #define THERMISTORS_DATA_PUBLISH_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )                 ///< Thermistors publish data time interval.
 #define THERMISTORS_ADC_READ_INTERVAL     ( MS_PER_SECOND / ( 2 * TASK_GENERAL_INTERVAL ) )         ///< Thermistors ADC read time interval.
-#define ADC_FPGA_READ_DELAY_COUNT                  1                                                ///< FGPA read delay upon startup.
-#define ONBOARD_THERMISTOR_SOURCE_VOLTAGE          3                                                ///< Onboard thermistor source voltage.
-#define ONBOARD_THERMISTOR_REFERENCE_RESISTOR      10                                               ///< Onboard thermistor reference resistor.
-#define ONBOARD_THERMISTOR_BETA_VALUE              3380                                             ///< Onboard thermistor beta value.
-#define ONBOARD_THERMISTOR_REFERENCE_TEMPERATURE   298                                              ///< Onboard thermistor reference temperature.
-#define TWELVE_BIT_RESOLUTION                      4096                                             ///< 12 bit resolution conversion.
+#define ADC_FPGA_READ_DELAY_COUNT                  1.0                                                ///< FGPA read delay upon startup.
+#define ONBOARD_THERMISTOR_SOURCE_VOLTAGE          3.0                                                ///< Onboard thermistor source voltage.
+#define ONBOARD_THERMISTOR_REFERENCE_RESISTOR      10000.0                                              ///< Onboard thermistor reference resistor.
+#define ONBOARD_THERMISTOR_BETA_VALUE              3380.0                                             ///< Onboard thermistor beta value.
+#define ONBOARD_THERMISTOR_REFERENCE_TEMPERATURE   298.0                                              ///< Onboard thermistor reference temperature.
+#define TWELVE_BIT_RESOLUTION                      4096.0                                           ///< 12 bit resolution conversion.
 #define CELSIUS_TO_KELVIN_CONVERSION               273.15                                           ///< Celsius to Kelvin temperature conversion.
 #define ADC_TEMP_SENSORS_CONVERSION_CONST          272.5                                            ///< ADC temperature sensors conversion constant.
 #define MIN_ALLOWED_TEMPERATURE                    0                                                ///< Thermistors/sensors minimum allowed temperature reading.
@@ -62,10 +62,9 @@
 static U32 adcReadCounter;                                                                          ///< Thermistors ADC read counter
 
 static const F32 fpgaBoardTempSensorConvCoeff = 503.975 / TWELVE_BIT_RESOLUTION;                    ///< FPGA board temperature sensor conversion coefficient
-static const F32 adcTempSensorsConversionCoeff1 = 1 / 13584;                                        ///< ADC temperature sensors conversion coefficient 1
+static const F32 adcTempSensorsConversionCoeff1 = 1.0 / 13584.0;                                        ///< ADC temperature sensors conversion coefficient 1
 static const F32 adcTempSensorsConversionCoeff2 = 0x800000 / 13584;                                 ///< ADC temperature sensors conversion coefficient 2
-static const F32 onBoardThermistorVoltageConvCoeff = ONBOARD_THERMISTOR_SOURCE_VOLTAGE /
-                                                     TWELVE_BIT_RESOLUTION;                         ///< On board thermistor ADC to voltage conversion coefficient
+static const F32 onBoardThermistorVoltageConvCoeff = ONBOARD_THERMISTOR_SOURCE_VOLTAGE / TWELVE_BIT_RESOLUTION;                         ///< On board thermistor ADC to voltage conversion coefficient
 static const F32 onBoardThermistorBetaValueInv =  1 / ONBOARD_THERMISTOR_BETA_VALUE;                ///< On board thermistor beta value inverse
 static const F32 onBoardThermistorRefTempInv = 1 / ONBOARD_THERMISTOR_REFERENCE_TEMPERATURE;        ///< On board thermistor reference inverse
 
@@ -421,21 +420,24 @@
     /*
      * voltage = ADC x 3 / 2^12
      * voltage = 3 x 10 / ( 10 + R(T) )
-     * R(T) = 10 x e^(3380 x (1/T - 1/298))
+     * R(T) = 10000 x e^(3380 x (1/T - 1/298))
      * Solve for T which is temperature in Kelvin
      */
 
     // Voltage = ADC x 3 / 2^12 for 12 bits resolution and a 3V ADC
     // The value of 3 / 2^12 has been calculated in a const to prevent the division again
     F32 const thermistorVoltage  = adcValue * onBoardThermistorVoltageConvCoeff;
+
     // Calculate the thermistor resistor by solving: thermistorVoltage = (3 x 10) / (10 + R(T))
     F32 const thermistorResistor = ( ( ONBOARD_THERMISTOR_REFERENCE_RESISTOR * ONBOARD_THERMISTOR_SOURCE_VOLTAGE ) -
                                    ( ONBOARD_THERMISTOR_REFERENCE_RESISTOR * thermistorVoltage ) ) / thermistorVoltage;
-    // 1/T = Ln(thermistorResistor/10)/3380 + 1/298
-    F32 const InvTemperature = ( logf( thermistorResistor / ONBOARD_THERMISTOR_REFERENCE_RESISTOR ) * onBoardThermistorBetaValueInv ) +
-                                onBoardThermistorRefTempInv;
+
+    // 1/T = Ln(thermistorResistor/10000)/3380 + 1/298
+    F32 const invTemperature = ( logf( thermistorResistor / ONBOARD_THERMISTOR_REFERENCE_RESISTOR ) / ONBOARD_THERMISTOR_BETA_VALUE ) +
+                                       onBoardThermistorRefTempInv;
+
     // Inverse the value to get the temperature in Kelvin and then convert it to Celsius
-    F32 const temperature = ( 1 / InvTemperature ) - CELSIUS_TO_KELVIN_CONVERSION;
+    F32 const temperature = ( 1 / invTemperature ) - CELSIUS_TO_KELVIN_CONVERSION;
 
     return temperature;
 }