aboutsummaryrefslogtreecommitdiffstats
path: root/hardware
diff options
context:
space:
mode:
authorNao Pross <np@0hm.ch>2021-11-15 18:52:34 +0100
committerNao Pross <np@0hm.ch>2021-11-15 18:52:34 +0100
commit5aa7fe322172163ef8549960d27b7c6cff46a1e7 (patch)
tree950fa0bfa4df412ddd948a1e1c405b0ba0cf80f4 /hardware
parentTest UDP connection on sink block (diff)
parentMerge remote-tracking branch 'origin/master' (diff)
downloadFading-5aa7fe322172163ef8549960d27b7c6cff46a1e7.tar.gz
Fading-5aa7fe322172163ef8549960d27b7c6cff46a1e7.zip
Merge branch 'master' of github.com:NaoPross/Fading
Diffstat (limited to '')
-rw-r--r--hardware/QAM/qam.grc4
-rwxr-xr-xhardware/QAM/qam.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/hardware/QAM/qam.grc b/hardware/QAM/qam.grc
index e14f1fe..0f2fa50 100644
--- a/hardware/QAM/qam.grc
+++ b/hardware/QAM/qam.grc
@@ -291,7 +291,7 @@ blocks:
modulus: eq_mod
mu: eq_gain
num_taps: eq_ntaps
- sps: int(sps / 2)
+ sps: '1'
states:
bus_sink: false
bus_source: false
@@ -398,7 +398,7 @@ blocks:
max_dev: '1.5'
maxoutbuf: '0'
minoutbuf: '0'
- osps: int(sps / 2)
+ osps: '1'
sps: sps
taps: rrc_taps
type: ccf
diff --git a/hardware/QAM/qam.py b/hardware/QAM/qam.py
index b8f0e3a..9b54472 100755
--- a/hardware/QAM/qam.py
+++ b/hardware/QAM/qam.py
@@ -86,7 +86,7 @@ class qam(gr.top_block, Qt.QWidget):
self.eq_ntaps = eq_ntaps = 15
self.eq_mod = eq_mod = 2
self.eq_gain = eq_gain = .01
- self.const = const = digital.constellation_bpsk().base()
+ self.const = const = digital.constellation_16qam().base()
##################################################
# Blocks
@@ -821,7 +821,7 @@ class qam(gr.top_block, Qt.QWidget):
self.plots_grid_layout_0.setRowStretch(r, 1)
for c in range(0, 1):
self.plots_grid_layout_0.setColumnStretch(c, 1)
- self.digital_pfb_clock_sync_xxx_0 = digital.pfb_clock_sync_ccf(sps, timing_loop_bw, rrc_taps, nfilts, nfilts/2, 1.5, int(sps / 2))
+ self.digital_pfb_clock_sync_xxx_0 = digital.pfb_clock_sync_ccf(sps, timing_loop_bw, rrc_taps, nfilts, nfilts/2, 1.5, 1)
self.digital_map_bb_0 = digital.map_bb([0, 1, 3, 2])
self.digital_diff_decoder_bb_0 = digital.diff_decoder_bb(4)
self.digital_costas_loop_cc_0 = digital.costas_loop_cc(phase_bw, 4, False)
@@ -834,7 +834,7 @@ class qam(gr.top_block, Qt.QWidget):
verbose=False,
log=False)
self.digital_constellation_decoder_cb_0 = digital.constellation_decoder_cb(const)
- self.digital_cma_equalizer_cc_0 = digital.cma_equalizer_cc(eq_ntaps, eq_mod, eq_gain, int(sps / 2))
+ self.digital_cma_equalizer_cc_0 = digital.cma_equalizer_cc(eq_ntaps, eq_mod, eq_gain, 1)
self.blocks_null_sink_0 = blocks.null_sink(gr.sizeof_char*1)
self.blocks_file_source_0 = blocks.file_source(gr.sizeof_char*1, '/home/sara/Documents/Fading/hardware/QPSK/lena512color.tiff', True, 0, 0)
self.blocks_file_source_0.set_begin_tag(pmt.PMT_NIL)