diff --git a/conf/airframes/Poine/turntable.xml b/conf/airframes/Poine/turntable.xml index ae8f5a4f37..a0d389e319 100644 --- a/conf/airframes/Poine/turntable.xml +++ b/conf/airframes/Poine/turntable.xml @@ -5,7 +5,7 @@ ARCH=lpc21 FLASH_MODE = IAP -MB=motor_bench +MB=firmwares/motor_bench main.ARCHDIR = $(ARCH) @@ -13,6 +13,8 @@ main.CFLAGS += -DBOARD_CONFIG=\"boards/olimex_lpc_h2148.h\" -I$(MB) main.CFLAGS += -DPERIPHERALS_AUTO_INIT main.srcs = $(MB)/main_turntable.c main.srcs += $(SRC_ARCH)/armVIC.c +main.srcs += mcu.c +main.srcs += $(SRC_ARCH)/mcu_arch.c main.CFLAGS += -DUSE_LED main.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))' -DTIME_LED=1 @@ -25,6 +27,7 @@ main.srcs += sys_time.c $(MB)/turntable_systime.c #main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UsbS main.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B115200 +main.srcs += mcu_periph/uart.c main.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0 diff --git a/sw/airborne/firmwares/motor_bench/main_turntable.c b/sw/airborne/firmwares/motor_bench/main_turntable.c index 8345c948e7..8ea42385e6 100644 --- a/sw/airborne/firmwares/motor_bench/main_turntable.c +++ b/sw/airborne/firmwares/motor_bench/main_turntable.c @@ -4,6 +4,8 @@ #include "led.h" #include "interrupt_hw.h" #include "mcu_periph/usb_serial.h" +#include "mcu_periph/uart.h" +#include "mcu_arch.h" #include "messages.h" #include "downlink.h" diff --git a/sw/airborne/firmwares/motor_bench/mb_tacho.c b/sw/airborne/firmwares/motor_bench/mb_tacho.c index 31e26ae80d..37d37c1c52 100644 --- a/sw/airborne/firmwares/motor_bench/mb_tacho.c +++ b/sw/airborne/firmwares/motor_bench/mb_tacho.c @@ -3,6 +3,7 @@ #include "LPC21xx.h" #include "interrupt_hw.h" +#include "mcu.h" volatile uint32_t mb_tacho_duration; volatile uint8_t got_one_pulse;