Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -rc672f41061bcd500d6593655641cb27ce3ae58fc
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision c672f41061bcd500d6593655641cb27ce3ae58fc)
@@ -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
@@ -127,7 +128,7 @@
     // 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)