fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 03:03:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix FastRTPSGen version verification

Browse Source
This commit is contained in:
TSC21
2019-10-04 16:56:03 +01:00
committed by Nuno Marques
parent 9c00f3de02
commit e7b0384f05
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
msg/templates/urtps/msg.idl.em
+6 -6
View File
@@ -57,7 +57,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 1.5 < fastrtpsgen_version <= 1.7:
if 1.5 <= fastrtpsgen_version <= 1.7:
include_directive = '#include "%s_.idl"' % builtin_type
else:
include_directive = '#include "%s.idl"' % builtin_type
@@ -77,12 +77,12 @@ def get_idl_type_name(field_type):
def add_msg_field(field):
if (not field.is_header):
if field.is_array:
if 1.5 < fastrtpsgen_version <= 1.7:
if 1.5 <= fastrtpsgen_version <= 1.7:
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 1.5 < fastrtpsgen_version <= 1.7:
if 1.5 <= fastrtpsgen_version <= 1.7:
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)
@@ -96,7 +96,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 1.5 < fastrtpsgen_version <= 1.7:
if 1.5 <= fastrtpsgen_version <= 1.7:
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)
@@ -127,14 +127,14 @@ def add_msg_constants():
@add_msg_constants()
@# Array types
@add_array_typedefs()
@[if 1.5 < fastrtpsgen_version <= 1.7]@
@[if 1.5 <= fastrtpsgen_version <= 1.7]@
struct @(topic)_
@[else]@
struct @(topic)
@[end if]@
{
@add_msg_fields()
@[if 1.5 < fastrtpsgen_version <= 1.7]@
@[if 1.5 <= fastrtpsgen_version <= 1.7]@
}; // struct @(topic)_
#pragma keylist @(topic)_