Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -r51c6a24b30643c8ce296ebfe1d703f289ffafe97 -ra0aca1a4d87df989303b4f7f41208a4916861afa
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 51c6a24b30643c8ce296ebfe1d703f289ffafe97)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision a0aca1a4d87df989303b4f7f41208a4916861afa)
@@ -156,7 +156,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 1, lampPattern )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_LAMP_INVALID_PATTERN_REQUESTED, lampPattern )
     }
 }
 
@@ -228,7 +228,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 2, alarmLampSelfTestState )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_LAMP_INVALID_SELF_TEST_STATE, alarmLampSelfTestState )
             result = SELF_TEST_STATUS_FAILED;
             break;
     }