Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -rfda570ba4c27bd2f3458d3549474b18f2c367aa0 -r1b01b8c723dd1b04943e07eeda9e369b6d8e4afe --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision fda570ba4c27bd2f3458d3549474b18f2c367aa0) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 1b01b8c723dd1b04943e07eeda9e369b6d8e4afe) @@ -28,9 +28,9 @@ #include "SystemCommMessages.h" #include "PIControllers.h" -#define MAIN_PRIMARY_HEATER_MAX_DUTY_CYCLE 0.89 ///< Main primary heater (heater A) max duty cycle (79.5%) -#define SMALL_PRIMAY_HEATER_MAX_DUTY_CYCLE 0.50 ///< Small Primary heater (heater B) max duty cycle (25%) -#define TRIMMER_HEATER_MAX_DUTY_CYCLE 0.50 ///< Trimmer heater max duty cycle (25%) +#define MAIN_PRIMARY_HEATER_MAX_DUTY_CYCLE 0.89 ///< Main primary heater (heater A) max duty cycle (89%) +#define SMALL_PRIMAY_HEATER_MAX_DUTY_CYCLE 0.50 ///< Small Primary heater (heater B) max duty cycle (50%) +#define TRIMMER_HEATER_MAX_DUTY_CYCLE 0.50 ///< Trimmer heater max duty cycle (50%) #define HEATERS_MIN_DUTY_CYCLE 0.00 ///< Primary and trimmer heaters minimum duty cycle (0.00%) #define PRIMARY_HEATERS_P_COEFFICIENT 0.02 ///< Primary heaters proportional coefficient @@ -598,6 +598,7 @@ { #ifdef DEBUG_ENABLED { + F32 flow = (F32)(10909.0909/getFPGAROPumpFlowRate()); char debugTempStr[ 256 ]; sprintf( debugTempStr, "MPDC: %2d, SPDC: %2d, THDC: %2d, TPi: %6.2f, TPo: %6.2f, TD1: %6.2f, " "TD2: %6.2f, TRo: %6.2f, TDi: %6.2f, TPh: %6.2f, TTh: %6.2f, PTarg: %6.2f, TTarg: %6.2f, ROFlow: %6.2f\r\n", @@ -611,7 +612,7 @@ getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP_SENSOR ), getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP_SESNOR ), primaryHeaterTargetTemperature, trimmerHeaterTargetTemperature, - (F32)(getFPGAROPumpFlowRate()*0.00018)); + (F32)(10909.0909/getFPGAROPumpFlowRate()) ); sendDebugData ( (U08*)debugTempStr, strlen(debugTempStr) ); } #endif