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

Merge branch 'dev' into positive_control_gains

Browse Source 
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
This commit is contained in:
Felix Ruess
2012-02-02 15:44:09 +01:00
parent 16f20347bc f07b05e6da
commit dd15598389
714 changed files with 6445 additions and 16214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/mm/fixed-wing/drops.xml
+6 -6
View File
@@ -175,9 +175,9 @@
<section name="HORIZONTAL CONTROL" prefix="H_CTL_">
<define name="COURSE_PGAIN" value="1.0340000391"/>
<define name="ROLL_MAX_SETPOINT" value="0.60" unit="radians"/>
<define name="PITCH_MAX_SETPOINT" value="0.5" unit="radians"/>
<define name="PITCH_MIN_SETPOINT" value="-0.5" unit="radians"/>
<define name="ROLL_MAX_SETPOINT" value="0.60" unit="rad"/>
<define name="PITCH_MAX_SETPOINT" value="0.5" unit="rad"/>
<define name="PITCH_MIN_SETPOINT" value="-0.5" unit="rad"/>
<define name="ROLL_PGAIN" value="6000."/>
<define name="AILERON_OF_THROTTLE" value="0.0"/>
@@ -250,11 +250,11 @@ ap.CFLAGS += -DRADIO_CONTROL -DRADIO_CONTROL_AUTO1
ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
ap.srcs += downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c xbee.c
ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
#TRANSPARENT
#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
#ap.srcs += downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c pprz_transport.c
#ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
ap.CFLAGS += -DINTER_MCU
ap.srcs += inter_mcu.c
@@ -289,7 +289,7 @@ sim.ARCH = sitl
sim.TARGET = autopilot
sim.TARGETDIR = autopilot
sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -DNAV -DUSE_LED -DWIND_INFO
sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl_a.c fw_v_ctl.c subsystems/nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
sim.srcs = latlong.c radio_control.c subsystems/datalink/downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl_a.c fw_v_ctl.c subsystems/nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
sim.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c