[booz_cam] fix compilation when settings is loaded wihtout tilt

paparazzi · Jun 26, 2012 · 4c0b304 · 4c0b304
1 parent dc73ef9
commit 4c0b304
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/sw/airborne/modules/cam_control/booz_cam.c b/sw/airborne/modules/cam_control/booz_cam.c
@@ -34,8 +34,8 @@ uint8_t booz_cam_mode;
 
 // Tilt definition
 int16_t booz_cam_tilt;
-#ifdef BOOZ_CAM_TILT_NEUTRAL
 int16_t booz_cam_tilt_pwm;
+#ifdef BOOZ_CAM_TILT_NEUTRAL
 #ifndef BOOZ_CAM_TILT_MIN
 #define BOOZ_CAM_TILT_MIN BOOZ_CAM_TILT_NEUTRAL
 #endif
@@ -79,6 +79,7 @@ void booz_cam_init(void) {
   BOOZ_CAM_SetPwm(booz_cam_tilt_pwm);
   booz_cam_tilt = 0;
 #else
+  booz_cam_tilt_pwm = 1500;
   booz_cam_tilt = 0;
 #endif
 #ifdef BOOZ_CAM_USE_PAN

diff --git a/sw/airborne/modules/cam_control/booz_cam.h b/sw/airborne/modules/cam_control/booz_cam.h
@@ -49,10 +49,7 @@ extern uint8_t booz_cam_mode;
 
 extern int16_t booz_cam_tilt;
 extern int16_t booz_cam_pan;
-
-#ifdef BOOZ_CAM_TILT_NEUTRAL
 extern int16_t booz_cam_tilt_pwm;
-#endif
 
 extern void booz_cam_init(void);
 extern void booz_cam_periodic(void);