dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

add genmsg and gencpp python modules, ros not required anymore for message generation

This commit is contained in:
Thomas Gubler 2014-12-04 16:40:46 +01:00
parent 9b680ebeb6
commit 6f9cbd9751
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -7,3 +7,9 @@
[submodule "uavcan"] [submodule "uavcan"]
path = uavcan path = uavcan
url = git://github.com/pavel-kirienko/uavcan.git url = git://github.com/pavel-kirienko/uavcan.git
[submodule "Tools/genmsg"]
path = Tools/genmsg
url = https://github.com/ros/genmsg.git
[submodule "Tools/gencpp"]
path = Tools/gencpp
url = https://github.com/ros/gencpp.git

7
Makefile
View File

@ -228,12 +228,15 @@ MSG_DIR = $(PX4_BASE)msg/px4_msgs
MSG_TEMPLATE_DIR = $(PX4_BASE)msg/templates MSG_TEMPLATE_DIR = $(PX4_BASE)msg/templates
TOPICS_DIR = $(PX4_BASE)src/modules/uORB/topics TOPICS_DIR = $(PX4_BASE)src/modules/uORB/topics
TOPICS_TEMPORARY_DIR = $(BUILD_DIR)topics_temporary TOPICS_TEMPORARY_DIR = $(BUILD_DIR)topics_temporary
GENMSG_PYTHONPATH = $(PX4_BASE)/Tools/genmsg/src
GENCPP_PYTHONPATH = $(PX4_BASE)/Tools/gencpp/src
.PHONY: generateuorbtopicheaders .PHONY: generateuorbtopicheaders
generateuorbtopicheaders: generateuorbtopicheaders:
@$(ECHO) "Generating uORB topic headers" @$(ECHO) "Generating uORB topic headers"
$(Q) ($(PX4_BASE)/Tools/px_generate_uorb_topic_headers.py -d $(MSG_DIR) \ $(Q) (PYTHONPATH=$(GENMSG_PYTHONPATH):$(GENCPP_PYTHONPATH) $(PYTHON) \
-o $(TOPICS_DIR) -e $(MSG_TEMPLATE_DIR) -t $(TOPICS_TEMPORARY_DIR)) $(PX4_BASE)Tools/px_generate_uorb_topic_headers.py \
-d $(MSG_DIR) -o $(TOPICS_DIR) -e $(MSG_TEMPLATE_DIR) -t $(TOPICS_TEMPORARY_DIR))
# clean up temporary files # clean up temporary files
$(Q) (rm -r $(TOPICS_TEMPORARY_DIR)) $(Q) (rm -r $(TOPICS_TEMPORARY_DIR))

1
Tools/gencpp Submodule

@ -0,0 +1 @@
Subproject commit 26a86f04bcec0018af6652b3ddd3f680e6e3fa2a

1
Tools/genmsg Submodule

@ -0,0 +1 @@
Subproject commit 72f0383f0e6a489214c51802ae12d6e271b1e454