Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rbbf67569fc5f34815c0e0855dd452de2be5a7976 -r25a1a0d6d14976c50f46a9388fa0932526ee04d9
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision bbf67569fc5f34815c0e0855dd452de2be5a7976)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 25a1a0d6d14976c50f46a9388fa0932526ee04d9)
@@ -275,8 +275,6 @@
  *************************************************************************/
 void stopPrimaryHeater( void )
 {
-    setMainPrimaryHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
-    setSmallPrimaryHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
     isPrimaryHeaterOn = FALSE;
 }
 
@@ -289,7 +287,6 @@
  *************************************************************************/
 void stopTrimmerHeater( void )
 {
-    setTrimmerHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
     isTrimmerHeaterOn = FALSE;
 }
 
@@ -704,6 +701,8 @@
         // Switch to off state. Set the duty cycles to 0
         mainPrimaryHeaterDutyCycle = HEATERS_MIN_DUTY_CYCLE;
         smallPrimaryHeaterDutyCycle = HEATERS_MIN_DUTY_CYCLE;
+        setMainPrimaryHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
+        setSmallPrimaryHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
         state = PRIMARY_HEATERS_EXEC_STATE_OFF;
     }
 
@@ -779,6 +778,7 @@
     {
         // Set the duty cycle to 0 and switch to off state
         trimmerHeaterDutyCycle = HEATERS_MIN_DUTY_CYCLE;
+        setTrimmerHeaterPWM( HEATERS_MIN_DUTY_CYCLE );
         state = TRIMMER_HEATER_EXEC_STATE_OFF;
     }
 
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r6742785597228dba2009e73a9de3f85024d4c82a -r25a1a0d6d14976c50f46a9388fa0932526ee04d9
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 6742785597228dba2009e73a9de3f85024d4c82a)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 25a1a0d6d14976c50f46a9388fa0932526ee04d9)
@@ -38,6 +38,7 @@
 #define PRIMARY_HEATER_EXT_TEMP_SENSORS_0_DEGREE_RESISTANCE     1000U                                           ///< Primary heater external temperature sensors zero degree resistance.
 
 #define COND_SENSORS_TEMP_SENSOR_GAIN                           8U                                              ///< Temperature sensor for conductivity gain.
+
 #define COND_SENSORS_TEMP_SENSOR_REF_RESISTANCE                 19600U                                          ///< Temperature sensor for conductivity reference resistance.
 #define COND_SENSORS_TEMP_SENSOR_0_DEGREE_RESISTANCE            1000U                                           ///< Temperature sensor for conductivity zero degree resistance.
 
@@ -813,10 +814,10 @@
         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.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 ];