aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--flowgraphs/qpsk_hw.grc75
-rwxr-xr-xflowgraphs/qpsk_hw.py29
-rw-r--r--src/gr-fadingui/python/ber.py14
-rw-r--r--src/gr-fadingui/python/phasecorrection.py5
4 files changed, 64 insertions, 59 deletions
diff --git a/flowgraphs/qpsk_hw.grc b/flowgraphs/qpsk_hw.grc
index 0acdc61..2ebc340 100644
--- a/flowgraphs/qpsk_hw.grc
+++ b/flowgraphs/qpsk_hw.grc
@@ -36,10 +36,10 @@ blocks:
id: variable
parameters:
comment: ''
- value: '[(-0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j),
+ value: 2 * np.array([(-0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j),
(0.7071067811865475+0.7071067811865475j), (0.7071067811865475+0.7071067811865475j),
(-0.7071067811865475-0.7071067811865475j), (0.7071067811865475+0.7071067811865475j),
- (0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j)]'
+ (0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j)])
states:
bus_sink: false
bus_source: false
@@ -124,7 +124,7 @@ blocks:
bus_sink: false
bus_source: false
bus_structure: null
- coordinate: [432, 1156.0]
+ coordinate: [256, 932.0]
rotation: 0
state: true
- name: samp_rate
@@ -274,25 +274,6 @@ blocks:
coordinate: [496, 1308.0]
rotation: 0
state: true
-- name: blocks_throttle_0
- id: blocks_throttle
- parameters:
- affinity: ''
- alias: ''
- comment: ''
- ignoretag: 'True'
- maxoutbuf: '0'
- minoutbuf: '0'
- samples_per_second: samp_rate
- type: complex
- vlen: '1'
- states:
- bus_sink: false
- bus_source: false
- bus_structure: null
- coordinate: [720, 428.0]
- rotation: 0
- state: true
- name: blocks_vector_source_x_0
id: blocks_vector_source_x
parameters:
@@ -331,7 +312,7 @@ blocks:
bus_structure: null
coordinate: [528, 980.0]
rotation: 0
- state: true
+ state: disabled
- name: digital_constellation_decoder_cb_0
id: digital_constellation_decoder_cb
parameters:
@@ -380,7 +361,7 @@ blocks:
minoutbuf: '0'
sps: '1'
symbols: access_code_symbols
- threshold: '0.9'
+ threshold: '0.85'
threshold_method: digital.THRESHOLD_ABSOLUTE
states:
bus_sink: false
@@ -389,6 +370,25 @@ blocks:
coordinate: [768, 972.0]
rotation: 0
state: true
+- name: digital_lms_dd_equalizer_cc_0
+ id: digital_lms_dd_equalizer_cc
+ parameters:
+ affinity: ''
+ alias: ''
+ cnst: qpsk_const
+ comment: ''
+ maxoutbuf: '0'
+ minoutbuf: '0'
+ mu: 3e-3
+ num_taps: '15'
+ sps: '1'
+ states:
+ bus_sink: false
+ bus_source: false
+ bus_structure: null
+ coordinate: [520, 1100.0]
+ rotation: 0
+ state: enabled
- name: digital_pfb_clock_sync_xxx_0
id: digital_pfb_clock_sync_xxx
parameters:
@@ -523,7 +523,7 @@ blocks:
bus_structure: null
coordinate: [1008, 988.0]
rotation: 0
- state: true
+ state: enabled
- name: import_0
id: import
parameters:
@@ -557,7 +557,7 @@ blocks:
color1: '"blue"'
color10: '"red"'
color2: '"red"'
- color3: '"red"'
+ color3: '"dark green"'
color4: '"red"'
color5: '"red"'
color6: '"red"'
@@ -589,7 +589,7 @@ blocks:
marker8: '0'
marker9: '0'
name: '""'
- nconnections: '2'
+ nconnections: '3'
size: '1024'
style1: '0'
style10: '0'
@@ -626,7 +626,7 @@ blocks:
bus_sink: false
bus_source: false
bus_structure: null
- coordinate: [1208, 804.0]
+ coordinate: [1128, 784.0]
rotation: 0
state: true
- name: qtgui_time_sink_x_0
@@ -828,7 +828,7 @@ blocks:
center_freq8: '0'
center_freq9: '0'
clock_rate: 0e0
- clock_source0: internal
+ clock_source0: external
clock_source1: ''
clock_source2: ''
clock_source3: ''
@@ -1105,7 +1105,7 @@ blocks:
center_freq8: '0'
center_freq9: '0'
clock_rate: 0e0
- clock_source0: ''
+ clock_source0: external
clock_source1: ''
clock_source2: ''
clock_source3: ''
@@ -1372,7 +1372,7 @@ blocks:
bus_sink: false
bus_source: false
bus_structure: null
- coordinate: [696, 684.0]
+ coordinate: [696, 676.0]
rotation: 0
state: true
- name: virtual_sink_0
@@ -1385,7 +1385,7 @@ blocks:
bus_sink: false
bus_source: false
bus_structure: null
- coordinate: [928, 428.0]
+ coordinate: [768, 428.0]
rotation: 0
state: true
- name: virtual_sink_1
@@ -1450,7 +1450,7 @@ blocks:
bus_sink: false
bus_source: false
bus_structure: null
- coordinate: [56, 756.0]
+ coordinate: [56, 764.0]
rotation: 0
state: true
@@ -1461,21 +1461,24 @@ connections:
- [blocks_stream_mux_0, '0', digital_constellation_modulator_0, '0']
- [blocks_stream_to_vector_0, '0', fadingui_ber_0, '0']
- [blocks_tagged_stream_align_0, '0', blocks_repack_bits_bb_0, '0']
-- [blocks_throttle_0, '0', virtual_sink_0, '0']
- [blocks_vector_source_x_0, '0', blocks_stream_mux_0, '0']
- [digital_cma_equalizer_cc_0, '0', digital_corr_est_cc_0, '0']
- [digital_cma_equalizer_cc_0, '0', fadingui_netsink_1, '0']
+- [digital_cma_equalizer_cc_0, '0', qtgui_const_sink_x_0_0, '1']
- [digital_constellation_decoder_cb_0, '0', blocks_tagged_stream_align_0, '0']
-- [digital_constellation_modulator_0, '0', blocks_throttle_0, '0']
- [digital_constellation_modulator_0, '0', fadingui_netsink_0, '0']
+- [digital_constellation_modulator_0, '0', virtual_sink_0, '0']
- [digital_corr_est_cc_0, '0', fadingui_phasecorrection_0, '0']
- [digital_corr_est_cc_0, '1', blocks_complex_to_mag_0, '0']
+- [digital_lms_dd_equalizer_cc_0, '0', digital_corr_est_cc_0, '0']
+- [digital_lms_dd_equalizer_cc_0, '0', qtgui_const_sink_x_0_0, '1']
- [digital_pfb_clock_sync_xxx_0, '0', digital_cma_equalizer_cc_0, '0']
+- [digital_pfb_clock_sync_xxx_0, '0', digital_lms_dd_equalizer_cc_0, '0']
- [digital_pfb_clock_sync_xxx_0, '0', fadingui_netsink_4, '0']
- [digital_pfb_clock_sync_xxx_0, '0', qtgui_const_sink_x_0_0, '0']
- [fadingui_datasource_0, '0', digital_constellation_modulator_0, '0']
- [fadingui_phasecorrection_0, '0', fadingui_netsink_3, '0']
-- [fadingui_phasecorrection_0, '0', qtgui_const_sink_x_0_0, '1']
+- [fadingui_phasecorrection_0, '0', qtgui_const_sink_x_0_0, '2']
- [fadingui_phasecorrection_0, '0', virtual_sink_2, '0']
- [uhd_usrp_source_0, '0', virtual_sink_1, '0']
- [virtual_source_0, '0', digital_constellation_decoder_cb_0, '0']
diff --git a/flowgraphs/qpsk_hw.py b/flowgraphs/qpsk_hw.py
index 198f944..eb6bf70 100755
--- a/flowgraphs/qpsk_hw.py
+++ b/flowgraphs/qpsk_hw.py
@@ -81,11 +81,11 @@ 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 = 1.5e6
+ self.samp_rate = samp_rate = 1e6
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
- self.access_code_symbols = access_code_symbols = [(-0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (-0.7071067811865475-0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j)]
+ self.access_code_symbols = access_code_symbols = 2 * np.array([(-0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (-0.7071067811865475-0.7071067811865475j), (0.7071067811865475+0.7071067811865475j), (0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j)])
##################################################
# Blocks
@@ -98,6 +98,7 @@ class qpsk_hw(gr.top_block, Qt.QWidget):
channels=list(range(0,1)),
),
)
+ self.uhd_usrp_source_0.set_clock_source('external', 0)
self.uhd_usrp_source_0.set_center_freq(2.4e9, 0)
self.uhd_usrp_source_0.set_normalized_gain(1, 0)
self.uhd_usrp_source_0.set_antenna('RX2', 0)
@@ -112,7 +113,7 @@ class qpsk_hw(gr.top_block, Qt.QWidget):
),
'',
)
- self.uhd_usrp_sink_0.set_clock_source('internal', 0)
+ self.uhd_usrp_sink_0.set_clock_source('external', 0)
self.uhd_usrp_sink_0.set_center_freq(2.4e9, 0)
self.uhd_usrp_sink_0.set_normalized_gain(0.4, 0)
self.uhd_usrp_sink_0.set_antenna('TX/RX', 0)
@@ -168,7 +169,7 @@ class qpsk_hw(gr.top_block, Qt.QWidget):
self.qtgui_const_sink_x_0_0 = qtgui.const_sink_c(
1024, #size
"", #name
- 2 #number of inputs
+ 3 #number of inputs
)
self.qtgui_const_sink_x_0_0.set_update_time(0.10)
self.qtgui_const_sink_x_0_0.set_y_axis(-2, 2)
@@ -183,7 +184,7 @@ class qpsk_hw(gr.top_block, Qt.QWidget):
'', '', '', '', '']
widths = [1, 1, 1, 1, 1,
1, 1, 1, 1, 1]
- colors = ["blue", "red", "red", "red", "red",
+ colors = ["blue", "red", "dark green", "red", "red",
"red", "red", "red", "red", "red"]
styles = [0, 0, 0, 0, 0,
0, 0, 0, 0, 0]
@@ -192,7 +193,7 @@ class qpsk_hw(gr.top_block, Qt.QWidget):
alphas = [1.0, 1.0, 1.0, 1.0, 1.0,
1.0, 1.0, 1.0, 1.0, 1.0]
- for i in range(2):
+ for i in range(3):
if len(labels[i]) == 0:
self.qtgui_const_sink_x_0_0.set_line_label(i, "Data {0}".format(i))
else:
@@ -208,7 +209,8 @@ class qpsk_hw(gr.top_block, Qt.QWidget):
self.fadingui_phasecorrection_0 = fadingui.phasecorrection(frame_len)
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_corr_est_cc_0 = digital.corr_est_cc(access_code_symbols, 1, len(access_code_symbols) // 2, 0.9, digital.THRESHOLD_ABSOLUTE)
+ 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_constellation_modulator_0 = digital.generic_mod(
constellation=qpsk_const,
differential=False,
@@ -218,9 +220,7 @@ class qpsk_hw(gr.top_block, Qt.QWidget):
verbose=False,
log=False)
self.digital_constellation_decoder_cb_0 = digital.constellation_decoder_cb(qpsk_const)
- self.digital_cma_equalizer_cc_0 = digital.cma_equalizer_cc(15, 1, 2e-3, 1)
self.blocks_vector_source_x_0 = blocks.vector_source_b(testvec, True, 1, [])
- self.blocks_throttle_0 = blocks.throttle(gr.sizeof_gr_complex*1, samp_rate,True)
self.blocks_tagged_stream_align_0 = blocks.tagged_stream_align(gr.sizeof_char*1, 'frame_start')
self.blocks_stream_to_vector_0 = blocks.stream_to_vector(gr.sizeof_char*1, frame_len)
self.blocks_stream_mux_0 = blocks.stream_mux(gr.sizeof_char*1, [len(testvec), 4])
@@ -239,17 +239,17 @@ class qpsk_hw(gr.top_block, Qt.QWidget):
self.connect((self.blocks_stream_mux_0, 0), (self.digital_constellation_modulator_0, 0))
self.connect((self.blocks_stream_to_vector_0, 0), (self.fadingui_ber_0, 0))
self.connect((self.blocks_tagged_stream_align_0, 0), (self.blocks_repack_bits_bb_0, 0))
- self.connect((self.blocks_throttle_0, 0), (self.uhd_usrp_sink_0, 0))
self.connect((self.blocks_vector_source_x_0, 0), (self.blocks_stream_mux_0, 0))
- self.connect((self.digital_cma_equalizer_cc_0, 0), (self.digital_corr_est_cc_0, 0))
self.connect((self.digital_constellation_decoder_cb_0, 0), (self.blocks_tagged_stream_align_0, 0))
- self.connect((self.digital_constellation_modulator_0, 0), (self.blocks_throttle_0, 0))
+ self.connect((self.digital_constellation_modulator_0, 0), (self.uhd_usrp_sink_0, 0))
self.connect((self.digital_corr_est_cc_0, 1), (self.blocks_complex_to_mag_0, 0))
self.connect((self.digital_corr_est_cc_0, 0), (self.fadingui_phasecorrection_0, 0))
- self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.digital_cma_equalizer_cc_0, 0))
+ self.connect((self.digital_lms_dd_equalizer_cc_0, 0), (self.digital_corr_est_cc_0, 0))
+ self.connect((self.digital_lms_dd_equalizer_cc_0, 0), (self.qtgui_const_sink_x_0_0, 1))
+ self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.digital_lms_dd_equalizer_cc_0, 0))
self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.qtgui_const_sink_x_0_0, 0))
self.connect((self.fadingui_phasecorrection_0, 0), (self.digital_constellation_decoder_cb_0, 0))
- self.connect((self.fadingui_phasecorrection_0, 0), (self.qtgui_const_sink_x_0_0, 1))
+ self.connect((self.fadingui_phasecorrection_0, 0), (self.qtgui_const_sink_x_0_0, 2))
self.connect((self.uhd_usrp_source_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0))
@@ -293,7 +293,6 @@ class qpsk_hw(gr.top_block, Qt.QWidget):
def set_samp_rate(self, samp_rate):
self.samp_rate = samp_rate
- self.blocks_throttle_0.set_sample_rate(self.samp_rate)
self.qtgui_time_sink_x_0.set_samp_rate(self.samp_rate / self.sps)
self.uhd_usrp_sink_0.set_samp_rate(self.samp_rate)
self.uhd_usrp_source_0.set_samp_rate(self.samp_rate)
diff --git a/src/gr-fadingui/python/ber.py b/src/gr-fadingui/python/ber.py
index e966f17..5b71f35 100644
--- a/src/gr-fadingui/python/ber.py
+++ b/src/gr-fadingui/python/ber.py
@@ -26,6 +26,8 @@ from gnuradio import gr
from fadingui.logger import get_logger
log = get_logger("ber")
+np.set_printoptions(formatter={'int': hex})
+
class ber(gr.sync_block):
"""
docstring for block ber
@@ -41,18 +43,16 @@ class ber(gr.sync_block):
def work(self, input_items, output_items):
inp = input_items[0]
- ber_tot = 0
log.debug(f"Length: {len(inp)}")
log.debug(f"Inp_vector:{inp}")
for i in inp:
- log.debug(f"In Schlaufe{i}")
- v = np.array(self.vgl, dtype=np.uint8)^np.array(i, dtype=np.uint8)
+ i = np.array(i, dtype=np.uint8)
+ v = np.array(self.vgl, dtype=np.uint8) ^ i
ber = sum(np.unpackbits(v))
- log.debug(f"BER {ber} in Paket {i}")
- ber_tot+=ber
- log.debug(f"BER Total{ber_tot}")
-
+
+ trueber = ber - 32
+ log.debug(f"BER {trueber if trueber > 0 else 0} in Paket {i}")
return len(input_items[0])
diff --git a/src/gr-fadingui/python/phasecorrection.py b/src/gr-fadingui/python/phasecorrection.py
index cd3fa37..9acf563 100644
--- a/src/gr-fadingui/python/phasecorrection.py
+++ b/src/gr-fadingui/python/phasecorrection.py
@@ -68,12 +68,15 @@ class phasecorrection(gr.sync_block):
phasediff = (ephase - sphase) % (2 * np.pi)
freq = phasediff / nsamples
+ if freq < 1e-3:
+ freq = 0
+
# save this one for the last block (see variable `end' in self.work)
self.lastfreq = freq
# debugging
log.debug(f"Correction for chunk of {nsamples:2d} samples is " \
- f"sphase={sphase: .4f} rad and freq={freq*1e3: .4f}e-3 rad / sample")
+ f"sphase={sphase: .4f} rad, ephase={ephase: .4f} rad and freq={freq*1e3: .4f}e-3 rad / sample")
self.lastnsamples = nsamples
# compute chunk values
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-22 13:23:56 +0100