From 4c0b3043f0428b7377df9329dc44e0387fc9c9bb Mon Sep 17 00:00:00 2001 From: Gautier Hattenberger Date: Tue, 26 Jun 2012 13:23:45 +0200 Subject: [PATCH] [booz_cam] fix compilation when settings is loaded wihtout tilt --- sw/airborne/modules/cam_control/booz_cam.c | 3 ++- sw/airborne/modules/cam_control/booz_cam.h | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sw/airborne/modules/cam_control/booz_cam.c b/sw/airborne/modules/cam_control/booz_cam.c index 58a6c0347b9..14904ca88d9 100644 --- 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 index a2182e69400..2a1fbfb0d8e 100644 --- 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);