Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

fix and update mavlink (#2920)

Browse Source 
* fix and update mavlink

* Remove mavlink from default build target.

* remove mavlink from default Makefile target.

Co-authored-by: Fabien-B <fabien.bonneval@gmal.com>
This commit is contained in:
Fabien-B
2022-10-26 23:26:37 +02:00
committed by GitHub
parent 9ed429c061
commit 6e6bc37d1d
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+1 -1
View File
@@ -18,7 +18,7 @@
url = https://github.com/swift-nav/libsbp.git
[submodule "sw/ext/mavlink"]
path = sw/ext/mavlink
url = https://github.com/paparazzi/mavlink.git
url = https://github.com/mavlink/mavlink.git
[submodule "sw/ext/pprzlink"]
path = sw/ext/pprzlink
url = https://github.com/paparazzi/pprzlink.git
Makefile
+4 -2
View File
@@ -106,9 +106,11 @@ ABI_MESSAGES_H=$(STATICINCLUDE)/abi_messages.h
MAVLINK_DIR=$(STATICINCLUDE)/mavlink/
MAVLINK_PROTOCOL_H=$(MAVLINK_DIR)protocol.h
GEN_HEADERS = $(UBX_PROTOCOL_H) $(MTK_PROTOCOL_H) $(XSENS_PROTOCOL_H) $(ABI_MESSAGES_H) $(MAVLINK_PROTOCOL_H)
GEN_HEADERS = $(UBX_PROTOCOL_H) $(MTK_PROTOCOL_H) $(XSENS_PROTOCOL_H) $(ABI_MESSAGES_H)
all: ground_segment ext subdirs_extra
core: ground_segment ext subdirs_extra
all: ground_segment ext subdirs_extra $(MAVLINK_PROTOCOL_H)
_print_building:
@echo "------------------------------------------------------------"
sw/ext/Makefile
+2 -2
View File
@@ -33,7 +33,7 @@ EXT_DIR=$(PAPARAZZI_SRC)/sw/ext
include $(PAPARAZZI_SRC)/conf/Makefile.arm-embedded-toolchain
all: libopencm3 luftboot chibios fatfs libsbp mavlink TRICAL hacl-c key_generator rustlink ecl matrix
all: libopencm3 luftboot chibios fatfs libsbp TRICAL hacl-c key_generator rustlink ecl matrix
# update (and init if needed) all submodules
update_submodules:
@@ -91,7 +91,7 @@ mavlink: mavlink.update mavlink.build
mavlink.build:
@echo GENERATE $(PAPARAZZI_SRC)/var/include/mavlink
$(Q)PYTHONPATH=$(EXT_DIR)/mavlink python2 $(EXT_DIR)/mavlink/pymavlink/tools/mavgen.py --output $(PAPARAZZI_SRC)/var/include/mavlink --lang C $(EXT_DIR)/mavlink/message_definitions/v1.0/paparazzi.xml --no-validate > /dev/null
$(Q)PYTHONPATH=$(EXT_DIR)/mavlink python $(EXT_DIR)/mavlink/pymavlink/tools/mavgen.py --output $(PAPARAZZI_SRC)/var/include/mavlink --lang C $(EXT_DIR)/mavlink/message_definitions/v1.0/paparazzi.xml --no-validate > /dev/null
libsbp: libsbp.update
sw/ext/mavlink
+1 -1
Submodule sw/ext/mavlink updated: 8e2bcac255...af35d3a47c