Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-06 07:53:43 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

fix typo in ppm makefile and prevent normal radio control from being used for stm32 targets

Browse Source
This commit is contained in:
Felix Ruess
2010-09-23 22:28:29 +00:00
parent e3563656da
commit 870215ba7a
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/AirborneCodeReorg/LisaFw.xml
+7 -2
View File
@@ -194,8 +194,13 @@
<!-- Sensors -->
<subsystem name="radio_control" type="ppm"/>
<!-- <subsystem name="attitude" type="infrared"/>
-->
<!--<subsystem name="attitude" type="infrared">
<param name="ADC_IR1" value="ADC_1"/>
<param name="ADC_IR2" value="ADC_2"/>
<param name="ADC_IR_TOP" value="ADC_0"/>
<param name="ADC_IR_NB_SAMPLES" value="16"/>
</subsystem>-->
<subsystem name="gps" type="ublox_lea4p">
<param name="GPS_UART_NR" value="1"/>
</subsystem>
conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile
+10 -10
View File
@@ -3,21 +3,12 @@ NORADIO = False
ifeq ($(BOARD),classix)
ifeq ($(TARGET),ap)
NODRADIO = True
NORADIO = True
endif
endif
ifeq ($(NORADIO), False)
$(TARGET).CFLAGS += -DRADIO_CONTROL
$(TARGET).srcs += $(SRC_FIXEDWING)/radio_control.c
ifneq ($(ARCH),jsbsim)
$(TARGET).srcs += $(SRC_ARCH)/ppm_hw.c
endif
endif
ifeq ($(ARCH),stm32)
ap.CFLAGS += -I$(SRC_FIXEDWING)/booz/
ap.CFLAGS += -I$(SRC_FIXEDWING)/booz/arch/stm32/
@@ -30,4 +21,13 @@ ifeq ($(ARCH),stm32)
$(SRC_FIXEDWING)/booz/arch/stm32/radio_control/booz_radio_control_ppm_arch.c
ap.CFLAGS += -DUSE_TIM2_IRQ
NORADIO = True
endif
ifeq ($(NORADIO), False)
$(TARGET).CFLAGS += -DRADIO_CONTROL
$(TARGET).srcs += $(SRC_FIXEDWING)/radio_control.c
ifneq ($(ARCH),jsbsim)
$(TARGET).srcs += $(SRC_ARCH)/ppm_hw.c
endif
endif