Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -rfacca88de0d4c72d943b59bad9264a9b0a031ae5
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision facca88de0d4c72d943b59bad9264a9b0a031ae5)
@@ -66,8 +66,8 @@
 #define ALARM_AUDIO_CURRENT_HG_MIN_MA         20.0F                                                     ///< Minimum audio current (high gain) during test tone self-test (in mA).  // TODO - Why is HG so low?  S/B same as LG I think.
 #define ALARM_AUDIO_CURRENT_LG_MIN_MA         60.0F                                                     ///< Minimum audio current (low gain) during test tone self-test (in mA).
 #define ALARM_AUDIO_MAX_TEST_TIME_MS          1000                                                      ///< Maximum time for audio current to reach threshold in test.
-#define MAX_ALARM_AUDIO_VOLUME_INDEX          (MAX_ALARM_VOLUME_LEVEL - 1 )                             ///< Index for maximum alarm audio volume.
-#define MIN_ALARM_AUDIO_VOLUME_INDEX          0                                                         ///< Index for minimum alarm audio volume.
+#define MAX_ALARM_AUDIO_VOLUME_INDEX          0                                                         ///< Index for maximum alarm audio volume.
+#define MIN_ALARM_AUDIO_VOLUME_INDEX          (MAX_ALARM_VOLUME_LEVEL - 1 )                             ///< Index for minimum alarm audio volume.
 
 /// Alarm priority ranking record.
 typedef struct
@@ -115,6 +115,7 @@
 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.
@@ -939,8 +940,8 @@
     if ( TRUE == alarmAudioTestToneRequested )
     {   // Play test tone at min volume
         setAlarmAudioState( ALARM_AUDIO_TEST_TONE,
-                            ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[MIN_ALARM_AUDIO_VOLUME_INDEX][ALARM_AUDIO_VOLUME_GAIN],
-                            ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[MIN_ALARM_AUDIO_VOLUME_INDEX][ALARM_AUDIO_VOLUME_DIVIDER] );
+                            ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[MAX_ALARM_AUDIO_VOLUME_INDEX][ALARM_AUDIO_VOLUME_GAIN],
+                            ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[MAX_ALARM_AUDIO_VOLUME_INDEX][ALARM_AUDIO_VOLUME_DIVIDER] );
         // If we're in Fault mode, ensure audio test tone request is cancelled.
         if ( MODE_FAUL == getCurrentOperationMode() )
         {