Index: firmware/App/Controllers/DrainPump.c =================================================================== diff -u -ra75923f40bea362b44fc082ce8eebde7bfa97c9a -rb5e25e2bf3b87f12f9d1beedf460b5884c8816e9 --- firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision a75923f40bea362b44fc082ce8eebde7bfa97c9a) +++ firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision b5e25e2bf3b87f12f9d1beedf460b5884c8816e9) @@ -108,7 +108,6 @@ * @details * Inputs : none * Outputs : DrainPump module initialized. - * @param none * @return none *************************************************************************/ void initDrainPump( void ) @@ -153,7 +152,6 @@ * @details * Inputs : none * Outputs : Drain pump stopped, set point reset, state changed to off - * @param none * @return none *************************************************************************/ void signalDrainPumpHardStop( void ) @@ -171,7 +169,6 @@ * @details * Inputs : none * Outputs : none - * @param none * @return none *************************************************************************/ void execDrainPumpMonitor( void ) @@ -188,7 +185,6 @@ * @details * Inputs : drainPumpState * Outputs : drainPumpState - * @param none * @return none *************************************************************************/ void execDrainPumpController( void ) @@ -216,7 +212,6 @@ * @details * Inputs : targetDrainPumpSpeed * Outputs : drainPumpPWMDutyCyclePctSet, isDrainPumpOn - * @param none * @return next state *************************************************************************/ static DRAIN_PUMP_STATE_T handleDrainPumpOffState( void ) @@ -255,7 +250,6 @@ * @details * Inputs : none * Outputs : drainPumpState - * @param none * @return next state *************************************************************************/ static DRAIN_PUMP_STATE_T handleDrainPumpControlToTargetState( void ) @@ -289,7 +283,6 @@ * @details * Inputs : none * Outputs : isDrainPumpOn, DAC zeroed - * @param none * @return none *************************************************************************/ static void stopDrainPump( void ) @@ -308,7 +301,6 @@ * @details * Inputs : drainPumpDataPublishInterval * Outputs : none - * @param none * @return the current Drain pump data publication interval (in ms). *************************************************************************/ U32 getPublishDrainPumpDataInterval( void ) @@ -472,7 +464,6 @@ * @details * Inputs : none * Outputs : targetDrainPumpSpeed - * @param none * @return TRUE if override reset successful, FALSE if not *************************************************************************/ BOOL testResetTargetDrainPumpPressureOverride( void ) Index: firmware/App/Controllers/LoadCell.c =================================================================== diff -u -ra75923f40bea362b44fc082ce8eebde7bfa97c9a -rb5e25e2bf3b87f12f9d1beedf460b5884c8816e9 --- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision a75923f40bea362b44fc082ce8eebde7bfa97c9a) +++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision b5e25e2bf3b87f12f9d1beedf460b5884c8816e9) @@ -109,7 +109,7 @@ } } -/************************************************************************* +/*********************************************************************//** * @brief * The getLoadCellFilteredWeight function gets the measured filtered load cell \n * weight for a given load cell ID. @@ -119,7 +119,7 @@ * @param loadCellID : ID of load cell to get filtered weight for. * @return the filtered load cell weight for the given load cell ID. *************************************************************************/ -U32 getLoadCellFilteredWeight( U32 loadCellID ) +F32 getLoadCellFilteredWeight( U32 loadCellID ) { U32 result = 0; Index: firmware/App/Controllers/LoadCell.h =================================================================== diff -u -ra75923f40bea362b44fc082ce8eebde7bfa97c9a -rb5e25e2bf3b87f12f9d1beedf460b5884c8816e9 --- firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision a75923f40bea362b44fc082ce8eebde7bfa97c9a) +++ firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision b5e25e2bf3b87f12f9d1beedf460b5884c8816e9) @@ -45,7 +45,7 @@ void initLoadCell( void ); // Initialize the LoadCell module. void execLoadCell( void ); // Execute the LoadCell monitor. -U32 getLoadCellFilteredWeight( U32 loadCellID ); +F32 getLoadCellFilteredWeight( U32 loadCellID ); BOOL testSetLoadCellOverride( F32 value, U32 loadCellID ); BOOL testResetLoadCellOverride( U32 loadCellID ); Index: firmware/App/Controllers/Pressures.c =================================================================== diff -u -ra75923f40bea362b44fc082ce8eebde7bfa97c9a -rb5e25e2bf3b87f12f9d1beedf460b5884c8816e9 --- firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision a75923f40bea362b44fc082ce8eebde7bfa97c9a) +++ firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision b5e25e2bf3b87f12f9d1beedf460b5884c8816e9) @@ -343,7 +343,7 @@ return result; } -/************************************************************************* +/*********************************************************************//** * @brief * The testSetDGPressureSensorOverride function overrides the value of the \n * specified pressure sensor with a given value. @@ -370,7 +370,7 @@ return result; } -/************************************************************************* +/*********************************************************************//** * @brief * The testResetDGPressureSensorOverride function resets the override of the \n * specified DG pressure sensor. Index: firmware/App/Modes/ModeStandby.h =================================================================== diff -u -rc48a99d2d1c852adcc986253b6c420a90dab7bfe -rb5e25e2bf3b87f12f9d1beedf460b5884c8816e9 --- firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision c48a99d2d1c852adcc986253b6c420a90dab7bfe) +++ firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision b5e25e2bf3b87f12f9d1beedf460b5884c8816e9) @@ -20,11 +20,11 @@ #include "DGCommon.h" /** - * @defgroup ChemicalDisinfectMode ChemicalDisinfectMode - * @brief Chemical disinfect mode module. - * Manages chemical disinfect mode functions via a state machine. + * @defgroup StandbyMode StandbyMode + * @brief Standby mode module. + * Manages standby mode functions via a state machine. * - * @addtogroup ChemicalDisinfectMode + * @addtogroup StandbyMode * @{ */ Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -rc48a99d2d1c852adcc986253b6c420a90dab7bfe -rb5e25e2bf3b87f12f9d1beedf460b5884c8816e9 --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision c48a99d2d1c852adcc986253b6c420a90dab7bfe) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision b5e25e2bf3b87f12f9d1beedf460b5884c8816e9) @@ -77,7 +77,6 @@ * @details * Inputs : none * Outputs : Operation Modes module initialized. - * @param none * @return none *************************************************************************/ void initOperationModes( void ) @@ -117,7 +116,6 @@ * @details * Inputs : none * Outputs : currentMode is set by state machine. - * @param none * @return none *************************************************************************/ void execOperationModes( void ) @@ -200,13 +198,13 @@ broadcastOperationMode(); } -/*********************************************************************//**** +/*********************************************************************//** * @brief requestNewOperationMode - * The requestNewOperationMode function initializes the Operation Modes module. + * The requestNewOperationMode function requests a new operation mode. * @details * Inputs : none - * Outputs : Initializes the Operation Modes module. - * @param none + * Outputs : makes the requested mode "pending". + * @param newMode : requested mode * @return none *************************************************************************/ void requestNewOperationMode( OP_MODE newMode ) @@ -229,7 +227,6 @@ * @details * Inputs : none * Outputs : Initializes the Operation Modes module. - * @param none * @return none *************************************************************************/ OP_MODE getCurrentOperationMode( void ) @@ -243,7 +240,6 @@ * @details * Inputs : none * Outputs : Initializes the Operation Modes module. - * @param none * @return none *************************************************************************/ static OP_MODE arbitrateModeRequest( void ) @@ -282,7 +278,7 @@ * @details * Inputs : none * Outputs : Initializes the Operation Modes module. - * @param none + * @param newMode : new op mode to transition to * @return none *************************************************************************/ static void transitionToNewOperationMode( OP_MODE newMode ) @@ -329,7 +325,7 @@ } } -/************************************************************************* +/*********************************************************************//** * @brief * The broadcastOperationMode function sends the current operation mode at \n * the prescribed interval.