diff --git a/conf/airframes/Poine/booz2_a7.xml b/conf/airframes/Poine/booz2_a7.xml index ad468fefcc..93cfabd45d 100644 --- a/conf/airframes/Poine/booz2_a7.xml +++ b/conf/airframes/Poine/booz2_a7.xml @@ -178,6 +178,7 @@ + diff --git a/conf/airframes/Poine/booz2_a8.xml b/conf/airframes/Poine/booz2_a8.xml index 196fecb21a..e97e7a496e 100644 --- a/conf/airframes/Poine/booz2_a8.xml +++ b/conf/airframes/Poine/booz2_a8.xml @@ -1,6 +1,6 @@ - + @@ -180,8 +180,6 @@ - -
@@ -190,44 +188,24 @@
- + + + + + + + + + + + + + -USER = -#HOST = 10.31.4.22 -#HOST = overo -HOST = auto7 -#HOST = 192.168.2.230 -TARGET_DIR = ~ + -SRC_FMS=fms - - -ARCH=stm32 -ARCHI=stm32 -BOARD_CFG=\"boards/lisa_0.99.h\" -FLASH_MODE = JTAG - -PERIODIC_FREQ = 512 - -include $(PAPARAZZI_SRC)/conf/autopilot/lisa_test_progs.makefile - - -CONFIG_PASSTHROUGH = $(PAPARAZZI_SRC)/conf/autopilot/subsystems/lisa_passthrough -SERVOS_REFRESH_FREQ=50 - -include $(PAPARAZZI_SRC)/conf/autopilot/lisa_passthrough.makefile - -RADIO_CONTROL_SPEKTRUM_MODEL=\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\" -include $(CONFIG_PASSTHROUGH)/radio_control_spektrum.makefile - - -# -# -# - - -
diff --git a/conf/autopilot/lisa_passthrough.makefile b/conf/autopilot/lisa_passthrough.makefile index d299148b4c..1e5e7001ff 100644 --- a/conf/autopilot/lisa_passthrough.makefile +++ b/conf/autopilot/lisa_passthrough.makefile @@ -4,6 +4,16 @@ # # +SRC_ARCH=$(ARCH) +SRC_BOOZ=booz +SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCH) +SRC_LISA=lisa +SRC_LISA_ARCH=$(SRC_LISA)/arch/$(ARCH) +SRC_CSC=csc + +CFG_LISA_PASSTHROUGH = $(PAPARAZZI_SRC)/conf/autopilot/subsystems/lisa_passthrough + + stm_passthrough.ARCHDIR = stm32 stm_passthrough.TARGET = stm_passthrough stm_passthrough.TARGETDIR = stm_passthrough @@ -36,6 +46,7 @@ stm_passthrough.srcs += $(SRC_LISA)/lisa_overo_link.c \ # IMU stm_passthrough.CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\" +stm_passthrough.CFLAGS += -DIMU_B2_VERSION_1_1 stm_passthrough.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001 stm_passthrough.srcs += $(SRC_BOOZ)/booz_imu.c stm_passthrough.CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ -DUSE_SPI2_IRQ @@ -91,3 +102,35 @@ stm_passthrough.srcs += $(SRC_CSC)/csc_protocol.c # Battery monitor + + + + + + + + +# +# +# +# +# test passthrough , aka using stm32 as io processor +# this demonstrates +# -link with io processor +# -periodic event +# -telemetry and datalink +# +SRC_FMS=fms + +overo_test_passthrough.ARCHDIR = omap +overo_test_passthrough.LDFLAGS += -levent -lm +overo_test_passthrough.CFLAGS += -I$(ACINCLUDE) -I. -I$(PAPARAZZI_HOME)/var/include +overo_test_passthrough.CFLAGS += -DOVERO_LINK_MSG_UP=AutopilotMessagePTUp -DOVERO_LINK_MSG_DOWN=AutopilotMessagePTDown +overo_test_passthrough.srcs = $(SRC_FMS)/overo_test_passthrough.c +overo_test_passthrough.CFLAGS += -DFMS_PERIODIC_FREQ=512 +overo_test_passthrough.srcs += $(SRC_FMS)/fms_periodic.c +overo_test_passthrough.srcs += $(SRC_FMS)/fms_spi_link.c +overo_test_passthrough.srcs += $(SRC_FMS)/fms_gs_com.c +overo_test_passthrough.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=UdpTransport +overo_test_passthrough.srcs += $(SRC_FMS)/udp_transport2.c downlink.c +overo_test_passthrough.srcs += $(SRC_FMS)/fms_network.c