Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-05 23:49:00 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

fix remains of conflict in stabilization_attitude

Browse Source
This commit is contained in:
Felix Ruess
2011-08-17 20:23:14 +02:00
parent 5c9fccd3d1
commit 9b351df8de
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
-4
View File
@@ -123,13 +123,9 @@ void h_ctl_init( void ) {
h_ctl_course_dgain = H_CTL_COURSE_DGAIN;
h_ctl_roll_max_setpoint = H_CTL_ROLL_MAX_SETPOINT;
<<<<<<< HEAD
h_ctl_pitch_mode = 0;
=======
#ifdef USE_AOA
h_ctl_pitch_mode = 0;
#endif
>>>>>>> bruzzlee/dev
h_ctl_disabled = FALSE;