summaryrefslogtreecommitdiff
path: root/gr-digital/grc
diff options
context:
space:
mode:
authorAndrej Rode <mail@andrejro.de>2018-07-05 19:44:08 +0200
committerMarcus Müller <marcus@hostalia.de>2018-07-30 16:45:39 +0200
commit4b48c7b0064b7ec79beb48563b2954fafbc401e0 (patch)
treeed6a2adf1fa82817653818aa8d3925ed0cec8b3c /gr-digital/grc
parenteca394798cbb1c126d3a14674511feea0bdefb61 (diff)
grc: forward port fixes from master XML to block.yaml definitions
Diffstat (limited to 'gr-digital/grc')
-rw-r--r--gr-digital/grc/digital_chunks_to_symbols.block.yml3
-rw-r--r--gr-digital/grc/digital_corr_est_cc.block.yml6
-rw-r--r--gr-digital/grc/digital_ofdm_carrier_allocator_cvc.block.yml6
-rw-r--r--gr-digital/grc/digital_ofdm_sync_sc_cfb.block.yml12
4 files changed, 23 insertions, 4 deletions
diff --git a/gr-digital/grc/digital_chunks_to_symbols.block.yml b/gr-digital/grc/digital_chunks_to_symbols.block.yml
index 35b5ee94c6..7f31d56058 100644
--- a/gr-digital/grc/digital_chunks_to_symbols.block.yml
+++ b/gr-digital/grc/digital_chunks_to_symbols.block.yml
@@ -39,6 +39,9 @@ outputs:
- domain: stream
dtype: ${ out_type }
multiplicity: ${ num_ports }
+- domain: message
+ id: set_symbol_table
+ optional: true
asserts:
- ${ num_ports > 0 }
diff --git a/gr-digital/grc/digital_corr_est_cc.block.yml b/gr-digital/grc/digital_corr_est_cc.block.yml
index b3a9698d18..9ded725a0f 100644
--- a/gr-digital/grc/digital_corr_est_cc.block.yml
+++ b/gr-digital/grc/digital_corr_est_cc.block.yml
@@ -15,6 +15,12 @@ parameters:
label: Threshold
dtype: float
default: '0.9'
+- id: threshold_method
+ label: Threshold Method
+ dtype: enum
+ options: [Absolute, Dynamic]
+ option_attributes:
+ fcn: [digital.corr_est_cc.THRESHOLD_ABSOLUTE, digital.corr_est_cc.THRESHOLD_DYNAMIC]
inputs:
- domain: stream
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 ab260ab9d9..ae80e3f76d 100644
--- a/gr-digital/grc/digital_ofdm_carrier_allocator_cvc.block.yml
+++ b/gr-digital/grc/digital_ofdm_carrier_allocator_cvc.block.yml
@@ -13,15 +13,15 @@ parameters:
- id: pilot_carriers
label: Pilot Carriers
dtype: raw
- default: ()
+ default: ((),)
- id: pilot_symbols
label: Pilot Symbols
dtype: raw
- default: ()
+ default: ((),)
- id: sync_words
label: Sync Words
dtype: raw
- default: ()
+ default: ((),)
- id: len_tag_key
label: Length tag key
dtype: string
diff --git a/gr-digital/grc/digital_ofdm_sync_sc_cfb.block.yml b/gr-digital/grc/digital_ofdm_sync_sc_cfb.block.yml
index f1e2f3b13b..96e7ab55d0 100644
--- a/gr-digital/grc/digital_ofdm_sync_sc_cfb.block.yml
+++ b/gr-digital/grc/digital_ofdm_sync_sc_cfb.block.yml
@@ -15,6 +15,10 @@ parameters:
options: ['False', 'True']
option_labels: [Odd, Even]
hide: part
+- id: threshold
+ label: Threshold
+ dtype: real
+ default: '0.9'
inputs:
- domain: stream
@@ -28,8 +32,14 @@ outputs:
domain: stream
dtype: byte
+asserts:
+ - ${ fft_len > 0}
+ - ${ cp_len >= 0}
+
templates:
imports: from gnuradio import digital
- make: digital.ofdm_sync_sc_cfb(${fft_len}, ${cp_len}, ${use_even_carriers})
+ make: digital.ofdm_sync_sc_cfb(${fft_len}, ${cp_len}, ${use_even_carriers}, ${threshold})
+ callbacks:
+ - set_treshold(${threshold})
file_format: 1