diff --git a/Tools/generate_microRTPS_bridge.py b/Tools/generate_microRTPS_bridge.py index ff79fe46f8..d2fdaff9bb 100644 --- a/Tools/generate_microRTPS_bridge.py +++ b/Tools/generate_microRTPS_bridge.py @@ -116,12 +116,12 @@ urtps_templates_dir = msg_folder + "/templates/urtps" uRTPS_CLIENT_TEMPL_FILE = 'microRTPS_client.cpp.template' uRTPS_AGENT_TOPICS_H_TEMPL_FILE = 'RtpsTopics.h.template' -uRTPS_AGENT_TOPICS_SRC_TEMPL_FILE = 'RtpsTopics.cxx.template' -uRTPS_AGENT_TEMPL_FILE = 'microRTPS_agent.cxx.template' +uRTPS_AGENT_TOPICS_SRC_TEMPL_FILE = 'RtpsTopics.cpp.template' +uRTPS_AGENT_TEMPL_FILE = 'microRTPS_agent.cpp.template' uRTPS_AGENT_CMAKELIST_TEMPL_FILE = 'microRTPS_agent_CMakeLists.txt.template' -uRTPS_PUBLISHER_SRC_TEMPL_FILE = 'Publisher.cxx.template' +uRTPS_PUBLISHER_SRC_TEMPL_FILE = 'Publisher.cpp.template' uRTPS_PUBLISHER_H_TEMPL_FILE = 'Publisher.h.template' -uRTPS_SUBSCRIBER_SRC_TEMPL_FILE = 'Subscriber.cxx.template' +uRTPS_SUBSCRIBER_SRC_TEMPL_FILE = 'Subscriber.cpp.template' uRTPS_SUBSCRIBER_H_TEMPL_FILE = 'Subscriber.h.template' def generate_agent(out_dir): @@ -160,7 +160,7 @@ def generate_agent(out_dir): if ret: raise Exception("fastrtpsgen not found. Specify the location of fastrtpsgen with the -f flag") - os.system("rm " + agent_out_dir + "/fastrtpsgen/*PubSubMain.cxx " + os.system("rm " + agent_out_dir + "/fastrtpsgen/*PubSubMain.cpp " + agent_out_dir + "/fastrtpsgen/makefile* " + agent_out_dir + "/fastrtpsgen/*Publisher* " + agent_out_dir + "/fastrtpsgen/*Subscriber*") diff --git a/msg/templates/urtps/Publisher.cxx.template b/msg/templates/urtps/Publisher.cpp.template similarity index 100% rename from msg/templates/urtps/Publisher.cxx.template rename to msg/templates/urtps/Publisher.cpp.template diff --git a/msg/templates/urtps/RtpsTopics.cxx.template b/msg/templates/urtps/RtpsTopics.cpp.template similarity index 98% rename from msg/templates/urtps/RtpsTopics.cxx.template rename to msg/templates/urtps/RtpsTopics.cpp.template index 8b433c90e3..a0856ab1b3 100644 --- a/msg/templates/urtps/RtpsTopics.cxx.template +++ b/msg/templates/urtps/RtpsTopics.cpp.template @@ -1,6 +1,6 @@ @############################################### @# -@# EmPy template for generating RtpsTopics.cxx file +@# EmPy template for generating RtpsTopics.cpp file @# @############################################### @# Start of Template diff --git a/msg/templates/urtps/Subscriber.cxx.template b/msg/templates/urtps/Subscriber.cpp.template similarity index 100% rename from msg/templates/urtps/Subscriber.cxx.template rename to msg/templates/urtps/Subscriber.cpp.template diff --git a/msg/templates/urtps/microRTPS_agent.cxx.template b/msg/templates/urtps/microRTPS_agent.cpp.template similarity index 100% rename from msg/templates/urtps/microRTPS_agent.cxx.template rename to msg/templates/urtps/microRTPS_agent.cpp.template diff --git a/msg/templates/urtps/microRTPS_agent_CMakeLists.txt.template b/msg/templates/urtps/microRTPS_agent_CMakeLists.txt.template index 90727dde69..200baecc8b 100644 --- a/msg/templates/urtps/microRTPS_agent_CMakeLists.txt.template +++ b/msg/templates/urtps/microRTPS_agent_CMakeLists.txt.template @@ -49,6 +49,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR endif() endif() -file(GLOB MICRORTPS_AGENT_SOURCES *.cxx) +file(GLOB MICRORTPS_AGENT_SOURCES *.cpp) add_executable(micrortps_agent ${MICRORTPS_AGENT_SOURCES}) -target_link_libraries(micrortps_agent fastrtps fastcdr) \ No newline at end of file +target_link_libraries(micrortps_agent fastrtps fastcdr) diff --git a/msg/templates/urtps/microRTPS_transport.cxx b/msg/templates/urtps/microRTPS_transport.cpp similarity index 100% rename from msg/templates/urtps/microRTPS_transport.cxx rename to msg/templates/urtps/microRTPS_transport.cpp diff --git a/src/drivers/protocol_splitter/protocol_splitter.cpp b/src/drivers/protocol_splitter/protocol_splitter.cpp index ecfc6f49ff..d4eaeee2be 100644 --- a/src/drivers/protocol_splitter/protocol_splitter.cpp +++ b/src/drivers/protocol_splitter/protocol_splitter.cpp @@ -33,10 +33,11 @@ /** * @file protocol_splitter.cpp - * NuttX Driver to split mavlink 2 and another protocol on a serial port. + * NuttX Driver to split mavlink 2 and another RTPS on a serial port. * Makes sure the two protocols can be read & written simultanously by 2 processes. * It will create two devices: - * /dev/mavlink + * /dev/mavlink + * /dev/rtps */ #include diff --git a/src/modules/micrortps_bridge/README.md b/src/modules/micrortps_bridge/README.md index 55e4b41ae6..733e7c3a17 100644 --- a/src/modules/micrortps_bridge/README.md +++ b/src/modules/micrortps_bridge/README.md @@ -129,22 +129,22 @@ src/modules/micrortps_bridge/micrortps_agent ├── idl │   ├── sensor_baro_.idl │   └── sensor_combined_.idl -├── microRTPS_agent.cxx -├── microRTPS_transport.cxx +├── microRTPS_agent.cpp +├── microRTPS_transport.cpp ├── microRTPS_transport.h -├── RtpsTopics.cxx +├── RtpsTopics.cpp ├── RtpsTopics.h -├── sensor_baro_.cxx +├── sensor_baro_.cpp ├── sensor_baro_.h -├── sensor_baro_Publisher.cxx +├── sensor_baro_Publisher.cpp ├── sensor_baro_Publisher.h -├── sensor_baro_PubSubTypes.cxx +├── sensor_baro_PubSubTypes.cpp ├── sensor_baro_PubSubTypes.h -├── sensor_combined_.cxx +├── sensor_combined_.cpp ├── sensor_combined_.h -├── sensor_combined_PubSubTypes.cxx +├── sensor_combined_PubSubTypes.cpp ├── sensor_combined_PubSubTypes.h -├── sensor_combined_Subscriber.cxx +├── sensor_combined_Subscriber.cpp └── sensor_combined_Subscriber.h 2 directories, 20 files ``` @@ -154,7 +154,7 @@ $ tree src/modules/micrortps_bridge/micrortps_client src/modules/micrortps_bridge/micrortps_client ├── CMakeLists.txt ├── microRTPS_client.cpp -├── microRTPS_transport.cxx +├── microRTPS_transport.cpp └── microRTPS_transport.h 0 directories, 4 files ``` diff --git a/src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt b/src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt index cbe9be8e9b..1e7c028d0f 100644 --- a/src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt +++ b/src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt @@ -49,17 +49,17 @@ if(NOT GENERATE_RTPS_BRIDGE MATCHES "off") endforeach() foreach(topic ${config_rtps_send_topics}) - list(APPEND topic_bridge_files_out ${msg_out_path}/${topic}_Publisher.cxx) + list(APPEND topic_bridge_files_out ${msg_out_path}/${topic}_Publisher.cpp) list(APPEND topic_bridge_files_out ${msg_out_path}/${topic}_Publisher.h) endforeach() foreach(topic ${config_rtps_receive_topics}) - list(APPEND topic_bridge_files_out ${msg_out_path}/${topic}_Subscriber.cxx) + list(APPEND topic_bridge_files_out ${msg_out_path}/${topic}_Subscriber.cpp) list(APPEND topic_bridge_files_out ${msg_out_path}/${topic}_Subscriber.h) endforeach() if (NOT "${config_rtps_send_topics}" STREQUAL "" OR NOT "${config_rtps_receive_topics}" STREQUAL "") - set(topic_bridge_files_out microRTPS_client.cpp microRTPS_transport.cxx microRTPS_transport.h) + set(topic_bridge_files_out microRTPS_client.cpp microRTPS_transport.cpp microRTPS_transport.h) set(send_topic_files_opt) if (NOT "${send_topic_files}" STREQUAL "") @@ -93,7 +93,7 @@ px4_add_module( MAIN micrortps_client STACK_MAIN 4096 SRCS - microRTPS_transport.cxx + microRTPS_transport.cpp microRTPS_client.cpp DEPENDS platforms__common