diff options
-rw-r--r-- | gr-dtv/grc/CMakeLists.txt | 1 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvb_bbheader_bb.block.yml | 16 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvb_bbscrambler_bb.block.yml | 14 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvb_bch_bb.block.yml | 14 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvb_ldpc_bb.block.yml | 16 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbs2_interleaver_bb.block.yml | 6 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbs2_modulator_bc.block.yml | 10 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbs2_physical_cc.block.yml | 6 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt2_framemapper_cc.block.yml | 10 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.block.yml | 4 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt2_miso_cc.block.yml | 4 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt2_p1insertion_cc.block.yml | 12 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml | 8 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt2_pilotgenerator_cc.block.yml | 15 |
14 files changed, 68 insertions, 68 deletions
diff --git a/gr-dtv/grc/CMakeLists.txt b/gr-dtv/grc/CMakeLists.txt index 3ed47f2311..ef4b37aae1 100644 --- a/gr-dtv/grc/CMakeLists.txt +++ b/gr-dtv/grc/CMakeLists.txt @@ -72,5 +72,6 @@ install(FILES dtv_catv_randomizer_bb.block.yml dtv_catv_frame_sync_enc_bb.block.yml dtv_catv_trellis_enc_bb.block.yml + dtv.tree.yml DESTINATION ${GRC_BLOCKS_DIR} ) diff --git a/gr-dtv/grc/dtv_dvb_bbheader_bb.block.yml b/gr-dtv/grc/dtv_dvb_bbheader_bb.block.yml index 520e5dd4c8..6c3c54df75 100644 --- a/gr-dtv/grc/dtv_dvb_bbheader_bb.block.yml +++ b/gr-dtv/grc/dtv_dvb_bbheader_bb.block.yml @@ -8,8 +8,8 @@ parameters: options: [STANDARD_DVBS2, STANDARD_DVBT2] option_labels: [DVB-S2, DVB-T2] option_attributes: - hide_dvbs2: ['', all] - hide_dvbt2: [all, ''] + hide_dvbs2: [none, all] + hide_dvbt2: [all, none] val: [dtv.STANDARD_DVBS2, dtv.STANDARD_DVBT2] - id: framesize1 label: FECFRAME size @@ -18,8 +18,8 @@ parameters: option_labels: [Normal, Short] option_attributes: hide_medium: [all, all] - hide_normal: ['', all] - hide_short: [all, ''] + hide_normal: [none, all] + hide_short: [all, none] val: [dtv.FECFRAME_NORMAL, dtv.FECFRAME_SHORT] hide: ${ standard.hide_dvbt2 } - id: framesize2 @@ -28,9 +28,9 @@ parameters: options: [FECFRAME_NORMAL, FECFRAME_MEDIUM, FECFRAME_SHORT] option_labels: [Normal, Medium, Short] option_attributes: - hide_medium: [all, '', all] - hide_normal: ['', all, all] - hide_short: [all, all, ''] + hide_medium: [all, none, all] + hide_normal: [none, all, all] + hide_short: [all, all, none] val: [dtv.FECFRAME_NORMAL, dtv.FECFRAME_MEDIUM, dtv.FECFRAME_SHORT] hide: ${ standard.hide_dvbs2 } - id: rate1 @@ -119,7 +119,7 @@ parameters: options: [INBAND_OFF, INBAND_ON] option_labels: ['Off', Type B] option_attributes: - hide_rate: [all, ''] + hide_rate: [all, none] val: [dtv.INBAND_OFF, dtv.INBAND_ON] hide: ${ standard.hide_dvbt2 } - id: fecblocks diff --git a/gr-dtv/grc/dtv_dvb_bbscrambler_bb.block.yml b/gr-dtv/grc/dtv_dvb_bbscrambler_bb.block.yml index 86872688ed..6b9c95cef1 100644 --- a/gr-dtv/grc/dtv_dvb_bbscrambler_bb.block.yml +++ b/gr-dtv/grc/dtv_dvb_bbscrambler_bb.block.yml @@ -8,8 +8,8 @@ parameters: options: [STANDARD_DVBS2, STANDARD_DVBT2] option_labels: [DVB-S2, DVB-T2] option_attributes: - hide_dvbs2: ['', all] - hide_dvbt2: [all, ''] + hide_dvbs2: [none, all] + hide_dvbt2: [all, none] val: [dtv.STANDARD_DVBS2, dtv.STANDARD_DVBT2] - id: framesize1 label: FECFRAME size @@ -18,8 +18,8 @@ parameters: option_labels: [Normal, Short] option_attributes: hide_medium: [all, all] - hide_normal: ['', all] - hide_short: [all, ''] + hide_normal: [none, all] + hide_short: [all, none] val: [dtv.FECFRAME_NORMAL, dtv.FECFRAME_SHORT] hide: ${ standard.hide_dvbt2 } - id: framesize2 @@ -28,9 +28,9 @@ parameters: options: [FECFRAME_NORMAL, FECFRAME_MEDIUM, FECFRAME_SHORT] option_labels: [Normal, Medium, Short] option_attributes: - hide_medium: [all, '', all] - hide_normal: ['', all, all] - hide_short: [all, all, ''] + hide_medium: [all, none, all] + hide_normal: [none, all, all] + hide_short: [all, all, none] val: [dtv.FECFRAME_NORMAL, dtv.FECFRAME_MEDIUM, dtv.FECFRAME_SHORT] hide: ${ standard.hide_dvbs2 } - id: rate1 diff --git a/gr-dtv/grc/dtv_dvb_bch_bb.block.yml b/gr-dtv/grc/dtv_dvb_bch_bb.block.yml index a9b47a52b2..817ee54c5d 100644 --- a/gr-dtv/grc/dtv_dvb_bch_bb.block.yml +++ b/gr-dtv/grc/dtv_dvb_bch_bb.block.yml @@ -8,8 +8,8 @@ parameters: options: [STANDARD_DVBS2, STANDARD_DVBT2] option_labels: [DVB-S2, DVB-T2] option_attributes: - hide_dvbs2: ['', all] - hide_dvbt2: [all, ''] + hide_dvbs2: [none, all] + hide_dvbt2: [all, none] val: [dtv.STANDARD_DVBS2, dtv.STANDARD_DVBT2] - id: framesize1 label: FECFRAME size @@ -18,8 +18,8 @@ parameters: option_labels: [Normal, Short] option_attributes: hide_medium: [all, all] - hide_normal: ['', all] - hide_short: [all, ''] + hide_normal: [none, all] + hide_short: [all, none] val: [dtv.FECFRAME_NORMAL, dtv.FECFRAME_SHORT] hide: ${ standard.hide_dvbt2 } - id: framesize2 @@ -28,9 +28,9 @@ parameters: options: [FECFRAME_NORMAL, FECFRAME_MEDIUM, FECFRAME_SHORT] option_labels: [Normal, Medium, Short] option_attributes: - hide_medium: [all, '', all] - hide_normal: ['', all, all] - hide_short: [all, all, ''] + hide_medium: [all, none, all] + hide_normal: [none, all, all] + hide_short: [all, all, none] val: [dtv.FECFRAME_NORMAL, dtv.FECFRAME_MEDIUM, dtv.FECFRAME_SHORT] hide: ${ standard.hide_dvbs2 } - id: rate1 diff --git a/gr-dtv/grc/dtv_dvb_ldpc_bb.block.yml b/gr-dtv/grc/dtv_dvb_ldpc_bb.block.yml index c8b5df4274..863643ce9b 100644 --- a/gr-dtv/grc/dtv_dvb_ldpc_bb.block.yml +++ b/gr-dtv/grc/dtv_dvb_ldpc_bb.block.yml @@ -8,8 +8,8 @@ parameters: options: [STANDARD_DVBS2, STANDARD_DVBT2] option_labels: [DVB-S2, DVB-T2] option_attributes: - hide_dvbs2: ['', all] - hide_dvbt2: [all, ''] + hide_dvbs2: [none, all] + hide_dvbt2: [all, none] val: [dtv.STANDARD_DVBS2, dtv.STANDARD_DVBT2] - id: framesize1 label: FECFRAME size @@ -18,8 +18,8 @@ parameters: option_labels: [Normal, Short] option_attributes: hide_medium: [all, all] - hide_normal: ['', all] - hide_short: [all, ''] + hide_normal: [none, all] + hide_short: [all, none] val: [dtv.FECFRAME_NORMAL, dtv.FECFRAME_SHORT] hide: ${ standard.hide_dvbt2 } - id: framesize2 @@ -28,9 +28,9 @@ parameters: options: [FECFRAME_NORMAL, FECFRAME_MEDIUM, FECFRAME_SHORT] option_labels: [Normal, Medium, Short] option_attributes: - hide_medium: [all, '', all] - hide_normal: ['', all, all] - hide_short: [all, all, ''] + hide_medium: [all, none, all] + hide_normal: [none, all, all] + hide_short: [all, all, none] val: [dtv.FECFRAME_NORMAL, dtv.FECFRAME_MEDIUM, dtv.FECFRAME_SHORT] hide: ${ standard.hide_dvbs2 } - id: rate1 @@ -119,7 +119,7 @@ templates: make: |- dtv.dvb_ldpc_bb( ${standard.val}, - if str(standard) == 'STANDARD_DVBT2': + % if str(standard) == 'STANDARD_DVBT2': ${framesize1.val}, % else: ${framesize2.val}, diff --git a/gr-dtv/grc/dtv_dvbs2_interleaver_bb.block.yml b/gr-dtv/grc/dtv_dvbs2_interleaver_bb.block.yml index d3a8a77abd..f9ab3446ac 100644 --- a/gr-dtv/grc/dtv_dvbs2_interleaver_bb.block.yml +++ b/gr-dtv/grc/dtv_dvbs2_interleaver_bb.block.yml @@ -8,9 +8,9 @@ parameters: options: [FECFRAME_NORMAL, FECFRAME_MEDIUM, FECFRAME_SHORT] option_labels: [Normal, Medium, Short] option_attributes: - hide_medium: [all, '', all] - hide_normal: ['', all, all] - hide_short: [all, all, ''] + hide_medium: [all, none, all] + hide_normal: [none, all, all] + hide_short: [all, all, none] val: [dtv.FECFRAME_NORMAL, dtv.FECFRAME_MEDIUM, dtv.FECFRAME_SHORT] - id: rate1 label: Code rate diff --git a/gr-dtv/grc/dtv_dvbs2_modulator_bc.block.yml b/gr-dtv/grc/dtv_dvbs2_modulator_bc.block.yml index dee9dba9b0..7935e0d85b 100644 --- a/gr-dtv/grc/dtv_dvbs2_modulator_bc.block.yml +++ b/gr-dtv/grc/dtv_dvbs2_modulator_bc.block.yml @@ -8,9 +8,9 @@ parameters: options: [FECFRAME_NORMAL, FECFRAME_MEDIUM, FECFRAME_SHORT] option_labels: [Normal, Medium, Short] option_attributes: - hide_medium: [all, '', all] - hide_normal: ['', all, all] - hide_short: [all, all, ''] + hide_medium: [all, none, all] + hide_normal: [none, all, all] + hide_short: [all, all, none] val: [dtv.FECFRAME_NORMAL, dtv.FECFRAME_MEDIUM, dtv.FECFRAME_SHORT] hide: ${ constellation.hide_dvb } - id: rate1 @@ -71,8 +71,8 @@ parameters: 64APSK, 8+16+20+20APSK, 4+12+20+28APSK, 128APSK, 256APSK, 64QAM (ITU-T J.83B), 256QAM (ITU-T J.83B), PI/2 BPSK, PI/2 BPSK-SF2, 8VSB (ATSC)] option_attributes: - hide_dvb: ['', '', '', '', '', '', '', '', '', '', '', '', '', all, all, '', - '', all] + hide_dvb: [none, none, none, none, none, none, none, none, none, none, none, none, none, all, all, none, + none, all] val: [dtv.MOD_QPSK, dtv.MOD_8PSK, dtv.MOD_8APSK, dtv.MOD_16APSK, dtv.MOD_8_8APSK, dtv.MOD_32APSK, dtv.MOD_4_12_16APSK, dtv.MOD_4_8_4_16APSK, dtv.MOD_64APSK, dtv.MOD_8_16_20_20APSK, dtv.MOD_4_12_20_28APSK, dtv.MOD_128APSK, dtv.MOD_256APSK, diff --git a/gr-dtv/grc/dtv_dvbs2_physical_cc.block.yml b/gr-dtv/grc/dtv_dvbs2_physical_cc.block.yml index 9872446d08..5aa0fda307 100644 --- a/gr-dtv/grc/dtv_dvbs2_physical_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbs2_physical_cc.block.yml @@ -8,9 +8,9 @@ parameters: options: [FECFRAME_NORMAL, FECFRAME_MEDIUM, FECFRAME_SHORT] option_labels: [Normal, Medium, Short] option_attributes: - hide_medium: [all, '', all] - hide_normal: ['', all, all] - hide_short: [all, all, ''] + hide_medium: [all, none, all] + hide_normal: [none, all, all] + hide_short: [all, all, none] val: [dtv.FECFRAME_NORMAL, dtv.FECFRAME_MEDIUM, dtv.FECFRAME_SHORT] - id: rate1 label: Code rate diff --git a/gr-dtv/grc/dtv_dvbt2_framemapper_cc.block.yml b/gr-dtv/grc/dtv_dvbt2_framemapper_cc.block.yml index bb753e4625..7a11df6680 100644 --- a/gr-dtv/grc/dtv_dvbt2_framemapper_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbt2_framemapper_cc.block.yml @@ -123,8 +123,8 @@ parameters: options: [VERSION_111, VERSION_131] option_labels: [1.1.1, 1.3.1] option_attributes: - hide_111: ['', all] - hide_131: [all, ''] + hide_111: [none, all] + hide_131: [all, none] val: [dtv.VERSION_111, dtv.VERSION_131] - id: preamble1 label: Preamble @@ -132,7 +132,7 @@ parameters: options: [PREAMBLE_T2_SISO, PREAMBLE_T2_MISO] option_labels: [T2 SISO, T2 MISO] option_attributes: - hide_base: ['', ''] + hide_base: [none, none] hide_lite: [all, all] val: [dtv.PREAMBLE_T2_SISO, dtv.PREAMBLE_T2_MISO] hide: ${ version.hide_111 } @@ -142,8 +142,8 @@ parameters: options: [PREAMBLE_T2_SISO, PREAMBLE_T2_MISO, PREAMBLE_T2_LITE_SISO, PREAMBLE_T2_LITE_MISO] option_labels: [T2 SISO, T2 MISO, T2-Lite SISO, T2-Lite MISO] option_attributes: - hide_base: ['', '', all, all] - hide_lite: [all, all, '', ''] + hide_base: [none, none, all, all] + hide_lite: [all, all, none, none] val: [dtv.PREAMBLE_T2_SISO, dtv.PREAMBLE_T2_MISO, dtv.PREAMBLE_T2_LITE_SISO, dtv.PREAMBLE_T2_LITE_MISO] hide: ${ version.hide_131 } diff --git a/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.block.yml b/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.block.yml index e6977374f0..15d7d80f75 100644 --- a/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.block.yml @@ -64,8 +64,8 @@ parameters: options: [VERSION_111, VERSION_131] option_labels: [1.1.1, 1.3.1] option_attributes: - hide_111: ['', all] - hide_131: [all, ''] + hide_111: [none, all] + hide_131: [all, none] val: [dtv.VERSION_111, dtv.VERSION_131] - id: preamble1 label: Preamble diff --git a/gr-dtv/grc/dtv_dvbt2_miso_cc.block.yml b/gr-dtv/grc/dtv_dvbt2_miso_cc.block.yml index e00a0b047e..d26dae4a2d 100644 --- a/gr-dtv/grc/dtv_dvbt2_miso_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbt2_miso_cc.block.yml @@ -64,8 +64,8 @@ parameters: options: [VERSION_111, VERSION_131] option_labels: [1.1.1, 1.3.1] option_attributes: - hide_111: ['', all] - hide_131: [all, ''] + hide_111: [none, all] + hide_131: [all, none] val: [dtv.VERSION_111, dtv.VERSION_131] inputs: diff --git a/gr-dtv/grc/dtv_dvbt2_p1insertion_cc.block.yml b/gr-dtv/grc/dtv_dvbt2_p1insertion_cc.block.yml index 2749f035d0..42ce872421 100644 --- a/gr-dtv/grc/dtv_dvbt2_p1insertion_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbt2_p1insertion_cc.block.yml @@ -48,8 +48,8 @@ parameters: options: [VERSION_111, VERSION_131] option_labels: [1.1.1, 1.3.1] option_attributes: - hide_111: ['', all] - hide_131: [all, ''] + hide_111: [none, all] + hide_131: [all, none] val: [dtv.VERSION_111, dtv.VERSION_131] - id: preamble1 label: Preamble @@ -57,7 +57,7 @@ parameters: options: [PREAMBLE_T2_SISO, PREAMBLE_T2_MISO] option_labels: [T2 SISO, T2 MISO] option_attributes: - hide_base: ['', ''] + hide_base: [none, none] hide_lite: [all, all] val: [dtv.PREAMBLE_T2_SISO, dtv.PREAMBLE_T2_MISO] hide: ${ version.hide_111 } @@ -67,8 +67,8 @@ parameters: options: [PREAMBLE_T2_SISO, PREAMBLE_T2_MISO, PREAMBLE_T2_LITE_SISO, PREAMBLE_T2_LITE_MISO] option_labels: [T2 SISO, T2 MISO, T2-Lite SISO, T2-Lite MISO] option_attributes: - hide_base: ['', '', all, all] - hide_lite: [all, all, '', ''] + hide_base: [none, none, all, all] + hide_lite: [all, all, none, none] val: [dtv.PREAMBLE_T2_SISO, dtv.PREAMBLE_T2_MISO, dtv.PREAMBLE_T2_LITE_SISO, dtv.PREAMBLE_T2_LITE_MISO] hide: ${ version.hide_131 } @@ -78,7 +78,7 @@ parameters: options: [SHOWLEVELS_OFF, SHOWLEVELS_ON] option_labels: ['Off', 'On'] option_attributes: - hide_vclip: [all, ''] + hide_vclip: [all, none] val: [dtv.SHOWLEVELS_OFF, dtv.SHOWLEVELS_ON] - id: vclip label: Vclip diff --git a/gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml b/gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml index 646291b1af..1ec6670e36 100644 --- a/gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml @@ -50,7 +50,7 @@ parameters: option_labels: ['Off', Active Constellation Extension, Tone Reservation, Both ACE and TR] option_attributes: - hide_vclip: [all, all, '', ''] + hide_vclip: [all, all, none, none] val: [dtv.PAPR_OFF, dtv.PAPR_ACE, dtv.PAPR_TR, dtv.PAPR_BOTH] hide: ${ version.hide_111 } - id: paprmode2 @@ -60,7 +60,7 @@ parameters: option_labels: [P2 Only, Active Constellation Extension, Tone Reservation, Both ACE and TR] option_attributes: - hide_vclip: [all, all, '', ''] + hide_vclip: [all, all, none, none] val: [dtv.PAPR_OFF, dtv.PAPR_ACE, dtv.PAPR_TR, dtv.PAPR_BOTH] hide: ${ version.hide_131 } - id: version @@ -69,8 +69,8 @@ parameters: options: [VERSION_111, VERSION_131] option_labels: [1.1.1, 1.3.1] option_attributes: - hide_111: ['', all] - hide_131: [all, ''] + hide_111: [none, all] + hide_131: [all, none] val: [dtv.VERSION_111, dtv.VERSION_131] - id: vclip label: Vclip diff --git a/gr-dtv/grc/dtv_dvbt2_pilotgenerator_cc.block.yml b/gr-dtv/grc/dtv_dvbt2_pilotgenerator_cc.block.yml index 1e9d7a9b74..021e7f90ae 100644 --- a/gr-dtv/grc/dtv_dvbt2_pilotgenerator_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbt2_pilotgenerator_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 @@ -67,8 +66,8 @@ parameters: options: [VERSION_111, VERSION_131] option_labels: [1.1.1, 1.3.1] option_attributes: - hide_111: ['', all] - hide_131: [all, ''] + hide_111: [none, all] + hide_131: [all, none] val: [dtv.VERSION_111, dtv.VERSION_131] - id: preamble1 label: Preamble @@ -76,7 +75,7 @@ parameters: options: [PREAMBLE_T2_SISO, PREAMBLE_T2_MISO] option_labels: [T2 SISO, T2 MISO] option_attributes: - hide_miso: [all, ''] + hide_miso: [all, none] val: [dtv.PREAMBLE_T2_SISO, dtv.PREAMBLE_T2_MISO] hide: ${ version.hide_111 } - id: preamble2 @@ -85,7 +84,7 @@ parameters: options: [PREAMBLE_T2_SISO, PREAMBLE_T2_MISO, PREAMBLE_T2_LITE_SISO, PREAMBLE_T2_LITE_MISO] option_labels: [T2 SISO, T2 MISO, T2-Lite SISO, T2-Lite MISO] option_attributes: - hide_miso: [all, '', all, ''] + hide_miso: [all, none, all, none] val: [dtv.PREAMBLE_T2_SISO, dtv.PREAMBLE_T2_MISO, dtv.PREAMBLE_T2_LITE_SISO, dtv.PREAMBLE_T2_LITE_MISO] hide: ${ version.hide_131 } @@ -104,7 +103,7 @@ parameters: options: [EQUALIZATION_OFF, EQUALIZATION_ON] option_labels: ['Off', 'On'] option_attributes: - hide_bandwidth: [all, ''] + hide_bandwidth: [all, none] val: [dtv.EQUALIZATION_OFF, dtv.EQUALIZATION_ON] - id: bandwidth label: Bandwidth |