mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-06-05 23:49:00 +08:00
Felix Ruess
dd15598389
Conflicts: conf/airframes/ENAC/fixed-wing/funjet2.xml conf/airframes/ENAC/fixed-wing/funjet2_nc.xml conf/airframes/ENAC/fixed-wing/funjet2_new.xml conf/airframes/ENAC/fixed-wing/funjet3.xml conf/airframes/ENAC/fixed-wing/merlin.xml conf/airframes/ENAC/fixed-wing/minimag1.xml conf/airframes/ENAC/fixed-wing/obsolete/drops.xml conf/airframes/ENAC/fixed-wing/overview.xml conf/airframes/ENAC/fixed-wing/soarzi.xml conf/airframes/ENAC/fixed-wing/weasel.xml conf/airframes/LAAS/mmlaas_N1.xml conf/airframes/LAAS/mmlaas_N2.xml conf/airframes/LAAS/mmlaas_N3.xml conf/airframes/Poine/funjet42.xml conf/airframes/Poine/swift_1.xml conf/airframes/TU_Delft/MicrojetBR.xml conf/airframes/delta_wing_minimal_example.xml conf/airframes/easystar_ets_example.xml conf/airframes/easystar_example.xml conf/airframes/example_twog_analogimu.xml conf/airframes/funjet_cam_example.xml conf/airframes/funjet_example.xml conf/airframes/mm/extra/press_t.xml conf/airframes/mm/extra/probe_t.xml conf/airframes/mm/extra/turbine_trigger.xml conf/airframes/mm/fixed-wing/drops.xml conf/airframes/mm/fixed-wing/funjet43.xml conf/airframes/mm/fixed-wing/funjetdca.xml conf/airframes/mm/fixed-wing/funjetdcb.xml conf/airframes/mm/fixed-wing/funjetdcc.xml conf/airframes/mm/fixed-wing/funjeteth1.xml conf/airframes/mm/fixed-wing/funjeteth2.xml conf/airframes/mm/fixed-wing/funjetfmi1.xml conf/airframes/mm/fixed-wing/funjetfmi2.xml conf/airframes/mm/fixed-wing/funjetfmi3.xml conf/airframes/mm/fixed-wing/funjetgfi1.xml conf/airframes/mm/fixed-wing/funjetgfi3.xml conf/airframes/mm/fixed-wing/funjetgfi4.xml conf/airframes/mm/fixed-wing/funjetgfi5.xml conf/airframes/mm/fixed-wing/funjetgfi6.xml conf/airframes/mm/fixed-wing/funjetgfi7.xml conf/airframes/mm/fixed-wing/funjetgfi8.xml conf/airframes/mm/fixed-wing/funjetgfi9.xml conf/airframes/mm/fixed-wing/funjetlisa.xml conf/airframes/mm/fixed-wing/funjetlisam.xml conf/airframes/mm/fixed-wing/funjetmm.xml conf/airframes/mm/fixed-wing/funjetmm2.xml conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml conf/airframes/mm/fixed-wing/merlin.xml conf/airframes/mm/fixed-wing/miniwing.xml conf/airframes/mm/fixed-wing/slowfast.xml conf/airframes/mm/fixed-wing/slowfast2.xml conf/airframes/mm/fixed-wing/twinstarmm.xml conf/airframes/mm/hangar/black_one.xml conf/airframes/mm/hangar/glass_one1.xml conf/airframes/mm/hangar/glass_one2.xml conf/airframes/mm/hangar/glass_one3.xml conf/airframes/mm/hangar/lila.xml conf/airframes/mm/hangar/mac06a.xml conf/airframes/mm/hangar/red_one.xml conf/airframes/obsolete/easystar2.xml conf/airframes/obsolete/kalscott_easystar.xml conf/airframes/obsolete/microjet5_tp_auto.xml conf/airframes/obsolete/microjet6.xml conf/airframes/obsolete/microjetII.xml conf/airframes/obsolete/minimag1.xml conf/airframes/obsolete/minimag_fs.xml conf/airframes/obsolete/mmlaas_N1_carto_cam.xml conf/airframes/obsolete/storm1.xml conf/airframes/obsolete/tiny2.xml conf/airframes/obsolete/xxx1.xml conf/airframes/test_hb.xml conf/airframes/twinstar_example.xml conf/airframes/usb_test.xml conf/settings/tuning_ctl_adaptive.xml sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
# # $Id$ # Copyright (C) 2003 Pascal Brisset Antoine Drouin # # This file is part of paparazzi. # # paparazzi is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. # # paparazzi is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with paparazzi; see the file COPYING. If not, write to # the Free Software Foundation, 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. #