Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-02 03:49:12 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

RTPS: add check for IDs on multi-topics/alias messages as well

Browse Source
This commit is contained in:
TSC21
2021-02-02 11:03:02 +01:00
committed by Julian Kent
parent 835e3258ed
commit 701a585a81
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
msg/tools/uorb_rtps_classifier.py
+17 -2
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
################################################################################ ################################################################################
# #
# Copyright (c) 2018-2019 PX4 Development Team. All rights reserved. # Copyright (c) 2018-2021 PX4 Development Team. All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met: # modification, are permitted provided that the following conditions are met:
@@ -68,7 +68,22 @@ class Classifier():
msg_list = [] msg_list = []
for filename in os.listdir(self.msg_folder): for filename in os.listdir(self.msg_folder):
if '.msg' in filename: if '.msg' in filename:
# add base messages
msg_list.append(re.sub(".msg", "", filename)) msg_list.append(re.sub(".msg", "", filename))
# add alias / multi-topics messages
with open(os.path.join(self.msg_folder, filename), 'r') as f:
alias_msgs = []
lines = f.readlines()
for line in lines:
if '# TOPICS' in line:
fileUpdated = True
alias_msgs += line.split()
alias_msgs.remove('#')
alias_msgs.remove('TOPICS')
for msg in alias_msgs:
if msg not in msg_list:
msg_list.append(msg)
return msg_list return msg_list
def set_msgs_to_send(self): def set_msgs_to_send(self):
@@ -140,7 +155,7 @@ class Classifier():
"\n%s %s: " % (error_msg, yaml_file) + ", ".join('%s' % msg for msg in none_listed_msgs) + "\n%s %s: " % (error_msg, yaml_file) + ", ".join('%s' % msg for msg in none_listed_msgs) +
"\n\nPlease add them to the yaml file with the respective ID and, if applicable, mark them " + "\n\nPlease add them to the yaml file with the respective ID and, if applicable, mark them " +
"to be sent or received by the micro-RTPS bridge.\n" "to be sent or received by the micro-RTPS bridge.\n"
"NOTE: If the message has multi-topics (#TOPICS), these should be added as well.\n") "NOTE: If the message is an alias / part of multi-topics (#TOPICS) of a base message, it should be added as well.\n")
def check_base_type(self): def check_base_type(self):
""" """