diff options
| author | Solomon Tan <solomonbstoner@yahoo.com.au> | 2021-08-04 10:09:37 +0800 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-08-23 07:38:43 -0400 |
| commit | a6fbb06a18a3ce0253dd8c9d714f5e96aa9e4c4e (patch) | |
| tree | 7738da59b09c52693e5d76c063359bbfa0ce2b5c | |
| parent | da71a3d85ee60b29388ac8f17de54af2ba5e3016 (diff) | |
grc: Fix cpp hier param yaml template
The following issues are fixed for the cpp hier block parameter yaml
template generation.
1. The key of the `data` dictionary containing the parameters should be
`parameters` instead of `param`.
2. Fix the yaml template for the parameter to generate `${param}`
instead of `$param` in the yaml file.
Signed-off-by: Solomon Tan <solomonbstoner@yahoo.com.au>
| -rw-r--r-- | grc/core/generator/cpp_hier_block.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/grc/core/generator/cpp_hier_block.py b/grc/core/generator/cpp_hier_block.py index 5a17854226..67f001568c 100644 --- a/grc/core/generator/cpp_hier_block.py +++ b/grc/core/generator/cpp_hier_block.py @@ -91,7 +91,7 @@ class CppHierBlockGenerator(CppTopBlockGenerator): p['dtype'] = param_block.params['value'].dtype p['default'] = param_block.params['value'].get_value() p['hide'] = param_block.params['hide'].get_value() - data['param'].append(p) + data['parameters'].append(p) # Ports for direction in ('inputs', 'outputs'): @@ -119,7 +119,7 @@ class CppHierBlockGenerator(CppTopBlockGenerator): t['make'] = '{cls}(\n {kwargs},\n)'.format( cls=block_id, kwargs=',\n '.join( - '{key}=${key}'.format(key=param.name) for param in parameters + '{key}=${{ {key} }}'.format(key=param.name) for param in parameters ), ) else: @@ -130,7 +130,7 @@ class CppHierBlockGenerator(CppTopBlockGenerator): # Callback data t['callbacks'] = [ - 'set_{key}(${key})'.format(key=param_block.name) for param_block in parameters + 'set_{key}(${{ {key} }})'.format(key=param_block.name) for param_block in parameters ] t_cpp = data['cpp_templates'] = collections.OrderedDict() @@ -143,7 +143,7 @@ class CppHierBlockGenerator(CppTopBlockGenerator): t_cpp['make'] = '{cls}(\n {kwargs},\n)'.format( cls=block_id, kwargs=',\n '.join( - '{key}=${key}'.format(key=param.name) for param in parameters + '{key}=${{ {key} }}'.format(key=param.name) for param in parameters ), ) else: @@ -152,7 +152,7 @@ class CppHierBlockGenerator(CppTopBlockGenerator): # Callback data t_cpp['callbacks'] = [ - 'set_{key}(${key})'.format(key=param_block.name) for param_block in parameters + 'set_{key}(${{ {key} }})'.format(key=param_block.name) for param_block in parameters ] # Documentation |