Index: firmware/App/Controllers/Heaters.h =================================================================== diff -u -r8116b493a8085f28f85e5a9e8ead7e18d0dc77a8 -ra3a396aa37fb562327f05e54990f06538c7617ed --- firmware/App/Controllers/Heaters.h (.../Heaters.h) (revision 8116b493a8085f28f85e5a9e8ead7e18d0dc77a8) +++ firmware/App/Controllers/Heaters.h (.../Heaters.h) (revision a3a396aa37fb562327f05e54990f06538c7617ed) @@ -37,23 +37,23 @@ /// Name of DD heaters typedef enum Heaters { - DD_PRIMARY_HEATER = 0, ///< DD primary heater - DD_HEATERS_FIRST = DD_PRIMARY_HEATER, ///< First heater - DD_TRIMMER_HEATER, ///< DD trimmer heater + D5_HEAT = 0, ///< DD primary heater + DD_HEATERS_FIRST = D5_HEAT, ///< First heater + D45_HEAT, ///< DD trimmer heater NUM_OF_DD_HEATERS, ///< Number of the heaters } DD_HEATERS_T; /// Heaters data structure. typedef struct { - F32 mainPrimayHeaterDC; ///< Main primary heater DC - F32 trimmerHeaterDC; ///< Trimmer heater DC - F32 primaryTargetTemp; ///< Primary heater target temperature - F32 trimmerTargetTemp; ///< Trimmer heater target temperature - U32 primaryHeaterState; ///< Primary heater state - U32 trimmerHeaterState; ///< Trimmer heater state - U32 primaryControlCounter; ///< Primary heater control interval count - U32 trimmerControlCounter; ///< Trimmer heater control interval count + F32 d5_HeaterDC; ///< Main primary heater Duty Cycle + F32 d45_HeaterDC; ///< Trimmer heater Duty Cycle + F32 d5_HeaterTargetTemp; ///< Primary heater target temperature + F32 d45_HeaterTargetTemp; ///< Trimmer heater target temperature + U32 d5_HeaterState; ///< Primary heater state + U32 d45_HeaterState; ///< Trimmer heater state + U32 d5_HeaterControlCounter; ///< Primary heater control interval count + U32 d45_HeaterControlCounter; ///< Trimmer heater control interval count } HEATERS_DATA_T; // ********** Public function prototypes **********