diff options
| author | Johannes Demel <demel@uni-bremen.de> | 2018-12-31 16:04:40 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-12-31 13:35:00 -0800 |
| commit | 4813feed742142507b4e43a9f2b431bf8de5dd89 (patch) | |
| tree | 7760c641ca694a06646518dab8cfdd3da7cfda9d /gr-fec | |
| parent | 529531fa7dc4ad7c74393dcdd07870d347f34b2e (diff) | |
grc: fix gr-fec GRC definitions.
Several FECAPI blocks have issues to generate correct Python code.
These problems should be fixed now.
Issues with the option persist, though. Those must be handled in the
encoder/decoder block definitions.
Diffstat (limited to 'gr-fec')
6 files changed, 13 insertions, 17 deletions
diff --git a/gr-fec/grc/variable_cc_decoder_def_list.block.yml b/gr-fec/grc/variable_cc_decoder_def_list.block.yml index 1cb1cfe746..c2e3930714 100644 --- a/gr-fec/grc/variable_cc_decoder_def_list.block.yml +++ b/gr-fec/grc/variable_cc_decoder_def_list.block.yml @@ -48,15 +48,13 @@ parameters: default: '-1' - id: mode label: Streaming Behavior - dtype: enum - options: [fec.CC_STREAMING, fec.CC_TERMINATED, fec.CC_TAILBITING, fec.CC_TRUNCATED] + dtype: raw + options: ['fec.CC_STREAMING', 'fec.CC_TERMINATED', 'fec.CC_TAILBITING', 'fec.CC_TRUNCATED'] option_labels: [Streaming, Terminated, Tailbiting, Truncated] - id: padding label: Byte Padding - dtype: enum + dtype: bool default: 'False' - options: ['False', 'True'] - option_labels: ['No', 'Yes'] value: ${ fec.cc_decoder.make(framebits, k, rate, polys, state_start, state_end, mode, padding) } diff --git a/gr-fec/grc/variable_cc_encoder_def_list.block.yml b/gr-fec/grc/variable_cc_encoder_def_list.block.yml index 0a5354d421..ea974aa445 100644 --- a/gr-fec/grc/variable_cc_encoder_def_list.block.yml +++ b/gr-fec/grc/variable_cc_encoder_def_list.block.yml @@ -39,15 +39,13 @@ parameters: default: '0' - id: mode label: Streaming Behavior - dtype: enum - options: [fec.CC_STREAMING, fec.CC_TERMINATED, fec.CC_TAILBITING, fec.CC_TRUNCATED] + dtype: raw + options: ['fec.CC_STREAMING', 'fec.CC_TERMINATED', 'fec.CC_TAILBITING', 'fec.CC_TRUNCATED'] option_labels: [Streaming, Terminated, Tailbiting, Truncated] - id: padding label: Byte Padding - dtype: enum + dtype: bool default: 'False' - options: ['False', 'True'] - option_labels: ['No', 'Yes'] value: ${ fec.cc_encoder_make(framebits, k, rate, polys, state_start, mode, padding) } diff --git a/gr-fec/grc/variable_ccsds_encoder_def_list.block.yml b/gr-fec/grc/variable_ccsds_encoder_def_list.block.yml index e36fce82ce..8b604414c7 100644 --- a/gr-fec/grc/variable_ccsds_encoder_def_list.block.yml +++ b/gr-fec/grc/variable_ccsds_encoder_def_list.block.yml @@ -27,8 +27,8 @@ parameters: default: '0' - id: mode label: Streaming Behavior - dtype: enum - options: [fec.CC_STREAMING, fec.CC_TERMINATED, fec.CC_TAILBITING, fec.CC_TRUNCATED] + dtype: int + options: ['fec.CC_STREAMING', 'fec.CC_TERMINATED', 'fec.CC_TAILBITING', 'fec.CC_TRUNCATED'] option_labels: [Streaming, Terminated, Tailbiting, Truncated] value: ${ fec.ccsds_encoder_make(framebits, state_start, mode) } diff --git a/gr-fec/grc/variable_polar_encoder.block.yml b/gr-fec/grc/variable_polar_encoder.block.yml index 10e07cdcb0..cadc121198 100644 --- a/gr-fec/grc/variable_polar_encoder.block.yml +++ b/gr-fec/grc/variable_polar_encoder.block.yml @@ -47,9 +47,9 @@ templates: ${num_info_bits}, ${frozen_bit_positions}, ${frozen_bit_values}, ${is_packed})),\ range(0, ${dim1}))) % else: - self.${id} = ${id} = list(map((lambda b: map((lambda\ - a: fec.polar_encoder.make(${block_size}, ${num_info_bits}, ${frozen_bit_positions},\ - ${frozen_bit_values}, ${is_packed})), range(0, ${dim2}))), range(0, ${dim1}))\) + self.${id} = ${id} = list(map((lambda b: map((lambda a: \ + fec.polar_encoder.make(${block_size}, ${num_info_bits}, ${frozen_bit_positions},\ + ${frozen_bit_values}, ${is_packed})), range(0, ${dim2}))), range(0, ${dim1}))) % endif file_format: 1 diff --git a/gr-fec/grc/variable_repetition_decoder_def_list.block.yml b/gr-fec/grc/variable_repetition_decoder_def_list.block.yml index 04632a32c9..3a757be2ea 100644 --- a/gr-fec/grc/variable_repetition_decoder_def_list.block.yml +++ b/gr-fec/grc/variable_repetition_decoder_def_list.block.yml @@ -42,7 +42,7 @@ templates: self.${id} = ${id} = fec.repetition_decoder.make(${framebits},\ ${rep}, ${prob}) % elif int(ndim)==1: - self.${id} = ${id} = list(map( (lambda\ + self.${id} = ${id} = list(map( (lambda \ a: fec.repetition_decoder.make(${framebits}, ${rep}, ${prob})), range(0,${dim1}))) % else: self.${id} = ${id} = list(map( (lambda b: map( ( lambda a: fec.repetition_decoder.make(${framebits},\ diff --git a/gr-fec/grc/variable_repetition_encoder_def_list.block.yml b/gr-fec/grc/variable_repetition_encoder_def_list.block.yml index 6a0b328749..2f38df1369 100644 --- a/gr-fec/grc/variable_repetition_encoder_def_list.block.yml +++ b/gr-fec/grc/variable_repetition_encoder_def_list.block.yml @@ -35,7 +35,7 @@ templates: self.${id} = ${id} = list(map((lambda a: fec.repetition_encoder_make(${framebits},\ ${rep})), range(0,${dim1}))) % else: - self.${id} = ${id} = list(map((lambda\ + self.${id} = ${id} = list(map((lambda \ b: map((lambda a: fec.repetition_encoder_make(${framebits}, ${rep})), range(0,${dim2}))),\ range(0,${dim1}))) % endif |