diff options
| author | Josh Morman <jmorman@perspectalabs.com> | 2021-03-15 12:28:42 -0400 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-03-16 09:18:25 -0400 |
| commit | 19dec449afe26681ef27aa8814ea8f199bd4d18c (patch) | |
| tree | b30917e67ee217ed9cb96568aebb7c389384a129 | |
| parent | aabde1fc4611906b951951b7b62f3c2d51fede37 (diff) | |
dtv/atsc: update examples/hier with new conns
Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
| -rw-r--r-- | gr-dtv/examples/uhd_atsc_rx.grc | 11 | ||||
| -rw-r--r-- | gr-dtv/python/dtv/atsc_rx.py | 15 |
2 files changed, 21 insertions, 5 deletions
diff --git a/gr-dtv/examples/uhd_atsc_rx.grc b/gr-dtv/examples/uhd_atsc_rx.grc index 77c8d711ca..c22687e4cc 100644 --- a/gr-dtv/examples/uhd_atsc_rx.grc +++ b/gr-dtv/examples/uhd_atsc_rx.grc @@ -189,7 +189,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [872, 556.0] + coordinate: [904, 556.0] rotation: 0 state: enabled - name: dc_blocker_xx_0 @@ -222,7 +222,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [144, 576.0] + coordinate: [120, 576.0] rotation: 0 state: enabled - name: dtv_atsc_depad_0 @@ -237,7 +237,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [736, 576.0] + coordinate: [752, 588.0] rotation: 0 state: enabled - name: dtv_atsc_derandomizer_0 @@ -870,14 +870,19 @@ connections: - [agc, '0', dtv_atsc_sync_0, '0'] - [dc_blocker_xx_0, '0', agc, '0'] - [dtv_atsc_deinterleaver_0, '0', dtv_atsc_rs_decoder_0, '0'] +- [dtv_atsc_deinterleaver_0, '1', dtv_atsc_rs_decoder_0, '1'] - [dtv_atsc_depad_0, '0', blocks_file_sink_0, '0'] - [dtv_atsc_derandomizer_0, '0', dtv_atsc_depad_0, '0'] - [dtv_atsc_equalizer_0, '0', dtv_atsc_viterbi_decoder_0, '0'] +- [dtv_atsc_equalizer_0, '1', dtv_atsc_viterbi_decoder_0, '1'] - [dtv_atsc_fpll_0, '0', dc_blocker_xx_0, '0'] - [dtv_atsc_fs_checker_0, '0', dtv_atsc_equalizer_0, '0'] +- [dtv_atsc_fs_checker_0, '1', dtv_atsc_equalizer_0, '1'] - [dtv_atsc_rs_decoder_0, '0', dtv_atsc_derandomizer_0, '0'] +- [dtv_atsc_rs_decoder_0, '1', dtv_atsc_derandomizer_0, '1'] - [dtv_atsc_sync_0, '0', dtv_atsc_fs_checker_0, '0'] - [dtv_atsc_viterbi_decoder_0, '0', dtv_atsc_deinterleaver_0, '0'] +- [dtv_atsc_viterbi_decoder_0, '1', dtv_atsc_deinterleaver_0, '1'] - [filter_fft_rrc_filter_0, '0', dtv_atsc_fpll_0, '0'] - [filter_fft_rrc_filter_0, '0', usrp_freq_sink, '1'] - [u, '0', filter_fft_rrc_filter_0, '0'] diff --git a/gr-dtv/python/dtv/atsc_rx.py b/gr-dtv/python/dtv/atsc_rx.py index 9306c9f8d9..88efa89a59 100644 --- a/gr-dtv/python/dtv/atsc_rx.py +++ b/gr-dtv/python/dtv/atsc_rx.py @@ -66,5 +66,16 @@ class atsc_rx(gr.hier_block2): dep = dtv.atsc_depad() # Connect pipeline - self.connect(self, rx_filt, pll, dcr, agc, btl, fsc, equ) - self.connect(equ, vit, dei, rsd, der, dep, self) + self.connect(self, rx_filt, pll, dcr, agc, btl, fsc) + self.connect((fsc,0),(equ,0)) + self.connect((fsc,1),(equ,1)) + self.connect((equ,0),(vit,0)) + self.connect((equ,1),(vit,1)) + self.connect((vit,0),(dei,0)) + self.connect((vit,1),(dei,1)) + self.connect((dei,0),(rsd,0)) + self.connect((dei,1),(rsd,1)) + self.connect((rsd,0),(der,0)) + self.connect((rsd,1),(der,1)) + self.connect((der,0),(dep,0)) + self.connect((dep,0),(self,0)) |