From fa528745b52ec6c63f84c8608f130e536028e3fd Mon Sep 17 00:00:00 2001 From: TSC21 Date: Thu, 29 Nov 2018 16:23:47 +0000 Subject: [PATCH] IDL generation: add constants fields for IDL's --- msg/templates/urtps/msg.idl.template | 12 ++++++++++++ msg/tools/generate_microRTPS_bridge.py | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/msg/templates/urtps/msg.idl.template b/msg/templates/urtps/msg.idl.template index 93674f639c..3cfabba707 100644 --- a/msg/templates/urtps/msg.idl.template +++ b/msg/templates/urtps/msg.idl.template @@ -83,6 +83,15 @@ def add_msg_fields(): key=sizeof_field_type, reverse=True) for field in sorted_fields: add_msg_field(field) + + +def add_msg_constants(): + sorted_constants = sorted(spec.constants, + key=sizeof_field_type, reverse=True) + for constant in sorted_constants: + constant_value = '%d' % constant.val + print("const " + get_idl_type_name(constant.type) + " " + constant.name + " = " + constant_value + ";") + }@ #ifndef __@(spec.short_name)__idl__ #define __@(spec.short_name)__idl__ @@ -94,6 +103,9 @@ def add_msg_fields(): @(line) @[end for]@ +@# Constants +@add_msg_constants() + @[for type in builtin_types]@ typedef @(type + '_') @(type); @[end for]@ diff --git a/msg/tools/generate_microRTPS_bridge.py b/msg/tools/generate_microRTPS_bridge.py index 0b48300c50..b20690e153 100644 --- a/msg/tools/generate_microRTPS_bridge.py +++ b/msg/tools/generate_microRTPS_bridge.py @@ -221,11 +221,11 @@ else: if args.fastrtpsgen is None or args.fastrtpsgen == "": # Assume fastrtpsgen is in PATH - fastrtpsgen_path = "fastrtpsgen" + fastrtpsgen_path = 'fastrtpsgen' else: # Path to fastrtpsgen is explicitly specified fastrtpsgen_path = os.path.join( - get_absolute_path(args.fastrtpsgen), "/fastrtpsgen") + get_absolute_path(args.fastrtpsgen), 'fastrtpsgen') fastrtpsgen_include = args.fastrtpsgen_include if fastrtpsgen_include is not None and fastrtpsgen_include != '': fastrtpsgen_include = "-I " + \