Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r561c8ae6df3c144944a2cc5ba2bb4f13ad904972 -r00aab2d131cccd39bfe478cfb4457b5661e9cefc --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 561c8ae6df3c144944a2cc5ba2bb4f13ad904972) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 00aab2d131cccd39bfe478cfb4457b5661e9cefc) @@ -134,7 +134,7 @@ heatersStatus[ heater ].dutycycle = 0.0; heatersStatus[ heater ].targetFlow = 0.0; heatersStatus[ heater ].hasTargetTempChanged = FALSE; - heatersStatus[ heater ].heaterEfficiency = 1.0; // Assuming 100% efficiency during initialization until it is updated + heatersStatus[ heater ].heaterEstGain = 1.0; // Assuming 100% efficiency during initialization until it is updated heatersStatus[ heater ].hasTargetBeenReached = FALSE; } @@ -352,8 +352,8 @@ *************************************************************************/ void resetHeatersEfficiency( void ) { - heatersStatus[ DG_PRIMARY_HEATER ].heaterEfficiency = 1.0; - heatersStatus[ DG_TRIMMER_HEATER ].heaterEfficiency = 1.0; + heatersStatus[ DG_PRIMARY_HEATER ].heaterEstGain = 1.0; + heatersStatus[ DG_TRIMMER_HEATER ].heaterEstGain = 1.0; } /*********************************************************************//** @@ -678,7 +678,7 @@ static F32 calculateTrimmerHeaterDutyCycle( F32 targetTemperature, F32 currentTemperature, F32 flow, BOOL checkEfficiency ) { // Get the primary heater's efficiency and the last fill temperature from the ModeFill - F32 heaterEfficiency = heatersStatus[ DG_TRIMMER_HEATER ].heaterEfficiency; + F32 heaterEfficiency = heatersStatus[ DG_TRIMMER_HEATER ].heaterEstGain; F32 dutyCycle = 0.0; #ifndef _RELEASE_ @@ -791,7 +791,7 @@ data.trimmerTargetTemp = heatersStatus[ DG_TRIMMER_HEATER ].targetTemp; data.primaryHeaterState = heatersStatus[ DG_PRIMARY_HEATER ].state; data.trimmerHeaterState = heatersStatus[ DG_TRIMMER_HEATER ].state; - data.primaryEfficiency = heatersStatus[ DG_PRIMARY_HEATER ].heaterEfficiency * 100; + data.primaryEfficiency = heatersStatus[ DG_PRIMARY_HEATER ].heaterEstGain * 100; data.primaryCalcTargetTemp = heatersStatus[ DG_PRIMARY_HEATER ].calculatedTemperature; data.trimmerCalcCurrentTemp = heatersStatus[ DG_TRIMMER_HEATER ].calculatedTemperature;