Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -rf308cc4c35eab630ebbbde405cfe47d049afeafb --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision a7bf3ca23ea37a61000379facae628a31b3ecc59) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision f308cc4c35eab630ebbbde405cfe47d049afeafb) @@ -7,14 +7,16 @@ * * @file Heaters.c * -* @author (last) Sean Nash -* @date (last) 06-Jul-2020 +* @author (last) Quang Nguyen +* @date (last) 31-Jul-2020 * * @author (original) Dara Navaei * @date (original) 23-Apr-2020 * ***************************************************************************/ +#include + #include "etpwm.h" #include "AlarmMgmt.h" @@ -191,7 +193,7 @@ * @details * Inputs : none * Outputs : primaryHeaterTargetTemperature - * @param targetTemp + * @param targetTemp target temperature for the primary heater * @return none *************************************************************************/ void setPrimaryHeaterTargetTemperature ( F32 targetTemp ) @@ -206,7 +208,7 @@ * @details * Inputs : trimmerHeaterTargetTemperature * Outputs : none - * @param targetTemp : targetTemp + * @param targetTemp target temperature for the trimmer heater * @return none *************************************************************************/ void setTrimmerHeaterTargetTemperature ( F32 targetTemp ) @@ -222,7 +224,6 @@ * Inputs : mainPrimaryHeaterDutyCycle, primaryHeaterTargetTemperature, * hasStartPrimaryHeaterRequested * Outputs : hasStartPrimaryHeaterRequested - * @param none * @return status *************************************************************************/ BOOL startPrimaryHeater ( void ) @@ -249,7 +250,6 @@ * Inputs : trimmerHeaterDutyCycle, trimmerHeaterTargetTemperature, * trimmerHeaterTargetTemperature * Outputs : trimmerHeaterTargetTemperature - * @param none * @return status *************************************************************************/ BOOL startTrimmerHeater ( void ) @@ -274,7 +274,6 @@ * @details * Inputs : isPrimaryHeaterOn * Outputs : isPrimaryHeaterOn - * @param none * @return none *************************************************************************/ void stopPrimaryHeater ( void ) @@ -292,7 +291,6 @@ * @details * Inputs : isTrimmerHeaterOn * Outputs : isTrimmerHeaterOn - * @param none * @return none *************************************************************************/ void stopTrimmerHeater ( void ) @@ -330,7 +328,6 @@ * @details * Inputs : heatersSelfTestState * Outputs : none - * @param none * @return heatersSelfTestState *************************************************************************/ SELF_TEST_STATUS_T execHeatersSelfTest ( void ) @@ -354,7 +351,7 @@ break; default: - SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_SELF_TEST_INVALID_STATE, + SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_SELF_TEST_INVALID_STATE, heatersSelfTestState ); heatersSelfTestState = HEATERS_SELF_TEST_COMPLETE; break; @@ -369,7 +366,6 @@ * @details * Inputs : primaryHeatersExecState * Outputs : primaryHeatersExecState - * @param none * @return none *************************************************************************/ void execPrimaryHeaters ( void ) @@ -385,7 +381,7 @@ break; default: - SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_PRIMARY_HEATER_EXEC_INVALID_STATE, + SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_PRIMARY_HEATER_EXEC_INVALID_STATE, primaryHeatersExecState ); primaryHeatersExecState = PRIMARY_HEATERS_EXEC_STATE_CONTROL_TO_TARGET; break; @@ -398,7 +394,6 @@ * @details * Inputs : trimmerHeaterExecState * Outputs : trimmerHeaterExecState - * @param none * @return none *************************************************************************/ void execTrimmerHeater ( void ) @@ -414,7 +409,7 @@ break; default: - SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_TRIMMER_HEATER_EXEC_INVALID_STATE, + SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_TRIMMER_HEATER_EXEC_INVALID_STATE, trimmerHeaterExecState ); trimmerHeaterExecState = TRIMMER_HEATER_EXEC_STATE_CONTROL_TO_TARGET; break; @@ -430,7 +425,6 @@ * @details * Inputs : heatersSelfTestResult, selfTestElapsedTime * Outputs : heatersSelfTestResult, selfTestElapsedTime - * @param none * @return state (HEATERS_SELF_TEST_STATES_T) *************************************************************************/ static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestStart ( void ) @@ -461,7 +455,6 @@ * @details * Inputs : heatersSelfTestResult, selfTestElapsedTime * Outputs : heatersSelfTestResult, selfTestElapsedTime - * @param none * @return state (HEATERS_SELF_TEST_STATES_T) *************************************************************************/ static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestSmallPrimaryAndTrimmerHeaters ( void ) @@ -473,7 +466,7 @@ setSmallPrimaryHeaterPWM ( 0 ); setTrimmerHeaterPWM ( 0 ); - F32 convertedTemperature = getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP ); + F32 convertedTemperature = getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL ); if ( fabs(convertedTemperature - SMALL_PRIMARY_AND_TRIMMER_HEATERS_POST_TARGET_TEMPERATURE) > HEATERS_POST_TEMPERATURE_TOLERANCE ) { @@ -502,7 +495,6 @@ * @details * Inputs : heatersSelfTestResult * Outputs : heatersSelfTestResult - * @param none * @return state (HEATERS_SELF_TEST_STATES_T) *************************************************************************/ static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestMainPrimaryHeater ( void ) @@ -513,7 +505,7 @@ { setMainPrimaryHeaterPWM ( 0 ); - F32 convertedTemperature = getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP ); + F32 convertedTemperature = getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL ); if ( fabs(convertedTemperature - MAIN_PRIMARY_HEATER_POST_TARGET_TEMPERATURE ) > HEATERS_POST_TEMPERATURE_TOLERANCE ) { @@ -539,7 +531,6 @@ * @details * Inputs : hasStartPrimaryHeaterRequested, isPrimaryHeaterOn * Outputs : state (PRIMARY_HEATERS_EXEC_STATES_T), isPrimaryHeaterOn - * @param none * @return state (PRIMARY_HEATERS_EXEC_STATES_T) *************************************************************************/ static PRIMARY_HEATERS_EXEC_STATES_T handlePrimaryHeaterStateOff ( void ) @@ -589,7 +580,6 @@ * smallPrimaryHeaterDutyCycle, isPrimaryHeaterOn * Outputs : primaryHeaterTimerCounter, mainPrimaryHeaterDutyCycle, * smallPrimaryHeaterDutyCycle - * @param none * @return state (PRIMARY_HEATERS_EXEC_STATES_T) *************************************************************************/ static PRIMARY_HEATERS_EXEC_STATES_T handlePrimaryHeaterStateControlToTarget ( void ) @@ -598,7 +588,7 @@ if ( ++primaryHeaterTimerCounter >= CONTROLLER_CHECK_INTERVAL_COUNT ) { - F32 outletTemp = getTemperatureValue ( TEMPSENSORS_OUTLET_PRIMARY_HEATER_TEMP_SENSOR ); + F32 outletTemp = getTemperatureValue ( TEMPSENSORS_OUTLET_PRIMARY_HEATER ); mainPrimaryHeaterDutyCycle = runPIController ( PI_CONTROLLER_ID_PRIMARY_HEATER, primaryHeaterTargetTemperature, outletTemp ); @@ -656,7 +646,6 @@ * @details * Inputs : hasStartTrimmerHeaterRequested, isTrimmerHeaterOn * Outputs : state (TRIMMER_HEATER_EXEC_STATES_T), isTrimmerHeaterOn - * @param none * @return state (TRIMMER_HEATER_EXEC_STATES_T) *************************************************************************/ static TRIMMER_HEATER_EXEC_STATES_T handleTrimmerHeaterStateOff ( void ) @@ -708,7 +697,6 @@ * Inputs : trimmerHeaterTimerCounter, trimmerHeaterDutyCycle * Outputs : trimmerHeaterTimerCounter, trimmerHeaterDutyCycle, * isTrimmerHeaterOn - * @param none * @return state (TRIMMER_HEATER_EXEC_STATES_T) *************************************************************************/ static TRIMMER_HEATER_EXEC_STATES_T handleTrimmerHeaterControlToTarget ( void ) @@ -717,7 +705,7 @@ if ( ++trimmerHeaterTimerCounter >= CONTROLLER_CHECK_INTERVAL_COUNT ) { - F32 outletTemp = getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR ); + F32 outletTemp = getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY ); trimmerHeaterDutyCycle = runPIController ( PI_CONTROLLER_ID_TRIMMER_HEATER, trimmerHeaterTargetTemperature, outletTemp ); setTrimmerHeaterPWM ( trimmerHeaterDutyCycle ); @@ -763,7 +751,7 @@ * @details * Inputs : none * Outputs : none - * @param : pwm : To set the PWM + * @param : pwm PWM duty cycle to set for 1st primary heater element * @return none *************************************************************************/ static void setMainPrimaryHeaterPWM ( F32 pwm ) @@ -778,7 +766,7 @@ * @details * Inputs : none * Outputs : none - * @param: pwm : To set the PWM + * @param: pwm : PWM duty cycle to set for 2nd primary heater element * @return none *************************************************************************/ static void setSmallPrimaryHeaterPWM ( F32 pwm ) @@ -792,7 +780,7 @@ * @details * Inputs : none * Outputs : none - * @param : pwm : To set the PWM + * @param : pwm : PWM duty cycle to set for trimmer heater * @return none *************************************************************************/ static void setTrimmerHeaterPWM ( F32 pwm ) @@ -807,7 +795,7 @@ * @details * Inputs : mainPrimaryHeaterDutyCycle, trimmerHeaterDutyCycle * Outputs : mainPrimaryHeaterDutyCycle, trimmerHeaterDutyCycle - * @param : heater (NAME_OF_HEATER) : Name of the heater to reset + * @param : heater : Enumeration of the heater for which the PI controller will be reset * @return none *************************************************************************/ static void resetHeaterState ( NAME_OF_HEATER_T heater ) @@ -831,7 +819,6 @@ * @details * Inputs : heatersDataPublishInterval * Outputs : none - * @param : none * @return result *************************************************************************/ U32 getPublishHeatersDataInterval ( void ) @@ -853,7 +840,6 @@ * @details * Inputs : dataPublicationTimerCounter * Outputs : dataPublicationTimerCounter - * @param none * @return none *************************************************************************/ static void publishHeatersData ( void ) @@ -869,15 +855,14 @@ { char debugTempStr[ 256 ]; sprintf( debugTempStr, "TPo: %6.2f, PriCJ: %6.2f, PriTC: %6.2f, TpriInt: %6.2f, TRo: %6.2f, TriCJ: %6.2f, TriTC: %6.2f, TtriInt: %6.2f\r\n", - getTemperatureValue ( TEMPSENSORS_OUTLET_PRIMARY_HEATER_TEMP_SENSOR ), - getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION_TEMP_SENSOR ), - getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE_TEMP_SENSOR ), - getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL_TEMP ), - getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY_TEMP_SENSOR ), - getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION_TEMP_SENSOR ), - getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE_TEMP_SENSOR ), - getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL_TEMP ) - ); + getTemperatureValue ( TEMPSENSORS_OUTLET_PRIMARY_HEATER ), + getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_COLD_JUNCTION ), + getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE ), + getTemperatureValue ( TEMPSENSORS_PRIMARY_HEATER_INTERNAL ), + getTemperatureValue ( TEMPSENSORS_OUTLET_REDUNDANCY ), + getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_COLD_JUNCTION ), + getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_THERMO_COUPLE ), + getTemperatureValue ( TEMPSENSORS_TRIMMER_HEATER_INTERNAL ) ); sendDebugData ( (U08*)debugTempStr, strlen(debugTempStr) ); } @@ -898,7 +883,6 @@ * @details * Inputs : heatersDataPublishInterval * Outputs : heatersDataPublishInterval - * @param value * @return result *************************************************************************/ BOOL testSetHeatersPublishIntervalOverride ( U32 value ) @@ -924,7 +908,6 @@ * @details * Inputs : heatersDataPublishInterval * Outputs : heatersDataPublishInterval - * @param none * @return result *************************************************************************/ BOOL testResetHeatersPublishIntervalOverride ( void )