Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rd288d5bf2a6cd52f9b0e1edccc1aadfa6589c127 -r9302e1bd2413cbf99e80ac51aac38502d94801d9
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision d288d5bf2a6cd52f9b0e1edccc1aadfa6589c127)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 9302e1bd2413cbf99e80ac51aac38502d94801d9)
@@ -183,7 +183,6 @@
  * @details
  * Inputs : none
  * Outputs : AlarmMgmt module initialized.
- * @param none
  * @return none
  *************************************************************************/
 void initAlarmMgmt( void )
@@ -233,7 +232,6 @@
  * @details
  * Inputs : larmStatusTable[], alarmTable[]
  * Outputs : larmStatus
- * @param none
  * @return none
  *************************************************************************/
 void execAlarmMgmt( void )
@@ -257,7 +255,7 @@
  * @details
  * Inputs : none
  * Outputs : alarmIsActive[], alarmStartedAt[]
- * @param alarm : ID of alarm to activate
+ * @param alarm ID of alarm to activate
  * @return none
  *************************************************************************/
 static void activateAlarm( ALARM_ID_T alarm )
@@ -296,8 +294,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 )
@@ -330,8 +328,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 )
@@ -364,9 +362,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 )
@@ -398,7 +396,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 )
@@ -447,7 +445,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 )
@@ -463,7 +461,7 @@
  * @details
  * Inputs : alarmStartedAt[]
  * Outputs : none
- * @param alarmID : ID of alarm to check
+ * @param alarmID ID of alarm to check
  * @return The start time stamp of given alarm ID
  *************************************************************************/
 static DATA_ARRAY_GET( U32, getAlarmStartTime, alarmID, NUM_OF_ALARM_IDS-1, alarmStartedAt, 0 )
@@ -475,7 +473,6 @@
  * @details
  * Inputs : alarmStatusTable[]
  * Outputs : alarmPriorityFIFO[], alarmStatus
- * @param none
  * @return none
  *************************************************************************/
 static void updateAlarmsState( void )
@@ -515,7 +512,6 @@
  * @details
  * Inputs : none
  * Outputs : Alarm lamp patter set according to current alarms status.
- * @param none
  * @return none
  *************************************************************************/
 static void setAlarmLampAndAudio( void )
@@ -592,7 +588,6 @@
  * @details
  * Inputs : alarmStatus
  * Outputs : alarmStatus
- * @param none
  * @return none
  *************************************************************************/
 static void updateAlarmsSilenceStatus( void )
@@ -629,7 +624,6 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param none
  * @return none
  *************************************************************************/
 static void handleAlarmEscalations( void )
@@ -693,7 +687,6 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @param none
  * @return none
  *************************************************************************/
 static void updateAlarmsFlags( void )
@@ -749,7 +742,7 @@
  * @details
  * Inputs : none
  * Outputs : alarmPriorityFIFO[]
- * @param priority : priority of FIFO to reset
+ * @param priority priority of FIFO to reset
  * @return none
  *************************************************************************/
 static void resetAlarmPriorityFIFO( ALARM_PRIORITY_T priority )
@@ -772,7 +765,6 @@
  * @details
  * Inputs : alarmStatusPublishInterval
  * Outputs : none
- * @param none
  * @return the current alarm status publication interval (in ms).
  *************************************************************************/
 DATA_GET( U32, getPublishAlarmStatusInterval, alarmStatusPublishInterval )
@@ -792,7 +784,7 @@
  * @details
  * Inputs : none
  * Outputs : alarmStatusPublishInterval
- * @param value : override blood flow data publish interval with (in ms)
+ * @param value override blood flow data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetAlarmStatusPublishIntervalOverride( U32 value )
@@ -842,8 +834,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 )
@@ -876,7 +868,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 )
@@ -902,8 +894,8 @@
  * @details
  * Inputs : none
  * Outputs : alarmStartedAt[]
- * @param alarmID : ID of alarm to override start time for
- * @param value : override time since start (in ms) for the given alarm ID
+ * @param alarmID ID of alarm to override start time for
+ * @param value override time since start (in ms) for the given alarm ID
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetAlarmStartOverride( U32 alarmID, U32 value )
@@ -935,7 +927,7 @@
  * @details
  * Inputs : none
  * Outputs : alarmStartedAt[]
- * @param alarmID : ID of alarm to reset override of start time for
+ * @param alarmID ID of alarm to reset override of start time for
  * @return TRUE if override reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetAlarmStartOverride( U32 alarmID )