diff --git a/conf/airframes/AirborneCodeReorg/LisaFw.xml b/conf/airframes/AirborneCodeReorg/LisaFw.xml index 93d6957f66..3d277613ee 100644 --- a/conf/airframes/AirborneCodeReorg/LisaFw.xml +++ b/conf/airframes/AirborneCodeReorg/LisaFw.xml @@ -194,8 +194,13 @@ - + + diff --git a/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile b/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile index a22389d46d..fa2c9fc036 100644 --- a/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile +++ b/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile @@ -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