aboutsummaryrefslogtreecommitdiffstats
path: root/simulation/QAM_Fading
diff options
context:
space:
mode:
authorNao Pross <np@0hm.ch>2021-12-16 16:53:08 +0100
committerNao Pross <np@0hm.ch>2021-12-16 16:53:08 +0100
commitaaca71a8500c06a45a8b4a4302f8770fb7e726fe (patch)
tree450829cf9fa6421a456c7faca7af86d1baa9064f /simulation/QAM_Fading
parentRemove old pictures (diff)
parentDoku bilder (diff)
downloadFading-aaca71a8500c06a45a8b4a4302f8770fb7e726fe.tar.gz
Fading-aaca71a8500c06a45a8b4a4302f8770fb7e726fe.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to '')
-rw-r--r--simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc4
-rwxr-xr-xsimulation/QAM_Fading/qam_fading_block.py5
2 files changed, 4 insertions, 5 deletions
diff --git a/simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc b/simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc
index 3010c58..8983c27 100644
--- a/simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc
+++ b/simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc
@@ -96,7 +96,7 @@ blocks:
rot_sym: '4'
soft_dec_lut: None
sym_map: '[0, 1, 3, 2]'
- type: calcdist
+ type: qpsk
states:
bus_sink: false
bus_source: false
@@ -273,7 +273,7 @@ blocks:
id: variable
parameters:
comment: ''
- value: '32000'
+ value: 1e6
states:
bus_sink: false
bus_source: false
diff --git a/simulation/QAM_Fading/qam_fading_block.py b/simulation/QAM_Fading/qam_fading_block.py
index 3e625ea..10af927 100755
--- a/simulation/QAM_Fading/qam_fading_block.py
+++ b/simulation/QAM_Fading/qam_fading_block.py
@@ -82,7 +82,7 @@ class qam_fading_block(gr.top_block, Qt.QWidget):
self.excess_bw = excess_bw = 350e-3
self.timing_loop_bw = timing_loop_bw = 2 * 3.141592653589793 / 100
self.time_offset = time_offset = 1.0
- self.samp_rate = samp_rate = 32000
+ 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.phase_bw = phase_bw = 2 * 3.141592653589793 / 100
self.noise_volt = noise_volt = 0.0001
@@ -91,8 +91,7 @@ class qam_fading_block(gr.top_block, Qt.QWidget):
self.eq_ntaps = eq_ntaps = 15
self.eq_mod = eq_mod = 1
self.eq_gain = eq_gain = .01
- self.const = const = digital.constellation_calcdist([-1-1j, -1+1j, 1+1j, 1-1j], [0, 1, 3, 2],
- 4, 1).base()
+ self.const = const = digital.constellation_qpsk().base()
self.chn_taps = chn_taps = [1.0 + 0.0j, ]
self.amp_1 = amp_1 = 0.2
self.LOS_NLOS = LOS_NLOS = 1