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

msg: remove gencpp and genmsh submodules; remove gencpp imports

This commit is contained in:
TSC21 2019-11-22 16:15:29 +00:00 committed by Nuno Marques
parent 98a3910b06
commit 2e9a4d89ee
21 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitmodules vendored
View File

@ -6,14 +6,6 @@
path = src/drivers/uavcan/libuavcan
url = https://github.com/PX4/uavcan.git
branch = px4
[submodule "msg/tools/genmsg"]
path = msg/tools/genmsg
url = https://github.com/PX4/genmsg.git
branch = px4
[submodule "msg/tools/gencpp"]
path = msg/tools/gencpp
url = https://github.com/PX4/gencpp.git
branch = px4
[submodule "Tools/jMAVSim"]
path = Tools/jMAVSim
url = https://github.com/PX4/jMAVSim.git

3
msg/CMakeLists.txt
View File

@ -193,9 +193,6 @@ if(NOT EXTERNAL_MODULES_LOCATION STREQUAL "")
endif()
endif()
px4_add_git_submodule(TARGET git_gencpp PATH tools/gencpp)
px4_add_git_submodule(TARGET git_genmsg PATH tools/genmsg)
# headers
set(msg_out_path ${PX4_BINARY_DIR}/uORB/topics)
set(msg_source_out_path ${CMAKE_CURRENT_BINARY_DIR}/topics_sources)

2
msg/templates/px4/ros/msg.h.em
View File

@ -54,7 +54,7 @@
@{
import genmsg.msgs
import gencpp
cpp_class = 'px4_%s'%spec.short_name
native_type = spec.short_name

2
msg/templates/px4/uorb/msg.h.em
View File

@ -54,7 +54,7 @@
@{
import genmsg.msgs
import gencpp
native_type = '%s_s'%spec.short_name
topic_name = spec.short_name

2
msg/templates/uorb/msg.cpp.em
View File

@ -55,7 +55,7 @@
@{
import genmsg.msgs
import gencpp
from px_generate_uorb_topic_helper import * # this is in Tools/
uorb_struct = '%s_s'%spec.short_name

2
msg/templates/uorb/msg.h.em
View File

@ -54,7 +54,7 @@
@{
import genmsg.msgs
import gencpp
from px_generate_uorb_topic_helper import * # this is in Tools/
uorb_struct = '%s_s'%spec.short_name

2
msg/templates/uorb_microcdr/microRTPS_client.cpp.em
View File

@ -14,7 +14,7 @@
import os
import genmsg.msgs
import gencpp
from px_generate_uorb_topic_helper import * # this is in Tools/
from px_generate_uorb_topic_files import MsgScope # this is in Tools/

2
msg/templates/uorb_microcdr/msg.cpp.em
View File

@ -54,7 +54,7 @@
@{
import genmsg.msgs
import gencpp
from px_generate_uorb_topic_helper import * # this is in Tools/
uorb_struct = '%s_s'%spec.short_name

2
msg/templates/uorb_microcdr/msg.h.em
View File

@ -54,7 +54,7 @@
@{
import genmsg.msgs
import gencpp
from px_generate_uorb_topic_helper import * # this is in Tools/
uorb_struct = '%s_s'%spec.short_name

2
msg/templates/urtps/Publisher.cpp.em
View File

@ -12,7 +12,7 @@
@###############################################
@{
import genmsg.msgs
import gencpp
from px_generate_uorb_topic_helper import * # this is in Tools/
topic = alias if alias else spec.short_name

2
msg/templates/urtps/Publisher.h.em
View File

@ -12,7 +12,7 @@
@###############################################
@{
import genmsg.msgs
import gencpp
from px_generate_uorb_topic_helper import * # this is in Tools/
topic = alias if alias else spec.short_name

2
msg/templates/urtps/RtpsTopics.cpp.em
View File

@ -13,7 +13,7 @@
import os
import genmsg.msgs
import gencpp
from px_generate_uorb_topic_helper import * # this is in Tools/
from px_generate_uorb_topic_files import MsgScope # this is in Tools/

2
msg/templates/urtps/RtpsTopics.h.em
View File

@ -13,7 +13,7 @@
import os
import genmsg.msgs
import gencpp
from px_generate_uorb_topic_helper import * # this is in Tools/
from px_generate_uorb_topic_files import MsgScope # this is in Tools/

2
msg/templates/urtps/Subscriber.cpp.em
View File

@ -12,7 +12,7 @@
@###############################################
@{
import genmsg.msgs
import gencpp
from px_generate_uorb_topic_helper import * # this is in Tools/
topic = alias if alias else spec.short_name

2
msg/templates/urtps/Subscriber.h.em
View File

@ -12,7 +12,7 @@
@###############################################
@{
import genmsg.msgs
import gencpp
from px_generate_uorb_topic_helper import * # this is in Tools/
topic = alias if alias else spec.short_name

2
msg/templates/urtps/microRTPS_agent.cpp.em
View File

@ -12,7 +12,7 @@
@###############################################
@{
import genmsg.msgs
import gencpp
from px_generate_uorb_topic_helper import * # this is in Tools/
from px_generate_uorb_topic_files import MsgScope # this is in Tools/

2
msg/templates/urtps/msg.idl.em
View File

@ -38,7 +38,7 @@
@################################################################################
@{
import genmsg.msgs
import gencpp
from px_generate_uorb_topic_helper import * # this is in Tools/
builtin_types = set()

1
msg/tools/gencpp

@ -1 +0,0 @@
Subproject commit ff6c9f3e8ee0a63be994e0b7dfc7a36cb0c1d8c7

1
msg/tools/genmsg

@ -1 +0,0 @@
Subproject commit 1ad8e136cd6311c6af12256fc39362334ca23988

5
msg/tools/px_generate_uorb_topic_files.py
View File

@ -45,11 +45,6 @@ import argparse
import sys
import errno
px4_tools_dir = os.path.dirname(os.path.abspath(__file__))
sys.path.append(px4_tools_dir + "/genmsg/src")
sys.path.append(px4_tools_dir + "/gencpp/src")
px4_msg_dir = os.path.join(px4_tools_dir, "..")
try:
import em
import genmsg.template_tools

2
msg/tools/px_generate_uorb_topic_helper.py
View File

@ -43,7 +43,7 @@ import os
import errno
import genmsg.msgs
import gencpp
type_map = {
'int8': 'int8_t',