Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -ra2bc96881a5fc3d8f779246b2abebf15a8de9384
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision a2bc96881a5fc3d8f779246b2abebf15a8de9384)
@@ -15,11 +15,12 @@
 *
 ***************************************************************************/
 
+#include "AlarmLamp.h"
+#include "AlarmMgmt.h"
 #include "CPLD.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
-#include "AlarmLamp.h"
 
 /**
  *  @addtogroup AlarmLamp
@@ -28,7 +29,7 @@
 
 // ********** private definitions **********
 
-#define NUM_OF_ALARM_LAMP_PATTERN_SEQUENCE_STEPS    2                   ///< Number of steps in an alarm lamp pattern sequence.
+#define NUM_OF_ALARM_LAMP_PATTERN_SEQUENCE_STEPS    2                   ///< Number of steps in an alarm lamp pattern sequence.
 
 /// Enumeration of alarm lamp color states.
 typedef enum LampStates
@@ -81,7 +82,7 @@
 };
 
 static ALARM_LAMP_SELF_TEST_STATE_T alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_START;  ///< Current alarm lamp self-test state.
-static U32 alarmLampSelfTestStepTimerCount = 0;                         ///< timer counter for current alarm lamp self-test state.
+static U32 alarmLampSelfTestStepTimerCount = 0;                         ///< Timer counter for current alarm lamp self-test state.
 
 // ********** private function prototypes **********
 
@@ -116,33 +117,33 @@
  *************************************************************************/
 void execAlarmLamp( void )
 {
-    // if starting a new lamp pattern, reset pattern variables
+    // If starting a new lamp pattern, reset pattern variables
     if ( pendingLampPattern != currentLampPattern.data )
     {
         currentLampPattern.data = pendingLampPattern;
         currentLampPatternStep = 0;
 
         setAlarmLampToPatternStep();
     }
-    // otherwise, increment pattern timer
+    // Otherwise, increment pattern timer
     else
     {
-        lampPatternStepTimer += TASK_GENERAL_INTERVAL;
+        lampPatternStepTimer += ALARM_LAMP_AND_AUDIO_CONTROL_INTERVAL_MS;
     }
 
-    // control alarm lamp to currently set pattern (unless we're in manual pattern)
+    // Control alarm lamp to currently set pattern (unless we are in manual pattern)
     if ( getCurrentAlarmLampPattern() != LAMP_PATTERN_MANUAL )
     {
-        // if pattern step duration has elapsed, move to next step
+        // If pattern step duration has elapsed, move to next step
         if ( lampPatternStepTimer >= lampPatterns[ getCurrentAlarmLampPattern() ].duration[ currentLampPatternStep ] )
         {
-            // increment pattern step
+            // Increment pattern step
             currentLampPatternStep++;
             if ( currentLampPatternStep >= NUM_OF_LAMP_STATES )
             {
                 currentLampPatternStep = 0;
             }
-            // set lamps according to pattern step
+            // Set lamps according to pattern step
             setAlarmLampToPatternStep();
         }
     }
@@ -226,7 +227,7 @@
             {
                 alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_YELLOW;
                 alarmLampSelfTestStepTimerCount = getMSTimerCount();
-                setCPLDLampGreen( PIN_SIGNAL_HIGH );  // green + red = yellow
+                setCPLDLampGreen( PIN_SIGNAL_HIGH );  // Green + red = yellow
             }
             break;
 
@@ -250,7 +251,7 @@
             break;
 
         case ALARM_LAMP_SELF_TEST_STATE_COMPLETE:
-            // if we get called in this state, assume we're doing self-test again
+            // If we get called in this state, assume we are doing self-test again
             alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_START;
             break;