Fixed-Wing Code on STM32 Step 1/10

This commit is contained in:
Christophe De Wagter
2010-07-26 19:14:25 +00:00
parent 765cee2c8c
commit 0da20d8da2
15 changed files with 193 additions and 33 deletions
+16 -2
View File
@@ -173,14 +173,28 @@
# Config for AP
# Board Specifics
include $(PAPARAZZI_SRC)/conf/autopilot/lisa_l.makefile
# Fixed Wing Specifics
include $(PAPARAZZI_SRC)/conf/autopilot/fixedwing_common.makefile
include $(CFG_FIXEDWING)/fixedwing_autopilot.makefile
# Temporary problem solving
ap.CFLAGS += -DSTM32
GPS_UART_NR = 1
GPS_BAUD = 38400
include $(CFG_FIXEDWING)/subsystems/fixedwing_gps_ublox.makefile
MODEM_UART_NR = 2
MODEM_BAUD = 57600
include $(CFG_FIXEDWING)/subsystems/fixedwing_telemetry_transparent.makefile
# Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DTRAFFIC_INFO
sim.srcs += nav_survey_rectangle.c traffic_info.c nav_line.c
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DTRAFFIC_INFO
sim.srcs += nav_survey_rectangle.c traffic_info.c nav_line.c
</makefile>
</airframe>
+10 -10
View File
@@ -171,8 +171,8 @@
</section>
<makefile>
BOARD_CFG=\"tiny_2_1_1.h\"
FLASH_MODE=IAP
BOARD_CFG = \"tiny_2_1_1.h\"
FLASH_MODE = IAP
# Board Specifics
include $(PAPARAZZI_SRC)/conf/autopilot/tiny.makefile
@@ -185,25 +185,25 @@ include $(CFG_FIXEDWING)/subsystems/fixedwing_attitude_infrared.makefile
# IO Options
include $(CFG_FIXEDWING)/subsystems/fixedwing_radio_control_ppm.makefile
GPS_UART=Uart0
GPS_BAUD=38400
GPS_UART_NR = 0
GPS_BAUD = 38400
include $(CFG_FIXEDWING)/subsystems/fixedwing_gps_ublox.makefile
MODEM_UART=Uart1
MODEM_BAUD=9600
MODEM_UART_NR = 1
MODEM_BAUD = 9600
include $(CFG_FIXEDWING)/subsystems/fixedwing_telemetry_transparent.makefile
# Special options
ap.CFLAGS += -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
ap.CFLAGS += -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
######################################
# Todo
ap.CFLAGS += -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
ap.CFLAGS += -DGYRO -DADXRS150
ap.srcs += gyro.c
ap.CFLAGS += -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
ap.CFLAGS += -DGYRO -DADXRS150
ap.srcs += $(SRC_FIXEDWING)/gyro.c
######################################
+5 -2
View File
@@ -60,11 +60,13 @@ endif
#
ap.CFLAGS += -DUSE_SYS_TIME
ap.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
#ap.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./512.)'
ap.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./60.))'
ifeq ($(ARCHI), stm32)
ap.CFLAGS += -DSYS_TIME_LED=1
ap.CFLAGS += -DSYS_TIME_LED=1 -DPERIPHERALS_AUTO_INIT
endif
#
# FlyByWire Main
#
@@ -80,8 +82,9 @@ ap.srcs += $(SRC_FIXEDWING)/estimator.c
ap.CFLAGS += -DNAV
ap.srcs += $(SRC_FIXEDWING)/nav.c $(SRC_FIXEDWING)/fw_h_ctl.c $(SRC_FIXEDWING)/fw_v_ctl.c
ap.srcs += $(SRC_FIXEDWING)/nav_survey_rectangle.c $(SRC_FIXEDWING)/nav_line.c
#
# InterMCU Commands
# InterMCU & Commands
#
ap.CFLAGS += -DINTER_MCU
@@ -1,13 +1,10 @@
ifeq ($(GPS_UART), Uart0)
ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B$(GPS_BAUD)
else
ap.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B$(GPS_BAUD)
endif
ap.CFLAGS += -DGPS -DUBX
ap.CFLAGS += -DGPS_LINK=Uart$(GPS_UART_NR)
ap.CFLAGS += -DUSE_UART$(GPS_UART_NR)
ap.CFLAGS += -DUART$(GPS_UART_NR)_BAUD=B$(GPS_BAUD)
ap.CFLAGS += -DGPS -DUBX -DGPS_LINK=$(GPS_UART)
ap.srcs += $(SRC_FIXEDWING)/gps_ubx.c $(SRC_FIXEDWING)/gps.c $(SRC_FIXEDWING)/latlong.c
ap.srcs += $(SRC_FIXEDWING)/gps_ubx.c $(SRC_FIXEDWING)/gps.c $(SRC_FIXEDWING)/latlong.c
@@ -1,12 +1,9 @@
ifeq ($(MODEM_UART), Uart0)
ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B$(MODEM_BAUD)
else
ap.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B$(MODEM_BAUD)
endif
ap.CFLAGS += -DUSE_UART$(MODEM_UART_NR)
ap.CFLAGS += -DUART$(MODEM_UART_NR)_BAUD=B$(MODEM_BAUD)
MODEM_UART = Uart$(MODEM_UART_NR)
ap.CFLAGS += -DDOWNLINK -DDOWNLINK_FBW_DEVICE=$(MODEM_UART) -DDOWNLINK_AP_DEVICE=$(MODEM_UART) -DPPRZ_UART=$(MODEM_UART)
ap.CFLAGS += -DDOWNLINK_TRANSPORT=PprzTransport -DDATALINK=PPRZ
+32
View File
@@ -0,0 +1,32 @@
<!DOCTYPE settings SYSTEM "settings.dtd">
<!-- A conf to use for standard operation (no tuning) -->
<settings>
<dl_settings>
<dl_settings NAME="flight params">
<dl_setting MAX="1000" MIN="0" STEP="10" VAR="flight_altitude" shortname="altitude"/>
<dl_setting MAX="360" MIN="0" STEP="1" VAR="nav_course"/>
<dl_setting MAX="10" MIN="-10" STEP="5" VAR="nav_shift" module="nav" handler="IncreaseShift" shortname="inc. shift"/>
<dl_setting MAX="0" MIN="0" STEP="1" VAR="estimator_flight_time" shortname="flight time" module="autopilot" handler="ResetFlightTimeAndLaunch"/>
<dl_setting MAX="200" MIN="-200" STEP="10" VAR="nav_radius" module="nav" handler="SetNavRadius">
<strip_button icon="circle-right.png" name="Circle right" value="1"/>
<strip_button icon="circle-left.png" name="Circle left" value="-1"/>
<key_press key="greater" value="1"/>
<key_press key="less" value="-1"/>
</dl_setting>
</dl_settings>
<dl_settings NAME="mode">
<dl_setting MAX="2" MIN="0" STEP="1" VAR="pprz_mode" module="estimator" values="MANUAL|AUTO1|AUTO2|HOME|NOGPS|FAILSAFE">
</dl_setting>
<dl_setting MAX="1" MIN="0" STEP="1" VAR="launch">
</dl_setting>
<dl_setting MAX="1" MIN="0" STEP="1" VAR="kill_throttle">
</dl_setting>
<dl_setting MAX="2" MIN="0" STEP="1" VAR="telemetry_mode_Ap_DefaultChannel" shortname="tele_AP" module="downlink"/>
<dl_setting MAX="2" MIN="0" STEP="1" VAR="gps_reset" module="gps_ubx" handler="Reset" shortname="GPS reset"/>
</dl_settings>
</dl_settings>
</settings>