Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -r380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7 -ra0d405d152c0f451ebf3c25e3c2cfa49a4db17cd
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 380b0afc95467d0861ff3aa2cdcde5d5d7ac85e7)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision a0d405d152c0f451ebf3c25e3c2cfa49a4db17cd)
@@ -61,9 +61,8 @@
 #define POST_LAMP_STEP_TIME_MS      1000                                ///< Duration (in ms) for each alarm lamp self-test step.
 
 // ********** private data **********
-
-/// Current alarm lamp pattern (overrideable).
-static OVERRIDE_U32_T currentLampPattern = { LAMP_PATTERN_MANUAL, LAMP_PATTERN_FAULT, LAMP_PATTERN_FAULT, 0 };
+
+static OVERRIDE_U32_T currentLampPattern;                               ///< Current alarm lamp pattern (overrideable).
 static LAMP_PATTERN_T pendingLampPattern = LAMP_PATTERN_MANUAL;         ///< Pending alarm lamp pattern.
 static U32 currentLampPatternStep = 0;                                  ///< Current alarm lamp pattern step.
 static U32 lampPatternStepTimer = 0;                                    ///< Timer counter for current alarm lamp pattern step.
@@ -95,7 +94,11 @@
  * @return none
  *************************************************************************/
 void initAlarmLamp( void )
-{
+{
+    currentLampPattern.data = LAMP_PATTERN_MANUAL;
+    currentLampPattern.ovData = LAMP_PATTERN_FAULT;
+    currentLampPattern.ovInitData = LAMP_PATTERN_FAULT;
+    currentLampPattern.override = OVERRIDE_RESET;
     pendingLampPattern = LAMP_PATTERN_MANUAL;
     currentLampPatternStep = 0;
     lampPatternStepTimer = 0;
@@ -325,47 +328,19 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetCurrentLampPatternOverride function overrides the current
+ * The testAlarmLampPatternOverride function overrides the current
  * alarm lamp pattern with a given pattern.
  * @details \b Inputs: none
  * @details \b Outputs: currentLampPattern
- * @param value Value to override the alarm lamp pattern to
+ * @param message Override message from Dialin which includes the alarm
+ * lamp pattern to override to.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetCurrentLampPatternOverride( U32 value )
+BOOL testAlarmLampPatternOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = u32Override( message, &currentLampPattern, 0, NUM_OF_LAMP_PATTERNS - 1 );
 
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        currentLampPattern.ovData = value;
-        currentLampPattern.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
-/*********************************************************************//**
- * @brief
- * The testResetCurrentLampPatternOverride function resets the override of the
- * alarm lamp pattern.
- * @details \b Inputs: none
- * @details \b Outputs: currentLampPattern
- * @return TRUE if override reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetCurrentLampPatternOverride( void )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        currentLampPattern.override = OVERRIDE_RESET;
-        currentLampPattern.ovData = currentLampPattern.ovInitData;
-    }
-
-    return result;
-}
-
 /**@}*/