Commit Graph

15 Commits

Author SHA1 Message Date
Felix Ruess dd15598389 Merge branch 'dev' into positive_control_gains
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
2012-02-02 15:44:09 +01:00
Felix Ruess 57dae8acb1 aiframe files: set code_unit to deg for cam defines that still use degrees 2011-12-09 14:46:48 +01:00
Felix Ruess d11b746efa replaced unit="radians" with unit="rad" since radians is not recognized as a known unit 2011-12-01 17:38:12 +01:00
Felix Ruess 4e6ff045b7 Revert "updaded all airframe files to set IR neutrals in radians"
Not needed since unit="deg" is automatically converted to radians now
This reverts commit 6b3c694a48.
2011-12-01 01:24:08 +01:00
Felix Ruess 336340fd3a changed v_ctl_auto_pitch_pgain to positive 2011-11-29 21:56:53 +01:00
Felix Ruess a844968419 changed v_ctl_auto_throttle_pgain to positive 2011-11-29 20:59:16 +01:00
Felix Ruess 00ac61cba5 changed v_ctl_altitude_pgain to positive 2011-11-29 20:20:47 +01:00
Felix Ruess a107375f8e changed h_ctl_roll_rate_gain to positive 2011-11-29 20:11:32 +01:00
Felix Ruess 5e59fc1f1b changed h_ctl_roll_attitude_gain to positive 2011-11-29 20:05:07 +01:00
Felix Ruess c3f0bb8170 changed h_ctl_pitch_pgain to positive 2011-11-29 19:38:42 +01:00
Felix Ruess 225111d9bc start defining all control gains with positive values: changed H_CTL_COURSE_PGAIN to positive 2011-11-29 19:00:02 +01:00
Felix Ruess 6b3c694a48 updaded all airframe files to set IR neutrals in radians 2011-11-29 01:04:39 +01:00
Felix Ruess a112535037 always include i2c driver for fixedwing firmware as well, no extra subsystem needed anymore 2011-08-23 17:37:27 +02:00
Felix Ruess e39670ee81 update overview airframe file to now gps subsystem name 2011-07-21 22:49:06 +02:00
Gautier Hattenberger b25ad64158 add new airframe and some code to track the carrot with a camera 2011-07-06 11:36:16 +02:00