Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -rfea9457eb78e1c39fa4eb35780d2ac7c43f12ce0 -rbbd5ac2589c8093f681f2284367975ddd220b553 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision fea9457eb78e1c39fa4eb35780d2ac7c43f12ce0) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision bbd5ac2589c8093f681f2284367975ddd220b553) @@ -7,8 +7,8 @@ * * @file Heaters.c * -* @author (last) Sean Nash -* @date (last) 19-Aug-2020 +* @author (last) Quang Nguyen +* @date (last) 14-Sep-2020 * * @author (original) Dara Navaei * @date (original) 23-Apr-2020 @@ -20,6 +20,7 @@ #include "etpwm.h" #include "AlarmMgmt.h" +#include "DGDefs.h" #include "Heaters.h" #include "ROPump.h" #include "PIControllers.h" @@ -64,64 +65,64 @@ #define MINIMUM_TARGET_TEMPERATURE 10U ///< Minimum allowed target temperature for the heaters. #define MAXIMUM_TARGET_TEMPERATURE 90U ///< Maximum allowed target temperature for the heaters. -/// Heaters self test enums +/// Heaters self-test enums typedef enum heaters_self_test_states { - HEATERS_SELF_TEST_START = 0, ///< Heaters self test start state - HEATERS_SELF_TEST_SMALL_PRIMARY_AND_TRIMMER_HEATERS, ///< Heaters self test small primary and trimmer heaters state - HEATERS_SELF_TEST_MAIN_PRIMARY_HEATER, ///< Heaters self test start main primary state - HEATERS_SELF_TEST_COMPLETE, ///< Heaters self test complete state - NUM_OF_HEATERS_SELF_TEST_STATES ///< Number of heaters self test states + HEATERS_SELF_TEST_START = 0, ///< Heaters self-test start state + HEATERS_SELF_TEST_SMALL_PRIMARY_AND_TRIMMER_HEATERS, ///< Heaters self-test small primary and trimmer heaters state + HEATERS_SELF_TEST_MAIN_PRIMARY_HEATER, ///< Heaters self-test start main primary state + HEATERS_SELF_TEST_COMPLETE, ///< Heaters self-test complete state + NUM_OF_HEATERS_SELF_TEST_STATES ///< Number of heaters self-test states } HEATERS_SELF_TEST_STATES_T ; /// Primary heaters exec states typedef enum primary_heaters_exec_states { - PRIMARY_HEATERS_EXEC_STATE_OFF = 0, ///< Primary heaters exec state off - PRIMARY_HEATERS_EXEC_STATE_CONTROL_TO_TARGET, ///< Primary heaters exec state control to target (PI controller state) - NUM_OF_PRIMARY_HEATERS_EXEC_STATES ///< Number of primary heaters exec states + PRIMARY_HEATERS_EXEC_STATE_OFF = 0, ///< Primary heaters exec state off + PRIMARY_HEATERS_EXEC_STATE_CONTROL_TO_TARGET, ///< Primary heaters exec state control to target (PI controller state) + NUM_OF_PRIMARY_HEATERS_EXEC_STATES ///< Number of primary heaters exec states } PRIMARY_HEATERS_EXEC_STATES_T; /// Trimmer heater exec states typedef enum trimmer_heater_exec_states { - TRIMMER_HEATER_EXEC_STATE_OFF = 0, ///< Trimmer heater exec state off - TRIMMER_HEATER_EXEC_STATE_CONTROL_TO_TARGET, ///< Trimmer heater exec state control to target (PI controller state) - NUM_OF_TRIMMER_HEATER_EXEC_STATES ///< Number of trimmer heater exec states + TRIMMER_HEATER_EXEC_STATE_OFF = 0, ///< Trimmer heater exec state off + TRIMMER_HEATER_EXEC_STATE_CONTROL_TO_TARGET, ///< Trimmer heater exec state control to target (PI controller state) + NUM_OF_TRIMMER_HEATER_EXEC_STATES ///< Number of trimmer heater exec states } TRIMMER_HEATER_EXEC_STATES_T; /// Name of the heaters states typedef enum name_of_heaters { - PRIMARY_HEATER = 0, ///< Primary heater - TRIMMER_HEATER, ///< Trimmer heater - NUM_OF_HEATERS ///< Number of heaters + PRIMARY_HEATER = 0, ///< Primary heater + TRIMMER_HEATER, ///< Trimmer heater + NUM_OF_HEATERS ///< Number of heaters } NAME_OF_HEATER_T; // ********** private data ********** -static SELF_TEST_STATUS_T heatersSelfTestResult; ///< Heaters self test results. -static HEATERS_SELF_TEST_STATES_T heatersSelfTestState; ///< Heaters self test state. -static PRIMARY_HEATERS_EXEC_STATES_T primaryHeatersExecState; ///< Primary heaters exec state. -static TRIMMER_HEATER_EXEC_STATES_T trimmerHeaterExecState; ///< Trimmer heater exec state. +static SELF_TEST_STATUS_T heatersSelfTestResult; ///< Heaters self-test results. +static HEATERS_SELF_TEST_STATES_T heatersSelfTestState; ///< Heaters self-test state. +static PRIMARY_HEATERS_EXEC_STATES_T primaryHeatersExecState; ///< Primary heaters exec state. +static TRIMMER_HEATER_EXEC_STATES_T trimmerHeaterExecState; ///< Trimmer heater exec state. -static F32 primaryHeaterTargetTemperature; ///< Primary heaters target temperature. -static F32 trimmerHeaterTargetTemperature; ///< Trimmer heater target temperature. +static F32 primaryHeaterTargetTemperature; ///< Primary heaters target temperature. +static F32 trimmerHeaterTargetTemperature; ///< Trimmer heater target temperature. -static F32 mainPrimaryHeaterDutyCycle; ///< Main primary heater duty cycle. -static F32 smallPrimaryHeaterDutyCycle; ///< Small primary heater duty cycle. -static F32 trimmerHeaterDutyCycle; ///< Trimmer heater duty cycle. -static U32 primaryHeaterTimerCounter; ///< Primary heater timer counter. -static U32 trimmerHeaterTimerCounter; ///< Trimmer heater timer counter. -static U32 dataPublicationTimerCounter; ///< Data publication timer counter. -static BOOL isPrimaryHeaterOn; ///< Flag to show if the primary heater is on. -static BOOL isTrimmerHeaterOn; ///< Flag to show if the trimmer heater is on. +static F32 mainPrimaryHeaterDutyCycle; ///< Main primary heater duty cycle. +static F32 smallPrimaryHeaterDutyCycle; ///< Small primary heater duty cycle. +static F32 trimmerHeaterDutyCycle; ///< Trimmer heater duty cycle. +static U32 primaryHeaterTimerCounter; ///< Primary heater timer counter. +static U32 trimmerHeaterTimerCounter; ///< Trimmer heater timer counter. +static U32 dataPublicationTimerCounter; ///< Data publication timer counter. +static BOOL isPrimaryHeaterOn; ///< Flag to show if the primary heater is on. +static BOOL isTrimmerHeaterOn; ///< Flag to show if the trimmer heater is on. static OVERRIDE_U32_T heatersDataPublishInterval = { HEATERS_DATA_PUBLISH_INTERVAL, - HEATERS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Heaters data publish time interval. -static U32 selfTestElapsedTime; ///< Self test elapsed time variable. -static BOOL hasStartPrimaryHeaterRequested; ///< Start primary heater request flag. -static BOOL hasStartTrimmerHeaterRequested; ///< Start trimmer heater request flag. + HEATERS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Heaters data publish time interval. +static U32 selfTestElapsedTime; ///< Self-test elapsed time variable. +static BOOL hasStartPrimaryHeaterRequested; ///< Start primary heater request flag. +static BOOL hasStartTrimmerHeaterRequested; ///< Start trimmer heater request flag. // ********** private function prototypes ********** @@ -151,9 +152,8 @@ * @brief * The initHeaters function initializes the variables and the PI controllers * for the primary and trimmer heaters. - * @details - * Inputs : none - * Outputs : Heaters module initialized + * @details Inputs: none + * @details Outputs: Heaters module initialized * @return none *************************************************************************/ void initHeaters( void ) @@ -183,9 +183,8 @@ * @brief * The setPrimaryHeaterTargetTemperature function sets the primary heater * target temperature. - * @details - * Inputs : none - * Outputs : primaryHeaterTargetTemperature + * @details Inputs: none + * @details Outputs: primaryHeaterTargetTemperature * @param targetTemp target temperature for the primary heater * @return none *************************************************************************/ @@ -198,9 +197,8 @@ * @brief * The setTrimmerHeaterTargetTemperature function sets the trimmer heater * target temperature. - * @details - * Inputs : none - * Outputs : trimmerHeaterTargetTemperature + * @details Inputs: none + * @details Outputs: trimmerHeaterTargetTemperature * @param targetTemp target temperature for the trimmer heater * @return none *************************************************************************/ @@ -213,9 +211,8 @@ * @brief * The startPrimaryHeater function starts the primary heaters. It resets * the primary heaters state and sets the main primary heater duty cycle. - * @details - * Inputs : primaryHeaterTargetTemperature - * Outputs : hasStartPrimaryHeaterRequested + * @details Inputs: primaryHeaterTargetTemperature + * @details Outputs: hasStartPrimaryHeaterRequested * @return status *************************************************************************/ BOOL startPrimaryHeater( void ) @@ -237,9 +234,8 @@ * @brief * The startTrimmerHeater function starts the trimmer heater. It resets the * trimmer heater's state and sets the duty cycle of the trimmer heater. - * @details - * Inputs : trimmerHeaterTargetTemperature - * Outputs : hasStartTrimmerHeaterRequested + * @details Inputs: trimmerHeaterTargetTemperature + * @details Outputs: hasStartTrimmerHeaterRequested * @return status *************************************************************************/ BOOL startTrimmerHeater( void ) @@ -260,9 +256,8 @@ /*********************************************************************//** * @brief * The stopPrimaryHeater function stops the primary heater. - * @details - * Inputs : none - * Outputs : Primary heater stops + * @details Inputs: none + * @details Outputs: Primary heater stops * @return none *************************************************************************/ void stopPrimaryHeater( void ) @@ -277,9 +272,8 @@ /*********************************************************************//** * @brief * The stopTrimmerHeater function stops the trimmer heater. - * @details - * Inputs : none - * Outputs : Trimmer heater stops + * @details Inputs: none + * @details Outputs: Trimmer heater stops * @return none *************************************************************************/ void stopTrimmerHeater( void ) @@ -291,10 +285,50 @@ /*********************************************************************//** * @brief + * 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 - * Outputs : 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 ) @@ -313,10 +347,9 @@ /*********************************************************************//** * @brief - * The execHeatersSelfTest function executes the heaters' self test state machine. - * @details - * Inputs : heatersSelfTestState - * Outputs : heatersSelfTestState + * The execHeatersSelfTest function executes the heaters' self-test state machine. + * @details Inputs: heatersSelfTestState + * @details Outputs: heatersSelfTestState * @return heatersSelfTestState *************************************************************************/ SELF_TEST_STATUS_T execHeatersSelfTest( void ) @@ -351,9 +384,8 @@ /*********************************************************************//** * @brief * The execPrimaryHeaters function executes the primary heaters' state machine. - * @details - * Inputs : primaryHeatersExecState - * Outputs : primaryHeatersExecState + * @details Inputs: primaryHeatersExecState + * @details Outputs: primaryHeatersExecState * @return none *************************************************************************/ void execPrimaryHeaters( void ) @@ -378,9 +410,8 @@ /*********************************************************************//** * @brief * The execTrimmerHeater function executes the trimmer heater's state machine. - * @details - * Inputs : trimmerHeaterExecState - * Outputs : trimmerHeaterExecState + * @details Inputs: trimmerHeaterExecState + * @details Outputs: trimmerHeaterExecState * @return none *************************************************************************/ void execTrimmerHeater( void ) @@ -405,10 +436,9 @@ /*********************************************************************//** * @brief * The handleHeatersSelfTestStart function starts the small primary and - * the trimmer heaters for self test. - * @details - * Inputs : heatersSelfTestResult, selfTestElapsedTime - * Outputs : heatersSelfTestResult, selfTestElapsedTime + * the trimmer heaters for self-test. + * @details Inputs: heatersSelfTestResult, selfTestElapsedTime + * @details Outputs: heatersSelfTestResult, selfTestElapsedTime * @return state (HEATERS_SELF_TEST_STATES_T) *************************************************************************/ static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestStart( void ) @@ -435,9 +465,8 @@ * elapsed, it checks the thermocouple temperature shared among the two * heaters. If they are in range, it sets the main primary heater and transitions * to the next state. If it fails, it sets an alarm and fails the test. - * @details - * Inputs : heatersSelfTestResult, selfTestElapsedTime - * Outputs : heatersSelfTestResult, selfTestElapsedTime + * @details Inputs: heatersSelfTestResult, selfTestElapsedTime + * @details Outputs: heatersSelfTestResult, selfTestElapsedTime * @return state (HEATERS_SELF_TEST_STATES_T) *************************************************************************/ static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestSmallPrimaryAndTrimmerHeaters( void ) @@ -475,9 +504,8 @@ * on the main primary heater has elapsed. When the time has elapsed, it * checks to ensure the thermocouple temperature is within the tolerance * of the target temperature. It then transitions to the complete state. - * @details - * Inputs : heatersSelfTestResult - * Outputs : heatersSelfTestResult + * @details Inputs: heatersSelfTestResult + * @details Outputs: heatersSelfTestResult * @return state (HEATERS_SELF_TEST_STATES_T) *************************************************************************/ static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestMainPrimaryHeater( void ) @@ -511,9 +539,8 @@ * @brief * The handlePrimaryHeaterStateOff function handles the primary heaters at * off state. - * @details - * Inputs : hasStartPrimaryHeaterRequested, isPrimaryHeaterOn - * Outputs : state (PRIMARY_HEATERS_EXEC_STATES_T), isPrimaryHeaterOn + * @details Inputs: hasStartPrimaryHeaterRequested, isPrimaryHeaterOn + * @details Outputs: state (PRIMARY_HEATERS_EXEC_STATES_T), isPrimaryHeaterOn * @return state (PRIMARY_HEATERS_EXEC_STATES_T) *************************************************************************/ static PRIMARY_HEATERS_EXEC_STATES_T handlePrimaryHeaterStateOff( void ) @@ -558,10 +585,9 @@ * @brief * The handlePrimaryHeaterStateControlToTarget function handles the primary * heaters at control state when the heaters are active. - * @details - * Inputs : primaryHeaterTimerCounter, mainPrimaryHeaterDutyCycle, + * @details Inputs: primaryHeaterTimerCounter, mainPrimaryHeaterDutyCycle, * smallPrimaryHeaterDutyCycle, isPrimaryHeaterOn - * Outputs : primaryHeaterTimerCounter, mainPrimaryHeaterDutyCycle, + * @details Outputs: primaryHeaterTimerCounter, mainPrimaryHeaterDutyCycle, * smallPrimaryHeaterDutyCycle * @return state (PRIMARY_HEATERS_EXEC_STATES_T) *************************************************************************/ @@ -625,9 +651,8 @@ * @brief * The handleTrimmerHeaterStateOff function handles the trimmer heater at * off state. - * @details - * Inputs : hasStartTrimmerHeaterRequested, isTrimmerHeaterOn - * Outputs : state (TRIMMER_HEATER_EXEC_STATES_T), isTrimmerHeaterOn + * @details Inputs: hasStartTrimmerHeaterRequested, isTrimmerHeaterOn + * @details Outputs: state (TRIMMER_HEATER_EXEC_STATES_T), isTrimmerHeaterOn * @return state (TRIMMER_HEATER_EXEC_STATES_T) *************************************************************************/ static TRIMMER_HEATER_EXEC_STATES_T handleTrimmerHeaterStateOff( void ) @@ -638,10 +663,10 @@ #ifdef DEBUG_ENABLED #ifdef ENABLE_DIP_SWITCHES #ifndef EMC_TEST_BUILD - if ( TOGGLEPRIMAYHEATER() ) - { - setTrimmerHeaterTargetTemperature( 38 ); - startTrimmerHeater(); +// if ( TOGGLEPRIMAYHEATER() ) +// { + //setTrimmerHeaterTargetTemperature( 38 ); + //startTrimmerHeater(); //F32 pumpPWM = 1; //etpwmSetCmpB( etpwmREG2, (U32)( (S32)( ( pumpPWM * (F32)(etpwmREG2->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) ); //temporaryStartROPump(); @@ -651,7 +676,7 @@ //etpwmSetCmpB( etpwmREG6, (U32)( (S32)( ( fanPWM * (F32)(etpwmREG6->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) ); //temporaryStartROPump(); //temporaryStartFan(); - } +// } #endif #endif #endif @@ -675,9 +700,8 @@ * @brief * The handleTrimmerHeaterControlToTarget function handles the trimmer * heater at control state when the heater is active. - * @details - * Inputs : trimmerHeaterTimerCounter, trimmerHeaterDutyCycle - * Outputs : trimmerHeaterTimerCounter, trimmerHeaterDutyCycle, isTrimmerHeaterOn + * @details Inputs: trimmerHeaterTimerCounter, trimmerHeaterDutyCycle + * @details Outputs: trimmerHeaterTimerCounter, trimmerHeaterDutyCycle, isTrimmerHeaterOn * @return state (TRIMMER_HEATER_EXEC_STATES_T) *************************************************************************/ static TRIMMER_HEATER_EXEC_STATES_T handleTrimmerHeaterControlToTarget( void ) @@ -686,7 +710,7 @@ if ( ++trimmerHeaterTimerCounter >= CONTROLLER_CHECK_INTERVAL_COUNT ) { - F32 outletTemp = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANCY ); + F32 outletTemp = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT ); trimmerHeaterDutyCycle = runPIController( PI_CONTROLLER_ID_TRIMMER_HEATER, trimmerHeaterTargetTemperature, outletTemp ); setTrimmerHeaterPWM( trimmerHeaterDutyCycle ); trimmerHeaterTimerCounter = 0; @@ -698,9 +722,9 @@ #ifdef DEBUG_ENABLED #ifdef ENABLE_DIP_SWITCHES #ifndef EMC_TEST_BUILD - if ( !TOGGLEPRIMAYHEATER() ) - { - stopTrimmerHeater(); +// if ( !TOGGLEPRIMAYHEATER() ) +// { + //stopTrimmerHeater(); //F32 pumpPWM = 0; //etpwmSetCmpB( etpwmREG2, (U32)( (S32)( ( pumpPWM * (F32)(etpwmREG2->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) ); //temporaryStartROPump(); @@ -710,7 +734,7 @@ //etpwmSetCmpB( etpwmREG6, (U32)( (S32)( ( fanPWM * (F32)(etpwmREG6->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) ); //temporaryStopROPump(); //temporaryStopFan(); - } +// } #endif #endif #endif @@ -727,9 +751,8 @@ /*********************************************************************//** * @brief * The setMainPrimaryHeaterPWM function sets the PWM of the main primary heater. - * @details - * Inputs : none - * Outputs : Sets the PWM duty cycle for the main primary heater + * @details Inputs: none + * @details Outputs: Sets the PWM duty cycle for the main primary heater * @param pwm PWM duty cycle to set for 1st primary heater element * @return none *************************************************************************/ @@ -741,9 +764,8 @@ /*********************************************************************//** * @brief * The setSmallPrimaryHeaterPWM function sets the PWM of the small primary heater. - * @details - * Inputs : none - * Outputs : Sets the PWM duty cycle for the small primary heater + * @details Inputs: none + * @details Outputs: Sets the PWM duty cycle for the small primary heater * @param pwm PWM duty cycle to set for 2nd primary heater element * @return none *************************************************************************/ @@ -755,9 +777,8 @@ /*********************************************************************//** * @brief * The setTrimmerHeaterPWM function sets the PWM of the trimmer heater. - * @details - * Inputs : none - * Outputs : Sets the PWM duty cycle for the trimmer heater + * @details Inputs: none + * @details Outputs: Sets the PWM duty cycle for the trimmer heater * @param pwm PWM duty cycle to set for trimmer heater * @return none *************************************************************************/ @@ -769,9 +790,8 @@ /*********************************************************************//** * @brief * The resetHeaterState function resets the PI controller of the selected heater. - * @details - * Inputs : mainPrimaryHeaterDutyCycle, trimmerHeaterDutyCycle - * Outputs : mainPrimaryHeaterDutyCycle, trimmerHeaterDutyCycle + * @details Inputs: mainPrimaryHeaterDutyCycle, trimmerHeaterDutyCycle + * @details Outputs: mainPrimaryHeaterDutyCycle, trimmerHeaterDutyCycle * @param heater enumeration of the heater for which the PI controller will be reset * @return none *************************************************************************/ @@ -792,9 +812,8 @@ /*********************************************************************//** * @brief * The getPublishHeatersDataInterval function gets the publish interval. - * @details - * Inputs : heatersDataPublishInterval - * Outputs : none + * @details Inputs: heatersDataPublishInterval + * @details Outputs: none * @return result *************************************************************************/ U32 getPublishHeatersDataInterval( void ) @@ -813,35 +832,16 @@ * @brief * The publishTemperatureData function publishes the temperature sensors * data into the USB debug port at the defined time interval. - * @details - * Inputs : dataPublicationTimerCounter - * Outputs : Broadcast temperature sensors' data + * @details Inputs: dataPublicationTimerCounter + * @details Outputs: Broadcast temperature sensors' data * @return none *************************************************************************/ static void publishHeatersData( void ) { if ( ++dataPublicationTimerCounter >= getPublishHeatersDataInterval() ) { broadcastHeatersData( (U32)(mainPrimaryHeaterDutyCycle*100), (U32)(smallPrimaryHeaterDutyCycle*100), (U32)(trimmerHeaterDutyCycle*100) ); - //NOTE: This section will be removed -#ifdef DEBUG_ENABLED -#ifdef HEATERS_DEBUG - { - 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 ), - 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) ); - } -#endif -#endif dataPublicationTimerCounter = 0; } } @@ -856,9 +856,8 @@ * @brief * The testSetHeatersPublishIntervalOverride function overrides the heaters * publish data time interval. - * @details - * Inputs : heatersDataPublishInterval - * Outputs : heatersDataPublishInterval + * @details Inputs: heatersDataPublishInterval + * @details Outputs: heatersDataPublishInterval * @return result *************************************************************************/ BOOL testSetHeatersPublishIntervalOverride( U32 value ) @@ -881,9 +880,8 @@ * @brief * The testResetHeatersPublishIntervalOverride function resets the heaters * publish time interval to its previous time interval. - * @details - * Inputs : heatersDataPublishInterval - * Outputs : heatersDataPublishInterval + * @details Inputs: heatersDataPublishInterval + * @details Outputs: heatersDataPublishInterval * @return result *************************************************************************/ BOOL testResetHeatersPublishIntervalOverride( void )