diff options
| author | Johannes Demel <demel@uni-bremen.de> | 2019-03-15 22:58:17 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-03-17 09:29:37 -0700 |
| commit | ac2df4f764a06a3b4f51d1c2c9ac4b3087e1d430 (patch) | |
| tree | 9d4134d0328c234828866b62339527d81fb5e3b9 /gr-digital/grc | |
| parent | d5e0b4b82aa2f08030d391cc878698295e525b4a (diff) | |
digital: Convert GRC examples to YAML format
This commit converts the examples in `gr-digital/ofdm` to the new YAML format.
Also, multiple fixes to GRC files are made. These fix issues with
outdated hide attributes.
This conversion is tracked in #2285.
Diffstat (limited to 'gr-digital/grc')
5 files changed, 8 insertions, 8 deletions
diff --git a/gr-digital/grc/digital_header_payload_demux.block.yml b/gr-digital/grc/digital_header_payload_demux.block.yml index 8cccb65862..eae4b16e3b 100644 --- a/gr-digital/grc/digital_header_payload_demux.block.yml +++ b/gr-digital/grc/digital_header_payload_demux.block.yml @@ -12,7 +12,7 @@ parameters: - id: items_per_symbol label: Items per symbol dtype: int - hide: ${ 'part' if vlen == 1 else 'none' } + hide: ${ 'none' if output_symbols else 'part' } - id: guard_interval label: Guard Interval (items) dtype: int @@ -32,7 +32,7 @@ parameters: dtype: enum options: ['False', 'True'] option_labels: [Items, Symbols] - hide: ${ 'part' if vlen == 1 else 'none' } + hide: ${ 'none' if output_symbols else 'part' } - id: type label: IO Type dtype: enum @@ -68,11 +68,11 @@ outputs: - label: out_hdr domain: stream dtype: ${ type } - vlen: '${ {True: items_per_symbol, False: 1}[output_symbols] }' + vlen: '${ items_per_symbol if output_symbols else 1 }' - label: out_payload domain: stream dtype: ${ type } - vlen: '${ {True: items_per_symbol, False: 1}[output_symbols] }' + vlen: '${ items_per_symbol if output_symbols else 1 }' templates: imports: from gnuradio import digital diff --git a/gr-digital/grc/digital_ofdm_carrier_allocator_cvc.block.yml b/gr-digital/grc/digital_ofdm_carrier_allocator_cvc.block.yml index 75e4daaeb8..e43a49f5ab 100644 --- a/gr-digital/grc/digital_ofdm_carrier_allocator_cvc.block.yml +++ b/gr-digital/grc/digital_ofdm_carrier_allocator_cvc.block.yml @@ -6,7 +6,7 @@ parameters: label: FFT length dtype: int default: fft_len - hide: ${ 'part' if vlen == 1 else 'none' } + hide: ${ 'part' if fft_len == 1 else 'none' } - id: occupied_carriers label: Occupied Carriers dtype: raw diff --git a/gr-digital/grc/digital_ofdm_chanest_vcvc.block.yml b/gr-digital/grc/digital_ofdm_chanest_vcvc.block.yml index 352c6ab5a7..849cac6d08 100644 --- a/gr-digital/grc/digital_ofdm_chanest_vcvc.block.yml +++ b/gr-digital/grc/digital_ofdm_chanest_vcvc.block.yml @@ -5,7 +5,7 @@ parameters: - id: sync_symbol1 label: Synch. symbol 1 dtype: complex_vector - hide: ${ 'part' if vlen == 1 else 'none' } + hide: ${ 'part' if len(sync_symbol1) == 1 else 'none' } - id: sync_symbol2 label: Synch. symbol 2 dtype: complex_vector diff --git a/gr-digital/grc/digital_ofdm_frame_equalizer_vcvc.block.yml b/gr-digital/grc/digital_ofdm_frame_equalizer_vcvc.block.yml index b2eba18e64..a761e481e8 100644 --- a/gr-digital/grc/digital_ofdm_frame_equalizer_vcvc.block.yml +++ b/gr-digital/grc/digital_ofdm_frame_equalizer_vcvc.block.yml @@ -6,7 +6,7 @@ parameters: label: FFT length dtype: int default: fft_len - hide: ${ 'part' if vlen == 1 else 'none' } + hide: ${ 'part' if fft_len == 1 else 'none' } - id: cp_len label: CP length dtype: int diff --git a/gr-digital/grc/digital_ofdm_serializer_vcc.block.yml b/gr-digital/grc/digital_ofdm_serializer_vcc.block.yml index d81dd569f7..c81b99043b 100644 --- a/gr-digital/grc/digital_ofdm_serializer_vcc.block.yml +++ b/gr-digital/grc/digital_ofdm_serializer_vcc.block.yml @@ -6,7 +6,7 @@ parameters: label: FFT length dtype: int default: fft_len - hide: ${ 'part' if vlen == 1 else 'none' } + hide: ${ 'part' if fft_len == 1 else 'none' } - id: occupied_carriers label: Occupied Carriers dtype: raw |