diff options
author | Ron Economos <w6rz@comcast.net> | 2019-01-13 21:06:41 -0800 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2019-01-14 09:31:35 -0800 |
commit | 7d8d99350ed107559df9bd59552ce8c72a49bec0 (patch) | |
tree | 182e52b952f54aad13bfbc5488ecb2ca51017eb9 /gr-dtv | |
parent | a861ef08ffcc0d68aaf702bc7a892823a314b1e8 (diff) |
dtv: Fix remaining DTV GRC bindings.
Diffstat (limited to 'gr-dtv')
-rw-r--r-- | gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml | 5 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_bit_inner_deinterleaver.block.yml | 3 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_bit_inner_interleaver.block.yml | 3 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_convolutional_deinterleaver.block.yml | 2 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_convolutional_interleaver.block.yml | 2 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_demap.block.yml | 3 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_demod_reference_signals.block.yml | 5 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_energy_descramble.block.yml | 2 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_energy_dispersal.block.yml | 1 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_inner_coder.block.yml | 2 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_map.block.yml | 3 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_ofdm_sym_acquisition.block.yml | 1 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_reed_solomon_dec.block.yml | 4 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_reed_solomon_enc.block.yml | 4 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_reference_signals.block.yml | 5 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_symbol_inner_interleaver.block.yml | 3 |
16 files changed, 12 insertions, 36 deletions
diff --git a/gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml b/gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml index 1ec6670e36..823b14c9a6 100644 --- a/gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml @@ -19,9 +19,8 @@ parameters: option_attributes: val: [dtv.FFTSIZE_1K, dtv.FFTSIZE_2K, dtv.FFTSIZE_4K, dtv.FFTSIZE_8K, dtv.FFTSIZE_8K_T2GI, dtv.FFTSIZE_16K, dtv.FFTSIZE_16K_T2GI, dtv.FFTSIZE_32K, dtv.FFTSIZE_32K_T2GI] - vlength: ['1024', '2048', '4096', '8192', '8192', '16384', '16384', '32768', - '32768'] - hide: ${ 'part' if vlen == 1 else 'none' } + vlength: [1024, 2048, 4096, 8192, 8192, 16384, 16384, 32768, + 32768] - id: pilotpattern label: Pilot Pattern dtype: enum diff --git a/gr-dtv/grc/dtv_dvbt_bit_inner_deinterleaver.block.yml b/gr-dtv/grc/dtv_dvbt_bit_inner_deinterleaver.block.yml index 0431f30881..0a805a7860 100644 --- a/gr-dtv/grc/dtv_dvbt_bit_inner_deinterleaver.block.yml +++ b/gr-dtv/grc/dtv_dvbt_bit_inner_deinterleaver.block.yml @@ -24,9 +24,8 @@ parameters: options: [T2k, T8k] option_labels: [2K, 8K] option_attributes: - payload_length: ['1512', '6048'] + payload_length: [1512, 6048] val: [dtv.T2k, dtv.T8k] - hide: ${ 'part' if vlen == 1 else 'none' } inputs: - domain: stream diff --git a/gr-dtv/grc/dtv_dvbt_bit_inner_interleaver.block.yml b/gr-dtv/grc/dtv_dvbt_bit_inner_interleaver.block.yml index 1d9b40473f..1f1e927cd8 100644 --- a/gr-dtv/grc/dtv_dvbt_bit_inner_interleaver.block.yml +++ b/gr-dtv/grc/dtv_dvbt_bit_inner_interleaver.block.yml @@ -24,9 +24,8 @@ parameters: options: [T2k, T8k] option_labels: [2K, 8K] option_attributes: - payload_length: ['1512', '6048'] + payload_length: [1512, 6048] val: [dtv.T2k, dtv.T8k] - hide: ${ 'part' if vlen == 1 else 'none' } inputs: - domain: stream diff --git a/gr-dtv/grc/dtv_dvbt_convolutional_deinterleaver.block.yml b/gr-dtv/grc/dtv_dvbt_convolutional_deinterleaver.block.yml index b4b5708bcc..50391b749a 100644 --- a/gr-dtv/grc/dtv_dvbt_convolutional_deinterleaver.block.yml +++ b/gr-dtv/grc/dtv_dvbt_convolutional_deinterleaver.block.yml @@ -6,12 +6,10 @@ parameters: label: Blocks (12 Bytes) dtype: int default: '136' - hide: ${ 'part' if vlen == 1 else 'none' } - id: I label: Number of Shift registers dtype: int default: '12' - hide: ${ 'part' if vlen == 1 else 'none' } - id: M label: Depth of shift registers dtype: int diff --git a/gr-dtv/grc/dtv_dvbt_convolutional_interleaver.block.yml b/gr-dtv/grc/dtv_dvbt_convolutional_interleaver.block.yml index e47f1d09e9..e30637ac18 100644 --- a/gr-dtv/grc/dtv_dvbt_convolutional_interleaver.block.yml +++ b/gr-dtv/grc/dtv_dvbt_convolutional_interleaver.block.yml @@ -6,12 +6,10 @@ parameters: label: Blocks (12 Bytes) dtype: int default: '136' - hide: ${ 'part' if vlen == 1 else 'none' } - id: I label: Number of Shift registers dtype: int default: '12' - hide: ${ 'part' if vlen == 1 else 'none' } - id: M label: Depth of shift registers dtype: int diff --git a/gr-dtv/grc/dtv_dvbt_demap.block.yml b/gr-dtv/grc/dtv_dvbt_demap.block.yml index 857bcf3463..0e2304b98a 100644 --- a/gr-dtv/grc/dtv_dvbt_demap.block.yml +++ b/gr-dtv/grc/dtv_dvbt_demap.block.yml @@ -22,9 +22,8 @@ parameters: options: [T2k, T8k] option_labels: [2K, 8K] option_attributes: - payload_length: ['1512', '6048'] + payload_length: [1512, 6048] val: [dtv.T2k, dtv.T8k] - hide: ${ 'part' if vlen == 1 else 'none' } - id: gain label: Gain dtype: complex diff --git a/gr-dtv/grc/dtv_dvbt_demod_reference_signals.block.yml b/gr-dtv/grc/dtv_dvbt_demod_reference_signals.block.yml index dbd26e9502..cda7fde6d3 100644 --- a/gr-dtv/grc/dtv_dvbt_demod_reference_signals.block.yml +++ b/gr-dtv/grc/dtv_dvbt_demod_reference_signals.block.yml @@ -50,10 +50,9 @@ parameters: options: [T2k, T8k] option_labels: [2K, 8K] option_attributes: - fft_length: ['2048', '8192'] - payload_length: ['1512', '6048'] + fft_length: [2048, 8192] + payload_length: [1512, 6048] val: [dtv.T2k, dtv.T8k] - hide: ${ 'part' if vlen == 1 else 'none' } - id: include_cell_id label: Include Cell ID dtype: enum diff --git a/gr-dtv/grc/dtv_dvbt_energy_descramble.block.yml b/gr-dtv/grc/dtv_dvbt_energy_descramble.block.yml index 9ca3fee196..7e28cb651d 100644 --- a/gr-dtv/grc/dtv_dvbt_energy_descramble.block.yml +++ b/gr-dtv/grc/dtv_dvbt_energy_descramble.block.yml @@ -10,7 +10,7 @@ parameters: inputs: - domain: stream dtype: byte - vlen: 188*8 + vlen: ${ nsize*188 } outputs: - domain: stream diff --git a/gr-dtv/grc/dtv_dvbt_energy_dispersal.block.yml b/gr-dtv/grc/dtv_dvbt_energy_dispersal.block.yml index 1b7628fb65..ed126aab2f 100644 --- a/gr-dtv/grc/dtv_dvbt_energy_dispersal.block.yml +++ b/gr-dtv/grc/dtv_dvbt_energy_dispersal.block.yml @@ -6,7 +6,6 @@ parameters: label: Blocks(1504 Bytes) dtype: int default: '8' - hide: ${ 'part' if vlen == 1 else 'none' } inputs: - domain: stream diff --git a/gr-dtv/grc/dtv_dvbt_inner_coder.block.yml b/gr-dtv/grc/dtv_dvbt_inner_coder.block.yml index ca9c2eda4a..a4e4cd93f5 100644 --- a/gr-dtv/grc/dtv_dvbt_inner_coder.block.yml +++ b/gr-dtv/grc/dtv_dvbt_inner_coder.block.yml @@ -6,12 +6,10 @@ parameters: label: Input length dtype: int default: '1' - hide: ${ 'part' if vlen == 1 else 'none' } - id: noutput label: Output length dtype: int default: '1512' - hide: ${ 'part' if vlen == 1 else 'none' } - id: constellation label: Constellation Type dtype: enum diff --git a/gr-dtv/grc/dtv_dvbt_map.block.yml b/gr-dtv/grc/dtv_dvbt_map.block.yml index 76ffa0400b..5ec0fc420a 100644 --- a/gr-dtv/grc/dtv_dvbt_map.block.yml +++ b/gr-dtv/grc/dtv_dvbt_map.block.yml @@ -22,9 +22,8 @@ parameters: options: [T2k, T8k] option_labels: [2K, 8K] option_attributes: - payload_length: ['1512', '6048'] + payload_length: [1512, 6048] val: [dtv.T2k, dtv.T8k] - hide: ${ 'part' if vlen == 1 else 'none' } - id: gain label: Gain dtype: complex diff --git a/gr-dtv/grc/dtv_dvbt_ofdm_sym_acquisition.block.yml b/gr-dtv/grc/dtv_dvbt_ofdm_sym_acquisition.block.yml index fc00654488..ec149acceb 100644 --- a/gr-dtv/grc/dtv_dvbt_ofdm_sym_acquisition.block.yml +++ b/gr-dtv/grc/dtv_dvbt_ofdm_sym_acquisition.block.yml @@ -14,7 +14,6 @@ parameters: label: FFT Length dtype: int default: '2048' - hide: ${ 'part' if vlen == 1 else 'none' } - id: occupied_tones label: Occupied Tones dtype: int diff --git a/gr-dtv/grc/dtv_dvbt_reed_solomon_dec.block.yml b/gr-dtv/grc/dtv_dvbt_reed_solomon_dec.block.yml index e037c42e08..65a9b559ab 100644 --- a/gr-dtv/grc/dtv_dvbt_reed_solomon_dec.block.yml +++ b/gr-dtv/grc/dtv_dvbt_reed_solomon_dec.block.yml @@ -18,12 +18,10 @@ parameters: label: N dtype: int default: '255' - hide: ${ 'part' if vlen == 1 else 'none' } - id: k label: K dtype: int default: '239' - hide: ${ 'part' if vlen == 1 else 'none' } - id: t label: t dtype: int @@ -32,12 +30,10 @@ parameters: label: Shortening size dtype: int default: '51' - hide: ${ 'part' if vlen == 1 else 'none' } - id: blocks label: Blocks dtype: int default: '8' - hide: ${ 'part' if vlen == 1 else 'none' } inputs: - domain: stream diff --git a/gr-dtv/grc/dtv_dvbt_reed_solomon_enc.block.yml b/gr-dtv/grc/dtv_dvbt_reed_solomon_enc.block.yml index af463cad4e..ce4e9fe4ff 100644 --- a/gr-dtv/grc/dtv_dvbt_reed_solomon_enc.block.yml +++ b/gr-dtv/grc/dtv_dvbt_reed_solomon_enc.block.yml @@ -18,12 +18,10 @@ parameters: label: N dtype: int default: '255' - hide: ${ 'part' if vlen == 1 else 'none' } - id: k label: K dtype: int default: '239' - hide: ${ 'part' if vlen == 1 else 'none' } - id: t label: t dtype: int @@ -32,12 +30,10 @@ parameters: label: Shortening size dtype: int default: '51' - hide: ${ 'part' if vlen == 1 else 'none' } - id: blocks label: Blocks dtype: int default: '8' - hide: ${ 'part' if vlen == 1 else 'none' } inputs: - domain: stream diff --git a/gr-dtv/grc/dtv_dvbt_reference_signals.block.yml b/gr-dtv/grc/dtv_dvbt_reference_signals.block.yml index 3a3e879391..96c4252717 100644 --- a/gr-dtv/grc/dtv_dvbt_reference_signals.block.yml +++ b/gr-dtv/grc/dtv_dvbt_reference_signals.block.yml @@ -50,10 +50,9 @@ parameters: options: [T2k, T8k] option_labels: [2K, 8K] option_attributes: - fft_length: ['2048', '8192'] - payload_length: ['1512', '6048'] + fft_length: [2048, 8192] + payload_length: [1512, 6048] val: [dtv.T2k, dtv.T8k] - hide: ${ 'part' if vlen == 1 else 'none' } - id: include_cell_id label: Include Cell ID dtype: enum diff --git a/gr-dtv/grc/dtv_dvbt_symbol_inner_interleaver.block.yml b/gr-dtv/grc/dtv_dvbt_symbol_inner_interleaver.block.yml index d516f0ec7a..2a5e48be90 100644 --- a/gr-dtv/grc/dtv_dvbt_symbol_inner_interleaver.block.yml +++ b/gr-dtv/grc/dtv_dvbt_symbol_inner_interleaver.block.yml @@ -9,9 +9,8 @@ parameters: option_labels: [2K, 8K] option_attributes: fft_length: ['2048', '8192'] - payload_length: ['1512', '6048'] + payload_length: [1512, 6048] val: [dtv.T2k, dtv.T8k] - hide: ${ 'part' if vlen == 1 else 'none' } - id: direction label: Direction dtype: enum |