Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r526e890e4e35fac0a622af538bf611ea15a30609 -rb687ab5673dc5da53537f538056ea12842b3f6ce
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 526e890e4e35fac0a622af538bf611ea15a30609)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision b687ab5673dc5da53537f538056ea12842b3f6ce)
@@ -110,7 +110,7 @@
 #ifndef _RELEASE_
 const  PRE_TREATMENT_RESERVOIR_VAR_T reservoirPrimingDisabled = {FALSE,FALSE,FALSE,TRUE,FALSE,(0)};
 #endif
-const  PRE_TREATMENT_RESERVOIR_VAR_T reservoirPretreatmentInit = {FALSE,FALSE,FALSE,FALSE,FALSE,PRE_TREATMENT_FLUSH_COUNT};
+const  PRE_TREATMENT_RESERVOIR_VAR_T reservoirPretreatmentInit = {FALSE,FALSE,FALSE,FALSE,FALSE,PRE_TREATMENT_FLUSH_COUNT};  ///< Pretreatment reservoir fill plan record.
 
 // ********** private function prototypes **********
 
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r408247fba0f81c8ca77fb3144694ac8d7358d87b -rb687ab5673dc5da53537f538056ea12842b3f6ce
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 408247fba0f81c8ca77fb3144694ac8d7358d87b)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision b687ab5673dc5da53537f538056ea12842b3f6ce)
@@ -89,6 +89,7 @@
 static U32 treatmentTimeBroadcastTimerCtr;                      ///< Treatment time data broadcast timer counter used to schedule when to transmit data.
 static U32 treatmentStateBroadcastTimerCtr;                     ///< Treatment state data broadcast timer counter used to schedule when to transmit data.
 static U32 treatmentParamsRangesBroadcastTimerCtr;              ///< Treatment parameter ranges broadcast timer counter used to schedule when to transmit updated ranges.
+
 /// Interval (in task intervals) at which to publish alarm status to CAN bus.
 static OVERRIDE_U32_T treatmentTimePublishInterval = { TREATMENT_TIME_DATA_PUB_INTERVAL, TREATMENT_TIME_DATA_PUB_INTERVAL, TREATMENT_TIME_DATA_PUB_INTERVAL, 0 };
 /// Interval (in task intervals) at which to publish alarm status to CAN bus.
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r1cefdd82890709898ba4f5c8d8d93db1e650bec0 -rb687ab5673dc5da53537f538056ea12842b3f6ce
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 1cefdd82890709898ba4f5c8d8d93db1e650bec0)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision b687ab5673dc5da53537f538056ea12842b3f6ce)
@@ -62,6 +62,7 @@
 static U32 broadcastModeIntervalCtr;                        ///< Interval counter used to determine when to broadcast operation mode.  Initialize to 11 to stagger broadcast.
 static U32 currentSubState;                                 ///< current sub state.
 static U32 current4thLevelState;                            ///< current 4th level state.
+
 /// Interval (in task intervals) at which to publish operation mode data to CAN bus.
 static OVERRIDE_U32_T opModePublishInterval = { BROADCAST_HD_OP_MODE_INTERVAL, BROADCAST_HD_OP_MODE_INTERVAL, BROADCAST_HD_OP_MODE_INTERVAL, 0 };
 /// Local structure init for saving confirmation requests
Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -rdd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37 -rb687ab5673dc5da53537f538056ea12842b3f6ce
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision dd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision b687ab5673dc5da53537f538056ea12842b3f6ce)
@@ -68,6 +68,7 @@
 static F32  totalAdditionalRinsebackVolume_mL;                              ///< Total accumulated volume (in mL) delivered so far for all additional volumes combined.
 static U32  rinsebackAdditionalTimerCtr;                                    ///< Timer counter for duration of an additional rinseback delivery.
 static U32  rinsebackPublishTimerCtr;                                       ///< Timer counter for determining interval for rinseback status to be published.
+
 /// Interval (in task intervals) at which to publish rinseback data to CAN bus.
 static OVERRIDE_U32_T rinsebackPublishInterval = { RINSEBACK_DATA_PUBLISH_INTERVAL, RINSEBACK_DATA_PUBLISH_INTERVAL, RINSEBACK_DATA_PUBLISH_INTERVAL, 0 };
 
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rd611c5eeaee076a6fbf79cf94f80fff05fd5d9a9 -rb687ab5673dc5da53537f538056ea12842b3f6ce
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision d611c5eeaee076a6fbf79cf94f80fff05fd5d9a9)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision b687ab5673dc5da53537f538056ea12842b3f6ce)
@@ -43,8 +43,8 @@
 
 #define PUMP_RUN_SELF_TEST_TIME_MS                          ( 15 * MS_PER_SECOND )                  ///< Self-test time to run pumps in ms.
 #define PUMP_SELF_TEST_FLOW_RATE_ML_MIN                     100                                     ///< Self-test pump flow rate in mL/min.
-#define BLOOD_PUMP_PRESSURE_SELF_TEST_FLOW                  100
-#define DIAL_IN_PUMP_PRESSURE_SELF_TEST_FLOW                400
+#define BLOOD_PUMP_PRESSURE_SELF_TEST_FLOW                  100                                     ///< Pressure self-test BP flow rate in mL/min.
+#define DIAL_IN_PUMP_PRESSURE_SELF_TEST_FLOW                400                                     ///< Pressure self-test DPi flow rate in mL/min.
 #define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 1 * MS_PER_SECOND )                   ///< Delay 1 second then check for syringe pump prime occlusion.
 
 #define PRE_NORMAL_PRESSURE_SELF_TEST_DELAY_MS              ( 5 * MS_PER_SECOND )                   ///< Delay 5 second prior to getting initial normal baseline pressures.
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r0caa659858cdbd6b887dda7417ffbbd3123f17f6 -rb687ab5673dc5da53537f538056ea12842b3f6ce
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 0caa659858cdbd6b887dda7417ffbbd3123f17f6)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision b687ab5673dc5da53537f538056ea12842b3f6ce)
@@ -120,16 +120,18 @@
 
 /// Interval (in task intervals) at which to publish alarm status to CAN bus.
 static OVERRIDE_U32_T alarmStatusPublishInterval = { ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL, 0 };
+
 /// Interval (in task intervals) at which to publish alarm information to CAN bus.
 static OVERRIDE_U32_T alarmInfoPublishInterval = { ALARM_INFO_PUB_INTERVAL, ALARM_INFO_PUB_INTERVAL, ALARM_INFO_PUB_INTERVAL, 0 };
+
 /// Alarm audio attenuation level (0..4 where 0 = max volume and 4 = min volume).
 static OVERRIDE_U32_T alarmAudioVolumeLevel = { MAX_ALARM_VOLUME_ATTENUATION, MAX_ALARM_VOLUME_ATTENUATION, MAX_ALARM_VOLUME_ATTENUATION, 0 };
 
-static OVERRIDE_F32_T alarmPrimaryAudioCurrentHG = { 0.0, 0.0, 0.0, 0 };            /// Alarm audio current (high gain) measured at ADC.
+static OVERRIDE_F32_T alarmPrimaryAudioCurrentHG = { 0.0, 0.0, 0.0, 0 };            ///< Alarm audio current (high gain) measured at ADC.
 
-static OVERRIDE_F32_T alarmPrimaryAudioCurrentLG = { 0.0, 0.0, 0.0, 0 };            /// Alarm audio current (low gain) measured at ADC.
+static OVERRIDE_F32_T alarmPrimaryAudioCurrentLG = { 0.0, 0.0, 0.0, 0 };            ///< Alarm audio current (low gain) measured at ADC.
 
-static OVERRIDE_F32_T alarmBackupAudioCurrent = { 0.0, 0.0, 0.0, 0 };               /// Alarm backup audio current measured at ADC.
+static OVERRIDE_F32_T alarmBackupAudioCurrent = { 0.0, 0.0, 0.0, 0 };               ///< Alarm backup audio current measured at ADC.
 
 static COMP_ALARM_STATUS_T alarmStatus;                                             ///< Record for the current composite alarm status.
 static ALARM_PRIORITY_RANKS_T alarmPriorityFIFO[ NUM_OF_ALARM_PRIORITIES ];         ///< FIFO - first activated or highest sub-rank alarm in each alarm priority category.
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -rdd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37 -rb687ab5673dc5da53537f538056ea12842b3f6ce
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision dd8d00b02a7565f3c5ce70040ae3b1bc40b4fe37)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision b687ab5673dc5da53537f538056ea12842b3f6ce)
@@ -38,9 +38,9 @@
 /// Interval (in ms) at which alarm lamp and audio control will be executed.
 #define ALARM_LAMP_AND_AUDIO_CONTROL_INTERVAL_MS        250
 
-#define MAX_ALARM_VOLUME_LEVEL                          5
-#define MAX_ALARM_VOLUME_ATTENUATION                    4
-#define MIN_ALARM_VOLUME_ATTENUATION                    0
+#define MAX_ALARM_VOLUME_LEVEL                          5           ///< Maximum alarm audio level.
+#define MAX_ALARM_VOLUME_ATTENUATION                    4           ///< Maximum alarm audio attenuation.
+#define MIN_ALARM_VOLUME_ATTENUATION                    0           ///< Minimum alarm audio attenuation.
 #define MAX_ALARM_LIST_SIZE                             10          ///< Maximum number of active alarms inside alarm list.
 
 /// Enumeration of alarm actions.
@@ -182,6 +182,7 @@
     U32 alarmID;                                ///< Alarm ID.
 } ALARM_ID_DATA_PUBLISH_T;
 
+/// Alarm list request response payload record structure.
 typedef struct
 {
     BOOL accepted;                              ///< Accepted/Rejected.