From b0565a9ac89ea7cc222297d73ef04ff20f547434 Mon Sep 17 00:00:00 2001
From: Christophe De Wagter <dewagter@gmail.com>
Date: Thu, 16 Jun 2011 15:54:25 +0200
Subject: [PATCH] Lights

---
 conf/modules/light.xml            | 8 ++++----
 sw/airborne/modules/light/light.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/modules/light.xml b/conf/modules/light.xml
index 2860bc40bb..de67709e60 100644
--- a/conf/modules/light.xml
+++ b/conf/modules/light.xml
@@ -9,11 +9,11 @@
   <makefile>
 
 <!-- these configureeters should be set in the airframe file unless you want the defaults
-    <configure name="LIGHT_LED_STROBE" value="3"/>
-    <configure name="LIGHT_LED_NAV" value="4"/>
+    <define name="LIGHT_LED_STROBE" value="3"/>
+    <define name="LIGHT_LED_NAV" value="4"/>
 
-    <configure name="STROBE_LIGHT_MODE_DEFAULT" value="5"/>
-    <configure name="NAV_LIGHT_MODE_DEFAULT" value="4"/>
+    <define name="STROBE_LIGHT_MODE_DEFAULT" value="5"/>
+    <define name="NAV_LIGHT_MODE_DEFAULT" value="4"/>
 -->
 
     <file name="light.c"/>
diff --git a/sw/airborne/modules/light/light.c b/sw/airborne/modules/light/light.c
index d017212fc4..cd9b578ce9 100644
--- a/sw/airborne/modules/light/light.c
+++ b/sw/airborne/modules/light/light.c
@@ -29,7 +29,7 @@ uint8_t strobe_light_mode;
 uint8_t nav_light_mode;
 
 #ifndef STROBE_LIGHT_MODE_DEFAULT
-#define STROBE_LIGHT_MODE_DEFAULT 5
+#define STROBE_LIGHT_MODE_DEFAULT 6
 #endif
 
 #ifndef NAV_LIGHT_MODE_DEFAULT
@@ -41,10 +41,10 @@ void init_light(void) {
   // this part is already done by led_init in fact
   LED_INIT(LIGHT_LED_STROBE);
   LED_OFF(LIGHT_LED_STROBE);
+  strobe_light_mode = STROBE_LIGHT_MODE_DEFAULT;
 #ifdef LIGHT_LED_NAV
   LED_INIT(LIGHT_LED_NAV);
   LED_OFF(LIGHT_LED_NAV);
-  strobe_light_mode = STROBE_LIGHT_MODE_DEFAULT;
   nav_light_mode = NAV_LIGHT_MODE_DEFAULT;
 #endif
 }