Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r834e2f1c57b828c546c56dea42a9757988e16314 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 834e2f1c57b828c546c56dea42a9757988e16314)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602)
@@ -404,7 +404,7 @@
 
     if( ++heatersStatus.controlIntervalCounter > HEATER_CONTROL_INTERVAL_COUNT )
     {
-        measuredTemperature = getTemperatureValue( TEMP_SENSOR_TRO1 );
+        measuredTemperature = getTemperatureValue( P23_TEMP );
         if ( measuredTemperature >= targetTemperature )
         {
             // Turn off heater
@@ -465,8 +465,8 @@
     {
         enable = TRUE;
     }
-    setFPGAHeaterEnabled( enable );
-    setFPGAHeaterPWM( pwm );
+    setFPGAP24Enabled( enable );
+    setFPGAP24PWM( pwm );
 }
 
 /*********************************************************************//**
@@ -490,36 +490,28 @@
  * @details \b Outputs: none
  * @details \b Alarms: ALARM_ID_DD_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE when
  * primary heater voltage found out of range.
- * @details \b Alarms: ALARM_ID_DD_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE when
- * trimmer heater voltage found out of range.
  * @return none
  *************************************************************************/
 //static void monitorHeatersVoltage( void )
 //{
 //    F32 mainPriVoltage  = getMonitoredLineLevel( MONITORED_LINE_24V_GND_MAIN_PRIM_HTR_V );
-//    F32 trimmerVoltage  = getMonitoredLineLevel( MONITORED_LINE_24V_GND_TRIM_HTR_V );
 //
 //    // Voltage to PWM is reverse. If PWM = 0 -> V = 24V
 //    F32 mainPriDC  = getHeaterControl( DD_PRIMARY_HEATER );
-//    F32 trimmerDC  = getHeaterControl( DD_TRIMMER_HEATER );
 //
 //    // The expected voltage is the inverse of the duty cycle
 //    F32 mainPriExpectedVoltage  = HEATERS_MAX_OPERATING_VOLTAGE_V * ( 1.0F - mainPriDC );
-//    F32 trimmerExpectedVoltage  = HEATERS_MAX_OPERATING_VOLTAGE_V * ( 1.0F - trimmerDC );
 //
 //    BOOL isMainPriOut  = FALSE;
-//    BOOL isTrimmerOut  = FALSE;
 //
 //    // If the system is DVT, check the FPGA persistent alarm of the main primary heater's voltage ADC
 //    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCReadCount() );
 //
 //    isMainPriOut  = ( fabs( mainPriExpectedVoltage  - mainPriVoltage )  > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE );
-//    isTrimmerOut  = ( fabs( trimmerExpectedVoltage  - trimmerVoltage )  > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE );
 //
 //    if ( getCurrentOperationMode() != DD_MODE_INIT )
 //    {
 //        checkPersistentAlarm( ALARM_ID_DD_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE,  isMainPriOut,  mainPriDC,  HEATERS_VOLTAGE_TOLERANCE_V );
-//        checkPersistentAlarm( ALARM_ID_DD_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE,       isTrimmerOut,  trimmerDC,  HEATERS_VOLTAGE_TOLERANCE_V );
 //    }
 //}
 
@@ -539,10 +531,10 @@
     {
         HEATERS_DATA_T data;
 
-        data.heaterHroDC             = getHeaterControl();
-        data.heaterHroTargetTemp     = getHeaterTargetTemperature();
-        data.heaterHroState          = heatersStatus.state;
-        data.heaterHroControlCounter = heatersStatus.controlIntervalCounter;
+        data.heaterP24DC             = getHeaterControl();
+        data.heaterP24TargetTemp     = getHeaterTargetTemperature();
+        data.heaterP24State          = heatersStatus.state;
+        data.heaterP24ControlCounter = heatersStatus.controlIntervalCounter;
 
         dataPublicationTimerCounter = 0;