Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -ra21818c35ee6d2db460e2713a003274ac41f1c47 -r9ce06772b2f651c57144327e6cbf886e2bc22dee --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision a21818c35ee6d2db460e2713a003274ac41f1c47) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 9ce06772b2f651c57144327e6cbf886e2bc22dee) @@ -20,6 +20,7 @@ #include "etpwm.h" #include "AlarmMgmt.h" +#include "DGDefs.h" #include "Heaters.h" #include "ROPump.h" #include "PIControllers.h" @@ -277,10 +278,50 @@ /*********************************************************************//** * @brief - * The execHeatersMonitor function turns off the heaters when RO pump is - * not on. - * @details Inputs: none TODO update the doxygen header function - * @details Outputs: none + * The handleTrimmerHeaterCmd handles a start trimmer heater command from the HD. + * It resets the trimmer heater's state and sets the duty cycle of the trimmer heater. + * @details Inputs: none + * @details Outputs: process command and send back response + * @param heaterCmdPtr pointer to heater command data record + * @return status + *************************************************************************/ +void handleTrimmerHeaterCmd( TRIMMER_HEATER_CMD_T *heaterCmdPtr ) +{ + DG_CMD_RESPONSE_T cmdResponse; + + cmdResponse.commandID = DG_CMD_START_TRIMMER_HEATER; + cmdResponse.rejected = TRUE; + cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE; + + if ( TRUE == heaterCmdPtr->startHeater ) + { + if ( ( MINIMUM_TARGET_TEMPERATURE <= heaterCmdPtr->targetTemp ) && ( heaterCmdPtr->targetTemp <= MAXIMUM_TARGET_TEMPERATURE ) ) + { + cmdResponse.rejected = FALSE; + #ifndef DISABLE_HEATERS_AND_TEMPS + trimmerHeaterTargetTemperature = heaterCmdPtr->targetTemp; + hasStartTrimmerHeaterRequested = TRUE; + #endif + } + else + { + cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER; + } + } + else + { + cmdResponse.rejected = FALSE; + stopTrimmerHeater(); + } + + sendCommandResponseMsg( &cmdResponse ); +} + +/*********************************************************************//** + * @brief + * The execHeatersMonitor function turns off the heaters when RO pump is not on. + * @details Inputs: none + * @details Outputs: Turns off the heaters when RO pump is not on * @return none *************************************************************************/ void execHeatersMonitor( void ) @@ -712,9 +753,9 @@ { HEATERS_DATA_T data; - data.mainPrimaryDutyCyclePct = mainPrimaryHeaterDutyCycle * 100; - data.smallPrimaryDutyCyclePct = smallPrimaryHeaterDutyCycle * 100; - data.trimmerDutyCyclePct = trimmerHeaterDutyCycle * 100; + //data.mainPrimaryDutyCyclePct = mainPrimaryHeaterDutyCycle * 100; + //data.smallPrimaryDutyCyclePct = smallPrimaryHeaterDutyCycle * 100; + //data.trimmerDutyCyclePct = trimmerHeaterDutyCycle * 100; broadcastHeatersData( &data );