aboutsummaryrefslogtreecommitdiffstats
path: root/simulation/QAM
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--simulation/QAM/qam.grc4
-rwxr-xr-xsimulation/QAM/qam.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/simulation/QAM/qam.grc b/simulation/QAM/qam.grc
index 13592fe..ebbb7dc 100644
--- a/simulation/QAM/qam.grc
+++ b/simulation/QAM/qam.grc
@@ -463,7 +463,7 @@ blocks:
affinity: ''
alias: ''
comment: ''
- constellation: const
+ constellation: qam_const
maxoutbuf: '0'
minoutbuf: '0'
states:
@@ -479,7 +479,7 @@ blocks:
affinity: ''
alias: ''
comment: ''
- constellation: const
+ constellation: qam_const
differential: 'True'
excess_bw: excess_bw
log: 'False'
diff --git a/simulation/QAM/qam.py b/simulation/QAM/qam.py
index 1066f68..2b64847 100755
--- a/simulation/QAM/qam.py
+++ b/simulation/QAM/qam.py
@@ -90,7 +90,7 @@ class qam(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_bpsk().base()
+ self.const = const = digital.constellation_16qam().base()
self.chn_taps = chn_taps = [1.0 + 0.0j, ]
##################################################
@@ -443,14 +443,14 @@ class qam(gr.top_block, Qt.QWidget):
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)
self.digital_constellation_modulator_0 = digital.generic_mod(
- constellation=const,
+ constellation=qam_const,
differential=True,
samples_per_symbol=sps,
pre_diff_code=True,
excess_bw=excess_bw,
verbose=False,
log=False)
- self.digital_constellation_decoder_cb_0 = digital.constellation_decoder_cb(const)
+ self.digital_constellation_decoder_cb_0 = digital.constellation_decoder_cb(qam_const)
self.digital_cma_equalizer_cc_0 = digital.cma_equalizer_cc(eq_ntaps, eq_mod, eq_gain, 2)
self.channels_channel_model_0 = channels.channel_model(
noise_voltage=noise_volt,