Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -r3a87ca0e2a722318216623d7e1f4c354c58c506c -re3699de422fa3ba1b8145c4cc44257702c9e336f --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 3a87ca0e2a722318216623d7e1f4c354c58c506c) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision e3699de422fa3ba1b8145c4cc44257702c9e336f) @@ -225,7 +225,7 @@ concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].isConcPumpParkInProgress = FALSE; } - // Don't monitor persistence for cp speed alarms if we parked. + // Don't monitor persistence for cp speed alarms if we are parked. if ( TRUE == acidConcentratePumpParkPersistenceClear ) { // Clear flag and resume persistence checking once park bit is set. @@ -273,7 +273,7 @@ { CONCENTRATE_PUMPS_T pumpId; - for ( pumpId = CONCENTRATEPUMPS_CP1_ACID; pumpId < NUM_OF_CONCENTRATE_PUMPS; pumpId++ ) + for ( pumpId = CONCENTRATEPUMPS_FIRST; pumpId < NUM_OF_CONCENTRATE_PUMPS; pumpId++ ) { switch ( concentratePumps[ pumpId ].execState ) { @@ -304,7 +304,7 @@ * @brief * The execConcenratePumpsSelfTest function executes the concentrate pumps * self-test. - * @details \b Inputs: none + * @details \b Inputs: calibration * @details \b Outputs: none * @return ConcentratepumpSelfTestResult (SELF_TEST_STATUS_T) *************************************************************************/ @@ -332,7 +332,8 @@ * The requestConcentratePumpOn function requests the module to turn on * the concentrate pumps. * @details \b Inputs: none - * @details \b Outputs: set flag isPumpOnRequested to TRUE + * @details \b Outputs: concentratePumps[],acidConcentratePumpParkPersistenceClear, + * bicarbConcentratePumpParkPersistenceClear * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT when invalid pump ID is seen. * @param pumpId concentrate pump id * @return none @@ -356,7 +357,7 @@ * The handleConcentratePumpParkRequest function accepts/rejects the park * concentrate pumps request. * @details \b Inputs: Pump state and DD operating mode - * @details \b Outputs: command response set to true if able to perform parking pump. + * @details \b Outputs: concentratePumps[] * @return result as true if park is accomplished. *************************************************************************/ BOOL handleConcentratePumpParkRequest( void ) @@ -383,7 +384,7 @@ * @brief * The isConcPumpParkInProgress function requests whether the concentrate * pump park is in progress or not. - * @details \b Inputs: concentratePumps + * @details \b Inputs: concentratePumps[] * @details \b Outputs: none * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT when invalid pump ID is seen. * @param pumpId concentrate pump id @@ -410,9 +411,9 @@ * The requestConcentratePumpOff function requests the module to turn off * the concentrate pumps. * @details \b Inputs: none - * @details \b Outputs: set flag isPumpOffRequested to TRUE + * @details \b Outputs: concentratePumps[] * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT when invalid pump ID is seen. - * @param pumpId concentrate pump id + * @param pumpId ID of concentrate pump * @param park TRUE if pump should be parked, FALSE if not * @return none *************************************************************************/ @@ -435,7 +436,7 @@ * The setConcentratePumpTargetSpeed function sets the target step speed based on * given speed in mL/min to specified concentrate pump. * @details \b Inputs: none - * @details \b Outputs: set target step speed for given pump + * @details \b Outputs: concentratePumps[] * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT when invalid pump ID is seen. * @param pumpId pump id to set step speed * @param targetSpeed_ml_min target speed in mL/min @@ -483,13 +484,13 @@ /*********************************************************************//** * @brief - * The getConcentratePumpTargetFlowMLPM function returns the concentrate pump's - * flow rate in mL/min. + * The getConcentratePumpTargetFlowMLPM function returns the target flow rate + * for a given concentrate pump. * @details \b Inputs: concentratePumps * @details \b Outputs: none * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT when invalid pump ID is seen. * @param pumpId concentrate pump id to get its target flow - * @return the current concentrate pump flow rate (in mL/min). + * @return the current target flow rate (in mL/min) for the given conecntrate pump. *************************************************************************/ F32 getConcentratePumpTargetFlowMLPM( CONCENTRATE_PUMPS_T pumpId ) { @@ -509,12 +510,13 @@ /*********************************************************************//** * @brief - * The getPumpTargetSpeed function gets the concentrate pump target spped. + * The getPumpTargetSpeed function gets the current target spped for the given + * concentrate pump. * @details \b Inputs: pumpTargetSpeed * @details \b Outputs: none * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT when invalid pump ID is seen. - * @param pumpId concentrate pump id to get the target speed - * @return the current concentrate pump target speed. + * @param pumpId concentrate pump id to get the current target speed + * @return the current target spped for the given concentrate pump. *************************************************************************/ F32 getPumpTargetSpeed( CONCENTRATE_PUMPS_T pumpId ) { @@ -534,12 +536,14 @@ /*********************************************************************//** * @brief - * The getMeasuredPumpSpeedMLPM function gets the measured concentrate pump flow rate. + * The getMeasuredPumpSpeedMLPM function gets the measured flow rate + * for a given concentrate pump. * @details \b Inputs: measuredPumpSpeed * @details \b Outputs: none * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT when invalid pump ID is seen. * @param pumpId concentrate pump id to increase current step speed - * @return the current concentrate pump flow rate (in mL/min). + * @return the current measured flow rate (in mL/min) for the given concentrate + * pump. *************************************************************************/ F32 getMeasuredPumpSpeedMLPM( CONCENTRATE_PUMPS_T pumpId ) { @@ -566,7 +570,8 @@ * @details \b Outputs: none * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT when invalid pump ID is seen. * @param pumpId concentrate pump id to get park request state for - * @return the current concentrate pump park request. + * @return TRUE if a park request is pending for the given concentrate pump, + * FALSE if not *************************************************************************/ BOOL getConcPumpParkRequest( CONCENTRATE_PUMPS_T pumpId ) { @@ -592,7 +597,7 @@ * @details \b Outputs: none * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT when invalid pump ID is seen. * @param pumpId concentrate pump id to get parked state for - * @return the current concentrate pump parked state. + * @return TRUE if the given concentrate pump is currently parked, FALSE if not. *************************************************************************/ BOOL getConcPumpIsParked( CONCENTRATE_PUMPS_T pumpId ) { @@ -618,7 +623,7 @@ * @details \b Outputs: none * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT when invalid pump ID is seen. * @param pumpId concentrate pump id to get park faulted state for - * @return the current concentrate pump park faulted state. + * @return TRUE if the given concentrate pump has failed a park command.. *************************************************************************/ BOOL getConcPumpParkIsFaulted( CONCENTRATE_PUMPS_T pumpId ) { @@ -638,11 +643,11 @@ /*********************************************************************//** * @brief - * The stopConcentratePump function sets the concentrate pump step speed + * The stopConcentratePump function sets the given concentrate pump step speed * to zero and turns off concentrate pump. Also parks the pump if requested. * @details \b Inputs: none * @details \b Outputs: concentratePumps - * @param pumpId concentrate pump id + * @param pumpId ID of the concentrate pump * @return none *************************************************************************/ static void stopConcentratePump( CONCENTRATE_PUMPS_T pumpId ) @@ -681,11 +686,11 @@ /*********************************************************************//** * @brief - * The handleConcentratePumpOffState function turns on concentrate pumps and - * switch to on state upon request. + * The handleConcentratePumpOffState function turns on a given concentrate + * pumps and switch to on state upon request. * @details \b Inputs: none - * @details \b Outputs: concentrate pumps turn on - * @param pumpId concentrate pump id + * @details \b Outputs: pump turned on + * @param pumpId ID of the concentrate pump * @return state *************************************************************************/ static CONCENTRATE_PUMP_STATE_T handleConcentratePumpOffState( CONCENTRATE_PUMPS_T pumpId ) @@ -721,11 +726,11 @@ /*********************************************************************//** * @brief * The handleConcentratePumpRampToTargetSpeedState function executes the - * concentrate pump ramp up to target speed state. Once the speed is close + * given concentrate pump ramp up to target speed state. Once the speed is close * to target the state is transitioned to control target state. * @details \b Inputs: none * @details \b Outputs: none - * @param pumpId concentrate pump id + * @param pumpId ID of the concentrate pump to ramp. * @return next state of the state machine *************************************************************************/ static CONCENTRATE_PUMP_STATE_T handleConcentratePumpRampToTargetSpeedState( CONCENTRATE_PUMPS_T pumpId ) @@ -748,12 +753,12 @@ /*********************************************************************//** * @brief - * The handleConcentratePumpControlTargetSpeedState function turns off concentrate - * pumps switch to off state upon request. While in on state, the function - * controls concentrate pumps to a target step speed. + * The handleConcentratePumpControlTargetSpeedState function turns off given + * concentrate pumps switch to off state upon request. While in on state, + * the function controls concentrate pumps to a target step speed. * @details \b Inputs: currentPumpSpeed[] - * @details \b Outputs: control concentrate pumps to target step speed - * @param pumpId concentrate pump id + * @details \b Outputs: control given concentrate pumps to target step speed + * @param pumpId ID of the concentrate pump * @return state *************************************************************************/ static CONCENTRATE_PUMP_STATE_T handleConcentratePumpControlTargetSpeedState( CONCENTRATE_PUMPS_T pumpId ) @@ -787,7 +792,7 @@ /*********************************************************************//** * @brief * The stepConcentratePumpToTargetSpeed function steps current step speed - * toward target speed with predefined step increase. + * toward target speed for the given concentrate pump,with predefined step increase. * @details \b Inputs: none * @details \b Outputs: currentPumpSpeed[] * @param pumpId concentrate pump id to increase current step speed @@ -820,7 +825,7 @@ concentratePumps[ pumpId ].currentPumpSpeed += speedIncrease; // If the pump's target speed is set to be 0, do not ramp down set it to zero immediately - if ( fabs( getPumpTargetSpeed( pumpId ) < NEARLY_ZERO ) ) + if ( getPumpTargetSpeed( pumpId ) < NEARLY_ZERO ) { concentratePumps[ pumpId ].currentPumpSpeed = 0.0F; } @@ -858,7 +863,7 @@ * The calcMeasuredPumpsSpeed function iterates through the concentrate * pumps and calculates the concentrate pump flow. It also checks that * the hall sensor pulse width count for the concentrate pump is valid. - * @details \b Inputs: none + * @details \b Inputs: Hall sensor reading from FPGA * @details \b Outputs: measuredPumpSpeed * @details \b Alarms: ALARM_ID_DD_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE when * hall sensor pulse width is out of range. @@ -923,11 +928,15 @@ /*********************************************************************//** * @brief - * The monitorPumpSpeed function monitors the concentrate pumps speed and + * The monitorPumpSpeed function monitors the given concentrate pumps speed and * triggers the alarms if they are out of range. * @details \b Inputs: concentratePumps * @details \b Outputs: none - * @param pumpId pump id to set step speed + * @details \b Alarm: ALARM_ID_DD_CP1_SPEED_CONTROL_ERROR when the speed difference + * between requested and measured is not in range. + * @details \b Alarm: ALARM_ID_DD_CP2_SPEED_CONTROL_ERROR when the speed difference + * between requested and measured is not in range. + * @param pumpId pump id to check the difference between requested and measured speed * @param alarm which the corresponding alarm of the concentrate pump * @return none *************************************************************************/ @@ -954,7 +963,7 @@ /*********************************************************************//** * @brief * The checkConcentratePumpControlSet function monitors the status of the - * concentrate pumps control set bit and if they are different from the + * given concentrate pumps control set bit and if they are different from the * required set bit, they are set again. * @details \b Inputs: concentratePumps * @details \b Outputs: none @@ -998,7 +1007,7 @@ * at the set interval. * @details \b Inputs: concentratePumpMonitorTimerCounter * @details \b Outputs: concentratePumpMonitorTimerCounter - * @details \b Messages: MSG_ID_DD_CONCENTRATE_PUMP_DATA to publish concentrate pump states. + * @details \b Message \Sent: MSG_ID_DD_CONCENTRATE_PUMP_DATA to publish concentrate pump states. * @return none *************************************************************************/ static void publishConcentratePumpData( void ) Index: firmware/App/Controllers/ConcentratePumps.h =================================================================== diff -u -r3a87ca0e2a722318216623d7e1f4c354c58c506c -re3699de422fa3ba1b8145c4cc44257702c9e336f --- firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 3a87ca0e2a722318216623d7e1f4c354c58c506c) +++ firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision e3699de422fa3ba1b8145c4cc44257702c9e336f) @@ -39,7 +39,6 @@ /// Enumeration of concentrate pumps. typedef enum ConcentratePumps { - CONCENTRATEPUMPS_CP1_ACID = 0, ///< Acid concentrate pump CONCENTRATEPUMPS_FIRST = CONCENTRATEPUMPS_CP1_ACID, ///< First concentrate pump in list CONCENTRATEPUMPS_CP2_BICARB, ///< Bicarbonate concentrate pump Index: firmware/App/Drivers/TemperatureSensors.c =================================================================== diff -u -rfefb47e88a5285e99498efb830fdceb9e95c2c3e -re3699de422fa3ba1b8145c4cc44257702c9e336f --- firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision fefb47e88a5285e99498efb830fdceb9e95c2c3e) +++ firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision e3699de422fa3ba1b8145c4cc44257702c9e336f) @@ -59,6 +59,12 @@ #define BARO_SENSOR_REFERENCE_TEMP_C 2000 ///< Barometric sensor reference temperature in C. #define BARO_SENSOR_WAIT_FOR_COEFF_TIME_OUT_MS ( 20 * MS_PER_SECOND ) ///< Barometric sensor wait for coefficients timeout in milliseconds. +static const U32 TEMP_EQUATION_RESISTOR_CALC = 1 << ( TEMP_SENSORS_ADC_BITS - 1 ); ///< Temperature sensors resistor calculation (2^(24 - 1)). +static const F32 TEMP_EQUATION_COEFF_A = 3.9083E-3; ///< ADC to temperature conversion coefficient A. +static const F32 TEMP_EQUATION_COEFF_B = -5.775E-7; ///< ADC to temperature conversion coefficient B. +static const U32 TWO_TO_POWER_OF_8 = ( 1 << 8 ); ///< 2^8. +static const U32 TWO_TO_POWER_OF_23 = ( 1 << 23 ); ///< 2^23. + /// Temperature sensor struct. typedef struct { @@ -106,12 +112,6 @@ //static DD_TEMP_SENSORS_CAL_RECORD_T tempSensorCalRecord; ///< Temperature sensors calibration record. -static const U32 TEMP_EQUATION_RESISTOR_CALC = 1 << ( TEMP_SENSORS_ADC_BITS - 1 ); ///< Temperature sensors resistor calculation (2^(24 - 1)). -static const F32 TEMP_EQUATION_COEFF_A = 3.9083E-3; ///< ADC to temperature conversion coefficient A. -static const F32 TEMP_EQUATION_COEFF_B = -5.775E-7; ///< ADC to temperature conversion coefficient B. -static const U32 TWO_TO_POWER_OF_8 = ( 1 << 8 ); ///< 2^8. -static const U32 TWO_TO_POWER_OF_23 = ( 1 << 23 ); ///< 2^23. - // ********** private function prototypes ********** static F32 getADC2TempConversion( F32 avgADC, U32 gain, U32 refResistance, U32 zeroDegResistance, F32 adcConversionCoeff ); @@ -282,9 +282,8 @@ *************************************************************************/ U32 getTemperatureSensorsReadCount( void ) { - U32 result = 0; + U32 result = lastTemperatureReadCounter.data; - result = lastTemperatureReadCounter.data; if ( OVERRIDE_KEY == lastTemperatureReadCounter.override ) { result = lastTemperatureReadCounter.ovData; @@ -303,9 +302,8 @@ *************************************************************************/ U32 getBaroTempSensorsReadCount( void ) { - U32 result = 0; + U32 result = lastBaroTempReadCounter.data; - result = lastBaroTempReadCounter.data; if ( OVERRIDE_KEY == lastBaroTempReadCounter.override ) { result = lastBaroTempReadCounter.ovData; @@ -318,7 +316,7 @@ * @brief * The checkTemperatureSensors function checks the temperature sensor * freshness and see if there is any read failures from FPGA. - * @details \b Inputs: FPGA + * @details \b Inputs: Temperature sensors reading from FPGA * @details \b Outputs: none * @details \b Alarms: ALARM_ID_DD_RTD_SENSORS_FPGA_FAULT when temperature sensor * read count not updated periodically @@ -387,9 +385,8 @@ /*********************************************************************//** * @brief - * The processADCRead function receives the ADC value and the sensor - * index and calculates the running sum and the moving average of the ADCs - * The temperatureSensorsADCRead and tempSensorsAvgADCValues are updated. + * The processADCRead function updates the ADC count moving average for a + * given temperature sensor. * @details \b Inputs: tempSensors * @details \b Outputs: tempSensors * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT when invalid temperature @@ -472,30 +469,16 @@ for ( sensorId = TEMPSENSORS_FIRST; sensorId < NUM_OF_TEMPERATURE_SENSORS; sensorId++ ) { - switch ( sensorId ) - { - case TEMPSENSORS_INLET_HEAT_EXCHANGER: - case TEMPSENSORS_OUTLET_HEAT_EXCHANGER: - case TEMPSENSORS_HYDRAULICS_PRIMARY_HEATER: - case TEMPSENSORS_TRIMMER_HEATER: - case TEMPSENSORS_BAROMETRIC_TEMP_SENSOR: - // Get temperature value. - temperature = getTemperatureValue( sensorId ); - // Check both temperature and to be in range - if ( ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > tempSensors[ sensorId ].maxAllowedTemp ) ) && - ( getCurrentOperationMode() != DD_MODE_INIT ) ) - { - isTemperatureOutOfRange |= TRUE; - sensorInAlarm = sensorId; - alarmTemperature = temperature; - } - break; - - default: - // Ignore the other sensors - break; - } - + // Get temperature value. + temperature = getTemperatureValue( sensorId ); + // Check both temperature and to be in range + if ( ( ( temperature < TEMP_SENSORS_MIN_ALLOWED_DEGREE_C ) || ( temperature > tempSensors[ sensorId ].maxAllowedTemp ) ) && + ( getCurrentOperationMode() != DD_MODE_INIT ) ) + { + isTemperatureOutOfRange |= TRUE; + sensorInAlarm = sensorId; + alarmTemperature = temperature; + } } checkPersistentAlarm( ALARM_ID_DD_TEMPERATURE_SENSOR_OUT_OF_RANGE, isTemperatureOutOfRange, sensorInAlarm, alarmTemperature ); @@ -512,7 +495,7 @@ * @details \b Inputs: hasBaroCoeffsBeenChecked * @details \b Outputs: hasBaroCoeffsBeenChecked * @details \b Alarms: ALARM_ID_DD_BAROMETRIC_SENSOR_COEFFS_BAD_CRC when baro - * temperature sensor coefficient CRC changes. + * temperature sensor coefficient CRC mismatch or timeout. * @return none *************************************************************************/ static void checkBaroSensorCRC( void ) Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -rfefb47e88a5285e99498efb830fdceb9e95c2c3e -re3699de422fa3ba1b8145c4cc44257702c9e336f --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision fefb47e88a5285e99498efb830fdceb9e95c2c3e) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision e3699de422fa3ba1b8145c4cc44257702c9e336f) @@ -297,15 +297,17 @@ * calibration applied to it. * @details \b Inputs: none * @details \b Outputs: none - * @return next state + * @param sensor sesnor id for the calibration to be applied for + * @param pressure pressure (mmHG) to be converted in PSI + * @return converted pressure in PSI. *************************************************************************/ static F32 getConvertedPressure( PRESSURE_SENSORS_T sensor, F32 pressure ) { F32 baroPressurePSI = getPressure( PRESSURE_SENSOR_BAROMETRIC ) * MMHG_TO_PSI_CONVERSION; F32 pressurePSI = pressure * MMHG_TO_PSI_CONVERSION; // calibrated pressure - //F32 calPressure = getCalibrationAppliedPressure( sensor, gaugePressure ); + //F32 calPressure = getCalibrationAppliedPressure( sensor, pressurePSI ); return pressurePSI; } Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -rfefb47e88a5285e99498efb830fdceb9e95c2c3e -re3699de422fa3ba1b8145c4cc44257702c9e336f --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision fefb47e88a5285e99498efb830fdceb9e95c2c3e) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision e3699de422fa3ba1b8145c4cc44257702c9e336f) @@ -47,7 +47,7 @@ // ********** private data ********** static TEMPSENSORS_EXEC_STATES_T tempSensorsExecState; ///< TemperatureSensor exec state. -static U32 elapsedTime; ///< Elapsed time variable. +static U32 startTime; ///< star time to read FPGA values. static U32 dataPublicationTimerCounter; ///< Temperature sensors data publish timer counter. static OVERRIDE_U32_T tempSensorsPublishInterval = { TEMP_SENSORS_DATA_PUBLISH_INTERVAL, @@ -68,7 +68,7 @@ *************************************************************************/ void initTemperature( void ) { - elapsedTime = 0; + startTime = 0; tempSensorsExecState = TEMPSENSORS_EXEC_STATE_START; dataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; @@ -111,7 +111,7 @@ * @details \b Inputs: tempSensorsExecState * @details \b Outputs: tempSensorsExecState * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT when invalid temperature - * sensor is seen. + * sensor state is seen. * @return none *************************************************************************/ void execTemperatureSensors( void ) @@ -151,24 +151,24 @@ * @brief * The handleExecStart function waits for a period of time and switches to * the state that reads the ADC values from FPGA. - * @details \b Inputs: elapsedTime - * @details \b Outputs: elapsedTime, baroCoeffsWaitToRcvStartTime + * @details \b Inputs: startTime + * @details \b Outputs: startTime, baroCoeffsWaitToRcvStartTime * @return the next state of the state machine *************************************************************************/ static TEMPSENSORS_EXEC_STATES_T handleExecStart( void ) { TEMPSENSORS_EXEC_STATES_T state = TEMPSENSORS_EXEC_STATE_START; - if ( 0 == elapsedTime ) + if ( 0 == startTime ) { - elapsedTime = getMSTimerCount(); + startTime = getMSTimerCount(); } // A delay to let FPGA to boot up - else if ( TRUE == didTimeout( elapsedTime, ADC_FPGA_READ_DELAY ) ) + else if ( TRUE == didTimeout( startTime, ADC_FPGA_READ_DELAY ) ) { - elapsedTime = 0; + startTime = 0; setBaroSensorCoefficientReadStartTime(); - state = TEMPSENSORS_EXEC_STATE_GET_ADC_VALUES; + state = TEMPSENSORS_EXEC_STATE_GET_ADC_VALUES; } return state; @@ -195,8 +195,8 @@ * @brief * The publishTemperatureSensorsData function broadcasts the temperature * sensors data at the publication interval. - * @details \b Inputs: dataPublicationTimerCounter, tempValuesForPublication - * @details \b Outputs: dataPublicationTimerCounter, tempValuesForPublication + * @details \b Inputs: dataPublicationTimerCounter and publish interval time. + * @details \b Outputs: dataPublicationTimerCounter * @details \b Message \b Sent: MSG_ID_DD_TEMPERATURE_DATA publishes the temperature * data in a periodic interval. * @return none Index: firmware/App/Monitors/Temperature.h =================================================================== diff -u -rfefb47e88a5285e99498efb830fdceb9e95c2c3e -re3699de422fa3ba1b8145c4cc44257702c9e336f --- firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision fefb47e88a5285e99498efb830fdceb9e95c2c3e) +++ firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision e3699de422fa3ba1b8145c4cc44257702c9e336f) @@ -23,7 +23,7 @@ /** * @defgroup Temperature Temperature - * @brief Temperature Monitor module. Reads and processes the temperature sensors. + * @brief Temperature Monitor unit. Reads and processes the temperature sensors. * * @addtogroup Temperature * @{ Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -rfefb47e88a5285e99498efb830fdceb9e95c2c3e -re3699de422fa3ba1b8145c4cc44257702c9e336f --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision fefb47e88a5285e99498efb830fdceb9e95c2c3e) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision e3699de422fa3ba1b8145c4cc44257702c9e336f) @@ -63,7 +63,7 @@ // Monitor pressures execPressureSensor(); - // Temperature sensors read + // Monitor temperatures execTemperatureSensors(); // Verify the processor clock speed against the FPGA clock