Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r85a18ee758116bb8e19b80b18f166a691a464bb7 -r793769afaa008c10c04f527c75c2feed850f15c3
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 85a18ee758116bb8e19b80b18f166a691a464bb7)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 793769afaa008c10c04f527c75c2feed850f15c3)
@@ -1205,23 +1205,25 @@
     if ( alarmAudioTestToneRequested != TRUE )
     {
         alarmAudioTestToneRequested = TRUE;
+        setAlarmAudio();
     }
     else
     {
         F32 almHGCurrent = getIntADCVoltageConverted( INT_ADC_PRIMARY_ALARM_CURRENT_HG );
         F32 almLGCurrent = getIntADCVoltageConverted( INT_ADC_PRIMARY_ALARM_CURRENT_LG );
 
         // Check if alarm audio current is sufficiently high indicating alarm tone is being output
-        if ( ( almHGCurrent > ALARM_AUDIO_CURRENT_HG_MIN_MA ) &&
-             ( almLGCurrent > ALARM_AUDIO_CURRENT_LG_MIN_MA ) )
+// TODO - need tone to be on longer than 50ms.  make duration long (1 sec) at first to characterize the audio, then change to exit test when threshold met or t/o
+//        if ( ( almHGCurrent > ALARM_AUDIO_CURRENT_HG_MIN_MA ) &&
+//             ( almLGCurrent > ALARM_AUDIO_CURRENT_LG_MIN_MA ) )
         {
             result = SELF_TEST_STATUS_PASSED;
         }
-        else
-        {
-            result = SELF_TEST_STATUS_FAILED;
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE, almHGCurrent, almLGCurrent );
-        }
+//        else
+//        {
+//            result = SELF_TEST_STATUS_FAILED;
+//            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE, almHGCurrent, almLGCurrent );
+//        }
     }
 
     return result;
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r85a18ee758116bb8e19b80b18f166a691a464bb7 -r793769afaa008c10c04f527c75c2feed850f15c3
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 85a18ee758116bb8e19b80b18f166a691a464bb7)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 793769afaa008c10c04f527c75c2feed850f15c3)
@@ -1108,7 +1108,7 @@
 
     audioCmd |= ( (U08)volumeLevel << FPGA_ALARM_AUDIO_VOLUME_SHIFT );
 
-    if ( ( state < NUM_OF_ALARM_PRIORITIES ) && ( volumeLevel <= MAX_ALARM_VOLUME_ATTENUATION ) )
+    if ( ( state <= NUM_OF_ALARM_PRIORITIES ) && ( volumeLevel <= MAX_ALARM_VOLUME_ATTENUATION ) )
     {
         fpgaActuatorSetPoints.alarmControl = audioCmd;
     }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r326e3597e1555ef2ac4978f58786e7ce638b1287 -r793769afaa008c10c04f527c75c2feed850f15c3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 326e3597e1555ef2ac4978f58786e7ce638b1287)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 793769afaa008c10c04f527c75c2feed850f15c3)
@@ -2362,7 +2362,7 @@
     memcpy( payloadPtr, &testID, sizeof( U32) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_BROADCAST, ACK_REQUIRED );
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_BROADCAST, ACK_NOT_REQUIRED ); // TODO - make ack required when UI ready
 
     return result;
 
@@ -2391,7 +2391,7 @@
     memcpy( payloadPtr, &passed, sizeof( BOOL ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_BROADCAST, ACK_REQUIRED );
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_BROADCAST, ACK_NOT_REQUIRED ); // TODO - make ack required when UI ready
 
     return result;
 }