diff --git a/conf/Makefile.stm32 b/conf/Makefile.stm32 index 680099c9e6..2a58b5bded 100644 --- a/conf/Makefile.stm32 +++ b/conf/Makefile.stm32 @@ -18,8 +18,8 @@ # You should have received a copy of the GNU General Public License # along with paparazzi; see the file COPYING. If not, write to # the Free Software Foundation, 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. -# +# Boston, MA 02111-1307, USA. +# # # This is the common Makefile for the stm32-target. @@ -69,13 +69,13 @@ endif # input files SRCS = $($(TARGET).srcs) -#ASRC = +#ASRC = # object files -COBJ = $(SRCS:%.c=$(OBJDIR)/%.o) +COBJ = $(SRCS:%.c=$(OBJDIR)/%.o) AOBJ = $(ASRC:%.S=$(OBJDIR)/%.o) -# linker script : +# linker script : # if LDSCRIPT is defined in the airframe use that independantly of TARGET # if not, and a TARGET.LDSCRIPT is defined, use that # if not, use the default STM32f103re_flash.ld @@ -87,7 +87,7 @@ LDSCRIPT = $($(TARGET).LDSCRIPT) endif endif -CFLAGS = -I. -I./$(ARCHI) $(INCLUDES) -D__thumb2__ -Wall -c -msoft-float -O$(OPT) +CFLAGS = -I. -I./$(ARCH) $(INCLUDES) -D__thumb2__ -Wall -c -msoft-float -O$(OPT) CFLAGS += -Wl,gc-sections CFLAGS += -mcpu=$(MCU) -mthumb -ansi CFLAGS += -std=gnu99 @@ -100,7 +100,7 @@ CFLAGS += -Wpointer-arith -Wswitch CFLAGS += -Wredundant-decls -Wreturn-type -Wshadow -Wunused CFLAGS += -Wa,-adhlns=$(OBJDIR)/$(notdir $(subst $(suffix $<),.lst,$<)) CFLAGS += -Wnested-externs -CFLAGS += -Wmissing-prototypes +CFLAGS += -Wmissing-prototypes CFLAGS += -Wstrict-prototypes CFLAGS += -Wmissing-declarations CFLAGS += -Wswitch-default @@ -112,7 +112,7 @@ AFLAGS += -x assembler-with-cpp -Wa,-adhlns=$(OBJDIR)/$(<:.S=.lst),--g$(DEBUG) LDFLAGS = -D__thumb2__ -T$(LDSCRIPT) -nostartfiles -L$(GCC_LIB_DIR) -O$(OPT) --gc-sections LDFLAGS += -Wl,-Map=$(OBJDIR)/$(TARGET).map,--cref,--gc-sections -LDLIBS += -lc -lm -lgcc -lcmsis -lstm32 +LDLIBS += -lc -lm -lgcc -lcmsis -lstm32 CPFLAGS = -j .isr_vector -j .text -j .data CPFLAGS_BIN = -Obinary @@ -131,7 +131,7 @@ build: elf bin hex elf: $(OBJDIR)/$(TARGET).elf bin: $(OBJDIR)/$(TARGET).bin hex: $(OBJDIR)/$(TARGET).hex -lss: $(OBJDIR)/$(TARGET).lss +lss: $(OBJDIR)/$(TARGET).lss sym: $(OBJDIR)/$(TARGET).sym # Display size of file. @@ -176,7 +176,7 @@ sizeafter: $(OBJDIR)/%.o : %.c $(OBJDIR)/../Makefile.ac @echo CC $@ $(Q)test -d $(dir $@) || mkdir -p $(dir $@) - $(Q)$(CC) -c $(CFLAGS) $< -o $@ + $(Q)$(CC) -c $(CFLAGS) $< -o $@ # Assemble: create object files from assembler source files. ARM/Thumb $(AOBJ) : $(OBJDIR)/%.o : %.S @@ -191,12 +191,12 @@ else ifeq ($(FLASH_MODE),JTAG) upload: $(OBJDIR)/$(TARGET).bin @echo -e " OOCD\t$<" $(Q)$(OOCD) -f interface/$(OOCD_INTERFACE).cfg \ - -f board/$(OOCD_BOARD).cfg \ - -c init \ - -c "reset halt" \ - -c "flash write_image erase $(OBJDIR)/$(TARGET).bin 0x08000000" \ - -c reset \ - -c shutdown + -f board/$(OOCD_BOARD).cfg \ + -c init \ + -c "reset halt" \ + -c "flash write_image erase $(OBJDIR)/$(TARGET).bin 0x08000000" \ + -c reset \ + -c shutdown endif @@ -258,11 +258,8 @@ $(OBJDIR)/.depend: @test -d $(OBJDIR) || mkdir -p $(OBJDIR) $(Q)$(CC) -MM -MG $(THUMB) $(CFLAGS) $($(TARGET).srcs) | sed 's|\([^\.]*\.o\)|$(OBJDIR)/\1|' > $@ -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(MAKECMDGOALS),erase) +ifneq ($(MAKECMDGOALS),clean) +ifneq ($(MAKECMDGOALS),erase) -include $(OBJDIR)/.depend endif endif - - - diff --git a/conf/airframes/ENAC/quadrotor/booz2_g1.xml b/conf/airframes/ENAC/quadrotor/booz2_g1.xml index 3820a02d6d..a5853d7884 100644 --- a/conf/airframes/ENAC/quadrotor/booz2_g1.xml +++ b/conf/airframes/ENAC/quadrotor/booz2_g1.xml @@ -211,7 +211,6 @@ ARCH=lpc21 -ARCHI=arm7 BOARD_CFG = \"boards/booz2_v1_0.h\" FLASH_MODE=IAP diff --git a/conf/airframes/ENAC/quadrotor/mkk1.xml b/conf/airframes/ENAC/quadrotor/mkk1.xml index 90f6e31bf4..a26819e357 100644 --- a/conf/airframes/ENAC/quadrotor/mkk1.xml +++ b/conf/airframes/ENAC/quadrotor/mkk1.xml @@ -222,7 +222,6 @@ ARCH=lpc21 -ARCHI=arm7 BOARD_CFG = \"boards/booz2_v1_0.h\" FLASH_MODE=IAP diff --git a/conf/airframes/Poine/antenna.xml b/conf/airframes/Poine/antenna.xml index 6f70600b97..6dedfbba7b 100644 --- a/conf/airframes/Poine/antenna.xml +++ b/conf/airframes/Poine/antenna.xml @@ -8,8 +8,8 @@ -ARCHI=avr -ant.ARCHDIR = $(ARCHI) +ARCH=avr +ant.ARCHDIR = $(ARCH) ant.MCU = atmega128 diff --git a/conf/airframes/Poine/autoplato.xml b/conf/airframes/Poine/autoplato.xml index c716219dfd..b509daabbf 100644 --- a/conf/airframes/Poine/autoplato.xml +++ b/conf/airframes/Poine/autoplato.xml @@ -6,12 +6,11 @@ ARCH=lpc21 BOARD_CFG = \"boards/olimex_lpc_h2148.h\" -ARCHI=arm7 FLASH_MODE = IAP include $(PAPARAZZI_SRC)/conf/autopilot/booz2_common.makefile -test_usb.ARCHDIR = $(ARCHI) +test_usb.ARCHDIR = $(ARCH) test_usb.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS) test_usb.srcs += $(SRC_BOOZ_TEST)/atpt_main.c @@ -40,4 +39,4 @@ test_usb.srcs += $(SRC_ARCH)/servos_direct_hw.c - \ No newline at end of file + diff --git a/conf/airframes/Poine/beth.xml b/conf/airframes/Poine/beth.xml index 7f1ca9f86a..82657f7eff 100644 --- a/conf/airframes/Poine/beth.xml +++ b/conf/airframes/Poine/beth.xml @@ -89,7 +89,6 @@ # ARCH=stm32 -ARCHI=stm32 #BOARD_CFG = \"boards/lisa_l_1.0.h\" FLASH_MODE = JTAG diff --git a/conf/airframes/Poine/bl_mc.xml b/conf/airframes/Poine/bl_mc.xml index 3df3bc213d..51d00613d0 100644 --- a/conf/airframes/Poine/bl_mc.xml +++ b/conf/airframes/Poine/bl_mc.xml @@ -3,9 +3,9 @@ -ARCHI=avr +ARCH=avr -main.ARCHDIR=$(ARCHI) +main.ARCHDIR=$(ARCH) main.MCU = atmega128 # internal RC 8MHz diff --git a/conf/airframes/Poine/booz2_a2.xml b/conf/airframes/Poine/booz2_a2.xml index 64093e80a1..773dfe1661 100644 --- a/conf/airframes/Poine/booz2_a2.xml +++ b/conf/airframes/Poine/booz2_a2.xml @@ -181,7 +181,6 @@ ARCH=lpc21 -ARCHI=arm7 BOARD_CFG = \"boards/booz2_v1_0.h\" # prevents motors from ever starting diff --git a/conf/airframes/Poine/motor_bench.xml b/conf/airframes/Poine/motor_bench.xml index 918d766a0f..2cfb8b27a2 100644 --- a/conf/airframes/Poine/motor_bench.xml +++ b/conf/airframes/Poine/motor_bench.xml @@ -2,13 +2,13 @@ -ARCHI=arm7 +ARCH=lpc21 FLASH_MODE = IAP MB=motor_bench -main.ARCHDIR = $(ARCHI) +main.ARCHDIR = $(ARCH) main.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB) main.srcs = $(MB)/main_motor_bench.c @@ -52,7 +52,7 @@ main.srcs += $(MB)/mb_modes.c #main.srcs += $(MB)/mb_static.c #main.srcs += $(MB)/mb_mode_fixed_rpm.c -foo.ARCHDIR = $(ARCHI) +foo.ARCHDIR = $(ARCH) foo.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB) foo.srcs = $(MB)/main_foo.c @@ -71,7 +71,7 @@ foo.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller_asctech.c -bar.ARCHDIR = $(ARCHI) +bar.ARCHDIR = $(ARCH) bar.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB) bar.srcs = $(MB)/main_bar.c diff --git a/conf/airframes/Poine/pt_ant.xml b/conf/airframes/Poine/pt_ant.xml index cbfdb0bd14..7f6164df25 100644 --- a/conf/airframes/Poine/pt_ant.xml +++ b/conf/airframes/Poine/pt_ant.xml @@ -8,17 +8,17 @@ -tunnel.ARCHDIR = $(ARCHI) +tunnel.ARCHDIR = $(ARCH) tunnel.CFLAGS += -DFBW -DBOARD_CONFIG=\"conf_demo.h\" -DLED -DTIME_LED=1 tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c -ARCHI=arm7 +ARCH=lpc21 FLASH_MODE = IAP PT_ANT = antenna -main.ARCHDIR = $(ARCHI) +main.ARCHDIR = $(ARCH) main.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" -I$(PT_ANT) main.srcs = $(PT_ANT)/pt_ant_main.c diff --git a/conf/airframes/Poine/turntable.xml b/conf/airframes/Poine/turntable.xml index 647e474039..77c99e020c 100644 --- a/conf/airframes/Poine/turntable.xml +++ b/conf/airframes/Poine/turntable.xml @@ -2,13 +2,12 @@ ARCH=lpc21 -ARCHI=arm7 FLASH_MODE = IAP MB=motor_bench -main.ARCHDIR = $(ARCHI) +main.ARCHDIR = $(ARCH) main.CFLAGS += -DBOARD_CONFIG=\"boards/olimex_lpc_h2148.h\" -I$(MB) main.CFLAGS += -DPERIPHERALS_AUTO_INIT diff --git a/conf/airframes/UofAdelaide/A1000_BOOZ.xml b/conf/airframes/UofAdelaide/A1000_BOOZ.xml index f4b9526d7c..7509af51d0 100644 --- a/conf/airframes/UofAdelaide/A1000_BOOZ.xml +++ b/conf/airframes/UofAdelaide/A1000_BOOZ.xml @@ -2,221 +2,221 @@ - - - - + + + + - - - - + + + +
- - + +
- - - - - - - - - - - + + + + + + + + + + +
- - - + + + - - - + + + - - - + + + - - - + + + - + + --> - - + + - - - - - - - + + + - - - + + + - - - - + + + + + + + + - - - + + + - + + + --> - - + + - + + + + + - - - - - - - + + +
- - - + + + - - - - + + + + - + - - - + + + - - - - + + + + - +
- - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + +
- +
@@ -259,7 +259,7 @@ second attempt
- +
@@ -271,50 +271,49 @@ second attempt - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + - + - - - + + + - - + BOOZ2_MAIN_002 main board + BOOZ2_IMU_002 IMU + BOOZ2_GPS_002 LEA-5H GPS + Datamodems configured for 57600 baud + ZEF100 Speed Controllers + --> - - - - + + + + - - - - + + + +
- - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + +
- + - - - - + + + + - + - - - + + + - - - - + + + +
- - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + - - - + + + - - - + + + - - - - + + + +
@@ -171,7 +171,7 @@
- +
@@ -216,57 +216,56 @@ - +
- +
- - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + - +--> + diff --git a/conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml b/conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml index 6eaf41316f..9c777b2448 100644 --- a/conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml +++ b/conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml @@ -222,7 +222,6 @@ -ARCHI=arm7 ARCH=lpc21 FLASH_MODE=IAP BOARD_CFG = \"boards/booz2_v1_0.h\" diff --git a/conf/airframes/UofAdelaide/booz2_a1000.xml b/conf/airframes/UofAdelaide/booz2_a1000.xml index 5446b6ccbd..6e906b1aab 100755 --- a/conf/airframes/UofAdelaide/booz2_a1000.xml +++ b/conf/airframes/UofAdelaide/booz2_a1000.xml @@ -275,7 +275,6 @@ second attempt -ARCHI=arm7 ARCH=lpc21 BOARD_CFG = \"boards/booz2_v1_0.h\" diff --git a/conf/airframes/UofAdelaide/lisa_a1000.xml b/conf/airframes/UofAdelaide/lisa_a1000.xml index b7032a5840..534c024217 100644 --- a/conf/airframes/UofAdelaide/lisa_a1000.xml +++ b/conf/airframes/UofAdelaide/lisa_a1000.xml @@ -169,7 +169,6 @@ ARCH=stm32 -ARCHI=stm32 BOARD_CFG=\"boards/lisa_0.99.h\" FLASH_MODE = JTAG diff --git a/conf/airframes/booz2_NoVa_001.xml b/conf/airframes/booz2_NoVa_001.xml index 96057ad455..f0f5bb64f9 100644 --- a/conf/airframes/booz2_NoVa_001.xml +++ b/conf/airframes/booz2_NoVa_001.xml @@ -222,7 +222,6 @@ -ARCHI=arm7 ARCH=lpc21 FLASH_MODE=IAP BOARD_CFG = \"boards/booz2_v1_0.h\" diff --git a/conf/airframes/booz2_NoVa_002.xml b/conf/airframes/booz2_NoVa_002.xml index 6fe4a909e0..04dea80215 100644 --- a/conf/airframes/booz2_NoVa_002.xml +++ b/conf/airframes/booz2_NoVa_002.xml @@ -222,7 +222,6 @@ -ARCHI=arm7 ARCH=lpc21 FLASH_MODE=IAP BOARD_CFG = \"boards/booz2_v1_0.h\" diff --git a/conf/airframes/demo.xml b/conf/airframes/demo.xml index 9a52ede37a..e70c819f25 100644 --- a/conf/airframes/demo.xml +++ b/conf/airframes/demo.xml @@ -2,7 +2,7 @@ -ARCHI=arm7 +ARCH=lpc21 FLASH_MODE = IAP @@ -10,7 +10,7 @@ FLASH_MODE = IAP # # simple emtpy demo # -demo1.ARCHDIR = $(ARCHI) +demo1.ARCHDIR = $(ARCH) demo1.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" demo1.srcs = main_demo1.c @@ -18,7 +18,7 @@ demo1.srcs = main_demo1.c # # hardware init ( pll ), system time and LEDs # -demo2.ARCHDIR = $(ARCHI) +demo2.ARCHDIR = $(ARCH) demo2.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" demo2.srcs = main_demo2.c @@ -31,7 +31,7 @@ demo2.CFLAGS += -DLED # # UART (interrupts) and formated ascii printing # -demo3.ARCHDIR = $(ARCHI) +demo3.ARCHDIR = $(ARCH) demo3.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" demo3.srcs = main_demo3.c @@ -50,7 +50,7 @@ demo3.srcs += $(SRC_ARCH)/uart_hw.c # DOWNLINK : send formated messages according to messages.xml description # requires "link" to run on the other side of the serial link # -demo4.ARCHDIR = $(ARCHI) +demo4.ARCHDIR = $(ARCH) demo4.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" demo4.srcs = main_demo4.c @@ -73,7 +73,7 @@ demo4.srcs += downlink.c pprz_transport.c # which lets you adjust variables described in the settings.xml file # IvySendMsg("1ME RAW_DATALINK 144 SETTING;0;0;%d", foo_value); # -demo5.ARCHDIR = $(ARCHI) +demo5.ARCHDIR = $(ARCH) demo5.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" demo5.srcs = main_demo5.c @@ -97,7 +97,7 @@ demo5.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0 # # Serial link over USB # -demo6.ARCHDIR = $(ARCHI) +demo6.ARCHDIR = $(ARCH) demo6.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" demo6.srcs = main_demo6.c @@ -124,7 +124,7 @@ demo6.srcs += downlink.c pprz_transport.c # # # -test_spk.ARCHDIR = $(ARCHI) +test_spk.ARCHDIR = $(ARCH) test_spk.CFLAGS += -DBOARD_CONFIG=\"booz2_board_usb.h\" test_spk.srcs = main_test_spk.c diff --git a/conf/airframes/esden/lisa_asctec.xml b/conf/airframes/esden/lisa_asctec.xml index decec5a744..60268c824c 100644 --- a/conf/airframes/esden/lisa_asctec.xml +++ b/conf/airframes/esden/lisa_asctec.xml @@ -180,7 +180,6 @@ SRC_FMS=fms ARCH=stm32 -ARCHI=stm32 BOARD_CFG=\"boards/lisa_0.99.h\" FLASH_MODE = JTAG diff --git a/conf/airframes/hitl_usb.xml b/conf/airframes/hitl_usb.xml index 535e7f48ac..08bc2a242b 100644 --- a/conf/airframes/hitl_usb.xml +++ b/conf/airframes/hitl_usb.xml @@ -4,110 +4,110 @@ - - - - + + + +
- - - + + + - - + + - - - - + + + +
- - - - + + + +
- +
- - - - - + + + + + - + - - - + + +
- - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - +
- + - - - + + + - - + + - - - + - - + + + +
- - + +
- - - - - - - - -
+ + + + + + + + +
- - - - + + + +
- + CONFIG=\"tiny_2_1_1_usb.h\" include $(PAPARAZZI_SRC)/conf/autopilot/tiny.makefile @@ -134,7 +134,7 @@ ap.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c ap.srcs += $(SRC_ARCH)/lpcusb/usbstdreq.c $(SRC_ARCH)/lpcusb/usbinit.c ap.CFLAGS += -DINTER_MCU -ap.srcs += inter_mcu.c +ap.srcs += inter_mcu.c ap.CFLAGS += -DGPS -DUBX @@ -153,7 +153,7 @@ ap.CFLAGS += -DHITL ap.CFLAGS += -DGPS_USE_LATLONG # simulating LEA 5H # Config for SITL simulation -sim.ARCHDIR = $(ARCHI) +sim.ARCHDIR = $(ARCH) sim.CFLAGS += -DSITL -DAP -DFBW -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED sim.srcs = latlong.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/mm/fixed-wing/merlin.xml b/conf/airframes/mm/fixed-wing/merlin.xml index 90092c3b93..3ff6f6f3c1 100644 --- a/conf/airframes/mm/fixed-wing/merlin.xml +++ b/conf/airframes/mm/fixed-wing/merlin.xml @@ -224,7 +224,7 @@ ap.srcs += snav.c # Config for SITL simulation # include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile -sim.ARCHDIR = $(ARCHI) +sim.ARCHDIR = $(ARCH) sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c diff --git a/conf/airframes/test_i2c.xml b/conf/airframes/test_i2c.xml index e62d6906d5..c575a5cd8e 100644 --- a/conf/airframes/test_i2c.xml +++ b/conf/airframes/test_i2c.xml @@ -7,8 +7,8 @@ -ARCHI=arm7 -mb.ARCHDIR = $(ARCHI) +ARCH=lpc21 +mb.ARCHDIR = $(ARCH) LPC21ISP_BAUD = 38400 LPC21ISP_XTAL = 12000 diff --git a/conf/airframes/vor.xml b/conf/airframes/vor.xml index 839dfb527e..99b625d096 100644 --- a/conf/airframes/vor.xml +++ b/conf/airframes/vor.xml @@ -2,12 +2,12 @@ -ARCHI=arm7 +ARCH=lpc21 VOR=vor FLASH_MODE = IAP -main.ARCHDIR = $(ARCHI) +main.ARCHDIR = $(ARCH) main.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" main.srcs = $(VOR)/lpc_vor_main.c diff --git a/conf/airframes/wind_tunnel.xml b/conf/airframes/wind_tunnel.xml index 52ee2fde9c..2ae886c686 100644 --- a/conf/airframes/wind_tunnel.xml +++ b/conf/airframes/wind_tunnel.xml @@ -2,14 +2,14 @@ -ARCHI=arm7 +ARCH=lpc21 FLASH_MODE = IAP WIND_TUNNEL=wind_tunnel -ap.ARCHDIR = $(ARCHI) +ap.ARCHDIR = $(ARCH) ap.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" -I$(WIND_TUNNEL) ap.srcs = $(WIND_TUNNEL)/main.c @@ -39,7 +39,7 @@ ap.srcs += $(WIND_TUNNEL)/wt_servo.c MB=motor_bench -mb.ARCHDIR = $(ARCHI) +mb.ARCHDIR = $(ARCH) mb.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" -I$(WIND_TUNNEL) -I$(MB) mb.srcs = $(WIND_TUNNEL)/main_mb.c diff --git a/conf/autopilot/booz2_test_progs.makefile b/conf/autopilot/booz2_test_progs.makefile index 5c0cb076f1..bc6703d52b 100644 --- a/conf/autopilot/booz2_test_progs.makefile +++ b/conf/autopilot/booz2_test_progs.makefile @@ -1,6 +1,6 @@ # # $id$ -# +# # Copyright (C) 2008 Antoine Drouin (poinix@gmail.com) # # This file is part of paparazzi. @@ -18,14 +18,14 @@ # You should have received a copy of the GNU General Public License # along with paparazzi; see the file COPYING. If not, write to # the Free Software Foundation, 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# Boston, MA 02111-1307, USA. # # # # test_led : blinks all leds # -test_led.ARCHDIR = $(ARCHI) +test_led.ARCHDIR = $(ARCH) test_led.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS) test_led.CFLAGS += -DPERIPHERALS_AUTO_INIT @@ -37,7 +37,7 @@ test_led.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c # # test_downlink : sends a TIME message # -test_downlink.ARCHDIR = $(ARCHI) +test_downlink.ARCHDIR = $(ARCH) test_downlink.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS) test_downlink.CFLAGS += -DPERIPHERALS_AUTO_INIT @@ -49,14 +49,14 @@ test_downlink.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC. test_downlink.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 test_downlink.srcs += $(SRC_ARCH)/uart_hw.c -test_downlink.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +test_downlink.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 test_downlink.srcs += downlink.c pprz_transport.c # -# test_max1168 : samples gyros and mags, sends values +# test_max1168 : samples gyros and mags, sends values # -test_max1168.ARCHDIR = $(ARCHI) +test_max1168.ARCHDIR = $(ARCH) test_max1168.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) test_max1168.CFLAGS += -DPERIPHERALS_AUTO_INIT @@ -68,17 +68,17 @@ test_max1168.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test_max1168.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 test_max1168.srcs += $(SRC_ARCH)/uart_hw.c -test_max1168.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +test_max1168.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 test_max1168.srcs += downlink.c pprz_transport.c test_max1168.CFLAGS += -DMAX1168_EOC_VIC_SLOT=8 -DSSP_VIC_SLOT=9 test_max1168.srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \ - $(SRC_BOOZ_ARCH)/peripherals/booz_max1168_arch.c + $(SRC_BOOZ_ARCH)/peripherals/booz_max1168_arch.c # # test MICROMAG # -test_micromag.ARCHDIR = $(ARCHI) +test_micromag.ARCHDIR = $(ARCH) test_micromag.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) test_micromag.srcs += $(SRC_BOOZ_TEST)/booz2_test_micromag.c @@ -89,7 +89,7 @@ test_micromag.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test_micromag.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 test_micromag.srcs += $(SRC_ARCH)/uart_hw.c -test_micromag.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +test_micromag.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 test_micromag.srcs += downlink.c pprz_transport.c #test_micromag.CFLAGS += -I$(BOOZ) @@ -103,7 +103,7 @@ test_micromag.srcs += micromag.c $(SRC_ARCH)/micromag_hw.c # # tunnel hw # -tunnel.ARCHDIR = $(ARCHI) +tunnel.ARCHDIR = $(ARCH) tunnel.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS) tunnel.srcs += $(SRC_BOOZ_TEST)/booz2_tunnel.c @@ -119,7 +119,7 @@ tunnel.srcs += $(SRC_ARCH)/uart_hw.c # # tunnel bit banging # -tunnel_bb.ARCHDIR = $(ARCHI) +tunnel_bb.ARCHDIR = $(ARCH) tunnel_bb.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS) tunnel_bb.srcs += $(SRC_BOOZ_TEST)/booz2_tunnel_bb.c @@ -132,7 +132,7 @@ tunnel_bb.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c # # test GPS # -test_gps.ARCHDIR = $(ARCHI) +test_gps.ARCHDIR = $(ARCH) test_gps.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) test_gps.srcs += $(SRC_BOOZ_TEST)/booz2_test_gps.c @@ -143,7 +143,7 @@ test_gps.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test_gps.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 test_gps.srcs += $(SRC_ARCH)/uart_hw.c -test_gps.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +test_gps.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 test_gps.srcs += downlink.c pprz_transport.c test_gps.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400 @@ -157,7 +157,7 @@ test_gps.srcs += $(SRC_BOOZ)/booz2_gps.c # # test modem # -test_modem.ARCHDIR = $(ARCHI) +test_modem.ARCHDIR = $(ARCH) test_modem.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS) test_modem.srcs += $(SRC_BOOZ_TEST)/booz2_test_modem.c @@ -168,7 +168,7 @@ test_modem.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test_modem.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 test_modem.srcs += $(SRC_ARCH)/uart_hw.c -test_modem.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +test_modem.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 test_modem.srcs += downlink.c pprz_transport.c #test_modem.CFLAGS += -DBOOZ_ANALOG_BARO_LED=2 -DBOOZ_ANALOG_BARO_PERIOD='SYS_TICS_OF_SEC((1./100.))' @@ -178,7 +178,7 @@ test_modem.srcs += downlink.c pprz_transport.c # # test USB telemetry # -test_usb.ARCHDIR = $(ARCHI) +test_usb.ARCHDIR = $(ARCH) test_usb.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS) test_usb.srcs += $(SRC_BOOZ_TEST)/booz2_test_usb.c @@ -189,7 +189,7 @@ test_usb.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c #test_usb.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 #test_usb.srcs += $(SRC_ARCH)/uart_hw.c -#test_usb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +#test_usb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 #test_usb.srcs += downlink.c pprz_transport.c test_usb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DUSE_USB_SERIAL @@ -207,7 +207,7 @@ test_usb.srcs += $(SRC_ARCH)/lpcusb/usbstdreq.c $(SRC_ARCH)/lpcusb/usbinit.c # # test AMI # -test_ami.ARCHDIR = $(ARCHI) +test_ami.ARCHDIR = $(ARCH) test_ami.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS) test_ami.srcs += $(SRC_BOOZ_TEST)/booz2_test_ami.c @@ -218,7 +218,7 @@ test_ami.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test_ami.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 test_ami.srcs += $(SRC_ARCH)/uart_hw.c -test_ami.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +test_ami.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 test_ami.srcs += downlink.c pprz_transport.c test_ami.CFLAGS += -DUSE_I2C1 -DI2C1_SCLL=150 -DI2C1_SCLH=150 -DI2C1_VIC_SLOT=11 -DI2C1_BUF_LEN=16 @@ -230,7 +230,7 @@ test_ami.srcs += AMI601.c # # test crista # -test_crista.ARCHDIR = $(ARCHI) +test_crista.ARCHDIR = $(ARCH) test_crista.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) test_crista.srcs += $(SRC_BOOZ_TEST)/booz2_test_crista.c @@ -241,7 +241,7 @@ test_crista.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test_crista.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B57600 test_crista.srcs += $(SRC_ARCH)/uart_hw.c -test_crista.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0 +test_crista.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0 test_crista.srcs += downlink.c pprz_transport.c test_crista.CFLAGS += -DFLOAT_T=float -DBOOZ2_IMU_TYPE=\"booz2_imu_crista.h\" @@ -254,7 +254,7 @@ test_crista.srcs += $(SRC_BOOZ)/booz2_imu_crista.c $(SRC_BOOZ_ARCH)/booz2_imu_cr # # test MICROMAG # -test_micromag2.ARCHDIR = $(ARCHI) +test_micromag2.ARCHDIR = $(ARCH) test_micromag2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) test_micromag2.srcs += $(SRC_BOOZ_TEST)/booz2_test_micromag_2.c @@ -267,7 +267,7 @@ test_micromag2.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test_micromag2.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 test_micromag2.srcs += $(SRC_ARCH)/uart_hw.c -test_micromag2.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +test_micromag2.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 test_micromag2.srcs += downlink.c pprz_transport.c @@ -278,7 +278,7 @@ test_micromag2.srcs += downlink.c pprz_transport.c # # test IMU b2 # -test_imu_b2.ARCHDIR = $(ARCHI) +test_imu_b2.ARCHDIR = $(ARCH) test_imu_b2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) test_imu_b2.srcs += $(SRC_BOOZ_TEST)/booz2_test_imu_b2.c @@ -289,7 +289,7 @@ test_imu_b2.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test_imu_b2.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 test_imu_b2.srcs += $(SRC_ARCH)/uart_hw.c -test_imu_b2.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +test_imu_b2.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 test_imu_b2.srcs += downlink.c pprz_transport.c test_imu_b2.srcs += $(SRC_BOOZ)/booz_trig_int.c @@ -307,7 +307,7 @@ test_imu_b2.srcs += $(SRC_BOOZ)/booz2_imu.c # test rc spektrum # -test_rc_spektrum.ARCHDIR = $(ARCHI) +test_rc_spektrum.ARCHDIR = $(ARCH) test_rc_spektrum.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) $(BOOZ_CFLAGS) test_rc_spektrum.CFLAGS += -DPERIPHERALS_AUTO_INIT @@ -318,7 +318,7 @@ test_rc_spektrum.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC #test_rc_spektrum.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 #test_rc_spektrum.srcs += $(SRC_ARCH)/uart_hw.c -#test_rc_spektrum.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +#test_rc_spektrum.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 #test_rc_spektrum.srcs += downlink.c pprz_transport.c test_rc_spektrum.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DUSE_USB_SERIAL test_rc_spektrum.CFLAGS += -DDOWNLINK_DEVICE=UsbS -DPPRZ_UART=UsbS -DDATALINK=PPRZ @@ -332,14 +332,14 @@ test_rc_spektrum.CFLAGS += -DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"booz_radio_control test_rc_spektrum.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B115200 test_rc_spektrum.CFLAGS += -DRADIO_CONTROL_LINK=Uart0 test_rc_spektrum.srcs += $(SRC_BOOZ)/booz_radio_control.c \ - $(SRC_BOOZ)/booz_radio_control_spektrum.c \ - $(SRC_ARCH)/uart_hw.c + $(SRC_BOOZ)/booz_radio_control_spektrum.c \ + $(SRC_ARCH)/uart_hw.c # # test rc ppm # -test_rc_ppm.ARCHDIR = $(ARCHI) +test_rc_ppm.ARCHDIR = $(ARCH) test_rc_ppm.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) $(BOOZ_CFLAGS) test_rc_ppm.CFLAGS += -DPERIPHERALS_AUTO_INIT @@ -350,7 +350,7 @@ test_rc_ppm.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c #test_rc_ppm.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 #test_rc_ppm.srcs += $(SRC_ARCH)/uart_hw.c -#test_rc_ppm.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +#test_rc_ppm.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 #test_rc_ppm.srcs += downlink.c pprz_transport.c test_rc_ppm.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DUSE_USB_SERIAL test_rc_ppm.CFLAGS += -DDOWNLINK_DEVICE=UsbS -DPPRZ_UART=UsbS -DDATALINK=PPRZ @@ -362,14 +362,14 @@ test_rc_ppm.CFLAGS += -DUSE_RADIO_CONTROL -DRADIO_CONTROL_LED=1 test_rc_ppm.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"booz_radio_control_ppm.h\" test_rc_ppm.CFLAGS += -DRADIO_CONTROL_TYPE_PPM test_rc_ppm.srcs += $(SRC_BOOZ)/booz_radio_control.c \ - $(SRC_BOOZ)/$(IMPL)/booz_radio_control_ppm.c \ - $(SRC_BOOZ)/$(IMPL)/$(ARCH)/booz_radio_control_ppm_arch.c \ + $(SRC_BOOZ)/$(IMPL)/booz_radio_control_ppm.c \ + $(SRC_BOOZ)/$(IMPL)/$(ARCH)/booz_radio_control_ppm_arch.c \ # # test MC # -test_mc.ARCHDIR = $(ARCHI) +test_mc.ARCHDIR = $(ARCH) test_mc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) test_mc.srcs += $(SRC_BOOZ_TEST)/booz2_test_mc.c @@ -380,7 +380,7 @@ test_mc.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test_mc.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 test_mc.srcs += $(SRC_ARCH)/uart_hw.c -test_mc.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +test_mc.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 test_mc.srcs += downlink.c pprz_transport.c test_mc.CFLAGS += -DACTUATORS=\"actuators_buss_twi_blmc_hw.h\" -DUSE_BUSS_TWI_BLMC @@ -393,7 +393,7 @@ test_mc.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # # test BUSS BLDC # -test_buss_bldc.ARCHDIR = $(ARCHI) +test_buss_bldc.ARCHDIR = $(ARCH) test_buss_bldc.CFLAGS += -DPERIPHERALS_AUTO_INIT test_buss_bldc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) @@ -405,7 +405,7 @@ test_buss_bldc.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test_buss_bldc.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 test_buss_bldc.srcs += $(SRC_ARCH)/uart_hw.c -test_buss_bldc.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +test_buss_bldc.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 test_buss_bldc.srcs += downlink.c pprz_transport.c test_buss_bldc.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10 @@ -416,9 +416,9 @@ test_buss_bldc.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # # test asctec BLMC # -test_amc.ARCHDIR = $(ARCHI) +test_amc.ARCHDIR = $(ARCH) -test_amc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) +test_amc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) test_amc.srcs += $(SRC_BOOZ_TEST)/booz2_test_amc.c test_amc.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))' -DTIME_LED=1 test_amc.CFLAGS += -DLED @@ -437,15 +437,15 @@ test_amc.srcs += $(SRC_BOOZ_ARCH)/actuators_asctec_twi_blmc_hw.c actuators.c test_amc.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10 test_amc.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c -test_amc.CFLAGS += -DFLOAT_T=float +test_amc.CFLAGS += -DFLOAT_T=float #-DBOOZ2_IMU_TYPE=\"booz2_imu_crista.h\" # -# test_mkk_bldc : +# test_mkk_bldc : # -test_mkk_bldc.ARCHDIR = $(ARCHI) +test_mkk_bldc.ARCHDIR = $(ARCH) test_mkk_bldc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) $(BOOZ_CFLAGS) test_mkk_bldc.CFLAGS += -DPERIPHERALS_AUTO_INIT @@ -460,7 +460,7 @@ test_mkk_bldc.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # # test 24 bits baro # -test_baro_24.ARCHDIR = $(ARCHI) +test_baro_24.ARCHDIR = $(ARCH) test_baro_24.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) $(BOOZ_CFLAGS) test_baro_24.srcs += $(SRC_BOOZ_TEST)/booz2_test_baro_24.c @@ -472,7 +472,7 @@ test_baro_24.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test_baro_24.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 test_baro_24.srcs += $(SRC_ARCH)/uart_hw.c -test_baro_24.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 +test_baro_24.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 test_baro_24.srcs += downlink.c pprz_transport.c test_baro_24.CFLAGS += -DUSE_I2C1 -DI2C1_SCLL=150 -DI2C1_SCLH=150 -DI2C1_VIC_SLOT=11 -DI2C1_BUF_LEN=16 @@ -482,7 +482,7 @@ test_baro_24.srcs += $(SRC_BOOZ)/booz2_baro_24.c # # test_coders : blinks all leds # -test_coder.ARCHDIR = $(ARCHI) +test_coder.ARCHDIR = $(ARCH) test_coder.CFLAGS += -DBOARD_CONFIG=\"boards/olimex_lpc_h2148.h\" $(BOOZ_CFLAGS) test_coder.CFLAGS += -DPERIPHERALS_AUTO_INIT diff --git a/conf/autopilot/booz_test_progs.makefile b/conf/autopilot/booz_test_progs.makefile index c103dad9d0..709e513edb 100644 --- a/conf/autopilot/booz_test_progs.makefile +++ b/conf/autopilot/booz_test_progs.makefile @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with Paparazzi; see the file COPYING. If not, write to # the Free Software Foundation, 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# Boston, MA 02111-1307, USA. # # @@ -32,15 +32,15 @@ # # every "firmware" makefile should have a description of available targets # possible options for each of them, susbsystems and associated params for each of them -# +# # # # ################################################################################ -ARCHI=arm7 +ARCH=lpc21 -SRC_ARCH=$(ARCHI) +SRC_ARCH=arch/$(ARCH) SRC_BOOZ=booz SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/lpc21 SRC_BOARD=boards/$(BOARD) @@ -50,7 +50,7 @@ BOARD_CFG=\"boards/booz_1.0.h\" # # default configuration expected from board files # -# SYS_TIME_LED = 1 +# SYS_TIME_LED = 1 # MODEM_PORT = UART1 # MODEM_BAUD = B57600 @@ -63,11 +63,11 @@ BOARD_CFG=\"boards/booz_1.0.h\" # MODEM_PORT : # MODEM_BAUD : # -test_telemetry.ARCHDIR = $(ARCHI) +test_telemetry.ARCHDIR = $(ARCH) test_telemetry.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_telemetry.CFLAGS += -DPERIPHERALS_AUTO_INIT test_telemetry.srcs += test/test_telemetry.c \ - $(SRC_ARCH)/armVIC.c + $(SRC_ARCH)/armVIC.c test_telemetry.CFLAGS += -DUSE_LED test_telemetry.CFLAGS += -DUSE_SYS_TIME test_telemetry.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))' @@ -88,12 +88,12 @@ test_telemetry.srcs += $(SRC_ARCH)/uart_hw.c # MODEM_PORT # MODEM_BAUD # -test_baro.ARCHDIR = $(ARCHI) +test_baro.ARCHDIR = $(ARCH) test_baro.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_baro.CFLAGS += -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_ARCH) -I$(SRC_BOARD) test_baro.CFLAGS += -DPERIPHERALS_AUTO_INIT test_baro.srcs = $(SRC_BOARD)/test_baro.c \ - $(SRC_ARCH)/armVIC.c + $(SRC_ARCH)/armVIC.c test_baro.CFLAGS += -DUSE_LED test_baro.CFLAGS += -DUSE_SYS_TIME test_baro.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./512.)' @@ -108,7 +108,7 @@ test_baro.CFLAGS += -DBOOZ2_ANALOG_BARO_PERIOD='SYS_TICS_OF_SEC((1./100.))' test_baro.CFLAGS += -DADC0_VIC_SLOT=2 test_baro.CFLAGS += -DADC1_VIC_SLOT=3 test_baro.srcs += $(SRC_BOOZ)/booz2_analog.c \ - $(SRC_BOOZ_ARCH)/booz2_analog_hw.c + $(SRC_BOOZ_ARCH)/booz2_analog_hw.c # tell me why this shit needs to know battery !!!! test_baro.CFLAGS += -DBOOZ2_ANALOG_BATTERY_PERIOD='SYS_TICS_OF_SEC((1./10.))' test_baro.srcs += $(SRC_BOOZ)/booz2_battery.c @@ -118,9 +118,9 @@ test_baro.srcs += $(SRC_BOOZ)/booz2_battery.c # test_rc_spektrum : # # TODO -# -# -# +# +# +# # @@ -134,7 +134,7 @@ test_baro.srcs += $(SRC_BOOZ)/booz2_battery.c # MODEM_BAUD # RADIO_CONTROL_LED # -test_rc_ppm.ARCHDIR = $(ARCHI) +test_rc_ppm.ARCHDIR = $(ARCH) test_rc_ppm.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_rc_ppm.CFLAGS += -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_BOARD) @@ -147,25 +147,25 @@ test_rc_ppm.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c test_rc_ppm.CFLAGS += -DUSE_$(MODEM_PORT) -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) test_rc_ppm.srcs += $(SRC_ARCH)/uart_hw.c -test_rc_ppm.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT) +test_rc_ppm.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT) test_rc_ppm.srcs += downlink.c pprz_transport.c test_rc_ppm.CFLAGS += -DUSE_RADIO_CONTROL -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED) test_rc_ppm.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"radio_control/booz_radio_control_ppm.h\" test_rc_ppm.CFLAGS += -DRADIO_CONTROL_TYPE_PPM test_rc_ppm.srcs += $(SRC_BOOZ)/booz_radio_control.c \ - $(SRC_BOOZ)/radio_control/booz_radio_control_ppm.c \ - $(SRC_BOOZ_ARCH)/radio_control/booz_radio_control_ppm_arch.c + $(SRC_BOOZ)/radio_control/booz_radio_control_ppm.c \ + $(SRC_BOOZ_ARCH)/radio_control/booz_radio_control_ppm_arch.c # # simple test of mikrokopter motor controllers # -test_esc_mkk_simple.ARCHDIR = $(ARCHI) -test_esc_mkk_simple.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_esc_mkk_simple.ARCHDIR = $(ARCH) +test_esc_mkk_simple.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_esc_mkk_simple.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -test_esc_mkk_simple.srcs = test/test_esc_mkk_simple.c \ - $(SRC_ARCH)/armVIC.c +test_esc_mkk_simple.srcs = test/test_esc_mkk_simple.c \ + $(SRC_ARCH)/armVIC.c test_esc_mkk_simple.CFLAGS += -DUSE_LED test_esc_mkk_simple.CFLAGS += -DUSE_SYS_TIME -DSYS_TIME_LED=1 test_esc_mkk_simple.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./512.)' @@ -179,11 +179,11 @@ test_esc_mkk_simple.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # # test actuators mkk # -test_actuators_mkk.ARCHDIR = $(ARCHI) +test_actuators_mkk.ARCHDIR = $(ARCH) test_actuators_mkk.CFLAGS = -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_actuators_mkk.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_actuators_mkk.srcs = test/test_actuators.c \ - $(SRC_ARCH)/armVIC.c + $(SRC_ARCH)/armVIC.c test_actuators_mkk.CFLAGS += -DUSE_LED @@ -194,7 +194,7 @@ test_actuators_mkk.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c test_actuators_mkk.CFLAGS += -DUSE_$(MODEM_PORT) -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) test_actuators_mkk.srcs += $(SRC_ARCH)/uart_hw.c -test_actuators_mkk.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT) +test_actuators_mkk.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT) test_actuators_mkk.srcs += downlink.c pprz_transport.c test_actuators_mkk.srcs += $(SRC_BOOZ)/booz2_commands.c @@ -210,11 +210,11 @@ test_actuators_mkk.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_V # # test ami601 # -test_ami601.ARCHDIR = $(ARCHI) +test_ami601.ARCHDIR = $(ARCH) test_ami601.CFLAGS = -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_ami601.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_ami601.srcs = test/peripherals/test_ami601.c \ - $(SRC_ARCH)/armVIC.c + $(SRC_ARCH)/armVIC.c test_ami601.CFLAGS += -DUSE_LED @@ -225,7 +225,7 @@ test_ami601.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c test_ami601.CFLAGS += -DUSE_$(MODEM_PORT) -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) test_ami601.srcs += $(SRC_ARCH)/uart_hw.c -test_ami601.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT) +test_ami601.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT) test_ami601.srcs += downlink.c pprz_transport.c test_ami601.CFLAGS += -DUSE_AMI601 diff --git a/conf/autopilot/classix.makefile b/conf/autopilot/classix.makefile index 2cbd8e141a..68bd3b990b 100644 --- a/conf/autopilot/classix.makefile +++ b/conf/autopilot/classix.makefile @@ -1,19 +1,19 @@ # Makefile for the Classix board (2 arm7tdmi) -ARCHI=arm7 +ARCH=arm7 -ap.ARCHDIR = $(ARCHI) +ap.ARCHDIR = $(ARCH) -fbw.ARCHDIR = $(ARCHI) +fbw.ARCHDIR = $(ARCH) -test.ARCHDIR = $(ARCHI) +test.ARCHDIR = $(ARCH) LPC21ISP_BAUD = 38400 LPC21ISP_XTAL = 12000 # A test program to monitor the ADC values -test_adcs.ARCHDIR = $(ARCHI) +test_adcs.ARCHDIR = $(ARCH) test_adcs.CFLAGS += -DAP -DBOARD_CONFIG=\"classix.h\" -DLED -DTIME_LED=2 -DADC -DUSE_AD1 -DUSE_AD1_2 -DUSE_AD1_3 -DUSE_AD1_4 -DUSE_AD1_5 -DUSE_AD1_6 -DUSE_AD1_7 test_adcs.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600 @@ -21,10 +21,10 @@ test_adcs.srcs += downlink.c $(SRC_ARCH)/uart_hw.c test_adcs.srcs += sys_time.c $(SRC_ARCH)/adc_hw.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c pprz_transport.c test_adcs.c -# a test program to setup actuators +# a test program to setup actuators # Message to send on Ivy bus, 1500 on servo 3 for aircraft 16 # xxx RAW_DATALINK 16 SET_ACTUATOR;1500;3 -setup_actuators.ARCHDIR = $(ARCHI) +setup_actuators.ARCHDIR = $(ARCH) setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"classix.h\" -DLED -DTIME_LED=2 -DACTUATORS=\"servos_4017_hw.h\" -DSERVOS_4017 -DSERVOS_4017_CLOCK_FALLING -DUSE_UART0 -DUART0_BAUD=B57600 -DDATALINK=PPRZ -DPPRZ_UART=Uart0 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c $(SRC_ARCH)/servos_4017_hw.c main.c diff --git a/conf/autopilot/classix_proto1.makefile b/conf/autopilot/classix_proto1.makefile index f9540d5770..45822a66d5 100644 --- a/conf/autopilot/classix_proto1.makefile +++ b/conf/autopilot/classix_proto1.makefile @@ -1,10 +1,10 @@ # Makefile for the Classix board (2 arm7tdmi) -ARCHI=arm7 +ARCH=lpc21 -ap.ARCHDIR = $(ARCHI) +ap.ARCHDIR = $(ARCH) -fbw.ARCHDIR = $(ARCHI) +fbw.ARCHDIR = $(ARCH) LPC21ISP_BAUD = 115200 -LPC21ISP_XTAL = 14746 \ No newline at end of file +LPC21ISP_XTAL = 14746 diff --git a/conf/autopilot/lisa_l_test_progs.makefile b/conf/autopilot/lisa_l_test_progs.makefile index 7e13aaa229..3fbe6b5891 100644 --- a/conf/autopilot/lisa_l_test_progs.makefile +++ b/conf/autopilot/lisa_l_test_progs.makefile @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with Paparazzi; see the file COPYING. If not, write to # the Free Software Foundation, 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# Boston, MA 02111-1307, USA. # # @@ -32,18 +32,18 @@ # # every "firmware" makefile should have a description of available targets # possible options for each of them, susbsystems and associated params for each of them -# +# # # # ################################################################################ -ARCHI=stm32 -SRC_ARCH=$(ARCHI) +ARCH=stm32 +SRC_ARCH=$(ARCH) SRC_LISA=lisa -SRC_LISA_ARCH=$(SRC_LISA)/arch/$(ARCHI) +SRC_LISA_ARCH=$(SRC_LISA)/arch/$(ARCH) SRC_BOOZ=booz -SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCHI) +SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH) SRC_BOOZ_TEST = $(SRC_BOOZ)/test #SRC_ROTORCRAFT=rotorcraft SRC_BOARD=boards/$(BOARD) @@ -53,7 +53,7 @@ BOARD_CFG=\"boards/lisa_l_1.0.h\" # # default configuration expected from the board files # -# SYS_TIME_LED = 1 +# SYS_TIME_LED = 1 # MODEM_PORT = UART2 # MODEM_BAUD = B57600 @@ -65,12 +65,12 @@ BOARD_CFG=\"boards/lisa_l_1.0.h\" # MODEM_PORT : # MODEM_BAUD : # -test_telemetry.ARCHDIR = $(ARCHI) +test_telemetry.ARCHDIR = $(ARCH) test_telemetry.CFLAGS += -I$(SRC_LISA) -I$(SRC_ARCH) -DPERIPHERALS_AUTO_INIT test_telemetry.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_telemetry.srcs = test/test_telemetry.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_telemetry.CFLAGS += -DUSE_LED test_telemetry.srcs += $(SRC_ARCH)/led_hw.c test_telemetry.CFLAGS += -DUSE_SYS_TIME @@ -92,12 +92,12 @@ test_telemetry.srcs += $(SRC_ARCH)/uart_hw.c # MODEM_PORT # MODEM_BAUD # -test_baro.ARCHDIR = $(ARCHI) +test_baro.ARCHDIR = $(ARCH) test_baro.CFLAGS = -I$(SRC_LISA) -I$(SRC_ARCH) -I$(SRC_BOARD) -DPERIPHERALS_AUTO_INIT test_baro.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -test_baro.srcs = $(SRC_BOARD)/test_baro.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c +test_baro.srcs = $(SRC_BOARD)/test_baro.c \ + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_baro.CFLAGS += -DUSE_LED test_baro.srcs += $(SRC_ARCH)/led_hw.c test_baro.CFLAGS += -DUSE_SYS_TIME @@ -123,13 +123,13 @@ test_baro.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # RADIO_CONTROL_LED # RADIO_CONROL_LINK # -test_rc_spektrum.ARCHDIR = $(ARCHI) +test_rc_spektrum.ARCHDIR = $(ARCH) test_rc_spektrum.CFLAGS += -I$(SRC_ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT -test_rc_spektrum.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) +test_rc_spektrum.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_rc_spektrum.srcs += $(SRC_BOOZ_TEST)/booz2_test_radio_control.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_rc_spektrum.CFLAGS += -DUSE_LED test_rc_spektrum.srcs += $(SRC_ARCH)/led_hw.c @@ -147,8 +147,8 @@ test_rc_spektrum.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"radio_control/booz_radio_con test_rc_spektrum.CFLAGS += -DRADIO_CONTROL_SPEKTRUM_PRIMARY_PORT=$(RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT) test_rc_spektrum.CFLAGS += -DOVERRIDE_$(RADIO_CONTROL_SPEKTRUM_PRIMARY_PORT)_IRQ_HANDLER -DUSE_TIM1_UP_IRQ test_rc_spektrum.srcs += $(SRC_BOOZ)/booz_radio_control.c \ - $(SRC_BOOZ)/radio_control/booz_radio_control_spektrum.c \ - $(SRC_BOOZ_ARCH)/radio_control/booz_radio_control_spektrum_arch.c + $(SRC_BOOZ)/radio_control/booz_radio_control_spektrum.c \ + $(SRC_BOOZ_ARCH)/radio_control/booz_radio_control_spektrum_arch.c # @@ -160,14 +160,14 @@ test_rc_spektrum.srcs += $(SRC_BOOZ)/booz_radio_control.c # MODEM_BAUD # RADIO_CONTROL_LED # -test_rc_ppm.ARCHDIR = $(ARCHI) +test_rc_ppm.ARCHDIR = $(ARCH) test_rc_ppm.CFLAGS += -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -I$(SRC_BOARD) test_rc_ppm.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_rc_ppm.CFLAGS += -DPERIPHERALS_AUTO_INIT test_rc_ppm.srcs += $(SRC_BOOZ)/test/booz2_test_radio_control.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_rc_ppm.CFLAGS += -DUSE_LED test_rc_ppm.srcs += $(SRC_ARCH)/led_hw.c @@ -177,15 +177,15 @@ test_rc_ppm.CFLAGS += -DSYS_TIME_LED=$(SYS_TIME_LED) test_rc_ppm.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c test_rc_ppm.CFLAGS += -DUSE_$(MODEM_PORT) -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) test_rc_ppm.srcs += $(SRC_ARCH)/uart_hw.c -test_rc_ppm.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT) +test_rc_ppm.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT) test_rc_ppm.srcs += downlink.c pprz_transport.c test_rc_ppm.CFLAGS += -DUSE_RADIO_CONTROL test_rc_ppm.CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED) test_rc_ppm.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"radio_control/booz_radio_control_ppm.h\" test_rc_ppm.CFLAGS += -DRADIO_CONTROL_TYPE_PPM test_rc_ppm.srcs += $(SRC_BOOZ)/booz_radio_control.c \ - $(SRC_BOOZ)/radio_control/booz_radio_control_ppm.c \ - $(SRC_BOOZ_ARCH)/radio_control/booz_radio_control_ppm_arch.c + $(SRC_BOOZ)/radio_control/booz_radio_control_ppm.c \ + $(SRC_BOOZ_ARCH)/radio_control/booz_radio_control_ppm_arch.c test_rc_ppm.CFLAGS += -DUSE_TIM2_IRQ # @@ -196,18 +196,18 @@ test_rc_ppm.CFLAGS += -DUSE_TIM2_IRQ # MODEM_PORT # MODEM_BAUD # -test_adc.ARCHDIR = $(ARCHI) -test_adc.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_adc.ARCHDIR = $(ARCH) +test_adc.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_adc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_adc.srcs = $(SRC_LISA)/test_adc.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_adc.CFLAGS += -DUSE_LED test_adc.srcs += $(SRC_ARCH)/led_hw.c -test_adc.CFLAGS += -DUSE_SYS_TIME +test_adc.CFLAGS += -DUSE_SYS_TIME test_adc.CFLAGS +=-DSYS_TIME_LED=$(SYS_TIME_LED) test_adc.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./512.)' test_adc.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c @@ -216,7 +216,7 @@ test_adc.CFLAGS += -DUSE_$(MODEM_PORT) -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) test_adc.srcs += $(SRC_ARCH)/uart_hw.c test_adc.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=$(MODEM_PORT) -test_adc.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT) +test_adc.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT) test_adc.srcs += downlink.c pprz_transport.c test_adc.srcs += $(SRC_ARCH)/adc_hw.c @@ -231,17 +231,17 @@ test_adc.CFLAGS += -DUSE_ADC1_2_IRQ_HANDLER # MODEM_PORT # MODEM_BAUD # -test_imu_b2.ARCHDIR = $(ARCHI) -test_imu_b2.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_imu_b2.ARCHDIR = $(ARCH) +test_imu_b2.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_imu_b2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_imu_b2.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_imu_b2.CFLAGS += -DUSE_LED test_imu_b2.srcs += $(SRC_ARCH)/led_hw.c -test_imu_b2.CFLAGS += -DUSE_SYS_TIME +test_imu_b2.CFLAGS += -DUSE_SYS_TIME test_imu_b2.CFLAGS += -DSYS_TIME_LED=$(SYS_TIME_LED) test_imu_b2.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))' test_imu_b2.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c @@ -249,7 +249,7 @@ test_imu_b2.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c test_imu_b2.CFLAGS += -DUSE_$(MODEM_PORT) -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) test_imu_b2.srcs += $(SRC_ARCH)/uart_hw.c -test_imu_b2.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart2 +test_imu_b2.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart2 test_imu_b2.srcs += downlink.c pprz_transport.c test_imu_b2.srcs += math/pprz_trig_int.c @@ -269,12 +269,12 @@ test_imu_b2.srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c $(SRC_BOOZ_ARCH)/peri # # test IMU aspirin # -test_imu_aspirin.ARCHDIR = $(ARCHI) -test_imu_aspirin.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_imu_aspirin.ARCHDIR = $(ARCH) +test_imu_aspirin.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_imu_aspirin.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_imu_aspirin.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_imu_aspirin.CFLAGS += -DUSE_LED test_imu_aspirin.srcs += $(SRC_ARCH)/led_hw.c @@ -293,8 +293,8 @@ test_imu_aspirin.srcs += math/pprz_trig_int.c test_imu_aspirin.CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_aspirin.h\" -DIMU_OVERRIDE_CHANNELS test_imu_aspirin.srcs += $(SRC_BOOZ)/booz_imu.c \ - $(SRC_BOOZ)/imu/booz_imu_aspirin.c \ - $(SRC_BOOZ_ARCH)/imu/booz_imu_aspirin_arch.c + $(SRC_BOOZ)/imu/booz_imu_aspirin.c \ + $(SRC_BOOZ_ARCH)/imu/booz_imu_aspirin_arch.c test_imu_aspirin.CFLAGS += -DUSE_I2C2 test_imu_aspirin.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c @@ -314,12 +314,12 @@ test_imu_aspirin.CFLAGS += -DUSE_DMA1_C4_IRQ # SPI2 Rx DMA # # test hmc5843 # -test_hmc5843.ARCHDIR = $(ARCHI) -test_hmc5843.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -Ibooz -DPERIPHERALS_AUTO_INIT +test_hmc5843.ARCHDIR = $(ARCH) +test_hmc5843.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -Ibooz -DPERIPHERALS_AUTO_INIT test_hmc5843.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_hmc5843.srcs = lisa/test/lisa_test_hmc5843.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_hmc5843.CFLAGS += -DUSE_LED test_hmc5843.srcs += $(SRC_ARCH)/led_hw.c test_hmc5843.CFLAGS += -DUSE_SYS_TIME -DSYS_TIME_LED=$(SYS_TIME_LED) @@ -329,7 +329,7 @@ test_hmc5843.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c test_hmc5843.CFLAGS += -DUSE_$(MODEM_PORT) -D$(MODEM_PORT)_BAUD=$(MODEM_BAUD) test_hmc5843.srcs += $(SRC_ARCH)/uart_hw.c -test_hmc5843.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT) +test_hmc5843.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=$(MODEM_PORT) test_hmc5843.srcs += downlink.c pprz_transport.c test_hmc5843.CFLAGS += -DUSE_I2C2 @@ -341,12 +341,12 @@ test_hmc5843.CFLAGS += -DUSE_EXTI9_5_IRQ # Mag Int on PB5 # # test ITG3200 # -test_itg3200.ARCHDIR = $(ARCHI) -test_itg3200.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_itg3200.ARCHDIR = $(ARCH) +test_itg3200.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_itg3200.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_itg3200.srcs += lisa/test/lisa_test_itg3200.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_itg3200.CFLAGS += -DUSE_LED test_itg3200.srcs += $(SRC_ARCH)/led_hw.c @@ -369,12 +369,12 @@ test_itg3200.CFLAGS += -DUSE_EXTI15_10_IRQ # Gyro Int on PC14 # # test adxl345 with DMA # -test_adxl345.ARCHDIR = $(ARCHI) -test_adxl345.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_adxl345.ARCHDIR = $(ARCH) +test_adxl345.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_adxl345.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_adxl345.srcs += lisa/test/lisa_test_adxl345_dma.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_adxl345.CFLAGS += -DUSE_LED test_adxl345.srcs += $(SRC_ARCH)/led_hw.c @@ -397,12 +397,12 @@ test_adxl345.CFLAGS += -DUSE_DMA1_C4_IRQ # SPI2 Rx DMA # # simple test of mikrokopter motor controllers # -test_esc_mkk_simple.ARCHDIR = $(ARCHI) -test_esc_mkk_simple.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_esc_mkk_simple.ARCHDIR = $(ARCH) +test_esc_mkk_simple.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_esc_mkk_simple.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -test_esc_mkk_simple.srcs = test/test_esc_mkk_simple.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c +test_esc_mkk_simple.srcs = test/test_esc_mkk_simple.c \ + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_esc_mkk_simple.CFLAGS += -DUSE_LED test_esc_mkk_simple.srcs += $(SRC_ARCH)/led_hw.c test_esc_mkk_simple.CFLAGS += -DUSE_SYS_TIME -DSYS_TIME_LED=1 @@ -415,12 +415,12 @@ test_esc_mkk_simple.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # # simple test of asctec v1 motor controllers # -test_esc_asctecv1_simple.ARCHDIR = $(ARCHI) -test_esc_asctecv1_simple.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_esc_asctecv1_simple.ARCHDIR = $(ARCH) +test_esc_asctecv1_simple.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_esc_asctecv1_simple.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_esc_asctecv1_simple.srcs = test/test_esc_asctecv1_simple.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_esc_asctecv1_simple.CFLAGS += -DUSE_LED test_esc_asctecv1_simple.srcs += $(SRC_ARCH)/led_hw.c test_esc_asctecv1_simple.CFLAGS += -DUSE_SYS_TIME -DSYS_TIME_LED=1 @@ -433,12 +433,12 @@ test_esc_asctecv1_simple.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # # test actuators mkk # -test_actuators_mkk.ARCHDIR = $(ARCHI) -test_actuators_mkk.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_actuators_mkk.ARCHDIR = $(ARCH) +test_actuators_mkk.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_actuators_mkk.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_actuators_mkk.srcs = test/test_actuators.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_actuators_mkk.CFLAGS += -DUSE_LED test_actuators_mkk.srcs += $(SRC_ARCH)/led_hw.c @@ -450,7 +450,7 @@ test_actuators_mkk.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c test_actuators_mkk.CFLAGS += -DUSE_UART2 -DUART2_BAUD=B57600 test_actuators_mkk.srcs += $(SRC_ARCH)/uart_hw.c -test_actuators_mkk.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart2 +test_actuators_mkk.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart2 test_actuators_mkk.srcs += downlink.c pprz_transport.c test_actuators_mkk.srcs += $(SRC_BOOZ)/booz2_commands.c @@ -463,12 +463,12 @@ test_actuators_mkk.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # # test actuators asctecv1 # -test_actuators_asctecv1.ARCHDIR = $(ARCHI) -test_actuators_asctecv1.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_actuators_asctecv1.ARCHDIR = $(ARCH) +test_actuators_asctecv1.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_actuators_asctecv1.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_actuators_asctecv1.srcs = test/test_actuators.c \ - $(SRC_ARCH)/stm32_exceptions.c \ - $(SRC_ARCH)/stm32_vector_table.c + $(SRC_ARCH)/stm32_exceptions.c \ + $(SRC_ARCH)/stm32_vector_table.c test_actuators_asctecv1.CFLAGS += -DUSE_LED test_actuators_asctecv1.srcs += $(SRC_ARCH)/led_hw.c @@ -480,7 +480,7 @@ test_actuators_asctecv1.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c test_actuators_asctecv1.CFLAGS += -DUSE_UART2 -DUART2_BAUD=B57600 test_actuators_asctecv1.srcs += $(SRC_ARCH)/uart_hw.c -test_actuators_asctecv1.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart2 +test_actuators_asctecv1.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart2 test_actuators_asctecv1.srcs += downlink.c pprz_transport.c test_actuators_asctecv1.srcs += $(SRC_BOOZ)/booz2_commands.c @@ -488,4 +488,3 @@ test_actuators_asctecv1.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c1 test_actuators_asctecv1.srcs += $(SRC_BOOZ)/actuators/booz_actuators_asctec.c test_actuators_asctecv1.CFLAGS += -DUSE_I2C1 test_actuators_asctecv1.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c - diff --git a/conf/autopilot/lisa_test_progs.makefile b/conf/autopilot/lisa_test_progs.makefile index 81373cb877..831ef8c851 100644 --- a/conf/autopilot/lisa_test_progs.makefile +++ b/conf/autopilot/lisa_test_progs.makefile @@ -116,12 +116,12 @@ overo_test_passthrough.srcs += $(SRC_FMS)/fms_network.c # ################################################################################ -ARCHI=stm32 -SRC_ARCH=$(ARCHI) +ARCH=stm32 +SRC_ARCH=$(ARCH) SRC_LISA=lisa -SRC_LISA_ARCH=$(SRC_LISA)/arch/$(ARCHI) +SRC_LISA_ARCH=$(SRC_LISA)/arch/$(ARCH) SRC_BOOZ=booz -SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCHI) +SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH) #BOARD_CFG=\"boards/olimex_stm32-h103.h\" BOARD_CFG=\"boards/lisa_l_1.0.h\" @@ -131,8 +131,8 @@ FLASH_MODE = JTAG # # test leds # -test_led.ARCHDIR = $(ARCHI) -test_led.CFLAGS += -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_led.ARCHDIR = $(ARCH) +test_led.CFLAGS += -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_led.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_led.srcs += $(SRC_LISA)/test_led.c \ $(SRC_ARCH)/led_hw.c \ @@ -144,8 +144,8 @@ test_led.CFLAGS += -DUSE_LED # # test leds2 # -test_led2.ARCHDIR = $(ARCHI) -test_led2.CFLAGS += -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_led2.ARCHDIR = $(ARCH) +test_led2.CFLAGS += -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_led2.CFLAGS += -DBOARD_CONFIG=\"boards/lisa_0.99.h\" test_led2.srcs += $(SRC_LISA)/test_led2.c \ $(SRC_LISA)/exceptions.c \ @@ -156,8 +156,8 @@ test_led2.CFLAGS += -DUSE_LED # # test periodic # -test_periodic.ARCHDIR = $(ARCHI) -test_periodic.CFLAGS += -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_periodic.ARCHDIR = $(ARCH) +test_periodic.CFLAGS += -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_periodic.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_periodic.srcs += $(SRC_LISA)/test_periodic.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -172,8 +172,8 @@ test_periodic.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c # # test uart # -test_uart.ARCHDIR = $(ARCHI) -test_uart.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_uart.ARCHDIR = $(ARCH) +test_uart.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_uart.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_uart.srcs = $(SRC_LISA)/test_uart.c \ $(SRC_LISA)/exceptions.c \ @@ -190,8 +190,8 @@ test_uart.srcs += $(SRC_ARCH)/uart_hw.c # # test telemetry1 # -test_telemetry1.ARCHDIR = $(ARCHI) -test_telemetry1.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_telemetry1.ARCHDIR = $(ARCH) +test_telemetry1.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_telemetry1.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_telemetry1.srcs = $(SRC_LISA)/test_telemetry.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -210,8 +210,8 @@ test_telemetry1.srcs += downlink.c pprz_transport.c # # test telemetry2 # -test_telemetry2.ARCHDIR = $(ARCHI) -test_telemetry2.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_telemetry2.ARCHDIR = $(ARCH) +test_telemetry2.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_telemetry2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_telemetry2.srcs = $(SRC_LISA)/test_telemetry.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -230,8 +230,8 @@ test_telemetry2.srcs += downlink.c pprz_transport.c # # test telemetry3 # -test_telemetry3.ARCHDIR = $(ARCHI) -test_telemetry3.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_telemetry3.ARCHDIR = $(ARCH) +test_telemetry3.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_telemetry3.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_telemetry3.srcs = $(SRC_LISA)/test_telemetry.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -249,8 +249,8 @@ test_telemetry3.srcs += downlink.c pprz_transport.c # # test datalink # -test_datalink.ARCHDIR = $(ARCHI) -test_datalink.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_datalink.ARCHDIR = $(ARCH) +test_datalink.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_datalink.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_datalink.srcs = $(SRC_LISA)/test_datalink.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -270,8 +270,8 @@ test_datalink.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart2 # # tunnel # -tunnel.ARCHDIR = $(ARCHI) -tunnel.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +tunnel.ARCHDIR = $(ARCH) +tunnel.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT tunnel.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) tunnel.srcs += $(SRC_LISA)/test/lisa_tunnel.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -300,8 +300,8 @@ tunnel.srcs += $(SRC_ARCH)/uart_hw.c # # test float # -test_float.ARCHDIR = $(ARCHI) -test_float.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_float.ARCHDIR = $(ARCH) +test_float.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_float.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_float.srcs = $(SRC_LISA)/test_float.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -320,8 +320,8 @@ test_float.srcs += lisa/plug_sys.c # # test bswap # -test_bswap.ARCHDIR = $(ARCHI) -test_bswap.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) +test_bswap.ARCHDIR = $(ARCH) +test_bswap.CFLAGS = -I$(SRC_LISA) -I$(ARCH) test_bswap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_bswap.srcs = $(SRC_LISA)/test/test_bswap.c \ @@ -334,8 +334,8 @@ test_bswap.srcs = $(SRC_LISA)/test/test_bswap.c \ SRC_BOOZ = booz SRC_BOOZ_TEST = $(SRC_BOOZ)/test -test_rc_24.ARCHDIR = $(ARCHI) -test_rc_24.CFLAGS += -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -DPERIPHERALS_AUTO_INIT +test_rc_24.ARCHDIR = $(ARCH) +test_rc_24.CFLAGS += -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -DPERIPHERALS_AUTO_INIT test_rc_24.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_rc_24.srcs += $(SRC_BOOZ_TEST)/booz2_test_radio_control.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -367,10 +367,10 @@ test_rc_24.srcs += $(SRC_BOOZ)/booz_radio_control.c \ # test servos # -SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCHI) +SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH) -test_servos.ARCHDIR = $(ARCHI) -test_servos.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_servos.ARCHDIR = $(ARCH) +test_servos.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_servos.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_servos.LDFLAGS += -lm test_servos.srcs += $(SRC_LISA)/test_servos.c \ @@ -398,8 +398,8 @@ test_servos.srcs += $(SRC_BOOZ)/actuators/booz_actuators_pwm.c $(SRC_BOOZ_ARCH)/ # # test IMU b2 # -test_imu_b2.ARCHDIR = $(ARCHI) -test_imu_b2.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_imu_b2.ARCHDIR = $(ARCH) +test_imu_b2.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_imu_b2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_imu_b2.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -432,8 +432,8 @@ test_imu_b2.srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c $(SRC_BOOZ_ARCH)/peri # # test IMU crista # -test_imu_crista.ARCHDIR = $(ARCHI) -test_imu_crista.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_imu_crista.ARCHDIR = $(ARCH) +test_imu_crista.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_imu_crista.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_imu_crista.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -464,8 +464,8 @@ test_imu_crista.CFLAGS += -DUSE_DMA1_C4_IRQ # # test IMU aspirin # -test_imu_aspirin.ARCHDIR = $(ARCHI) -test_imu_aspirin.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_imu_aspirin.ARCHDIR = $(ARCH) +test_imu_aspirin.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_imu_aspirin.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_imu_aspirin.srcs += $(SRC_BOOZ_TEST)/booz_test_imu.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -507,8 +507,8 @@ test_imu_aspirin.CFLAGS += -DUSE_DMA1_C4_IRQ # SPI2 Rx DMA # # test motor controllers # -test_mc.ARCHDIR = $(ARCHI) -test_mc.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_mc.ARCHDIR = $(ARCH) +test_mc.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_mc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_mc.srcs = $(SRC_LISA)/test_mc.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -523,8 +523,8 @@ test_mc.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c # # test motor controllers with interrupts # -test_mc2.ARCHDIR = $(ARCHI) -test_mc2.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_mc2.ARCHDIR = $(ARCH) +test_mc2.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_mc2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_mc2.srcs = $(SRC_LISA)/test_mc2.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -541,8 +541,8 @@ test_mc2.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # # test motor controllers asctec with interrupts # -test_mc_asctec_v1_simple.ARCHDIR = $(ARCHI) -test_mc_asctec_v1_simple.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_mc_asctec_v1_simple.ARCHDIR = $(ARCH) +test_mc_asctec_v1_simple.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_mc_asctec_v1_simple.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_mc_asctec_v1_simple.srcs = $(SRC_LISA)/test/test_mc_asctec_v1_simple.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -564,8 +564,8 @@ test_mc_asctec_v1_simple.srcs += downlink.c pprz_transport.c # # test motor controllers asctec2 with interrupts # -test_mc5.ARCHDIR = $(ARCHI) -test_mc5.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_mc5.ARCHDIR = $(ARCH) +test_mc5.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_mc5.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_mc5.srcs = $(SRC_LISA)/test_mc5.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -584,8 +584,8 @@ test_mc5.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # # test actuators mkk # -test_actuators_mkk.ARCHDIR = $(ARCHI) -test_actuators_mkk.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_actuators_mkk.ARCHDIR = $(ARCH) +test_actuators_mkk.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_actuators_mkk.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_actuators_mkk.srcs = $(SRC_LISA)/test/lisa_test_actuators_mkk.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -618,8 +618,8 @@ test_actuators_mkk.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # # test actuators asctec # -test_actuators_asctec.ARCHDIR = $(ARCHI) -test_actuators_asctec.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_actuators_asctec.ARCHDIR = $(ARCH) +test_actuators_asctec.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_actuators_asctec.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_actuators_asctec.srcs = $(SRC_LISA)/test/lisa_test_actuators_mkk.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -656,8 +656,8 @@ test_actuators_asctec.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # # test motor controllers asctec # -test_mc3.ARCHDIR = $(ARCHI) -test_mc3.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_mc3.ARCHDIR = $(ARCH) +test_mc3.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_mc3.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_mc3.srcs = $(SRC_LISA)/test_mc3.c \ $(SRC_LISA)/exceptions.c \ @@ -673,8 +673,8 @@ test_mc3.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c # # test baro # -test_baro.ARCHDIR = $(ARCHI) -test_baro.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_baro.ARCHDIR = $(ARCH) +test_baro.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_baro.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_baro.srcs = $(SRC_LISA)/test_baro.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -695,8 +695,8 @@ test_baro.srcs += downlink.c pprz_transport.c # # test baro with interrupts # -test_baro2.ARCHDIR = $(ARCHI) -test_baro2.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_baro2.ARCHDIR = $(ARCH) +test_baro2.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_baro2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_baro2.srcs = $(SRC_LISA)/test_baro2.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -721,8 +721,8 @@ test_baro2.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # # another baro test with interrupts # -test_baro3.ARCHDIR = $(ARCHI) -test_baro3.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_baro3.ARCHDIR = $(ARCH) +test_baro3.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_baro3.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_baro3.srcs = $(SRC_LISA)/test_baro3.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -747,8 +747,8 @@ test_baro3.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c # # test spi slave ( hardcoded SPI without DMA ) # -test_spi_slave.ARCHDIR = $(ARCHI) -test_spi_slave.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_spi_slave.ARCHDIR = $(ARCH) +test_spi_slave.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_spi_slave.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_spi_slave.srcs = $(SRC_LISA)/test_spi_slave.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -768,8 +768,8 @@ test_spi_slave.srcs += downlink.c pprz_transport.c # # test spi slave2 ( hardcoded SPI with DMA ) # -test_spi_slave2.ARCHDIR = $(ARCHI) -test_spi_slave2.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_spi_slave2.ARCHDIR = $(ARCH) +test_spi_slave2.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_spi_slave2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_spi_slave2.srcs = $(SRC_LISA)/test_spi_slave2.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -789,8 +789,8 @@ test_spi_slave2.srcs += downlink.c pprz_transport.c # # test spi link between overo and stm32 # -stm_test_spi_link.ARCHDIR = $(ARCHI) -stm_test_spi_link.CFLAGS += -Ilisa -Ilisa/arch/$(ARCHI) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +stm_test_spi_link.ARCHDIR = $(ARCH) +stm_test_spi_link.CFLAGS += -Ilisa -Ilisa/arch/$(ARCH) -I$(ARCH) -DPERIPHERALS_AUTO_INIT stm_test_spi_link.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) stm_test_spi_link.srcs += lisa/stm_test_spi_link.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -817,8 +817,8 @@ stm_test_spi_link.srcs += lisa/lisa_overo_link.c lisa/arch/stm32/lisa_overo_link # # test static # -test_static.ARCHDIR = $(ARCHI) -test_static.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_static.ARCHDIR = $(ARCH) +test_static.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_static.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_static.srcs = $(SRC_LISA)/test_static.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -829,8 +829,8 @@ test_static.srcs = $(SRC_LISA)/test_static.c \ # # test SC18IS600 # -test_sc18is600.ARCHDIR = $(ARCHI) -test_sc18is600.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_sc18is600.ARCHDIR = $(ARCH) +test_sc18is600.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_sc18is600.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_sc18is600.srcs += lisa/test/lisa_test_sc18is600.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -859,8 +859,8 @@ test_sc18is600.srcs += $(SRC_BOOZ)/peripherals/booz_sc18is600.c \ # # test Max1168 # -test_max1168.ARCHDIR = $(ARCHI) -test_max1168.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_max1168.ARCHDIR = $(ARCH) +test_max1168.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_max1168.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_max1168.srcs = $(SRC_LISA)/test/lisa_test_max1168.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -886,8 +886,8 @@ test_max1168.srcs += downlink.c pprz_transport.c # # test ms2001 # -test_ms2001.ARCHDIR = $(ARCHI) -test_ms2001.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_ms2001.ARCHDIR = $(ARCH) +test_ms2001.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_ms2001.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_ms2001.srcs = $(SRC_LISA)/test/lisa_test_ms2001.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -915,8 +915,8 @@ test_ms2001.srcs += downlink.c pprz_transport.c # # test adxl345 # -test_adxl345.ARCHDIR = $(ARCHI) -test_adxl345.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_adxl345.ARCHDIR = $(ARCH) +test_adxl345.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_adxl345.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_adxl345.srcs += lisa/test/lisa_test_adxl345.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -940,8 +940,8 @@ test_adxl345.CFLAGS += -DUSE_EXTI2_IRQ # Acc Int on PD2 # # test adxl345 with DMA # -test_adxl345_dma.ARCHDIR = $(ARCHI) -test_adxl345_dma.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_adxl345_dma.ARCHDIR = $(ARCH) +test_adxl345_dma.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_adxl345_dma.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_adxl345_dma.srcs += lisa/test/lisa_test_adxl345_dma.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -969,8 +969,8 @@ test_adxl345_dma.CFLAGS += -DUSE_DMA1_C4_IRQ # SPI2 Rx DMA # # test ITG3200 # -test_itg3200.ARCHDIR = $(ARCHI) -test_itg3200.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_itg3200.ARCHDIR = $(ARCH) +test_itg3200.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_itg3200.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_itg3200.srcs += lisa/test/lisa_test_itg3200.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -997,8 +997,8 @@ test_itg3200.CFLAGS += -DUSE_EXTI15_10_IRQ # Gyro Int on PC14 # # test hmc5843 # -test_hmc5843.ARCHDIR = $(ARCHI) -test_hmc5843.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -Ibooz -DPERIPHERALS_AUTO_INIT +test_hmc5843.ARCHDIR = $(ARCH) +test_hmc5843.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -Ibooz -DPERIPHERALS_AUTO_INIT test_hmc5843.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_hmc5843.srcs = lisa/test/lisa_test_hmc5843.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -1027,8 +1027,8 @@ test_hmc5843.CFLAGS += -DUSE_EXTI9_5_IRQ # Mag Int on PB5 # # test Aspirin ( rewired ) no sc18is600 # -test_aspirin.ARCHDIR = $(ARCHI) -test_aspirin.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_aspirin.ARCHDIR = $(ARCH) +test_aspirin.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_aspirin.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_aspirin.srcs += lisa/test/lisa_test_aspirin.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -1124,8 +1124,8 @@ ptw.CFLAGS += -DUSE_I2C1 # # test csc servo # -test_csc_servo.ARCHDIR = $(ARCHI) -test_csc_servo.CFLAGS = -I $(SRC_CSC) -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_csc_servo.ARCHDIR = $(ARCH) +test_csc_servo.CFLAGS = -I $(SRC_CSC) -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_csc_servo.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_csc_servo.srcs = $(SRC_CSC)/csc_protocol.c \ $(SRC_LISA)/test_csc_servo.c \ @@ -1163,8 +1163,8 @@ test_csc_servo.srcs += can.c $(SRC_ARCH)/can_hw.c # # test GPS # -test_gps.ARCHDIR = $(ARCHI) -test_gps.CFLAGS = -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_gps.ARCHDIR = $(ARCH) +test_gps.CFLAGS = -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_gps.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) test_gps.srcs += $(SRC_BOOZ_TEST)/booz2_test_gps.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -1194,8 +1194,8 @@ test_gps.srcs += $(SRC_BOOZ)/gps/booz_gps_skytraq.c # # test ADC # -# test_adc.ARCHDIR = $(ARCHI) -# test_adc.CFLAGS = -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +# test_adc.ARCHDIR = $(ARCH) +# test_adc.CFLAGS = -I$(ARCH) -DPERIPHERALS_AUTO_INIT # test_adc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) # test_adc.srcs += $(SRC_LISA)/test/lisa_test_adc.c \ # $(SRC_ARCH)/stm32_exceptions.c \ @@ -1217,8 +1217,8 @@ test_gps.srcs += $(SRC_BOOZ)/gps/booz_gps_skytraq.c # # test adc # -test_adc.ARCHDIR = $(ARCHI) -test_adc.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -DPERIPHERALS_AUTO_INIT +test_adc.ARCHDIR = $(ARCH) +test_adc.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -DPERIPHERALS_AUTO_INIT test_adc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_adc.srcs = $(SRC_ARCH)/adc_hw.c \ $(SRC_LISA)/test_adc.c \ @@ -1246,8 +1246,8 @@ test_adc.CFLAGS += -DUSE_AD1 -DUSE_AD1_1 -DUSE_AD1_2 -DUSE_AD1_3 -DUSE_AD1_4 # # ################################################################################ -test_board.ARCHDIR = $(ARCHI) -test_board.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +test_board.ARCHDIR = $(ARCH) +test_board.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT test_board.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) test_board.srcs = $(SRC_LISA)/test/test_board.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -1290,8 +1290,8 @@ test_board.srcs += $(SRC_BOOZ)/actuators/booz_actuators_pwm.c $(SRC_BOOZ_ARCH)/a # # Spits every samples of one axis of gyro on IMU aspirin # -hs_gyro_aspirin.ARCHDIR = $(ARCHI) -hs_gyro_aspirin.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +hs_gyro_aspirin.ARCHDIR = $(ARCH) +hs_gyro_aspirin.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT hs_gyro_aspirin.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) hs_gyro_aspirin.srcs += lisa/test/hs_gyro.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -1328,8 +1328,8 @@ hs_gyro_aspirin.CFLAGS += -DUSE_DMA1_C4_IRQ # SPI2 Rx DMA # # Spits every samples of one axis of gyro on IMU b2 # -hs_gyro_b2.ARCHDIR = $(ARCHI) -hs_gyro_b2.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +hs_gyro_b2.ARCHDIR = $(ARCH) +hs_gyro_b2.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT hs_gyro_b2.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) hs_gyro_b2.srcs += lisa/test/hs_gyro.c \ $(SRC_ARCH)/stm32_exceptions.c \ @@ -1361,8 +1361,8 @@ hs_gyro_b2.srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c $(SRC_BOOZ_ARCH)/perip # # Spits every samples of one axis of gyro on IMU crista # -hs_gyro_crista.ARCHDIR = $(ARCHI) -hs_gyro_crista.CFLAGS = -I$(SRC_LISA) -I$(ARCHI) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT +hs_gyro_crista.ARCHDIR = $(ARCH) +hs_gyro_crista.CFLAGS = -I$(SRC_LISA) -I$(ARCH) -I$(SRC_BOOZ) -I$(SRC_BOOZ_ARCH) -DPERIPHERALS_AUTO_INIT hs_gyro_crista.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) hs_gyro_crista.srcs += lisa/test/hs_gyro.c \ $(SRC_ARCH)/stm32_exceptions.c \ diff --git a/conf/autopilot/mercury_csc.makefile b/conf/autopilot/mercury_csc.makefile index ec72617e23..1515defa7b 100644 --- a/conf/autopilot/mercury_csc.makefile +++ b/conf/autopilot/mercury_csc.makefile @@ -1,6 +1,6 @@ # # $Id$ -# +# # Copyright (C) 2009 Antoine Drouin # # This file is part of paparazzi. @@ -18,11 +18,11 @@ # You should have received a copy of the GNU General Public License # along with paparazzi; see the file COPYING. If not, write to # the Free Software Foundation, 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# Boston, MA 02111-1307, USA. # # -ARCHI=lpc21 +ARCH=lpc21 FLASH_MODE = ISP LPC21ISP_PORT = /dev/ttyUSB0 @@ -40,9 +40,9 @@ BOARD_CFG = \"csc_board_v1_0.h\" SRC_CSC=csc -SRC_CSC_ARCH=$(SRC_CSC)/$(ARCHI) +SRC_CSC_ARCH=$(SRC_CSC)/$(ARCH) -ap.ARCHDIR = $(ARCHI) +ap.ARCHDIR = $(ARCH) ap.CFLAGS += -I$(SRC_CSC) -I$(SRC_CSC_ARCH) ap.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG) @@ -51,7 +51,7 @@ ap.CFLAGS += -DLED -DTIME_LED=1 ap.CFLAGS += -DCSC_BOARD_ID=$(CSC_ID) -ap.CFLAGS += -DUSE_PWM_INPUT +ap.CFLAGS += -DUSE_PWM_INPUT ap.CFLAGS += -DUSE_PWM_INPUT1 ap.CFLAGS += -DUSE_PWM_INPUT2 ap.CFLAGS += -DUSE_VANE_SENSOR @@ -66,7 +66,7 @@ ap.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c #ap.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 -DUART1_VIC_SLOT=6 #ap.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport \ -# -DDOWNLINK_DEVICE=Uart0 +# -DDOWNLINK_DEVICE=Uart0 #ap.srcs += downlink.c pprz_transport.c @@ -74,7 +74,7 @@ ap.CFLAGS += -DAP_LINK_CAN -DCAN_LED=2 ap.CFLAGS += -DUSE_CAN1 #-DCAN1_BTR=CANBitrate125k_3MHz ap.CFLAGS += -DCAN1_VIC_SLOT=3 -DCAN1_ERR_VIC_SLOT=7 ap.srcs += $(SRC_CSC)/csc_can.c -ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B57600 -DUART0_VIC_SLOT=5 +ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B57600 -DUART0_VIC_SLOT=5 #ap.CFLAGS += -DUSE_CAN2 -DCAN2_BTR=CANBitrate125k_2MHz -DCAN2_VIC_SLOT=4 ap.CFLAGS += -DACTUATORS=\"servos_direct_hw.h\" @@ -92,7 +92,7 @@ ap.CFLAGS += -DERROR_LED=4 # # test uart # -test_uart.ARCHDIR = $(ARCHI) +test_uart.ARCHDIR = $(ARCH) test_uart.CFLAGS += -I$(SRC_CSC) @@ -108,7 +108,7 @@ test_uart.srcs += $(SRC_ARCH)/uart_hw.c test_uart.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600 -DUART1_VIC_SLOT=6 test_uart.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport \ - -DDOWNLINK_DEVICE=Uart1 + -DDOWNLINK_DEVICE=Uart1 test_uart.srcs += downlink.c pprz_transport.c @@ -116,7 +116,7 @@ test_uart.srcs += downlink.c pprz_transport.c # TEST CAN1 # -test_can1.ARCHDIR = $(ARCHI) +test_can1.ARCHDIR = $(ARCH) test_can1.CFLAGS += -I$(SRC_CSC) diff --git a/conf/autopilot/sitl.makefile b/conf/autopilot/sitl.makefile index 979ae20109..3ec10c07a1 100644 --- a/conf/autopilot/sitl.makefile +++ b/conf/autopilot/sitl.makefile @@ -1,4 +1,4 @@ -sim.ARCHDIR = $(ARCHI) +sim.ARCHDIR = $(ARCH) sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO sim.srcs += latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c diff --git a/conf/autopilot/sitl_jsbsim.makefile b/conf/autopilot/sitl_jsbsim.makefile index beafd8bf38..51908c6de5 100644 --- a/conf/autopilot/sitl_jsbsim.makefile +++ b/conf/autopilot/sitl_jsbsim.makefile @@ -1,14 +1,13 @@ -jsbsim.ARCHDIR = $(ARCHI) +jsbsim.ARCHDIR = $(ARCH) # external libraries jsbsim.CFLAGS = -I$(SIMDIR) -I/usr/include `pkg-config glib-2.0 --cflags` jsbsim.LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lpcre -lglibivy -L/usr/lib -lJSBSim jsbsim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO -jsbsim.srcs = $(SRC_ARCH)/jsbsim_hw.c $(SRC_ARCH)/jsbsim_gps.c $(SRC_ARCH)/jsbsim_ir.c $(SRC_ARCH)/jsbsim_transport.c $(SRC_ARCH)/ivy_transport.c +jsbsim.srcs = $(SRC_ARCH)/jsbsim_hw.c $(SRC_ARCH)/jsbsim_gps.c $(SRC_ARCH)/jsbsim_ir.c $(SRC_ARCH)/jsbsim_transport.c $(SRC_ARCH)/ivy_transport.c jsbsim.srcs += latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c jsbsim.srcs += $(SIMDIR)/sim_ac_jsbsim.c # Choose in your airframe file type of airframe # jsbsim.srcs += $(SIMDIR)/sim_ac_fw.c # jsbsim.srcs += $(SIMDIR)/sim_ac_booz.c - diff --git a/conf/autopilot/sitl_link_pprz.makefile b/conf/autopilot/sitl_link_pprz.makefile index 361db797ae..11e7353827 100644 --- a/conf/autopilot/sitl_link_pprz.makefile +++ b/conf/autopilot/sitl_link_pprz.makefile @@ -1,3 +1,3 @@ -sim.ARCHDIR = $(ARCHI) +sim.ARCHDIR = $(ARCH) sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DINFRARED -DRADIO_CONTROL_SETTINGS -DSIM_UART -DDOWNLINK_AP_DEVICE=SimUart -DDOWNLINK_FBW_DEVICE=SimUart -DDATALINK=PPRZ -sim.srcs = radio_control.c downlink.c pprz_transport.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c cam.c sys_time.c main_fbw.c main_ap.c rc_settings.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/sim_uart.c datalink.c +sim.srcs = radio_control.c downlink.c pprz_transport.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c cam.c sys_time.c main_fbw.c main_ap.c rc_settings.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/sim_uart.c datalink.c diff --git a/conf/autopilot/sitl_link_xbee.makefile b/conf/autopilot/sitl_link_xbee.makefile index 286a3cf782..b1723aa41c 100644 --- a/conf/autopilot/sitl_link_xbee.makefile +++ b/conf/autopilot/sitl_link_xbee.makefile @@ -1,3 +1,3 @@ -sim.ARCHDIR = $(ARCHI) +sim.ARCHDIR = $(ARCH) sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=XBeeTransport -DINFRARED -DRADIO_CONTROL_SETTINGS -DSIM_UART -DSIM_XBEE -DXBEE_UART=SimUart -sim.srcs = radio_control.c downlink.c xbee.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c cam.c sys_time.c main_fbw.c main_ap.c rc_settings.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/sim_uart.c +sim.srcs = radio_control.c downlink.c xbee.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c cam.c sys_time.c main_fbw.c main_ap.c rc_settings.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/sim_uart.c diff --git a/conf/autopilot/twin_avr.makefile b/conf/autopilot/twin_avr.makefile index d90c3c25c0..a2331af654 100644 --- a/conf/autopilot/twin_avr.makefile +++ b/conf/autopilot/twin_avr.makefile @@ -1,6 +1,6 @@ -ARCHI=avr +ARCH=avr -ap.ARCHDIR = $(ARCHI) +ap.ARCHDIR = $(ARCH) ap.MCU = atmega128 ap.LOW_FUSE = a0 ap.HIGH_FUSE = 99 @@ -8,7 +8,7 @@ ap.EXT_FUSE = ff ap.LOCK_FUSE = ff ap.CFLAGS += -DAP -fbw.ARCHDIR = $(ARCHI) +fbw.ARCHDIR = $(ARCH) fbw.MCU = atmega8 fbw.LOW_FUSE = 2e fbw.HIGH_FUSE = cb @@ -16,6 +16,6 @@ fbw.EXT_FUSE = ff fbw.LOCK_FUSE = ff fbw.CFLAGS += -DFBW -tunnel.ARCHDIR = $(ARCHI) +tunnel.ARCHDIR = $(ARCH) tunnel.MCU = atmega128 tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c diff --git a/conf/boards/booz_1.0.makefile b/conf/boards/booz_1.0.makefile index 548891993b..7e9184cf5c 100644 --- a/conf/boards/booz_1.0.makefile +++ b/conf/boards/booz_1.0.makefile @@ -4,7 +4,6 @@ # http://paparazzi.enac.fr/wiki/Booz # ARCH=lpc21 -ARCHI=lpc21 BOARD=booz BOARD_VERSION=1.0 BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\" diff --git a/conf/boards/classix.makefile b/conf/boards/classix.makefile index b2804578ce..6171b48e98 100644 --- a/conf/boards/classix.makefile +++ b/conf/boards/classix.makefile @@ -5,7 +5,6 @@ # ARCH=lpc21 -ARCHI=arm7 BOARD=classix diff --git a/conf/boards/lisa_l_1.0.makefile b/conf/boards/lisa_l_1.0.makefile index 4bc421e210..9990c67986 100644 --- a/conf/boards/lisa_l_1.0.makefile +++ b/conf/boards/lisa_l_1.0.makefile @@ -11,16 +11,15 @@ BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\" # ----------------------------------------------------------------------- ifeq ($(BOARD_PROCESSOR),'omap') - ARCHI = omap + ARCH = omap $(TARGET).LDFLAGS += -levent -lm # ----------------------------------------------------------------------- else ARCH=stm32 - ARCHI=stm32 - $(TARGET).ARCHDIR = $(ARCHI) + $(TARGET).ARCHDIR = $(ARCH) # not needed? endif @@ -59,4 +58,4 @@ GPS_LED = 3 MAX_1168_DRDY_PORT = _GPIOD MAX_1168_DRDY_PORT_SOURCE = PortSourceGPIOD # v1.1 -#MAX_1168_DRDY_PORT = GPIOB \ No newline at end of file +#MAX_1168_DRDY_PORT = GPIOB diff --git a/conf/boards/pc.makefile b/conf/boards/pc.makefile index f534fcf558..3657756ac2 100644 --- a/conf/boards/pc.makefile +++ b/conf/boards/pc.makefile @@ -5,7 +5,6 @@ # ARCH=sim -ARCHI=sim BOARD = pc BOARD_VERSION= @@ -14,5 +13,5 @@ BOARD_VERSION= BOARD_CFG = \"tiny.h\" -$(TARGET).ARCHDIR = $(ARCHI) +$(TARGET).ARCHDIR = $(ARCH) diff --git a/conf/boards/tiny_2.11.makefile b/conf/boards/tiny_2.11.makefile index 105be4821a..3abe3dabfe 100644 --- a/conf/boards/tiny_2.11.makefile +++ b/conf/boards/tiny_2.11.makefile @@ -3,11 +3,8 @@ # # http://paparazzi.enac.fr/wiki/Tiny_v2 # -# TODO: move all to new directories -# ARCH=lpc21 -ARCH=lpc21 -ARCHI=arm7 +ARCH=lpc21 BOARD=tiny BOARD_VERSION=2.11