Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -r07b9515c080aa68fecfa331cbc593adea4c0b8dc -re5bb82cad756fbb10f04d576dffd499df78f6b35
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 07b9515c080aa68fecfa331cbc593adea4c0b8dc)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision e5bb82cad756fbb10f04d576dffd499df78f6b35)
@@ -1,6 +1,6 @@
 /**************************************************************************
  *
- *  Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved.
+ *  Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  *
  *  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  *  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
@@ -14,7 +14,7 @@
  *
  **************************************************************************/
 
-#include "Common.h"
+#include <HDCommon.h>
 #include "CPLD.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
@@ -53,8 +53,8 @@
 
 // ********** private data **********
 
-DATA_DECL( LAMP_PATTERN_T, LampPattern, currentLampPattern, LAMP_PATTERN_OFF, LAMP_PATTERN_FAULT );
-static LAMP_PATTERN_T pendingLampPattern = LAMP_PATTERN_OFF;
+DATA_DECL( LAMP_PATTERN_T, LampPattern, currentLampPattern, LAMP_PATTERN_MANUAL, LAMP_PATTERN_FAULT );
+static LAMP_PATTERN_T pendingLampPattern = LAMP_PATTERN_MANUAL;
 static U32 currentLampPatternStep = 0;
 static U32 lampPatternStepTimer = 0;
 
@@ -86,7 +86,7 @@
  *************************************************************************/
 void initAlarmLamp( void )
 {
-    pendingLampPattern = LAMP_PATTERN_OFF;
+    pendingLampPattern = LAMP_PATTERN_MANUAL;
     currentLampPatternStep = 0;
     lampPatternStepTimer = 0;
 
@@ -218,6 +218,7 @@
             {
                 alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_COMPLETE;
                 setCPLDLampGreen( PIN_SIGNAL_LOW );
+                requestAlarmLampPattern( LAMP_PATTERN_OK );
                 result = SELF_TEST_STATUS_PASSED;
             }
             break;