Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r075a45f01b77c0cdb3eea1b9cf666d973364a605 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 075a45f01b77c0cdb3eea1b9cf666d973364a605)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -121,7 +121,7 @@
  * @details
  * Inputs : none
  * Outputs : targetDrainPumpPressure
- * @param rpm : new target drain pump speed (in RPM).
+ * @param rpm new target drain pump speed (in RPM)
  * @return TRUE if new target speed is set, FALSE if not
  *************************************************************************/
 BOOL setDrainPumpTargetSpeed( U32 rpm )
@@ -417,7 +417,7 @@
  * @details
  * Inputs : none
  * Outputs : drainPumpDataPublishInterval
- * @param value : override RO pump data publish interval with (in ms)
+ * @param value override RO pump data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetDrainPumpDataPublishIntervalOverride( U32 value )
@@ -466,7 +466,7 @@
  * @details
  * Inputs : none
  * Outputs : targetDrainPumpSpeed
- * @param value : override target drain pump speed (in RPM)
+ * @param value override target drain pump speed (in RPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetTargetDrainPumpSpeedOverride( U32 value )
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r8f5feed92f41a476d5656038bcdfe884e17bd593 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 8f5feed92f41a476d5656038bcdfe884e17bd593)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -191,7 +191,7 @@
  * @details
  * Inputs : none
  * Outputs : primaryHeaterTargetTemperature
- * @param targetTemp
+ * @param targetTemp target temperature for the primary heater
  * @return none
  *************************************************************************/
 void setPrimaryHeaterTargetTemperature ( F32 targetTemp )
@@ -206,7 +206,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 +222,6 @@
  * Inputs : mainPrimaryHeaterDutyCycle, primaryHeaterTargetTemperature,
  * hasStartPrimaryHeaterRequested
  * Outputs : hasStartPrimaryHeaterRequested
- * @param none
  * @return status
  *************************************************************************/
 BOOL startPrimaryHeater ( void )
@@ -249,7 +248,6 @@
  * Inputs : trimmerHeaterDutyCycle, trimmerHeaterTargetTemperature,
  * trimmerHeaterTargetTemperature
  * Outputs : trimmerHeaterTargetTemperature
- * @param none
  * @return status
  *************************************************************************/
 BOOL startTrimmerHeater ( void )
@@ -274,7 +272,6 @@
  * @details
  * Inputs : isPrimaryHeaterOn
  * Outputs : isPrimaryHeaterOn
- * @param none
  * @return none
  *************************************************************************/
 void stopPrimaryHeater ( void )
@@ -292,7 +289,6 @@
  * @details
  * Inputs : isTrimmerHeaterOn
  * Outputs : isTrimmerHeaterOn
- * @param none
  * @return none
  *************************************************************************/
 void stopTrimmerHeater ( void )
@@ -330,7 +326,6 @@
  * @details
  * Inputs : heatersSelfTestState
  * Outputs : none
- * @param none
  * @return heatersSelfTestState
  *************************************************************************/
 SELF_TEST_STATUS_T execHeatersSelfTest ( void )
@@ -369,7 +364,6 @@
  * @details
  * Inputs : primaryHeatersExecState
  * Outputs : primaryHeatersExecState
- * @param none
  * @return none
  *************************************************************************/
 void execPrimaryHeaters ( void )
@@ -398,7 +392,6 @@
  * @details
  * Inputs : trimmerHeaterExecState
  * Outputs : trimmerHeaterExecState
- * @param none
  * @return none
  *************************************************************************/
 void execTrimmerHeater ( void )
@@ -430,7 +423,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 +453,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 )
@@ -502,7 +493,6 @@
  * @details
  * Inputs : heatersSelfTestResult
  * Outputs : heatersSelfTestResult
- * @param none
  * @return state (HEATERS_SELF_TEST_STATES_T)
  *************************************************************************/
 static HEATERS_SELF_TEST_STATES_T handleHeatersSelfTestMainPrimaryHeater ( void )
@@ -539,7 +529,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 +578,6 @@
  * smallPrimaryHeaterDutyCycle, isPrimaryHeaterOn
  * Outputs : primaryHeaterTimerCounter, mainPrimaryHeaterDutyCycle,
  * smallPrimaryHeaterDutyCycle
- * @param none
  * @return state (PRIMARY_HEATERS_EXEC_STATES_T)
  *************************************************************************/
 static PRIMARY_HEATERS_EXEC_STATES_T handlePrimaryHeaterStateControlToTarget ( void )
@@ -656,7 +644,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 +695,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 )
@@ -763,7 +749,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 +764,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 +778,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 +793,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 +817,6 @@
  * @details
  * Inputs : heatersDataPublishInterval
  * Outputs : none
- * @param : none
  * @return result
  *************************************************************************/
 U32 getPublishHeatersDataInterval ( void )
@@ -853,7 +838,6 @@
  * @details
  * Inputs : dataPublicationTimerCounter
  * Outputs : dataPublicationTimerCounter
- * @param none
  * @return none
  *************************************************************************/
 static void publishHeatersData ( void )
@@ -898,7 +882,6 @@
  * @details
  * Inputs : heatersDataPublishInterval
  * Outputs : heatersDataPublishInterval
- * @param value
  * @return result
  *************************************************************************/
 BOOL testSetHeatersPublishIntervalOverride ( U32 value )
@@ -924,7 +907,6 @@
  * @details
  * Inputs : heatersDataPublishInterval
  * Outputs : heatersDataPublishInterval
- * @param none
  * @return result
  *************************************************************************/
 BOOL testResetHeatersPublishIntervalOverride ( void )
Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r73113d51d6ca20fd4e34d69d241fbb18bb70dc1e -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 73113d51d6ca20fd4e34d69d241fbb18bb70dc1e)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -132,7 +132,7 @@
  * @details
  * Inputs : filteredLoadCellWeights[]
  * Outputs : none
- * @param loadCellID : ID of load cell to get filtered weight for.
+ * @param loadCellID ID of load cell to get filtered weight for
  * @return the filtered load cell weight for the given load cell ID.
  *************************************************************************/
 F32 getLoadCellFilteredWeight( LOAD_CELL_ID_T loadCellID )
@@ -192,8 +192,8 @@
  * @details
  * Inputs : none
  * Outputs : filteredLoadCellWeights[]
- * @param loadCellID : ID of the load cell to override.
- * @param value : override filtered load cell weight
+ * @param loadCellID ID of the load cell to override
+ * @param value override filtered load cell weight
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetLoadCellOverride( U32 loadCellID, F32 value )
@@ -220,7 +220,7 @@
  * @details
  * Inputs : none
  * Outputs : filteredLoadCellWeights[]
- * @param loadCellID : ID of the load cell to override.
+ * @param loadCellID ID of the load cell to override
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetLoadCellOverride( U32 loadCellID )
@@ -247,7 +247,7 @@
  * @details
  * Inputs : none
  * Outputs : loadCellDataPublishInterval
- * @param value : override load cell data publish interval with (in ms)
+ * @param value override load cell data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetLoadCellDataPublishIntervalOverride( U32 value )
Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r075a45f01b77c0cdb3eea1b9cf666d973364a605 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 075a45f01b77c0cdb3eea1b9cf666d973364a605)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -346,7 +346,7 @@
  * @details
  * Inputs : none
  * Outputs : pressuresDataPublishInterval
- * @param value : override pressure and occlusion data publish interval with (in ms)
+ * @param value override pressure and occlusion data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetPressuresDataPublishIntervalOverride( U32 value )
@@ -394,8 +394,8 @@
  * specified pressure sensor with a given value.
  * Inputs : none
  * Outputs : pressures[]
- * @param sensor : ID of pressure sensor to override for
- * @param value : override value for the given pressure sensor ID
+ * @param sensor ID of pressure sensor to override for
+ * @param value override value for the given pressure sensor ID
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetDGPressureSensorOverride( U32 sensor, F32 value )
@@ -422,7 +422,7 @@
  * @details
  * Inputs : none
  * Outputs : pressures[]
- * @param value : ID of sensor to reset override pressure for
+ * @param value ID of sensor to reset override pressure for
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testResetDGPressureSensorOverride( U32 sensor )
Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r075a45f01b77c0cdb3eea1b9cf666d973364a605 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 075a45f01b77c0cdb3eea1b9cf666d973364a605)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -142,8 +142,8 @@
  * @details
  * Inputs : none
  * Outputs : targetROPumpPressure, roPumpPWMDutyCyclePct
- * @param roPressure : new target RO pressure
- * @param mode : new control mode
+ * @param roPressure new target RO pressure
+ * @param mode new control mode
  * @return TRUE if new target pressure is set, FALSE if not
  *************************************************************************/
 BOOL setROPumpTargetPressure( U32 roPressure, PUMP_CONTROL_MODE_T mode )
@@ -265,7 +265,6 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param none
  * @return isROPumpOn
  *************************************************************************/
 BOOL isReverseOsmosisPumpOn( void )
@@ -384,7 +383,7 @@
  * @details
  * Inputs : none
  * Outputs : PWM duty cycle zeroed
- * @param newPWM : new duty cycle % to apply to PWM
+ * @param newPWM new duty cycle % to apply to PWM
  * @return none
  *************************************************************************/
 static void setROPumpControlSignalPWM( F32 newPWM )
@@ -522,7 +521,7 @@
  * @details
  * Inputs : none
  * Outputs : roPumpDataPublishInterval
- * @param value : override RO pump data publish interval with (in ms)
+ * @param value override RO pump data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetROPumpDataPublishIntervalOverride( U32 value )
@@ -571,7 +570,7 @@
  * @details
  * Inputs : none
  * Outputs : targetROPumpPressure
- * @param value : override target RO pressure (in PSI)
+ * @param value override target RO pressure (in PSI)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetTargetROPumpPressureOverride( U32 value )
@@ -596,7 +595,6 @@
  * @details
  * Inputs : none
  * Outputs : targetROPumpPressure
- * @param none
  * @return TRUE if override reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetTargetROPumpPressureOverride( void )
@@ -622,7 +620,7 @@
  * @details
  * Inputs : none
  * Outputs : measuredROFlowRateLPM
- * @param value : override measured RO pump motor speed (in LPM)
+ * @param value override measured RO pump motor speed (in LPM)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetMeasuredROFlowRateOverride( F32 value )
@@ -646,7 +644,6 @@
  * @details
  * Inputs : none
  * Outputs : measuredROFlowRateLPM
- * @param none
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testResetMeasuredROFlowRateOverride( void )
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r6d43aaf32070f80ac586ffe67a6364a6a2618b65 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 6d43aaf32070f80ac586ffe67a6364a6a2618b65)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -177,7 +177,6 @@
  * Inputs : none
  * Outputs : tempSensorsSelfTestResult, tempSensorsSelfTestState,
  * tempSensorsExecState, sampleCount, elapsedTime, tempSensorsConstants
- * @param none
  * @return none
  *************************************************************************/
 void initTemperatureSensors ( void )
@@ -253,7 +252,6 @@
  * @details
  * Inputs : tempSensorsSelfTestState
  * Outputs : tempSensorsSelfTestState
- * @param none
  * @return tempSensorsSelfTestState
  *************************************************************************/
 SELF_TEST_STATUS_T execTemperatureSensorsSelfTest ( void )
@@ -293,7 +291,6 @@
  * @details
  * Inputs : tempSensorsExecState
  * Outputs : tempSensorsExecState
- * @param none
  * @return none
  *************************************************************************/
 void execTemperatureSensors ( void )
@@ -323,7 +320,7 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param sensor
+ * @param sensor ID of sensor to get temperature for
  * @return temperature
  *************************************************************************/
 F32 getTemperatureValue ( U32 sensor )
@@ -354,8 +351,11 @@
  * @details
  * Inputs : none
  * Outputs : temperatureValues
- * @param avgADC, gain, refResistance, zeroDegResistance
- * @return temperature
+ * @param avgADC average ADC value for given temperature sensor to convert
+ * @param gain gain value to apply
+ * @param refResistance resistance value to apply
+ * @param zeroDegResistance resistance value at zero degrees
+ * @return temperature (in degrees C)
  *************************************************************************/
 static F32 getADC2TempConversion ( F32 avgADC, U32 gain, U32 refResistance, U32 zeroDegResistance, F32 adcConversionCoeff )
 {
@@ -384,7 +384,8 @@
  * @details
  * Inputs : temperatureValues
  * Outputs : temperatureValues
- * @param TCIndex, CJIndex
+ * @param TCIndex thermocouple index
+ * @param CJIndex cold junction index
  * @return none
  *************************************************************************/
 static void getHeaterInternalTemp ( U32 TCIndex, U32 CJIndex )
@@ -441,7 +442,10 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param sensorIndex, adc, fpgaError, fpgaCount
+ * @param sensorIndex ID of temperature sensor to process
+ * @param adc ADC value for the temperature sensor
+ * @param fpgaError reported FPGA error status
+ * @param fpgaCount reported FPGA read count
  * @return none
  *************************************************************************/
 static void processTempSnsrsADCRead ( U32 sensorIndex, U32 adc, U32 fpgaError, U32 fpgaCount )
@@ -464,7 +468,10 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param sensorIndex, adc, fpgaError, fpgaCount
+ * @param sensorIndex ID of temperature sensor to process
+ * @param adc reported ADC value for temperature sensor
+ * @param fpgaError reported error status by FPGA
+ * @param fpgaCount reported read count by FPGA
  * @return none
  *************************************************************************/
 static void processHtrsTempSnsrsADCRead ( U32 sensorIndex, U32 adc, U32 fpgaError, U32 fpgaCount )
@@ -506,7 +513,9 @@
  * @details
  * Inputs : readAndErrorCounts
  * Outputs : readAndErrorCounts
- * @param sensorIndex, fpgaError, fpgaCount
+ * @param sensorIndex ID of temperature sensor to check
+ * @param fpgaError reported error status by FPGA
+ * @param fpgaCount reported read count by FPGA
  * @return isADCValid (BOOL)
  *************************************************************************/
 static BOOL isADCReadValid ( U32 sensorIndex, U32 fpgaError, U32 fpgaCount )
@@ -557,7 +566,8 @@
  * @details
  * Inputs : runningSumAndIndex, rawADCReads, sampleCount, temperatureValues
  * Outputs : runningSumAndIndex, rawADCReads, sampleCount, temperatureValues
- * @param sensorIndex, adc
+ * @param sensorIndex ID of temperature sensor to process
+ * @param adc reported ADC value for temperature sensor
  * @return none
  *************************************************************************/
 static void processADCRead ( U32 sensorIndex, S32 adc )
@@ -592,7 +602,6 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param none
  * @return state (TEMPSENSORS_SELF_TEST_STATES_T)
  *************************************************************************/
 static TEMPSENSORS_SELF_TEST_STATES_T handleSelfTestStart ( void )
@@ -609,7 +618,6 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param none
  * @return state (TEMPSENSORS_SELF_TEST_STATES_T)
  *************************************************************************/
 static TEMPSENSORS_SELF_TEST_STATES_T handleSelfTestADCCheck ( void )
@@ -639,7 +647,6 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param none
  * @return state (TEMPSENSORS_SELF_TEST_STATES_T)
  *************************************************************************/
 static TEMPSENSORS_SELF_TEST_STATES_T handleSelfTestConsistencyCheck ( void )
@@ -681,7 +688,6 @@
  * @details
  * Inputs : none
  * Outputs : elapsedTime
- * @param none
  * @return state (TEMPSENSORS_EXEC_STATES_T)
  *************************************************************************/
 static TEMPSENSORS_EXEC_STATES_T handleExecStart ( void )
@@ -710,7 +716,6 @@
  * @details
  * Inputs : none
  * Outputs : internalHeatersConversionTimer, elapsedTime, temperatureValues
- * @param none
  * @return state (TEMPSENSORS_EXEC_STATES_T)
  *************************************************************************/
 static TEMPSENSORS_EXEC_STATES_T handleExecGetADCValues ( void )
@@ -774,7 +779,6 @@
  * @details
  * Inputs : tempSensorsPublishInterval
  * Outputs : none
- * @param none
  * @return result
  *************************************************************************/
 U32 getPublishTemperatureSensorsDataInterval ( void )
@@ -796,7 +800,6 @@
  * @details
  * Inputs : dataPublicationTimerCounter, tempValuesForPublication
  * Outputs : dataPublicationTimerCounter, tempValuesForPublication
- * @param none
  * @return none
  *************************************************************************/
 static void publishTemperatureSensorsData ( void )
@@ -826,7 +829,8 @@
  * @details
  * Inputs : temperatureValues
  * Outputs : temperatureValues
- * @param sensor, temperature
+ * @param sensor ID of temperature sensor to override
+ * @param temperature override temperature value (in degrees C)
  * @return result
  *************************************************************************/
 BOOL testSetMeasuredTemperatureOverride ( U32 sensor, F32 temperature )
@@ -853,7 +857,7 @@
  * @details
  * Inputs : temperatureValues
  * Outputs : temperatureValues
- * @param sensor
+ * @param sensor ID of temperature sensor to reset override
  * @return result
  *************************************************************************/
 BOOL testResetMeasuredTemperatureOverride ( U32 sensor )
@@ -880,7 +884,7 @@
  * @details
  * Inputs : tempSensorsPublishInterval
  * Outputs : tempSensorsPublishInterval
- * @param value
+ * @param value temperature sensor data broadcast interval (in ms) to override to
  * @return result
  *************************************************************************/
 BOOL testSetTemperatureSensorsPublishIntervalOverride ( U32 value )
@@ -906,7 +910,6 @@
  * @details
  * Inputs : tempSensorsPublishInterval
  * Outputs : tempSensorsPublishInterval
- * @param none
  * @return result
  *************************************************************************/
 BOOL testResetTemperatureSensorsPublishIntervalOverride ( void )
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r2db16f950f61815bd8be6d7d300a82eb1f6ee6da -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 2db16f950f61815bd8be6d7d300a82eb1f6ee6da)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -120,8 +120,8 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param valveID : ID of valve to check a valve state name for.
- * @param valveStateName : valve state name to check for given valve ID.
+ * @param valveID ID of valve to check a valve state name for
+ * @param valveStateName valve state name to check for given valve ID
  * @return TRUE if given valveStateName is appropriate for given valve ID, FALSE if not.
  *************************************************************************/
 static BOOL checkValveStateName( VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName )
@@ -273,7 +273,7 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param valveStateName : valve state name enumeration to convert to energized/de-energized.
+ * @param valveStateName valve state name enumeration to convert to energized/de-energized
  * @return converted valve state for given valve state name
  *************************************************************************/
 U32 convertValveStateNameToValveState( VALVE_STATE_NAMES_T valveStateName )
@@ -344,8 +344,8 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param valveID : ID of valve to set state for.
- * @param valveStateName : Name of valve state to set given valve to.
+ * @param valveID ID of valve to set state for
+ * @param valveStateName Name of valve state to set given valve to
  * @return TRUE if new valve state is set for given valve ID, FALSE if not.
  *************************************************************************/
 BOOL setValveState( VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName )
@@ -374,7 +374,7 @@
  * @details
  * Inputs : valveStates[]
  * Outputs : none
- * @param valveID : ID of valve to get state for.
+ * @param valveID ID of valve to get state for
  * @return the current valve state for given valve
  *************************************************************************/
 U32 getValveState( U32 valveID )
@@ -431,7 +431,7 @@
  * @details
  * Inputs : none
  * Outputs : valvesStatesPublishInterval
- * @param value : override valves states publish interval with (in ms)
+ * @param value override valves states publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetValvesStatesPublishIntervalOverride( U32 value )
@@ -479,8 +479,8 @@
  * specified valve with a given value.
  * Inputs : none
  * Outputs : valves[]
- * @param valveID : ID of valve to override for
- * @param value : override value for the given valve ID
+ * @param valveID ID of valve to override for
+ * @param value override value for the given valve ID
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetValveStateOverride( U32 valveID, U32 value )
@@ -507,7 +507,7 @@
  * @details
  * Inputs : none
  * Outputs : valves[]
- * @param valveID : ID of valve to reset override state for
+ * @param valveID ID of valve to reset override state for
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testResetValveStateOverride( U32 valveID )
Index: firmware/App/Drivers/CPLD.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -52,7 +52,6 @@
  * @details
  * Inputs : none
  * Outputs : CPLD module signal outputs set to initial states.
- * @param none
  * @return none
  *************************************************************************/
 void initCPLD( void )
@@ -72,7 +71,6 @@
  * @details
  * Inputs : none
  * Outputs : watchdog pet signal toggled.
- * @param level : none
  * @return none
  *************************************************************************/
 void toggleCPLDWatchdog( void )
@@ -87,7 +85,6 @@
  * @details
  * Inputs : Signal from CPLD on watchdog expired pin.
  * Outputs : none
- * @param none
  * @return level : (LOW or HIGH)
  *************************************************************************/
 PIN_SIGNAL_STATE_T getCPLDWatchdogExpired( void )
@@ -104,7 +101,7 @@
  * @details
  * Inputs : none
  * Outputs : alarm lamp green signal set to given level.
- * @param level : LOW or HIGH
+ * @param level LOW or HIGH
  * @return none
  *************************************************************************/
 void setCPLDLampGreen( PIN_SIGNAL_STATE_T level )
@@ -126,7 +123,7 @@
  * @details
  * Inputs : none
  * Outputs : alarm lamp blue signal set to given level.
- * @param level : LOW or HIGH
+ * @param level LOW or HIGH
  * @return none
  *************************************************************************/
 void setCPLDLampBlue( PIN_SIGNAL_STATE_T level )
@@ -148,7 +145,7 @@
  * @details
  * Inputs : none
  * Outputs : alarm lamp red signal set to given level.
- * @param level : LOW or HIGH
+ * @param level LOW or HIGH
  * @return none
  *************************************************************************/
 void setCPLDLampRed( PIN_SIGNAL_STATE_T level )
Index: firmware/App/Drivers/Comm.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Drivers/Comm.c	(.../Comm.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Drivers/Comm.c	(.../Comm.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -39,7 +39,6 @@
  * @details
  * Inputs : none
  * Outputs : canXmitsInProgress
- * @param none
  * @return none
  *************************************************************************/
 void signalCANXmitsInitiated( void )
@@ -54,7 +53,6 @@
  * @details
  * Inputs : none
  * Outputs : canXmitsInProgress
- * @param none
  * @return none
  *************************************************************************/
 void signalCANXmitsCompleted( void )
@@ -69,7 +67,6 @@
  * @details
  * Inputs : none
  * Outputs : uartXmitsInProgress
- * @param none
  * @return none
  *************************************************************************/
 #ifdef DEBUG_ENABLED
@@ -86,7 +83,6 @@
  * @details
  * Inputs : none
  * Outputs : uartXmitsInProgress
- * @param none
  * @return none
  *************************************************************************/
 #ifdef DEBUG_ENABLED
@@ -103,7 +99,6 @@
  * @details
  * Inputs : none
  * Outputs : DMA receive interrupt is enabled.
- * @param none
  * @return none
  *************************************************************************/
 #ifdef DEBUG_ENABLED
@@ -120,7 +115,6 @@
  * @details
  * Inputs : none
  * Outputs : DMA transmit interrupt is enabled.
- * @param none
  * @return none
  *************************************************************************/
 #ifdef DEBUG_ENABLED
@@ -137,7 +131,6 @@
  * @details
  * Inputs : none
  * Outputs : DMA receive interrupt is disabled.
- * @param none
  * @return none
  *************************************************************************/
 #ifdef DEBUG_ENABLED
@@ -154,7 +147,6 @@
  * @details
  * Inputs : none
  * Outputs : DMA transmit interrupt is disabled.
- * @param none
  * @return none
  *************************************************************************/
 #ifdef DEBUG_ENABLED
@@ -171,7 +163,6 @@
  * @details
  * Inputs : none
  * Outputs : DMA receive interrupt is enabled.
- * @param none
  * @return none
  *************************************************************************/
 void setSCI2DMAReceiveInterrupt( void )
@@ -186,7 +177,6 @@
  * @details
  * Inputs : none
  * Outputs : DMA transmit interrupt is enabled.
- * @param none
  * @return none
  *************************************************************************/
 void setSCI2DMATransmitInterrupt( void )
@@ -201,7 +191,6 @@
  * @details
  * Inputs : none
  * Outputs : DMA receive interrupt is disabled.
- * @param none
  * @return none
  *************************************************************************/
 void clearSCI2DMAReceiveInterrupt( void )
@@ -216,7 +205,6 @@
  * @details
  * Inputs : none
  * Outputs : DMA transmit interrupt is disabled.
- * @param none
  * @return none
  *************************************************************************/
 void clearSCI2DMATransmitInterrupt( void )
@@ -231,7 +219,6 @@
  * @details
  * Inputs : none
  * Outputs : SCI1 error flags cleared.
- * @param none
  * @return none
  *************************************************************************/
 #ifdef DEBUG_ENABLED
@@ -249,7 +236,6 @@
  * @details
  * Inputs : none
  * Outputs : SCI2 error flags cleared.
- * @param none
  * @return none
  *************************************************************************/
 void clearSCI2CommErrors( void )
@@ -265,7 +251,6 @@
  * @details
  * Inputs : status registers
  * Outputs : none
- * @param none
  * @return TRUE if a transmit is in progress, FALSE if not
  *************************************************************************/
 #ifdef DEBUG_ENABLED
@@ -286,7 +271,6 @@
  * @details
  * Inputs : status registers
  * Outputs : none
- * @param none
  * @return TRUE if a transmit is in progress, FALSE if not
  *************************************************************************/
 BOOL isSCI2DMATransmitInProgress( void )
@@ -304,7 +288,6 @@
  * @details
  * Inputs : status registers
  * Outputs : none
- * @param none
  * @return TRUE if a transmit is in progress, FALSE if not
  *************************************************************************/
 BOOL isCAN1TransmitInProgress( void )
Index: firmware/App/Drivers/InternalADC.c
===================================================================
diff -u -r699c4f96ab672fb9db9ac218a5a00358dc68c2c6 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Drivers/InternalADC.c	(.../InternalADC.c)	(revision 699c4f96ab672fb9db9ac218a5a00358dc68c2c6)
+++ firmware/App/Drivers/InternalADC.c	(.../InternalADC.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -79,7 +79,6 @@
  * @details
  * Inputs : none
  * Outputs : InternalADC module is initialized.
- * @param none
  * @return none
  *************************************************************************/
 void initInternalADC( void )
@@ -112,8 +111,8 @@
  * @details
  * Inputs : ADC FIFO
  * Outputs : adcRawReadingsCount, adcRawReadings[]
- * @param adc : pointer to the ADC1 controller
- * @param group : ADC channel group ID
+ * @param adc pointer to the ADC1 controller
+ * @param group ADC channel group ID
  * @return none
  *************************************************************************/
 void adcNotification( adcBASE_t *adc, uint32 group )
@@ -131,8 +130,8 @@
  * @details
  * Inputs : adcRawReadingsCount, adcRawReadings[]
  * Outputs : adcReadings[][], adcReadingsIdx[], adcReadingsTotals[], adcReadingsAvgs[]
- * @param adc : pointer to the ADC1 controller
- * @param group : ADC channel group ID
+ * @param adc pointer to the ADC1 controller
+ * @param group ADC channel group ID
  * @return none
  *************************************************************************/
 void execInternalADC( void )
@@ -169,7 +168,7 @@
  * @details
  * Inputs : adcReadingsAvgs[]
  * Outputs : none
- * @param channel : adc channel to retrieve a reading for
+ * @param channel adc channel to retrieve a reading for
  * @return average reading for the given channel
  *************************************************************************/
 U16 getIntADCReading( INT_ADC_CHANNEL_T channel )
Index: firmware/App/Drivers/SafetyShutdown.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -84,7 +84,7 @@
  * @details
  * Inputs : none
  * Outputs : HD safety shutdown overridden
- * @param value : TRUE to activate safety shutdown, FALSE to de-activate it.
+ * @param value TRUE to activate safety shutdown, FALSE to de-activate it
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetSafetyShutdownOverride( U32 value )
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r74a9c045d2d045721baac1d15b618db450e7f775 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 74a9c045d2d045721baac1d15b618db450e7f775)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -116,7 +116,6 @@
  * @details
  * Inputs : none
  * Outputs :
- * @param none
  * @return the next state
  *************************************************************************/
 static DG_FILL_MODE_STATE_T handleDialysateProductionState( void )
@@ -140,7 +139,6 @@
  * @details
  * Inputs : none
  * Outputs :
- * @param none
  * @return the next state
  *************************************************************************/
 static DG_FILL_MODE_STATE_T handleDeliverDialysateState( void )
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rbd7df978ca5b65a730ea0164d8b2ab24e135e661 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision bd7df978ca5b65a730ea0164d8b2ab24e135e661)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -190,7 +190,7 @@
  * @details
  * Inputs : postPassed
  * Outputs : none
- * @param testStatus
+ * @param testStatus status reported by last test
  * @return recommended next POST state
  *************************************************************************/
 static DG_POST_STATE_T handlePOSTStatus( SELF_TEST_STATUS_T testStatus )
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r2db16f950f61815bd8be6d7d300a82eb1f6ee6da -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 2db16f950f61815bd8be6d7d300a82eb1f6ee6da)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -208,7 +208,7 @@
  * @details
  * Inputs : none
  * Outputs : makes the requested mode "pending".
- * @param newMode : requested mode
+ * @param newMode requested mode
  * @return none
  *************************************************************************/
 void requestNewOperationMode( DG_OP_MODE_T newMode )
@@ -282,7 +282,7 @@
  * @details
  * Inputs : none
  * Outputs : Initializes the Operation Modes module.
- * @param newMode : new op mode to transition to
+ * @param newMode new op mode to transition to
  * @return none
  *************************************************************************/
 static void transitionToNewOperationMode( DG_OP_MODE_T newMode )
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r075a45f01b77c0cdb3eea1b9cf666d973364a605 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 075a45f01b77c0cdb3eea1b9cf666d973364a605)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -47,7 +47,6 @@
  * @details
  * Inputs : none
  * Outputs : AlarmMgmt module initialized.
- * @param none
  * @return none
  *************************************************************************/
 void initAlarmMgmt( void )
@@ -71,7 +70,6 @@
  * @details
  * Inputs :
  * Outputs :
- * @param none
  * @return none
  *************************************************************************/
 void execAlarmMgmt( void )
@@ -85,7 +83,7 @@
  * @details
  * Inputs : none
  * Outputs : alarmIsActive[]
- * @param alarm : ID of alarm to activate
+ * @param alarm ID of alarm to activate
  * @return none
  *************************************************************************/
 static void activateAlarm( ALARM_ID_T alarm )
@@ -114,8 +112,8 @@
  * @details
  * Inputs : none
  * Outputs : alarm triggered message sent, alarm activated
- * @param alarm : ID of alarm to activate
- * @param alarmData : supporting data to include in alarm msg
+ * @param alarm ID of alarm to activate
+ * @param alarmData supporting data to include in alarm msg
  * @return none
  *************************************************************************/
 void activateAlarmNoData( ALARM_ID_T alarm )
@@ -148,8 +146,8 @@
  * @details
  * Inputs : none
  * Outputs : alarm triggered message sent, alarm activated
- * @param alarm : ID of alarm to activate
- * @param alarmData : supporting data to include in alarm msg
+ * @param alarm ID of alarm to activate
+ * @param alarmData supporting data to include in alarm msg
  * @return none
  *************************************************************************/
 void activateAlarm1Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData )
@@ -182,9 +180,9 @@
  * @details
  * Inputs : none
  * Outputs : alarm triggered message sent, alarm activated
- * @param alarm : ID of alarm to activate
- * @param alarmData1 : supporting data to include in alarm msg
- * @param alarmData2 : supporting data to include in alarm msg
+ * @param alarm ID of alarm to activate
+ * @param alarmData1 supporting data to include in alarm msg
+ * @param alarmData2 supporting data to include in alarm msg
  * @return none
  *************************************************************************/
 void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2 )
@@ -216,7 +214,7 @@
  * @details
  * Inputs : none
  * Outputs : AlarmStatusTable[]
- * @param alarm : ID of alarm to clear
+ * @param alarm ID of alarm to clear
  * @return none
  *************************************************************************/
 void clearAlarm( ALARM_ID_T alarm )
@@ -255,7 +253,7 @@
  * @details
  * Inputs : alarmIsActive[]
  * Outputs : none
- * @param alarmID : ID of alarm to check
+ * @param alarmID ID of alarm to check
  * @return TRUE if given alarm is active, FALSE if not
  *************************************************************************/
 BOOL isAlarmActive( ALARM_ID_T alarm )
@@ -271,7 +269,7 @@
  * @details
  * Inputs : alarmIsActive[]
  * Outputs : none
- * @param alarmID : ID of alarm to check
+ * @param alarmID ID of alarm to check
  * @return TRUE if given alarm is active, FALSE if not
  *************************************************************************/
 static DATA_ARRAY_GET( BOOL, getAlarmActive, alarmID, NUM_OF_ALARM_IDS-1, alarmIsActive, TRUE )
@@ -290,8 +288,8 @@
  * @details
  * Inputs : none
  * Outputs : alarm activated or cleared
- * @param alarmID : ID of alarm to activate or clear
- * @param value : override state for the given alarm ID (1=activate, 0=clear)
+ * @param alarmID ID of alarm to activate or clear
+ * @param value override state for the given alarm ID (1=activate, 0=clear)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetAlarmStateOverride( U32 alarmID, U32 state )
@@ -324,7 +322,7 @@
  * @details
  * Inputs : none
  * Outputs : alarm cleared
- * @param alarmID : ID of alarm to clear
+ * @param alarmID ID of alarm to clear
  * @return TRUE if alarm clear successful, FALSE if not
  *************************************************************************/
 BOOL testResetAlarmStateOverride( U32 alarmID )
Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -r777d38c1f794e05052f47c3ed1826487722e0335 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 777d38c1f794e05052f47c3ed1826487722e0335)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -46,7 +46,6 @@
  * @details
  * Inputs : none
  * Outputs : CommBuffers module initialized.
- * @param none
  * @return none
  *************************************************************************/
 void initCommBuffers( void )
@@ -68,7 +67,7 @@
  * @details
  * Inputs : none
  * Outputs : given buffer is cleared.
- * @param buffer : the buffer to clear
+ * @param buffer the buffer to clear
  * @return none
  *************************************************************************/
 void clearBuffer( COMM_BUFFER_T buffer )
@@ -102,9 +101,9 @@
  * @details
  * Inputs : commBufferByteCount[], activeDoubleBuffer[]
  * Outputs : commBuffers[], commBufferByteCount[]
- * @param buffer : which comm buffer to add data to
- * @param data : pointer to byte array containing data to add
- * @param len : length of data (in bytes)
+ * @param buffer which comm buffer to add data to
+ * @param data pointer to byte array containing data to add
+ * @param len length of data (in bytes)
  * @return TRUE if data added to buffer successfully, FALSE if not
  *************************************************************************/
 BOOL addToCommBuffer( COMM_BUFFER_T buffer, U08* data, U32 len )
@@ -203,9 +202,9 @@
  * Inputs : commBuffers[], commBufferByteCount[], activeDoubleBuffer[]
  * Outputs : commBuffers[], commBufferByteCount[], activeDoubleBuffer[], \n
  * and the given data array is populated with data from the buffer.
- * @param buffer : which comm buffer to retrieve data from
- * @param data : pointer to byte array to stuff data into
- * @param len : # of bytes to retrieve into given data array.
+ * @param buffer which comm buffer to retrieve data from
+ * @param data pointer to byte array to stuff data into
+ * @param len # of bytes to retrieve into given data array.
  * @return the number of bytes retrieved.
  *************************************************************************/
 U32 getFromCommBuffer( COMM_BUFFER_T buffer, U08* data, U32 len )
@@ -262,9 +261,9 @@
  * @details
  * Inputs : commBuffers[], commBufferByteCount[], activeDoubleBuffer[]
  * Outputs : given array populated with requested # of bytes from the buffer.
- * @param buffer : which comm buffer to retrieve data from
- * @param data : pointer to byte array to stuff data into
- * @param len : # of bytes to retrieve into given data array.
+ * @param buffer which comm buffer to retrieve data from
+ * @param data pointer to byte array to stuff data into
+ * @param len # of bytes to retrieve into given data array.
  * @return the number of bytes retrieved.
  *************************************************************************/
 U32 peekFromCommBuffer( COMM_BUFFER_T buffer, U08 *data, U32 len )
@@ -317,7 +316,7 @@
  * @details
  * Inputs : activeDoubleBuffer[], commBufferByteCount[]
  * Outputs : none
- * @param buffer : which comm buffer to get byte count for
+ * @param buffer which comm buffer to get byte count for
  * @return the number of bytes in the given comm buffer.
  *************************************************************************/
 U32 numberOfBytesInCommBuffer( COMM_BUFFER_T buffer )
@@ -349,7 +348,7 @@
  * @details
  * Inputs : activeDoubleBuffer[]
  * Outputs : activeDoubleBuffer[], commBufferByteCount[]
- * @param buffer : which comm buffer to switch double buffers on
+ * @param buffer which comm buffer to switch double buffers on
  * @return the new active buffer for the given buffer.
  *************************************************************************/
 static U32 switchDoubleBuffer( COMM_BUFFER_T buffer )
@@ -374,9 +373,9 @@
  * @details
  * Inputs : commBuffers[], activeDoubleBuffer[], commBufferByteCount[]
  * Outputs : commBuffers[], activeDoubleBuffer[], commBufferByteCount[]
- * @param buffer : which comm buffer get data from
- * @param data : pointer to byte array to populate with data
- * @param len : # of bytes to get from comm buffer
+ * @param buffer which comm buffer get data from
+ * @param data pointer to byte array to populate with data
+ * @param len # of bytes to get from comm buffer
  * @return none
  *************************************************************************/
 static void getDataFromInactiveBuffer( COMM_BUFFER_T buffer, U08 *data, U32 len )
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r777d38c1f794e05052f47c3ed1826487722e0335 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 777d38c1f794e05052f47c3ed1826487722e0335)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -217,7 +217,6 @@
  * @details
  * Inputs : none
  * Outputs : FPGA module initialized.
- * @param none
  * @return none
  *************************************************************************/
 void initFPGA( void )
@@ -334,7 +333,6 @@
  * @details
  * Inputs : none
  * Outputs : fpga comm flags & counters reset
- * @param none
  * @return none
  *************************************************************************/
 static void resetFPGACommFlags( void )
@@ -355,7 +353,6 @@
  * @details
  * Inputs : none
  * Outputs : fpgaReceiptCounter
- * @param none
  * @return none
  *************************************************************************/
 void signalFPGAReceiptCompleted( void )
@@ -391,7 +388,6 @@
  * @details
  * Inputs : none
  * Outputs : fpgaReceiptCounter
- * @param none
  * @return none
  *************************************************************************/
 void signalFPGATransmitCompleted( void )
@@ -405,7 +401,6 @@
  * @details
  * Inputs : fpgaState
  * Outputs : fpgaState
- * @param none
  * @return none
  *************************************************************************/
 void execFPGAIn( void )
@@ -459,7 +454,6 @@
  * @details
  * Inputs : fpgaState
  * Outputs : fpgaState
- * @param none
  * @return none
  *************************************************************************/
 void execFPGAOut( void )
@@ -501,7 +495,6 @@
  * @details
  * Inputs : none
  * Outputs : read command sent to FPGA
- * @param none
  * @return next FPGA state
  *************************************************************************/
 static FPGA_STATE_T handleFPGAReadHeaderState( void )
@@ -534,7 +527,6 @@
  * @details
  * Inputs : none
  * Outputs : header register values updated
- * @param none
  * @return next FPGA state
  *************************************************************************/
 static FPGA_STATE_T handleFPGAReceiveHeaderState( void )
@@ -587,7 +579,6 @@
  * @details
  * Inputs : actuator set points
  * Outputs : actuator set points sent to FPGA
- * @param none
  * @return next FPGA state
  *************************************************************************/
 static FPGA_STATE_T handleFPGAWriteAllActuatorsState( void )
@@ -635,7 +626,6 @@
  * @details
  * Inputs : none
  * Outputs : sensor values updated
- * @param none
  * @return next FPGA state
  *************************************************************************/
 static FPGA_STATE_T handleFPGAReceiveAllSensorsState( void )
@@ -693,7 +683,6 @@
  * @details
  * Inputs : fpgaHeader
  * Outputs : none
- * @param none
  * @return passed, or failed
  *************************************************************************/
 SELF_TEST_STATUS_T execFPGATest( void )
@@ -725,7 +714,7 @@
  * @details
  * Inputs : none
  * Outputs : # of bytes for next FPGA write command is set
- * @param bytes2Transmit : # of bytes to be transmitted via DMA to the FPGA.
+ * @param bytes2Transmit number of bytes to be transmitted via DMA to the FPGA.
  * @return none
  *************************************************************************/
 static void setupDMAForWriteCmd( U32 bytes2Transmit )
@@ -748,7 +737,6 @@
  * @details
  * Inputs : none
  * Outputs : DMA write command to FPGA is initiated
- * @param none
  * @return none
  *************************************************************************/
 static void startDMAWriteCmd( void )
@@ -765,7 +753,7 @@
  * @details
  * Inputs : none
  * Outputs : # of expected bytes for next FPGA write command response is set
- * @param bytes2Receive : # of bytes expected to be transmitted via DMA from the FPGA.
+ * @param bytes2Receive number of bytes expected to be transmitted via DMA from the FPGA.
  * @return none
  *************************************************************************/
 static void setupDMAForWriteResp( U32 bytes2Receive )
@@ -788,7 +776,6 @@
  * @details
  * Inputs : none
  * Outputs : DMA write command response is ready to be received from the FPGA
- * @param none
  * @return none
  *************************************************************************/
 static void startDMAReceiptOfWriteResp( void )
@@ -805,7 +792,7 @@
  * @details
  * Inputs : none
  * Outputs : # of bytes for next FPGA read command is set
- * @param bytes2Transmit : # of bytes to be transmitted via DMA to the FPGA.
+ * @param bytes2Transmit number of bytes to be transmitted via DMA to the FPGA.
  * @return none
  *************************************************************************/
 static void setupDMAForReadCmd( U32 bytes2Transmit )
@@ -828,7 +815,6 @@
  * @details
  * Inputs : none
  * Outputs : DMA read command to FPGA is initiated
- * @param none
  * @return none
  *************************************************************************/
 static void startDMAReadCmd( void )
@@ -845,7 +831,7 @@
  * @details
  * Inputs : none
  * Outputs : # of expected bytes for next FPGA read command response is set
- * @param bytes2Receive : # of expected bytes to be transmitted via DMA from the FPGA.
+ * @param bytes2Receive number of expected bytes to be transmitted via DMA from the FPGA.
  * @return none
  *************************************************************************/
 static void setupDMAForReadResp( U32 bytes2Receive )
@@ -868,7 +854,6 @@
  * @details
  * Inputs : none
  * Outputs : DMA read command response is ready to be received from the FPGA
- * @param none
  * @return none
  *************************************************************************/
 static void startDMAReceiptOfReadResp( void )
@@ -885,7 +870,6 @@
  * @details
  * Inputs : fpgaHeader
  * Outputs : none
- * @param none
  * @return fpgaDiag
  *************************************************************************/
 static void consumeUnexpectedData( void )
@@ -920,7 +904,7 @@
  * @details
  * Inputs : none
  * Outputs : fpgaActuatorSetPoints.fpgaValveStates
- * @param valveStates
+ * @param valveStates bit mask for the various valve states
  * @return none
  *************************************************************************/
 void setFPGAValveStates( U16 valveStates )
@@ -935,7 +919,7 @@
  * @details
  * Inputs : none
  * Outputs : fpgaActuatorSetPoints.fpgaDrainPumpSetSpeed
- * @param drainPumpDAC
+ * @param drainPumpDAC DAC value to command for the drain pump
  * @return none
  *************************************************************************/
 void setFPGADrainPumpSpeed( U08 drainPumpDAC )
@@ -953,7 +937,6 @@
  * @details
  * Inputs : fpgaHeader
  * Outputs : none
- * @param none
  * @return Id
  *************************************************************************/
 U08 getFPGAId( void )
@@ -968,7 +951,6 @@
  * @details
  * Inputs : fpgaHeader
  * Outputs : none
- * @param none
  * @return Revision
  *************************************************************************/
 U08 getFPGARev( void )
@@ -998,7 +980,6 @@
  * @details
  * Inputs : fpgaSensorReadings
  * Outputs : none
- * @param none
  * @return last load cell A 1 reading
  *************************************************************************/
 U32 getFPGALoadCellA1( void )
@@ -1012,7 +993,6 @@
  * @details
  * Inputs : fpgaSensorReadings
  * Outputs : none
- * @param none
  * @return last load cell A 2 reading
  *************************************************************************/
 U32 getFPGALoadCellA2( void )
@@ -1026,7 +1006,6 @@
  * @details
  * Inputs : fpgaSensorReadings
  * Outputs : none
- * @param none
  * @return last load cell B 1 reading
  *************************************************************************/
 U32 getFPGALoadCellB1( void )
@@ -1040,7 +1019,6 @@
  * @details
  * Inputs : fpgaSensorReadings
  * Outputs : none
- * @param none
  * @return last load cell B 2 reading
  *************************************************************************/
 U32 getFPGALoadCellB2( void )
@@ -1055,7 +1033,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaValveStates
  * Outputs : none
- * @param none
  * @return last valve states reading
  *************************************************************************/
 U16 getFPGAValveStates( void )
@@ -1069,7 +1046,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaROFlowRate
  * Outputs : none
- * @param none
  * @return last RO flow rate reading
  *************************************************************************/
 U16 getFPGAROPumpFlowRate( void )
@@ -1083,7 +1059,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaDrainPumpSpeed
  * Outputs : none
- * @param none
  * @return last drain pump speed reading
  *************************************************************************/
 U16 getFPGADrainPumpSpeed( void )
@@ -1098,7 +1073,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaTPiTemp
  * Outputs : none
- * @param none
  * @return last primary heater inlet temperature reading
  *************************************************************************/
 U32 getFPGATPiTemp( void )
@@ -1113,7 +1087,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaTPoTemp
  * Outputs : none
- * @param none
  * @return last primary heater outlet temperature reading
  *************************************************************************/
 U32 getFPGATPoTemp( void )
@@ -1128,7 +1101,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaCD1Temp
  * Outputs : none
- * @param none
  * @return last conductivity sensor 1 outlet temperature reading
  *************************************************************************/
 U32 getFPGACD1Temp( void )
@@ -1143,7 +1115,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaCD2Temp
  * Outputs : none
- * @param none
  * @return last conductivity sensor 2 outlet temperature reading
  *************************************************************************/
 U32 getFPGACD2Temp( void )
@@ -1158,7 +1129,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaRTDErrorCnt
  * Outputs : none
- * @param none
  * @return Last error count of the RTD conductivity sensors
  *************************************************************************/
 U08 getFPGARTDErrorCount( void )
@@ -1173,7 +1143,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaRTDReadCnt
  * Outputs : none
- * @param none
  * @return Last read count of the RTC conductivity sensors
  *************************************************************************/
 U08 getFPGARTDReadCount( void )
@@ -1188,7 +1157,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaTHDoTemp
  * Outputs : none
- * @param none
  * @return Last redundant sensor outlet temperature reading
  *************************************************************************/
 U32 getFPGATHDoTemp( void )
@@ -1203,7 +1171,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaTHDoErrorCnt
  * Outputs : none
- * @param none
  * @return Last redundant sensor outlet temperature error count
  *************************************************************************/
 U08 getFPGATHDoErrorCount( void )
@@ -1217,7 +1184,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaTHDoReadCnt
  * Outputs : none
- * @param none
  * @return Last redundant sensor outlet temperature error count reading
  *************************************************************************/
 U08 getFPGATHDoReadCount( void )
@@ -1232,7 +1198,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaTDiTemp
  * Outputs : none
- * @param none
  * @return last primary heater outlet temperature reading
  *************************************************************************/
 U32 getFPGATDiTemp( void )
@@ -1247,7 +1212,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaTDiErrorCnt
  * Outputs : none
- * @param none
  * @return Last dialysate inlet error count
  *************************************************************************/
 U08 getFPGATDiErrorCount( void )
@@ -1262,7 +1226,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaTDiReadCnt
  * Outputs : none
- * @param none
  * @return Last dialysate inlet read count
  *************************************************************************/
 U08 getFPGATDiReadCount( void )
@@ -1277,7 +1240,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaPrimaryHeaterIntTemp
  * Outputs : none
- * @param none
  * @return last primary heater temperature reading
  *************************************************************************/
 U16 getFPGAPrimaryHeaterTemp( void )
@@ -1292,7 +1254,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaPrimaryHeaterFlags
  * Outputs : none
- * @param none
  * @return Last primary heater internal temperature sensor flag read
  *************************************************************************/
 U08 getFPGAPrimaryHeaterFlags( void )
@@ -1307,7 +1268,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaPrimaryHeaterReadCnt
  * Outputs : none
- * @param none
  * @return Last primary heater internal temperature sensor read count
  *************************************************************************/
 U08 getFPGAPrimaryHeaterReadCount( void )
@@ -1322,7 +1282,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaTrimmerHeaterIntTemp
  * Outputs : none
- * @param none
  * @return last trimmer heater temperature reading
  *************************************************************************/
 U16 getFPGATrimmerHeaterTemp( void )
@@ -1337,7 +1296,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaTrimmerHeaterFlags
  * Outputs : none
- * @param none
  * @return Last trimmer heater internal temperature flags read
  *************************************************************************/
 U08 getFPGATrimmerHeaterFlags( void )
@@ -1352,7 +1310,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaTrimmerHeaterReadCnt
  * Outputs : none
- * @param none
  * @return Last trimmer heater internal temperature read count
  *************************************************************************/
 U08 getFPGATrimmerHeaterReadCount( void )
@@ -1367,7 +1324,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaPrimaryHeaterIntJunctionTemp
  * Outputs : none
- * @param none
  * @return Last primary cold junction temperature
  *************************************************************************/
 U16 getFPGAPRimaryColdJunctionTemp ( void )
@@ -1382,7 +1338,6 @@
  * @details
  * Inputs : fpgaSensorReadings.fpgaTrimmerHeaterIntJunctionTemp
  * Outputs : none
- * @param none
  * @return Last trimmer cold junction temperature
  *************************************************************************/
 U16 getFPGATrimmerColdJunctionTemp ( void )
@@ -1397,9 +1352,9 @@
  * @details
  * Inputs : fpgaSensorReadings
  * Outputs : none
- * @param x : Populate this param with X axis reading
- * @param y : Populate this param with Y axis reading
- * @param z : Populate this param with Z axis reading
+ * @param x Populate this param with X axis reading
+ * @param y Populate this param with Y axis reading
+ * @param z Populate this param with Z axis reading
  * @return none
  *************************************************************************/
 void getFPGAAccelAxes( S16 *x, S16 *y, S16 *z )
@@ -1417,9 +1372,9 @@
  * @details
  * Inputs : fpgaSensorReadings
  * Outputs : none
- * @param x : Populate this param with maximum X axis reading
- * @param y : Populate this param with maximum Y axis reading
- * @param z : Populate this param with maximum Z axis reading
+ * @param x Populate this param with maximum X axis reading
+ * @param y Populate this param with maximum Y axis reading
+ * @param z Populate this param with maximum Z axis reading
  * @return none
  *************************************************************************/
 void getFPGAAccelMaxes( S16 *xmax, S16*ymax, S16*zmax )
@@ -1436,8 +1391,8 @@
  * @details
  * Inputs : fpgaSensorReadings
  * Outputs : none
- * @param cnt : Populate this param with latest sample counter value
- * @param err : Populate this param with latest error
+ * @param cnt Populate this param with latest sample counter value
+ * @param err Populate this param with latest error
  * @return none
  *************************************************************************/
 void getFPGAAccelStatus( U16 *cnt, U16 *err )
Index: firmware/App/Services/Interrupts.c
===================================================================
diff -u -r2db16f950f61815bd8be6d7d300a82eb1f6ee6da -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 2db16f950f61815bd8be6d7d300a82eb1f6ee6da)
+++ firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -105,7 +105,7 @@
  * @details
  * Inputs : none
  * Outputs : RTI notification handled.
- * @param notification : Which RTI timer caused this interrupt.
+ * @param notification Which RTI timer caused this interrupt
  * @return none
  *************************************************************************/
 void rtiNotification(uint32 notification)
@@ -140,8 +140,8 @@
  * @details
  * Inputs : none
  * Outputs : CAN message notification handled.
- * @param node : which CAN controller
- * @param messageBox : which message box triggered the message notification
+ * @param node which CAN controller
+ * @param messageBox which message box triggered the message notification
  * @return none
  *************************************************************************/
 void canMessageNotification(canBASE_t *node, uint32 messageBox)
@@ -158,11 +158,11 @@
  * @details
  * Inputs : none
  * Outputs : CAN error notification handled.
- * @param node : which CAN controller
- * @param notification : canLEVEL_PASSIVE    (0x20) : When RX- or TX error counter are between 32 and 63 \n
- *                       canLEVEL_WARNING    (0x40) : When RX- or TX error counter are between 64 and 127 \n
- *                       canLEVEL_BUS_OFF    (0x80) : When RX- or TX error counter are between 128 and 255 \n
- *                       canLEVEL_PARITY_ERR (0x100): When parity error detected on CAN RAM read access
+ * @param node which CAN controller
+ * @param notification canLEVEL_PASSIVE    (0x20) : When RX- or TX error counter are between 32 and 63 \n
+ *                     canLEVEL_WARNING    (0x40) : When RX- or TX error counter are between 64 and 127 \n
+ *                     canLEVEL_BUS_OFF    (0x80) : When RX- or TX error counter are between 128 and 255 \n
+ *                     canLEVEL_PARITY_ERR (0x100): When parity error detected on CAN RAM read access
  * @return none
  *************************************************************************/
 void canErrorNotification(canBASE_t *node, uint32 notification)
@@ -235,8 +235,8 @@
  * @details
  * Inputs : none
  * Outputs : UART error interrupts handled.
- * @param sci : Pointer to the SCI peripheral that detected the error
- * @param flags : error flag(s)
+ * @param sci Pointer to the SCI peripheral that detected the error
+ * @param flags error flag(s)
  * @return none
  *************************************************************************/
 void sciNotification(sciBASE_t *sci, uint32 flags)
@@ -306,8 +306,8 @@
  * @details
  * Inputs : none
  * Outputs : DMA interrupt is handled.
- * @param inttype : type of DMA interrupt
- * @param channel : DMA channel that caused the interrupt
+ * @param inttype type of DMA interrupt
+ * @param channel DMA channel that caused the interrupt
  * @return none
  *************************************************************************/
 void dmaGroupANotification(dmaInterrupt_t inttype, uint32 channel)
Index: firmware/App/Services/MsgQueues.c
===================================================================
diff -u -r8f5feed92f41a476d5656038bcdfe884e17bd593 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision 8f5feed92f41a476d5656038bcdfe884e17bd593)
+++ firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -36,7 +36,6 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param none
  * @return none
  *************************************************************************/
 void initMsgQueues( void )
@@ -63,8 +62,8 @@
  * @details
  * Inputs : none
  * Outputs : message added to queue
- * @param queue : the message queue to add to
- * @param msg : a pointer to a message structure to add to the queue
+ * @param queue the message queue to add to
+ * @param msg a pointer to a message structure to add to the queue
  * @return TRUE if message added to queue, FALSE if could not
  *************************************************************************/
 BOOL addToMsgQueue( MSG_QUEUE_T queue, MESSAGE_WRAPPER_T *msg )
@@ -104,8 +103,8 @@
  * @details
  * Inputs : queue
  * Outputs : message retrieved from the queue
- * @param queue : the message queue to retrieve from
- * @param msg : a pointer to a message structure to populate with the retrieved \n
+ * @param queue the message queue to retrieve from
+ * @param msg a pointer to a message structure to populate with the retrieved \n
  * message.
  * @return TRUE if a message was found to retrieve, FALSE if not
  *************************************************************************/
@@ -145,7 +144,7 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param queue : the message queue to check
+ * @param queue the message queue to check
  * @return TRUE if a given message queue is empty, FALSE if not
  *************************************************************************/
 BOOL isMsgQueueEmpty( MSG_QUEUE_T queue )
@@ -174,7 +173,7 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param queue : the message queue to check
+ * @param queue the message queue to check
  * @return TRUE if the given message queue is full, FALSE if not
  *************************************************************************/
 BOOL isMsgQueueFull( MSG_QUEUE_T queue )
@@ -203,7 +202,7 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param message : Pointer to the message to blank.
+ * @param message Pointer to the message to blank
  * @return none
  *************************************************************************/
 void blankMessage( MESSAGE_T *message )
@@ -225,7 +224,7 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param message : Pointer to the message in a wrapper to blank.
+ * @param message Pointer to the message in a wrapper to blank
  * @return none
  *************************************************************************/
 void blankMessageInWrapper( MESSAGE_WRAPPER_T *message )
Index: firmware/App/Services/PIControllers.c
===================================================================
diff -u -r6d43aaf32070f80ac586ffe67a6364a6a2618b65 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Services/PIControllers.c	(.../PIControllers.c)	(revision 6d43aaf32070f80ac586ffe67a6364a6a2618b65)
+++ firmware/App/Services/PIControllers.c	(.../PIControllers.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -63,12 +63,12 @@
  * Initialize controller before operation. Make sure to call it before
  * first call to runController function.
  *
- * @param controllerID - ID filter number
- * @param initialControlSignal - Value of the output on the first iteration
- * @param kP - Coefficient for proportional.
- * @param kI - Coefficient for integral.
- * @param controlMin - Minimum control output.
- * @param controlMax - Maximum control output.
+ * @param controllerID ID filter number
+ * @param initialControlSignal Value of the output on the first iteration
+ * @param kP Coefficient for proportional
+ * @param kI Coefficient for integral
+ * @param controlMin Minimum control output
+ * @param controlMax Maximum control output
  *
  * @return none
  *************************************************************************/
@@ -105,8 +105,8 @@
  * Reset controller before new set point. Make sure to call it before first
  * call to runController function.
  *
- * @param controllerID - ID filter number
- * @param initialControlSignal - Value of the output on the first iteration
+ * @param controllerID ID filter number
+ * @param initialControlSignal Value of the output on the first iteration
  *
  * @return none
  *************************************************************************/
@@ -134,9 +134,9 @@
  * @brief
  * Call this function whenever a new measured signal sampled is acquired.
  *
- * @param controllerID - ID filter number
- * @param referenceSignal - reference signal value
- * @param measuredSignal - latest measured sample
+ * @param controllerID ID filter number
+ * @param referenceSignal reference signal value
+ * @param measuredSignal latest measured sample
  *
  * @return value of the control signal
  *************************************************************************/
@@ -182,8 +182,8 @@
  * @brief
  * Returns the latest requested signal sample.
  *
- * @param controllerID - ID filter number
- * @param signalID -  signal sample ID request
+ * @param controllerID ID filter number
+ * @param signalID signal sample ID request
  *
  * @return latest sample requested
  *************************************************************************/
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r73113d51d6ca20fd4e34d69d241fbb18bb70dc1e -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 73113d51d6ca20fd4e34d69d241fbb18bb70dc1e)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -100,7 +100,7 @@
  * @details
  * Inputs : none
  * Outputs : Specified reservoir is set as active.
- * @param resID : ID of reservoir to set as active.
+ * @param resID ID of reservoir to set as active
  * @return TRUE if set active reservoir command successful, FALSE if not.
  *************************************************************************/
 BOOL setActiveReservoirCmd( RESERVOIR_ID_T resID )
@@ -145,7 +145,7 @@
  * @details
  * Inputs : none
  * Outputs : move to fill mode
- * @param fillToVolMl : Target volume (in mL) to fill reservoir to.
+ * @param fillToVolMl Target volume (in mL) to fill reservoir to
  * @return TRUE if fill command successful, FALSE if not.
  *************************************************************************/
 BOOL startFillCmd( U32 fillToVolMl )
@@ -197,7 +197,7 @@
  * @details
  * Inputs : none
  * Outputs :
- * @param drainToVolMl : Target volume (in mL) to drain reservoir to.
+ * @param drainToVolMl Target volume (in mL) to drain reservoir to
  * @return TRUE if drain command successful, FALSE if not.
  *************************************************************************/
 BOOL startDrainCmd( U32 drainToVolMl )
@@ -357,7 +357,7 @@
  * @details
  * Inputs : activeReservoir
  * Outputs : activeReservoir
- * @param value : override active reservoir ID.
+ * @param value override active reservoir ID
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetDGActiveReservoirOverride( RESERVOIR_ID_T value )
@@ -404,7 +404,7 @@
  * @details
  * Inputs : fillVolumeTargetMl
  * Outputs : fillVolumeTargetMl
- * @param value : override target reservoir fill volume (in mL)
+ * @param value override target reservoir fill volume (in mL)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetReservoirFillVolumeMlOverride( U32 value )
@@ -451,7 +451,7 @@
  * @details
  * Inputs : drainVolumeTargetMl
  * Outputs : drainVolumeTargetMl
- * @param value : override target reservoir drain volume (in mL)
+ * @param value override target reservoir drain volume (in mL)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetReservoirDrainVolumeMlOverride( U32 value )
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r56b304f221d78b5b34e1431fba3544cf9e0b40a9 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 56b304f221d78b5b34e1431fba3544cf9e0b40a9)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -297,7 +297,7 @@
  * @details
  * Inputs : none
  * Outputs : message interrupt handled
- * @param srcCANBox : which CAN message box triggered this interrupt
+ * @param srcCANBox which CAN message box triggered this interrupt
  * @return none
  *************************************************************************/
 void handleCANMsgInterrupt( CAN_MESSAGE_BOX_T srcCANBox )
@@ -450,7 +450,7 @@
  * @details
  * Inputs : CAN_OUT_BUFFERS[]
  * Outputs : none
- * @param srcCANBox : which CAN message box to check
+ * @param srcCANBox which CAN message box to check
  * @return TRUE if the given CAN message box is configured for transmit, FALSE if not.
  *************************************************************************/
 BOOL isCANBoxForXmit( CAN_MESSAGE_BOX_T srcCANBox )
@@ -477,7 +477,7 @@
  * @details
  * Inputs : MSG_IN_BUFFERS[]
  * Outputs : none
- * @param srcCANBox : which CAN message box to check
+ * @param srcCANBox which CAN message box to check
  * @return TRUE if the given CAN message box is configured for receiving, FALSE if not.
  *************************************************************************/
 BOOL isCANBoxForRecv( CAN_MESSAGE_BOX_T srcCANBox )
@@ -730,7 +730,7 @@
  * @details
  * Inputs : none
  * Outputs : Any padding at front of comm buffer is consumed.
- * @param msg : buffer : the comm buffer to process
+ * @param buffer the comm buffer to process
  * @return none
  *************************************************************************/
 static void consumeBufferPaddingBeforeSync( COMM_BUFFER_T buffer )
@@ -761,8 +761,8 @@
  * @details
  * Inputs : none
  * Outputs : If a complete message can be found in buffer contents, it is parsed out.
- * @param data : pointer to byte array to search for a message
- * @param len : # of bytes in the data to search
+ * @param data pointer to byte array to search for a message
+ * @param len # of bytes in the data to search
  * @return size of message if found, zero if no complete message found, \n
  * -1 if message found but CRC fails.
  *************************************************************************/
@@ -906,9 +906,9 @@
  * @details
  * Inputs : pendingAckList[]
  * Outputs : pendingAckList[]
- * @param msg : pointer to msg within the message data
- * @param msgData : pointer to message data to add to pending ACK list
- * @param len : # of bytes of message data
+ * @param msg pointer to msg within the message data
+ * @param msgData pointer to message data to add to pending ACK list
+ * @param len # of bytes of message data
  * @return TRUE if message added successfully, FALSE if not
  *************************************************************************/
 BOOL addMsgToPendingACKList( MESSAGE_T *msg, COMM_BUFFER_T channel, U08 *msgData, U32 len )
@@ -952,7 +952,7 @@
  * @details
  * Inputs : pendingAckList[]
  * Outputs : pendingAckList[]
- * @param seqNo : sequence # to match to an entry in the list
+ * @param seqNo sequence # to match to an entry in the list
  * @return TRUE if a match was found, FALSE if not
  *************************************************************************/
 static BOOL matchACKtoPendingACKList( S16 seqNo )
@@ -1018,7 +1018,7 @@
  * @details
  * Inputs : none
  * Outputs : message processed
- * @param message : pointer to message to process
+ * @param message pointer to message to process
  * @return none
  *************************************************************************/
 static void processReceivedMessage( MESSAGE_T *message )
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r777d38c1f794e05052f47c3ed1826487722e0335 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 777d38c1f794e05052f47c3ed1826487722e0335)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -70,9 +70,9 @@
  * @details
  * Inputs : none
  * Outputs : given data array populated with serialized message data and queued for transmit.
- * @param msg : message to serialize
- * @param buffer : outgoing buffer that message should be queued in
- * @param ackReq : is an acknowledgement from receiver required?
+ * @param msg message to serialize
+ * @param buffer outgoing buffer that message should be queued in
+ * @param ackReq is an acknowledgement from receiver required?
  * @return size (in bytes) of serialized message populated in given data array.
  *************************************************************************/
 static U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq )
@@ -150,7 +150,7 @@
  * @details
  * Inputs : none
  * Outputs : ACK message queued for transmit on broadcast CAN channel.
- * @param message : message to send an ACK for
+ * @param message message to send an ACK for
  * @return TRUE if ACK message queued successfully, FALSE if not
  *************************************************************************/
 BOOL sendACKMsg( MESSAGE_T *message )
@@ -181,9 +181,9 @@
  * @details
  * Inputs : none
  * Outputs : response message constructed and queued for transmit.
- * @param msgID : ID of handled message that we are responding to
- * @param buffer : outgoing buffer that message should be queued in
- * @param ack : TRUE if test message was handled successfully, FALSE if not
+ * @param msgID ID of handled message that we are responding to
+ * @param buffer outgoing buffer that message should be queued in
+ * @param ack TRUE if test message was handled successfully, FALSE if not
  * @return TRUE if response message successfully queued for transmit, FALSE if not
  *************************************************************************/
 static BOOL sendAckResponseMsg( MSG_ID_T msgID, COMM_BUFFER_T buffer, BOOL ack )
@@ -214,9 +214,9 @@
  * @details
  * Inputs : none
  * Outputs : alarm triggered msg constructed and queued.
- * @param alarm : ID of alarm triggered
- * @param almData1 : 1st data associated with alarm
- * @param almData2 : 2nd data associated with alarm
+ * @param alarm ID of alarm triggered
+ * @param almData1 1st data associated with alarm
+ * @param almData2 2nd data associated with alarm
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 )
@@ -249,7 +249,7 @@
  * @details
  * Inputs : none
  * Outputs : alarm cleared msg constructed and queued.
- * @param alarm : ID of alarm cleared
+ * @param alarm ID of alarm cleared
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL broadcastAlarmCleared( U16 alarm )
@@ -278,15 +278,15 @@
  * @details
  * Inputs : none
  * Outputs : accelerometer data broadcast msg constructed and queued.
- * @param x : X axis vector magnitude (in g)
- * @param y : Y axis vector magnitude (in g)
- * @param z : Z axis vector magnitude (in g)
- * @param xm : max X axis vector magnitude (in g)
- * @param ym : max Y axis vector magnitude (in g)
- * @param zm : max Z axis vector magnitude (in g)
- * @param xt : X axis tilt (in degrees)
- * @param yt : Y axis tilt (in degrees)
- * @param zt : Z axis tilt (in degrees)
+ * @param x X axis vector magnitude (in g)
+ * @param y Y axis vector magnitude (in g)
+ * @param z Z axis vector magnitude (in g)
+ * @param xm max X axis vector magnitude (in g)
+ * @param ym max Y axis vector magnitude (in g)
+ * @param zm max Z axis vector magnitude (in g)
+ * @param xt X axis tilt (in degrees)
+ * @param yt Y axis tilt (in degrees)
+ * @param zt Z axis tilt (in degrees)
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL broadcastAccelData( F32 x, F32 y, F32 z, F32 xm, F32 ym, F32 zm, F32 xt, F32 yt, F32 zt )
@@ -325,7 +325,7 @@
  * @details
  * Inputs : none
  * Outputs : RTC time and date in epoch
- * @param epoch : Current time and date in epoch
+ * @param epoch Current time and date in epoch
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL broadcastRTCEpoch( U32 epoch )
@@ -354,8 +354,8 @@
  * @details
  * Inputs : none
  * Outputs : DG operation mode msg constructed and queued
- * @param mode : current operation mode of the DG.
- * @param subMode : current sub-mode of the current operation mode of the DG.
+ * @param mode current operation mode of the DG.
+ * @param subMode current sub-mode of the current operation mode of the DG.
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL broadcastDGOperationMode( U32 mode, U32 subMode )
@@ -385,10 +385,10 @@
  * @details
  * Inputs : none
  * Outputs : load cell data msg constructed and queued
- * @param loadCellA1 : load cell A 1 data in grams.
- * @param loadCellA2 : load cell A 2 data in grams.
- * @param loadCellB1 : load cell B 1 data in grams.
- * @param loadCellB2 : load cell B 2 data in grams.
+ * @param loadCellA1 load cell A 1 data in grams
+ * @param loadCellA2 load cell A 2 data in grams
+ * @param loadCellB1 load cell B 1 data in grams
+ * @param loadCellB2 load cell B 2 data in grams
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL broadcastLoadCellData( F32 loadCellA1, F32 loadCellA2, F32 loadCellB1, F32 loadCellB2 )
@@ -422,7 +422,7 @@
  * @details
  * Inputs : none
  * Outputs : Valves states msg constructed and queued
- * @param valvesStates : valves states
+ * @param valvesStates valves states
  * refer to setFPGAValveStates function in FPGA.c for details
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
@@ -451,9 +451,9 @@
  * @details
  * Inputs : heaters data
  * Outputs : heatears data msg constructed and queued
- * @param mainPrimaryDC : main primary heater duty cycle
- * @param smallPrimaryDC : small primary heater duty cycle
- * @param trimmerDC : trimmer heater duty cycle
+ * @param mainPrimaryDC main primary heater duty cycle
+ * @param smallPrimaryDC small primary heater duty cycle
+ * @param trimmerDC trimmer heater duty cycle
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC )
@@ -486,9 +486,9 @@
  * @details
  * Inputs : none
  * Outputs : RO pump data msg constructed and queued
- * @param tgtPressure : target pressure for RO pump in PSI.
- * @param measFlow : measure RO flow rate in LPM.
- * @param setPWM : set PWM duty cycle in %.
+ * @param tgtPressure target pressure for RO pump in PSI
+ * @param measFlow measure RO flow rate in LPM
+ * @param setPWM set PWM duty cycle in %
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL broadcastROPumpData( U32 tgtPressure, F32 measFlow, F32 setPWM )
@@ -521,8 +521,8 @@
  * @details
  * Inputs : none
  * Outputs : Drain pump data msg constructed and queued
- * @param tgtSpeed : target speed for drain pump in RPM.
- * @param dac : set DAC value.
+ * @param tgtSpeed target speed for drain pump in RPM
+ * @param dac set DAC value
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL broadcastDrainPumpData( U32 tgtSpeed, U32 dac )
@@ -554,10 +554,10 @@
  * @details
  * Inputs : none
  * Outputs : Pressure data msg constructed and queued
- * @param measROIn : measured RO pump inlet pressure in PSI.
- * @param measROOut : measured RO pump outlet pressure in PSI.
- * @param measDrainIn : measured Drain pump inlet pressure in PSI.
- * @param measDrainOut : measured Drain pump outlet pressure in PSI.
+ * @param measROIn measured RO pump inlet pressure in PSI
+ * @param measROOut measured RO pump outlet pressure in PSI
+ * @param measDrainIn measured Drain pump inlet pressure in PSI
+ * @param measDrainOut measured Drain pump outlet pressure in PSI
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL broadcastPressureSensorsData( F32 measROIn, F32 measROOut, F32 measDrainIn, F32 measDrainOut )
@@ -591,9 +591,9 @@
  * @details
  * Inputs : none
  * Outputs : Reservoir data msg constructed and queued
- * @param resID : ID of currently active reservoir.
- * @param fillToVol : Current target fill to volume for inactive reservoir.
- * @param drainToVol : Current target drain to volume for inactive reservoir.
+ * @param resID ID of currently active reservoir
+ * @param fillToVol Current target fill to volume for inactive reservoir
+ * @param drainToVol Current target drain to volume for inactive reservoir
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL broadcastReservoirData( U32 resID, U32 fillToVol, U32 drainToVol )
@@ -626,7 +626,7 @@
  * sensors data
  * Inputs : heaters data
  * Outputs : temperatur sensors data msg constructed and queued
- * @param sensorsValue : sensors value array
+ * @param sensorsValue sensors value array
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
 BOOL broadcastTemperatureSensorsData ( U08 *sensorsValue, U32 byteLength )
@@ -659,7 +659,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handlePowerOffWarning( MESSAGE_T *message )
@@ -677,7 +677,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handleSetDialysateTemperatureCmd( MESSAGE_T *message )
@@ -702,7 +702,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handleFWVersionCmd( MESSAGE_T *message )
@@ -737,7 +737,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handleSwitchReservoirCmd( MESSAGE_T *message )
@@ -764,7 +764,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handleFillCmd( MESSAGE_T *message )
@@ -789,7 +789,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handleDrainCmd( MESSAGE_T *message )
@@ -816,7 +816,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handleStartStopTreatmentMsg( MESSAGE_T *message )
@@ -849,7 +849,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handleStartStopTrimmerHeaterCmd( MESSAGE_T *message )
@@ -881,7 +881,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handleSampleWaterCmd( MESSAGE_T *message )
@@ -906,7 +906,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handleSetRTCTimestamp( MESSAGE_T *message )
@@ -933,7 +933,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return result
  *************************************************************************/
 BOOL handleStartStopPrimaryHeater( MESSAGE_T * message )
@@ -974,8 +974,8 @@
      * @details
      * Inputs : none
      * Outputs : PC serial port
-     * @param dbgData : Pointer to debug data
-     * @param len : # of bytes of debug data
+     * @param dbgData Pointer to debug data
+     * @param len number of bytes of debug data
      * @return TRUE if debug data was successfully queued for transmit, FALSE if not
      *************************************************************************/
     BOOL sendDebugData( U08 *dbgData, U32 len )
@@ -994,7 +994,7 @@
      * @details
      * Inputs : none
      * Outputs : Message constructed and queued for transmit
-     * @param str : Pointer to debug string
+     * @param str Pointer to debug string
      * @return none
      *************************************************************************/
     void sendDebugDataToUI( U08 *str )
@@ -1024,7 +1024,6 @@
  * @details
  * Inputs : testerLoggedIn
  * Outputs : none
- * @param none
  * @return TRUE if a tester has logged in to activate testing, FALSE if not
  *************************************************************************/
 BOOL isTestingActivated( void )
@@ -1040,8 +1039,8 @@
  * @details
  * Inputs : none
  * Outputs : response message constructed and queued for transmit.
- * @param msgID : ID of handled message that we are responding to
- * @param ack : TRUE if test message was handled successfully, FALSE if not
+ * @param msgID ID of handled message that we are responding to
+ * @param ack TRUE if test message was handled successfully, FALSE if not
  * @return TRUE if response message successfully queued for transmit, FALSE if not
  *************************************************************************/
 static BOOL sendTestAckResponseMsg( MSG_ID_T msgID, BOOL ack )
@@ -1068,7 +1067,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handleTesterLogInRequest( MESSAGE_T *message )
@@ -1094,7 +1093,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestWatchdogCheckInStateOverrideRequest, testSetWatchdogTaskCheckInOverride, testResetWatchdogTaskCheckInOverride )
@@ -1106,7 +1105,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestAlarmStateOverrideRequest, testSetAlarmStateOverride, testResetAlarmStateOverride )
@@ -1118,7 +1117,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestLoadCellOverrideRequest, testSetLoadCellOverride, testResetLoadCellOverride )
@@ -1130,7 +1129,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestTemperatureSensorsOverrideRequest, \
@@ -1143,7 +1142,7 @@
 * @details
 * Inputs : none
 * Outputs : message handled
-* @param message : a pointer to the message to handle
+* @param message a pointer to the message to handle
 * @return none
 *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestTemperatureSensorsDataPublishOverrideRequest, \
@@ -1156,7 +1155,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestHeatersDataPublishOverrideRequest, \
@@ -1169,7 +1168,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestLoadCellDataBroadcastIntervalOverrideRequest, testSetLoadCellDataPublishIntervalOverride, testResetLoadCellDataPublishIntervalOverride )
@@ -1181,7 +1180,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestPressureSensorOverrideRequest, testSetDGPressureSensorOverride, testResetDGPressureSensorOverride )
@@ -1193,7 +1192,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestPressureDataBroadcastIntervalOverrideRequest, testSetPressuresDataPublishIntervalOverride, testResetPressuresDataPublishIntervalOverride )
@@ -1205,7 +1204,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestROPumpSetPointOverrideRequest, testSetTargetROPumpPressureOverride, testResetTargetROPumpPressureOverride )
@@ -1217,7 +1216,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestROMeasuredFlowOverrideRequest, testSetMeasuredROFlowRateOverride, testResetMeasuredROFlowRateOverride )
@@ -1229,7 +1228,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestROPumpDataBroadcastIntervalOverrideRequest, testSetROPumpDataPublishIntervalOverride, testResetROPumpDataPublishIntervalOverride )
@@ -1241,7 +1240,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestDrainPumpSetPointOverrideRequest, testSetTargetDrainPumpSpeedOverride, testResetTargetDrainPumpSpeedOverride )
@@ -1253,7 +1252,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestDrainPumpDataBroadcastIntervalOverrideRequest, testSetDrainPumpDataPublishIntervalOverride, testResetDrainPumpDataPublishIntervalOverride )
@@ -1265,7 +1264,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestValveStateOverrideRequest, testSetValveStateOverride, testResetValveStateOverride )
@@ -1277,7 +1276,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestValvesStatesPublishIntervalOverrideRequest, testSetValvesStatesPublishIntervalOverride, testResetValvesStatesPublishIntervalOverride )
@@ -1289,7 +1288,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestDGSafetyShutdownOverrideRequest, testSetSafetyShutdownOverride, testResetSafetyShutdownOverride )
@@ -1301,7 +1300,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestDGAccelOverrideRequest, testSetAccelAxisOverride, testResetAccelAxisOverride )
@@ -1313,7 +1312,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestDGAccelMaxOverrideRequest, testSetAccelMaxOverride, testResetAccelMaxOverride )
@@ -1325,7 +1324,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestDGAccelBroadcastIntervalOverrideRequest, testSetAccelDataPublishIntervalOverride, testResetAccelDataPublishIntervalOverride )
@@ -1337,7 +1336,7 @@
  * @details
  * Inputs : none
  * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
 void handleSetAccelCalibration( MESSAGE_T *message )
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r8f5feed92f41a476d5656038bcdfe884e17bd593 -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 8f5feed92f41a476d5656038bcdfe884e17bd593)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -58,7 +58,6 @@
  * @details
  * Inputs : none
  * Outputs : Watchdog mgmt. module initialized.
- * @param none
  * @return none
  *************************************************************************/
 void initWatchdogMgmt( void )
@@ -85,7 +84,6 @@
  * @details
  * Inputs : none
  * Outputs :
- * @param none
  * @return none
  *************************************************************************/
 void execWatchdogMgmt( void )
@@ -125,7 +123,7 @@
  * @details
  * Inputs : none
  * Outputs : task is checked in with the watchdog mgmt..
- * @param task : the task that is checking in with the watchdog mgmt.
+ * @param task the task that is checking in with the watchdog mgmt
  * @return none
  *************************************************************************/
 void checkInWithWatchdogMgmt( TASK_T task )
@@ -144,7 +142,6 @@
  * @details
  * Inputs :
  * Outputs :
- * @param none
  * @return in progress, passed, or failed
  *************************************************************************/
 SELF_TEST_STATUS_T execWatchdogTest( void )
@@ -205,7 +202,6 @@
  * @details
  * Inputs : none
  * Outputs : watchdogTaskCheckedIn[] array reset to all false.
- * @param none
  * @return none
  *************************************************************************/
 static void resetWDTaskCheckIns( void )
@@ -226,7 +222,6 @@
  * @details
  * Inputs : watchdogTaskCheckedIn[]
  * Outputs : none
- * @param none
  * @return TRUE if all tasks have checked in since last watchdog pet, FALSE if not.
  *************************************************************************/
 static BOOL haveAllTasksCheckedIn( void )
@@ -254,7 +249,7 @@
  * @details
  * Inputs : watchdogTaskCheckedIn[]
  * Outputs : none
- * @param task : ID of task to check
+ * @param task ID of task to check
  * @return TRUE if given task has checked in, FALSE if not
  *************************************************************************/
 static DATA_ARRAY_GET( BOOL, hasTaskGeneralCheckedIn, task, NUM_OF_TASKS-1, watchdogTaskCheckedIn, FALSE )
@@ -266,7 +261,6 @@
  * @details
  * Inputs : none
  * Outputs : CPLD WD pet signal is pulsed
- * @param none
  * @return none
  *************************************************************************/
 static void petWatchdog( void )
@@ -293,8 +287,8 @@
  * @details
  * Inputs : none
  * Outputs : watchdogTaskCheckedIn[]
- * @param task : ID of task to override check-in state for
- * @param value : override state for the given task ID
+ * @param task ID of task to override check-in state for
+ * @param value  override state for the given task ID
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 DATA_ARRAY_OVERRIDE_FUNC( BOOL, testSetWatchdogTaskCheckInOverride, testResetWatchdogTaskCheckInOverride, watchdogTaskCheckedIn, task, NUM_OF_TASKS-1 )
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r3f3729899d6811c763bc8e5ef9baf54a2d5c9cfe -r8e6488e189349e0f87f2fb21fa8176aced0b5a43
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 3f3729899d6811c763bc8e5ef9baf54a2d5c9cfe)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 8e6488e189349e0f87f2fb21fa8176aced0b5a43)
@@ -43,7 +43,6 @@
  * @details
  * Inputs : none
  * Outputs : Executive for the TBD called.
- * @param none
  * @return none
  *************************************************************************/
 void taskGeneral( void )