Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r5a882c7292cea58e74b5a28d4e85dd60e741b834 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -70,10 +70,11 @@
 
 // ********** private function prototypes **********
 
-static void processCPiCPoSensorRead( U32 sensorId, U32 fgpaRead, U08 fpgaReadCount, U08 fpgaErrorCount, U08 fpgaSensorFault );
+static F32 getConductivityValue( U32 sensorId );
 static F32 calcCompensatedConductivity( F32 conductivity, F32 temperature);
 static void calcRORejectionRatio( void );
-static DATA_GET_PROTOTYPE( U32, getConductivityDataPublishInterval );
+static void processCPiCPoSensorRead( U32 sensorId, U32 fgpaRead, U08 fpgaReadCount, U08 fpgaErrorCount, U08 fpgaSensorFault );
+static U32 getConductivityDataPublishInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -180,7 +181,7 @@
  * @param sensorId conductivity sensor id
  * @return compensated conductivity
  *************************************************************************/
-F32 getConductivityValue( U32 sensorId )
+static F32 getConductivityValue( U32 sensorId )
 {
     F32 result = 0.0;
 
Index: firmware/App/Controllers/ConductivitySensors.h
===================================================================
diff -u -r5a882c7292cea58e74b5a28d4e85dd60e741b834 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
+++ firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -46,8 +46,6 @@
 void checkInletWaterConductivity( void );
 void checkRORejectionRatio( void );
 
-DATA_ARRAY_GET_PROTOTYPE ( F32, getConductivityValue, sensorId );
-
 BOOL testSetConductivityOverride( U32 sensorId, F32 value );
 BOOL testResetConductivityOverride( U32 sensorId );
 
Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r5a882c7292cea58e74b5a28d4e85dd60e741b834 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -97,10 +97,10 @@
 static DRAIN_PUMP_STATE_T handleDrainPumpControlToTargetState( void );
 static void stopDrainPump( void );
 static void publishDrainPumpData( void );
-static DATA_GET_PROTOTYPE( U32, getPublishDrainPumpDataInterval );
+static U32 getPublishDrainPumpDataInterval( void );
 
 /*********************************************************************//**
- * @brief initDrainPump
+ * @brief
  * The initDrainPump function initializes the DrainPump module.
  * @details
  * Inputs : none
@@ -331,7 +331,7 @@
  * Outputs : none
  * @return the current drain pump data publication interval (in ms).
  *************************************************************************/
-U32  getPublishDrainPumpDataInterval( void )
+static U32 getPublishDrainPumpDataInterval( void )
 {
     U32 result = drainPumpDataPublishInterval.data;
 
Index: firmware/App/Controllers/DrainPump.h
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Controllers/DrainPump.h	(.../DrainPump.h)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Controllers/DrainPump.h	(.../DrainPump.h)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -44,7 +44,7 @@
 
 SELF_TEST_STATUS_T execDrainPumpTest( void );
 
-DATA_GET_PROTOTYPE( U32, getTargetDrainPumpSpeed );
+U32 getTargetDrainPumpSpeed( void );
 
 BOOL testSetDrainPumpDataPublishIntervalOverride( U32 value );
 BOOL testResetDrainPumpDataPublishIntervalOverride( void );
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r5a882c7292cea58e74b5a28d4e85dd60e741b834 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -140,7 +140,7 @@
 static void setTrimmerHeaterPWM( F32 pwm );
 static void resetHeaterState( NAME_OF_HEATER_T heater );
 static void publishHeatersData( void );
-static DATA_GET_PROTOTYPE( U32, getPublishHeatersDataInterval );
+static U32 getPublishHeatersDataInterval( void  );
 
 // TODO: Remove the below code. FOR TESTING ONLY
 #define PRIMARY_HEATER_MIBSPI1_PORT_MASK     0x00000002  // (CS1 - re-purposed as input GPIO)
@@ -775,7 +775,7 @@
  * @param : heater enumeration of the heater for which the PI controller will be reset
  * @return none
  *************************************************************************/
-static void resetHeaterState ( NAME_OF_HEATER_T heater )
+static void resetHeaterState( NAME_OF_HEATER_T heater )
 {
     if ( heater == PRIMARY_HEATER )
     {
Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r5a882c7292cea58e74b5a28d4e85dd60e741b834 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -86,7 +86,7 @@
 static PRESSURE_STATE_T handlePressuresInitState( void );
 static PRESSURE_STATE_T handlePressuresContReadState( void );
 static void publishPressuresData( void );
-static DATA_GET_PROTOTYPE( U32, getPublishPressuresDataInterval );
+static U32 getPublishPressuresDataInterval( void );
 
 static SELF_TEST_STATUS_T handleSelfTestADCCheck( void );
 
Index: firmware/App/Controllers/Pressures.h
===================================================================
diff -u -r5a882c7292cea58e74b5a28d4e85dd60e741b834 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Controllers/Pressures.h	(.../Pressures.h)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
+++ firmware/App/Controllers/Pressures.h	(.../Pressures.h)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -47,7 +47,7 @@
 void execPressures( void );
 SELF_TEST_STATUS_T execPressureSelfTest( void );
 void checkInletPressure( void );
-DATA_ARRAY_GET_PROTOTYPE( F32, getMeasuredDGPressure, pressureID );
+F32 getMeasuredDGPressure( U32 pressureID );
 
 BOOL testSetPressuresDataPublishIntervalOverride( U32 value );
 BOOL testResetPressuresDataPublishIntervalOverride( void );
Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r5a882c7292cea58e74b5a28d4e85dd60e741b834 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -116,10 +116,10 @@
 static void setROPumpControlSignalPWM( F32 newPWM );
 static void stopROPump( void );
 static void publishROPumpData( void );
-static DATA_GET_PROTOTYPE( U32, getPublishROPumpDataInterval );
+static U32 getPublishROPumpDataInterval( void );
 
 /*********************************************************************//**
- * @brief initROPump
+ * @brief
  * The initROPump function initializes the ROPump module.
  * @details
  * Inputs : none
@@ -413,7 +413,7 @@
  * Outputs : none
  * @return the current RO pump data publication interval (in ms).
  *************************************************************************/
-U32  getPublishROPumpDataInterval( void )
+static U32 getPublishROPumpDataInterval( void )
 {
     U32 result = roPumpDataPublishInterval.data;
 
Index: firmware/App/Controllers/ROPump.h
===================================================================
diff -u -r5a882c7292cea58e74b5a28d4e85dd60e741b834 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
+++ firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -45,10 +45,10 @@
 BOOL isReverseOsmosisPumpOn( void );
 
 SELF_TEST_STATUS_T execROPumpTest( void );
+
+U32 getTargetROPumpPressure( void );
+F32 getMeasuredROFlowRate( void );
 
-DATA_GET_PROTOTYPE( U32, getTargetROPumpPressure );
-DATA_GET_PROTOTYPE( F32, getMeasuredROFlowRate );
-
 BOOL testSetROPumpDataPublishIntervalOverride( U32 value );
 BOOL testResetROPumpDataPublishIntervalOverride( void );
 BOOL testSetTargetROPumpPressureOverride( U32 value );
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r5a882c7292cea58e74b5a28d4e85dd60e741b834 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -162,7 +162,7 @@
 static BOOL isADCReadValid( U32 sensorIndex, U32 fpgaError, U32 fpgaCount );
 static void processADCRead( U32 sensorIndex, S32 adc );
 static void publishTemperatureSensorsData( void );
-static DATA_GET_PROTOTYPE( U32, getPublishTemperatureSensorsDataInterval );
+static U32 getPublishTemperatureSensorsDataInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -748,7 +748,7 @@
  * Outputs : none
  * @return result
  *************************************************************************/
-U32 getPublishTemperatureSensorsDataInterval( void )
+static U32 getPublishTemperatureSensorsDataInterval( void )
 {
     U32 result = tempSensorsPublishInterval.data;
 
Index: firmware/App/Controllers/TemperatureSensors.h
===================================================================
diff -u -r5a882c7292cea58e74b5a28d4e85dd60e741b834 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
+++ firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -57,7 +57,7 @@
 void execTemperatureSensors( void );
 void checkInletWaterTemperature( void );
 
-DATA_ARRAY_GET_PROTOTYPE( F32, getTemperatureValue, sensorIndex );
+F32 getTemperatureValue( U32 sensorIndex );
 
 BOOL testSetMeasuredTemperatureOverride( U32 sensorIndex, F32 temperature );
 BOOL testResetMeasuredTemperatureOverride( U32 sensorIndex );
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r5a882c7292cea58e74b5a28d4e85dd60e741b834 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -50,7 +50,7 @@
 static U32 convertValveStateNameToValveState(VALVE_STATE_NAMES_T valveStateName);
 static U16 fromU32ArrayToU16( void );
 static void publishValvesStates( void );
-static DATA_GET_PROTOTYPE( U32, getPublishValvesStatesInterval );
+static U32 getPublishValvesStatesInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -229,7 +229,7 @@
  * Outputs : none
  * @return the current valves states publication interval (in task intervals)
  *************************************************************************/
-U32 getPublishValvesStatesInterval( void )
+static U32 getPublishValvesStatesInterval( void )
 {
     U32 result = valvesStatesPublishInterval.data;
 
Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r5a882c7292cea58e74b5a28d4e85dd60e741b834 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 5a882c7292cea58e74b5a28d4e85dd60e741b834)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -73,7 +73,7 @@
 void execValves( void );
 
 BOOL setValveState( VALVES_T valve, VALVE_STATE_NAMES_T valveState );
-DATA_ARRAY_GET_PROTOTYPE( U32, getValveState, valveID );
+U32  getValveState( U32 valveID );
 
 BOOL testSetValvesStatesPublishIntervalOverride( U32 value );
 BOOL testResetValvesStatesPublishIntervalOverride( void );
Index: firmware/App/Drivers/CPLD.c
===================================================================
diff -u -r2fe8834dda9d8f69068c151ff0474d915eef6eb5 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision 2fe8834dda9d8f69068c151ff0474d915eef6eb5)
+++ firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -47,7 +47,7 @@
 #define CLR_RED()          {mibspiREG5->PC3 &= ~LAMP_RED_SPI5_PORT_MASK;}                           ///< Clear alarm lamp red signal.
 
 /*********************************************************************//**
- * @brief initCPLD
+ * @brief
  * The initCPLD function initializes the CPLD module.
  * @details
  * Inputs : none
@@ -66,7 +66,7 @@
 }
 
 /*********************************************************************//**
- * @brief toggleCPLDWatchdog
+ * @brief
  * The toggleCPLDWatchdog function toggles the watchdog pet signal to CPLD.
  * @details
  * Inputs : none
@@ -79,7 +79,7 @@
 }
 
 /*********************************************************************//**
- * @brief getCPLDWatchdogExpired
+ * @brief
  * The getCPLDWatchdogExpired function determines the current signal level
  * on the watchdog expired pin from the CPLD.
  * @details
@@ -95,7 +95,7 @@
 }
 
 /*********************************************************************//**
- * @brief setCPLDLampGreen
+ * @brief
  * The setCPLDLampGreen function sets the alarm lamp green signal to CPLD to given level.
  * @details
  * Inputs : none
@@ -116,7 +116,7 @@
 }
 
 /*********************************************************************//**
- * @brief setCPLDLampBlue
+ * @brief
  * The setCPLDLampBlue function sets the alarm lamp blue signal to CPLD to given level.
  * @details
  * Inputs : none
@@ -137,7 +137,7 @@
 }
 
 /*********************************************************************//**
- * @brief setCPLDLampRed
+ * @brief
  * The setCPLDLampRed function sets the alarm lamp red signal to CPLD to given level.
  * @details
  * Inputs : none
Index: firmware/App/Drivers/Comm.c
===================================================================
diff -u -r2fe8834dda9d8f69068c151ff0474d915eef6eb5 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Drivers/Comm.c	(.../Comm.c)	(revision 2fe8834dda9d8f69068c151ff0474d915eef6eb5)
+++ firmware/App/Drivers/Comm.c	(.../Comm.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -35,7 +35,7 @@
 #endif
 
 /*********************************************************************//**
- * @brief signalCANXmitsInitiated
+ * @brief
  * The signalCANXmitsInitiated function sets the CAN transmits in progress flag.
  * @details
  * Inputs : none
@@ -48,7 +48,7 @@
 }
 
 /*********************************************************************//**
- * @brief signalCANXmitsCompleted
+ * @brief
  * The signalCANXmitsCompleted function resets the CAN transmits in progress flag.
  * @details
  * Inputs : none
@@ -61,7 +61,7 @@
 }
 
 /*********************************************************************//**
- * @brief signalSCI1XmitsInitiated
+ * @brief
  * The signalSCI1XmitsInitiated function sets the SCI1 transmits in progress flag.
  * @details
  * Inputs : none
@@ -76,7 +76,7 @@
 #endif
 
 /*********************************************************************//**
- * @brief signalSCI1XmitsCompleted
+ * @brief
  * The signalSCI1XmitsCompleted function resets the SCI1 transmits in progress flag.
  * @details
  * Inputs : none
@@ -91,7 +91,7 @@
 #endif
 
 /*********************************************************************//**
- * @brief setSCI1DMAReceiveInterrupt
+ * @brief
  * The setSCI1DMAReceiveInterrupt function enables DMA receive interrupts
  * for the SCI1 peripheral.
  * @details
@@ -107,7 +107,7 @@
 #endif
 
 /*********************************************************************//**
- * @brief setSCI1DMATransmitInterrupt
+ * @brief
  * The setSCI1DMATransmitInterrupt function enables DMA transmit interrupts
  * for the SCI1 peripheral.
  * @details
@@ -123,7 +123,7 @@
 #endif
 
 /*********************************************************************//**
- * @brief clearSCI1DMAReceiveInterrupt
+ * @brief
  * The clearSCI1DMAReceiveInterrupt function disables DMA receive interrupts
  * for the SCI1 peripheral.
  * @details
@@ -139,7 +139,7 @@
 #endif
 
 /*********************************************************************//**
- * @brief clearSCI1DMATransmitInterrupt
+ * @brief
  * The clearSCI1DMATransmitInterrupt function disables DMA transmit interrupts
  * for the SCI1 peripheral.
  * @details
@@ -155,7 +155,7 @@
 #endif
 
 /*********************************************************************//**
- * @brief setSCI2DMAReceiveInterrupt
+ * @brief
  * The setSCI2DMAReceiveInterrupt function enables DMA receive interrupts
  * for the SCI2 peripheral.
  * @details
@@ -169,7 +169,7 @@
 }
 
 /*********************************************************************//**
- * @brief setSCI2DMATransmitInterrupt
+ * @brief
  * The setSCI2DMATransmitInterrupt function enables DMA transmit interrupts
  * for the SCI2 peripheral.
  * @details
@@ -183,7 +183,7 @@
 }
 
 /*********************************************************************//**
- * @brief clearSCI2DMAReceiveInterrupt
+ * @brief
  * The clearSCI2DMAReceiveInterrupt function disables DMA receive interrupts
  * for the SCI2 peripheral.
  * @details
@@ -197,7 +197,7 @@
 }
 
 /*********************************************************************//**
- * @brief clearSCI2DMATransmitInterrupt
+ * @brief
  * The clearSCI2DMATransmitInterrupt function disables DMA transmit interrupts
  * for the SCI2 peripheral.
  * @details
@@ -211,7 +211,7 @@
 }
 
 /*********************************************************************//**
- * @brief clearSCI1CommErrors
+ * @brief
  * The clearSCI1CommErrors function clears framing and/or overrun error flags
  * for the SCI1 peripheral.
  * @details
@@ -228,7 +228,7 @@
 #endif
 
 /*********************************************************************//**
- * @brief clearSCI2CommErrors
+ * @brief
  * The clearSCI2CommErrors function clears framing and/or overrun error flags
  * for the SCI2 peripheral.
  * @details
@@ -243,7 +243,7 @@
 }
 
 /*********************************************************************//**
- * @brief isSCI1DMATransmitInProgress
+ * @brief
  * The isSCI2DMATransmitInProgress function determines whether a DMA transmit
  * is in progress on the SCI1 peripheral.
  * @details
@@ -263,7 +263,7 @@
 #endif
 
 /*********************************************************************//**
- * @brief isSCI2DMATransmitInProgress
+ * @brief
  * The isSCI2DMATransmitInProgress function determines whether a DMA transmit
  * is in progress on the SCI2 peripheral.
  * @details
@@ -280,7 +280,7 @@
 }
 
 /*********************************************************************//**
- * @brief isCAN1TransmitInProgress
+ * @brief
  * The isCAN1TransmitInProgress function determines whether a transmit
  * is in progress on the CAN1 peripheral.
  * @details
Index: firmware/App/Drivers/InternalADC.c
===================================================================
diff -u -r2fe8834dda9d8f69068c151ff0474d915eef6eb5 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Drivers/InternalADC.c	(.../InternalADC.c)	(revision 2fe8834dda9d8f69068c151ff0474d915eef6eb5)
+++ firmware/App/Drivers/InternalADC.c	(.../InternalADC.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -70,7 +70,7 @@
 static U32 adcReadingsAvgs[ NUM_OF_INT_ADC_CHANNELS ];                    ///< Rolling average for each ADC channel.
 
 /*********************************************************************//**
- * @brief initInternalADC
+ * @brief
  * The initInternalADC function initializes the InternalADC module.
  * @details
  * Inputs : none
@@ -120,7 +120,7 @@
 }
 
 /*********************************************************************//**
- * @brief execInternalADC
+ * @brief
  * The execInternalADC function processes the last set of raw ADC channel
  * readings and kicks off the next conversion of ADC channels.
  * @details
@@ -158,7 +158,7 @@
 }
 
 /*********************************************************************//**
- * @brief getIntADCReading
+ * @brief
  * The getIntADCReading function gets the latest average reading for a given channel.
  * @details
  * Inputs : adcReadingsAvgs[]
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rcc398b14ccf518f350b57fb5cb8728e5c908bd1e -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision cc398b14ccf518f350b57fb5cb8728e5c908bd1e)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -43,7 +43,7 @@
 static DG_FILL_MODE_STATE_T handleDeliverDialysateState( void );
 
 /*********************************************************************//**
- * @brief initFillMode
+ * @brief
  * The initFillMode function initializes the fill mode module.
  * @details
  * Inputs : none
@@ -56,7 +56,7 @@
 }
 
 /*********************************************************************//**
- * @brief transitionToFillMode
+ * @brief
  * The transitionToFillMode function prepares for transition to fill mode.
  * @details
  * Inputs : none
@@ -75,7 +75,7 @@
 }
 
 /*********************************************************************//**
- * @brief execFillMode
+ * @brief
  * The execFillMode function executes the fill mode state machine.
  * @details
  * Inputs : fillState
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -40,7 +40,7 @@
 static DATA_ARRAY_GET_PROTOTYPE( BOOL, getAlarmActive, alarmID );
 
 /*********************************************************************//**
- * @brief initAlarmMgmt
+ * @brief
  * The initAlarmMgmt function initializes the AlarmMgmt module.
  * @details
  * Inputs : none
@@ -62,7 +62,7 @@
 }
 
 /*********************************************************************//**
- * @brief execAlarmMgmt
+ * @brief
  * The execAlarmMgmt function executes the alarm management module.
  * @details
  * Inputs : none
@@ -75,7 +75,7 @@
 }
 
 /*********************************************************************//**
- * @brief activateAlarm
+ * @brief
  * The activateAlarm function activates a given alarm.
  * @details
  * Inputs : none
@@ -102,7 +102,7 @@
 }
 
 /*********************************************************************//**
- * @brief activateAlarmNoData
+ * @brief
  * The activateAlarmNoData function activates a given alarm. An alarm message
  * is broadcast to the rest of the system.
  * @details
@@ -134,7 +134,7 @@
 }
 
 /*********************************************************************//**
- * @brief activateAlarm1Data
+ * @brief
  * The activateAlarm1Data function activates a given alarm. An alarm message
  * is broadcast to the rest of the system.  This function will include given
  * data in the broadcast message for logging.
@@ -168,7 +168,7 @@
 }
 
 /*********************************************************************//**
- * @brief activateAlarm2Data
+ * @brief
  * The activateAlarm2Data function activates a given alarm. An alarm message
  * is broadcast to the rest of the system.  This function will include
  * two given data in the broadcast message for logging.
@@ -203,7 +203,7 @@
 }
 
 /*********************************************************************//**
- * @brief clearAlarm
+ * @brief
  * The clearAlarm function clears a given alarm if it is recoverable.
  * An alarm message is broadcast to the rest of the system.
  * @details
@@ -242,7 +242,7 @@
 }
 
 /*********************************************************************//**
- * @brief isAlarmActive
+ * @brief
  * The isAlarmActive function determines whether a given alarm is currently active.
  * @details
  * Inputs : alarmIsActive[]
@@ -258,7 +258,7 @@
 }
 
 /*********************************************************************//**
- * @brief getAlarmActive
+ * @brief
  * The getAlarmActive function gets the active state of a given alarm.
  * @details
  * Inputs : alarmIsActive[]
Index: firmware/App/Services/MsgQueues.c
===================================================================
diff -u -r5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision 5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1)
+++ firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -36,7 +36,7 @@
 // ********** private function prototypes **********
 
 /*********************************************************************//**
- * @brief initMsgQueues
+ * @brief
  * The initMsgQueues function initializes the MsgQueues module.
  * @details
  * Inputs : none
@@ -61,7 +61,7 @@
 }
 
 /*********************************************************************//**
- * @brief addToMsgQueue
+ * @brief
  * The addToMsgQueue function adds a message to a given message queue.
  * This function should only be called from the general task.
  * @details
@@ -102,7 +102,7 @@
 }
 
 /*********************************************************************//**
- * @brief getFromMsgQueue
+ * @brief
  * The getFromMsgQueue function retrieves the next message from a given
  * message queue.  This function should only be called from the general task.
  * @details
@@ -143,7 +143,7 @@
 }
 
 /*********************************************************************//**
- * @brief isMsgQueueEmpty
+ * @brief
  * The isMsgQueueEmpty function determines whether a given message queue is empty.
  * @details
  * Inputs : msgQueueCounts[]
@@ -172,7 +172,7 @@
 }
 
 /*********************************************************************//**
- * @brief isMsgQueueFull
+ * @brief
  * The isMsgQueueFull function determines whether a given message queue is full.
  * @details
  * Inputs : msgQueueCounts[]
@@ -201,7 +201,7 @@
 }
 
 /*********************************************************************//**
- * @brief blankMessage
+ * @brief
  * The blankMessage function blanks a given message.
  * @details
  * Inputs : none
@@ -223,7 +223,7 @@
 }
 
 /*********************************************************************//**
- * @brief blankMessageInWrapper
+ * @brief
  * The blankMessageInWrapper function blanks a given message in a wrapper.
  * @details
  * Inputs : none
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -180,7 +180,7 @@
 }
 
 /*********************************************************************//**
- * @brief sendTestAckResponseMsg
+ * @brief
  * The sendTestAckResponseMsg function constructs a simple response message for
  * a handled test message and queues it for transmit on the appropriate UART channel.
  * @details
@@ -214,7 +214,7 @@
 // ***********************************************************************
 
 /*********************************************************************//**
- * @brief broadcastAlarmTriggered
+ * @brief
  * The broadcastAlarmTriggered function constructs an alarm triggered msg to
  * be broadcast and queues the msg for transmit on the appropriate CAN channel.
  * @details
@@ -249,7 +249,7 @@
 }
 
 /*********************************************************************//**
- * @brief broadcastAlarmCleared
+ * @brief
  * The broadcastAlarmCleared function constructs an alarm cleared msg to be
  * broadcast and queues the msg for transmit on the appropriate CAN channel.
  * @details
@@ -325,7 +325,7 @@
 }
 
 /*********************************************************************//**
- * @brief broadcastRTCEpoch
+ * @brief
  * The broadcastRTCEpoch function constructs an epoch  msg to be broadcast
  * and queues the msg for transmit on the appropriate CAN channel.
  * @details
@@ -943,7 +943,7 @@
 }
 
 /*********************************************************************//**
- * @brief handleSetRTCTimestamp
+ * @brief
  * The handleSetRTCTimestamp function handles a request to write time and
  * date to RTC
  * @details
@@ -1140,7 +1140,7 @@
 DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestWatchdogCheckInStateOverrideRequest, testSetWatchdogTaskCheckInOverride, testResetWatchdogTaskCheckInOverride )
 
 /*********************************************************************//**
- * @brief handleTestAlarmStateOverrideRequest
+ * @brief
  * The handleTestAlarmStateOverrideRequest function handles a request to
  * override the active status of a given alarm.
  * @details
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1 -r482f4465ccdb813922de506bf780e29f4fb2f84b
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 5e0cd9b5be11ff4b2acaadbdcafc4ffe05172aa1)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 482f4465ccdb813922de506bf780e29f4fb2f84b)
@@ -59,7 +59,7 @@
 static DATA_ARRAY_GET_PROTOTYPE( BOOL, hasTaskGeneralCheckedIn, task );
 
 /*********************************************************************//**
- * @brief initWatchdogMgmt
+ * @brief
  * The initWatchdogMgmt function initializes the WatchdogMgmt module.
  * @details
  * Inputs : none
@@ -85,7 +85,7 @@
 }
 
 /*********************************************************************//**
- * @brief execWatchdogMgmt
+ * @brief
  * The execWatchdogMgmt function executes the watchdog management service.
  * @details
  * Inputs : none
@@ -123,7 +123,7 @@
 }
 
 /*********************************************************************//**
- * @brief checkInWithWatchdogMgmt
+ * @brief
  * The checkInWithWatchdogMgmt function checks a given task in with the
  * watchdog management service.
  * @details
@@ -141,7 +141,7 @@
 }
 
 /*********************************************************************//**
- * @brief execWatchdogTest
+ * @brief
  * The execWatchdogTest function executes the watchdog test. This function
  * should be called periodically until a pass or fail result is returned.
  * @details
@@ -202,7 +202,7 @@
 }
 
 /*********************************************************************//**
- * @brief resetWDTaskCheckIns
+ * @brief
  * The resetWDTaskCheckIns function resets the task check-ins with the watchdog.
  * @details
  * Inputs : none
@@ -221,7 +221,7 @@
 }
 
 /*********************************************************************//**
- * @brief haveAllTasksCheckedIn
+ * @brief
  * The haveAllTasksCheckedIn function determines whether all tasks have
  * checked in with watchdog mgmt.
  * @details
@@ -248,7 +248,7 @@
 }
 
 /*********************************************************************//**
- * @brief hasTaskGeneralCheckedIn
+ * @brief
  * The hasTaskGeneralCheckedIn function gets the check-in state of a given task.
  * @details
  * Inputs : watchdogTaskCheckedIn[]
@@ -259,7 +259,7 @@
 static DATA_ARRAY_GET( BOOL, hasTaskGeneralCheckedIn, task, NUM_OF_TASKS-1, watchdogTaskCheckedIn, FALSE )
 
 /*********************************************************************//**
- * @brief petWatchdog
+ * @brief
  * The petWatchdog function pets the watchdog by pulsing the CPLD WD pet signal.
  * @details
  * Inputs : none
@@ -281,7 +281,7 @@
  *************************************************************************/
 
 /*********************************************************************//**
- * @brief testSetWatchdogTaskCheckInOverride and testResetWatchdogTaskCheckInOverride
+ * @brief
  * The testSetWatchdogTaskCheckInOverride function overrides the state of the
  * task check-in with the watchdog management with a given check-in state.
  * The testResetWatchdogTaskCheckInOverride function resets the override of the