fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-02 04:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

microRTPS: templates: use full version comparison when checking for version 1.7

Browse Source
This commit is contained in:
TSC21
2020-03-24 17:47:39 +00:00
committed by Nuno Marques
parent 1b453ed849
commit c4f8f39ca9
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
msg/templates/urtps/msg.idl.em
+6 -6
View File
@@ -58,7 +58,7 @@ def get_include_directives(spec):
if genmsg.msgs.is_valid_constant_type(genmsg.msgs.bare_msg_type(field.type)):
continue
builtin_type = str(field.base_type).replace('px4/', '')
if version.parse(fastrtps_version) <= version.parse('1.7'):
if version.parse(fastrtps_version) <= version.parse('1.7.2'):
include_directive = '#include "%s_.idl"' % builtin_type
else:
include_directive = '#include "%s.idl"' % builtin_type
@@ -78,12 +78,12 @@ def get_idl_type_name(field_type):
def add_msg_field(field):
if (not field.is_header):
if field.is_array:
if version.parse(fastrtps_version) <= version.parse('1.7'):
if version.parse(fastrtps_version) <= version.parse('1.7.2'):
print(' {0}__{1}_array_{2} {3}_;'.format(topic, str(get_idl_type_name(field.base_type)).replace(" ", "_"), str(field.array_len), field.name))
else:
print(' {0}__{1}_array_{2} {3};'.format(topic, str(get_idl_type_name(field.base_type)).replace(" ", "_"), str(field.array_len), field.name))
else:
if version.parse(fastrtps_version) <= version.parse('1.7'):
if version.parse(fastrtps_version) <= version.parse('1.7.2'):
base_type = get_idl_type_name(field.base_type) + "_" if get_idl_type_name(field.base_type) in builtin_types else get_idl_type_name(field.base_type)
else:
base_type = get_idl_type_name(field.base_type) if get_idl_type_name(field.base_type) in builtin_types else get_idl_type_name(field.base_type)
@@ -97,7 +97,7 @@ def add_msg_fields():
def add_array_typedefs():
for field in spec.parsed_fields():
if not field.is_header and field.is_array:
if version.parse(fastrtps_version) <= version.parse('1.7'):
if version.parse(fastrtps_version) <= version.parse('1.7.2'):
base_type = get_idl_type_name(field.base_type) + "_" if get_idl_type_name(field.base_type) in builtin_types else get_idl_type_name(field.base_type)
else:
base_type = get_idl_type_name(field.base_type) if get_idl_type_name(field.base_type) in builtin_types else get_idl_type_name(field.base_type)
@@ -130,14 +130,14 @@ def add_msg_constants():
@add_msg_constants()
@# Array types
@add_array_typedefs()
@[if version.parse(fastrtps_version) <= version.parse('1.7')]@
@[if version.parse(fastrtps_version) <= version.parse('1.7.2')]@
struct @(topic)_
@[else]@
struct @(topic)
@[end if]@
{
@add_msg_fields()
@[if version.parse(fastrtps_version) <= version.parse('1.7')]@
@[if version.parse(fastrtps_version) <= version.parse('1.7.2')]@
}; // struct @(topic)_
#pragma keylist @(topic)_