Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-06 16:58:48 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

making fixedwing build on lisa/M and lisa/L

Browse Source
This commit is contained in:
Antoine Drouin
2010-11-04 15:43:33 +00:00
parent fc30316e3b
commit 8fe8bf44c2
4 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/autopilot/subsystems/fixedwing/actuators_direct.makefile
+2 -2
View File
@@ -8,6 +8,6 @@ ap.srcs += $(SRC_ARCH)/servos_direct_hw.c $(SRC_FIXEDWING)/actuators.c
# Carefull: paths might get broken with this silly rotorcraft/fixedwing mixup of directories
ifeq ($(ARCH), stm32)
ap.srcs += $(SRC_FIXEDWING)/booz/arch/stm32/actuators/actuators_pwm_arch.c
ap.CFLAGS += -I$(SRC_FIXEDWING)/booz/arch/stm32/
ap.srcs += firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
ap.CFLAGS += -Ifirmwares/rotorcraft/actuators/arch/stm32
endif
conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile
+16
View File
@@ -10,9 +10,25 @@
# to change just redefine these before including this file
#
#
# LPC only has one ADC
#
ifeq ($(ARCH), lpc21)
ap.CFLAGS += -DADC_CHANNEL_IR1=$(ADC_IR1) -DUSE_$(ADC_IR1)
ap.CFLAGS += -DADC_CHANNEL_IR2=$(ADC_IR2) -DUSE_$(ADC_IR2)
ap.CFLAGS += -DADC_CHANNEL_IR_TOP=$(ADC_IR_TOP) -DUSE_$(ADC_IR_TOP)
endif
#
# On STM32 let's hardwire infrared sensors to AD1 for now
#
ifeq ($(ARCH), stm32)
ap.CFLAGS += -DUSE_AD1
ap.CFLAGS += -DADC_CHANNEL_IR1=$(ADC_IR1) -DUSE_AD1_$(ADC_IR1)
ap.CFLAGS += -DADC_CHANNEL_IR2=$(ADC_IR2) -DUSE_AD1_$(ADC_IR2)
ap.CFLAGS += -DADC_CHANNEL_IR_TOP=$(ADC_IR_TOP) -DUSE_AD1_$(ADC_IR_TOP)
endif
ap.CFLAGS += -DADC_CHANNEL_IR_NB_SAMPLES=$(ADC_IR_NB_SAMPLES)
$(TARGET).CFLAGS += -DINFRARED
conf/autopilot/subsystems/fixedwing/autopilot.makefile
+4 -4
View File
@@ -127,12 +127,12 @@ ns_srcs += $(SRC_ARCH)/uart_hw.c
# ANALOG
#
ifeq ($(ARCH), lpc21)
#ifeq ($(ARCH), lpc21)
ns_CFLAGS += -DADC
ns_srcs += $(SRC_ARCH)/adc_hw.c
else ifeq ($(ARCH), stm32)
ns_srcs += lisa/lisa_analog_plug.c
endif
#else ifeq ($(ARCH), stm32)
# ns_srcs += lisa/lisa_analog_plug.c
#endif
######################################################################
conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile
+4 -1
View File
@@ -10,7 +10,10 @@ endif
ifeq ($(ARCH),stm32)
ap.CFLAGS += -DRADIO_CONTROL -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
ap.CFLAGS += -DRADIO_CONTROL
ifdef RADIO_CONTROL_LED
ap.CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
endif
ap.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"subsystems/radio_control/ppm.h\"
ap.CFLAGS += -DRADIO_CONTROL_TYPE_PPM
ap.srcs += $(SRC_SUBSYSTEMS)/radio_control.c \