diff options
| author | Nao Pross <np@0hm.ch> | 2021-12-14 19:53:52 +0100 |
|---|---|---|
| committer | Nao Pross <np@0hm.ch> | 2021-12-14 19:53:52 +0100 |
| commit | 1a0dfb03aaa7f609e041122807617d8427847272 (patch) | |
| tree | efa0d1096f3fa11c26054120904364fb82d7a1ae /flowgraphs | |
| parent | Attempt to use UNIX sockets for better performance (diff) | |
| parent | Implement network_value to show BER (diff) | |
| download | Fading-1a0dfb03aaa7f609e041122807617d8427847272.tar.gz Fading-1a0dfb03aaa7f609e041122807617d8427847272.zip | |
Merge branch 'ber-gui'
Diffstat (limited to 'flowgraphs')
| -rw-r--r-- | flowgraphs/qpsk_hw.grc | 12 | ||||
| -rwxr-xr-x | flowgraphs/qpsk_hw.py | 4 | ||||
| -rw-r--r-- | flowgraphs/qpsk_sim.grc | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/flowgraphs/qpsk_hw.grc b/flowgraphs/qpsk_hw.grc index 2ebc340..a0d6872 100644 --- a/flowgraphs/qpsk_hw.grc +++ b/flowgraphs/qpsk_hw.grc @@ -131,7 +131,7 @@ blocks: id: variable parameters: comment: '' - value: 1e6 + value: 5e5 states: bus_sink: false bus_source: false @@ -361,7 +361,7 @@ blocks: minoutbuf: '0' sps: '1' symbols: access_code_symbols - threshold: '0.85' + threshold: '0.7' threshold_method: digital.THRESHOLD_ABSOLUTE states: bus_sink: false @@ -386,7 +386,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [520, 1100.0] + coordinate: [520, 1084.0] rotation: 0 state: enabled - name: digital_pfb_clock_sync_xxx_0 @@ -424,7 +424,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1184, 1300.0] + coordinate: [1184, 1292.0] rotation: 0 state: true - name: fadingui_datasource_0 @@ -1000,7 +1000,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [312, 692.0] + coordinate: [336, 684.0] rotation: 0 state: true - name: uhd_usrp_source_0 @@ -1450,7 +1450,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [56, 764.0] + coordinate: [80, 756.0] rotation: 0 state: true diff --git a/flowgraphs/qpsk_hw.py b/flowgraphs/qpsk_hw.py index eb6bf70..9db06a3 100755 --- a/flowgraphs/qpsk_hw.py +++ b/flowgraphs/qpsk_hw.py @@ -81,7 +81,7 @@ class qpsk_hw(gr.top_block, Qt.QWidget): self.sps = sps = 4 self.nfilts = nfilts = 32 self.excess_bw = excess_bw = 0.35 - self.samp_rate = samp_rate = 1e6 + self.samp_rate = samp_rate = 5e5 self.rrc_taps = rrc_taps = firdes.root_raised_cosine(nfilts, nfilts, 1.0/float(sps), excess_bw, 45*nfilts) self.qpsk_const = qpsk_const = digital.constellation_qpsk().base() self.frame_len = frame_len = len(testvec) +4 @@ -210,7 +210,7 @@ class qpsk_hw(gr.top_block, Qt.QWidget): self.fadingui_ber_0 = fadingui.ber(vgl=testvec + list(np.zeros(4)), vlen=frame_len) self.digital_pfb_clock_sync_xxx_0 = digital.pfb_clock_sync_ccf(sps, 2 * np.pi / 100, rrc_taps, 32, 16, 1.5, 1) self.digital_lms_dd_equalizer_cc_0 = digital.lms_dd_equalizer_cc(15, 3e-3, 1, qpsk_const) - self.digital_corr_est_cc_0 = digital.corr_est_cc(access_code_symbols, 1, len(access_code_symbols) // 2, 0.85, digital.THRESHOLD_ABSOLUTE) + self.digital_corr_est_cc_0 = digital.corr_est_cc(access_code_symbols, 1, len(access_code_symbols) // 2, 0.7, digital.THRESHOLD_ABSOLUTE) self.digital_constellation_modulator_0 = digital.generic_mod( constellation=qpsk_const, differential=False, diff --git a/flowgraphs/qpsk_sim.grc b/flowgraphs/qpsk_sim.grc index db8f2be..ea9518b 100644 --- a/flowgraphs/qpsk_sim.grc +++ b/flowgraphs/qpsk_sim.grc @@ -433,7 +433,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [600, 572.0] + coordinate: [592, 572.0] rotation: 0 state: enabled - name: digital_cma_equalizer_cc_0 |