Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r0798ef0a54e4ddaa551ced7b2bd9b032aa458095 -r85a18ee758116bb8e19b80b18f166a691a464bb7
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 0798ef0a54e4ddaa551ced7b2bd9b032aa458095)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 85a18ee758116bb8e19b80b18f166a691a464bb7)
@@ -91,6 +91,8 @@
 #define FPGA_PBO_TEMP_GAIN              200.0                   ///< Used in conversion of PBo temperature reading to deg C.
 #define FPGA_PBO_TEMP_OFFSET            50.0                    ///< Used in conversion of PBo temperature reading to deg C.
 
+#define FPGA_ALARM_AUDIO_VOLUME_SHIFT   3                       ///< Shift alarm audio volume 3 bits to left before writing to register.
+
 // FPGA Sensors Record
 #pragma pack(push,1)
 /// Record structure for FPGA header read.
@@ -1091,6 +1093,7 @@
  *          1 - Low priority alarm tone (c e)
  *          2 - Medium priority alarm tone (c f# c)
  *          3 - High priority alarm tone (c f# c - c f#)
+ *          4 - Continuous test tone (e)
  * @param volumeLevel the level of attenuation to command (0..4)
  *          4 - 3 dB gain
  *          3 - 6 dB gain
@@ -1099,25 +1102,24 @@
  *          0 - 15 dB gain
  * @return none
  *************************************************************************/
-void setAlarmAudioState( ALARM_PRIORITY_T state, U32 volumeLevel )
+void setAlarmAudioState( U32 state, U32 volumeLevel )
 {
+    U08 audioCmd = (U08)state;
+
+    audioCmd |= ( (U08)volumeLevel << FPGA_ALARM_AUDIO_VOLUME_SHIFT );
+
     if ( ( state < NUM_OF_ALARM_PRIORITIES ) && ( volumeLevel <= MAX_ALARM_VOLUME_ATTENUATION ) )
     {
-        U08 audioCmd = (U08)state;
-
-        audioCmd |= ( (U08)volumeLevel << 2 );
         fpgaActuatorSetPoints.alarmControl = audioCmd;
     }
     else
     {
-        U08 audioCmd = (U08)ALARM_PRIORITY_HIGH;
-
+        // S/w fault to indicate issue w/ s/w
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_ALARM_AUDIO_PARAM, (U32)audioCmd )
         // Set alarm audio to high priority, max volume for safety since s/w seems to be having trouble setting audio correctly
-        audioCmd |= ( (U08)MIN_ALARM_VOLUME_ATTENUATION << 2 );
+        audioCmd = (U08)ALARM_PRIORITY_HIGH;
+        audioCmd |= ( (U08)MIN_ALARM_VOLUME_ATTENUATION << FPGA_ALARM_AUDIO_VOLUME_SHIFT );
         fpgaActuatorSetPoints.alarmControl = audioCmd;
-        // S/w fault to indicate issue w/ s/w
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_ALARM_AUDIO_PARAM, volumeLevel )
-
     }
 }