[paparazzi-commits] [4644] change the booz failsafe mode to slow decent by default even if BOOZ_FAILSAFE_GROUND_DETECT is not enabled

[Felix Ruess]

Revision: 4644
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4644
Author:   flixr
Date:     2010-03-08 19:02:33 +0000 (Mon, 08 Mar 2010)
Log Message:
-----------
change the booz failsafe mode to slow decent by default even if 
BOOZ_FAILSAFE_GROUND_DETECT is not enabled

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/booz/booz2_autopilot.c

Modified: paparazzi3/trunk/sw/airborne/booz/booz2_autopilot.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz2_autopilot.c 2010-03-07 16:54:54 UTC 
(rev 4643)
+++ paparazzi3/trunk/sw/airborne/booz/booz2_autopilot.c 2010-03-08 19:02:33 UTC 
(rev 4644)
@@ -102,12 +102,10 @@
     /* horizontal mode */
     switch (new_autopilot_mode) {
     case BOOZ2_AP_MODE_FAILSAFE:
-#ifdef BOOZ_FAILSAFE_GROUND_DETECT
       booz_stab_att_sp_euler.phi = 0;
       booz_stab_att_sp_euler.theta = 0;
       booz2_guidance_h_mode_changed(BOOZ2_GUIDANCE_H_MODE_ATTITUDE);
       break;
-#endif
     case BOOZ2_AP_MODE_KILL:
       booz2_autopilot_motors_on = FALSE;
       booz2_guidance_h_mode_changed(BOOZ2_GUIDANCE_H_MODE_KILL);
@@ -133,11 +131,9 @@
     /* vertical mode */
     switch (new_autopilot_mode) {
     case BOOZ2_AP_MODE_FAILSAFE:
-#ifdef BOOZ_FAILSAFE_GROUND_DETECT
       booz2_guidance_v_zd_sp = SPEED_BFP_OF_REAL(0.5);
       booz2_guidance_v_mode_changed(BOOZ2_GUIDANCE_V_MODE_CLIMB);
       break;
-#endif
     case BOOZ2_AP_MODE_KILL:
       booz2_guidance_v_mode_changed(BOOZ2_GUIDANCE_V_MODE_KILL);
       break;