diff options
| author | Nao Pross <np@0hm.ch> | 2021-11-10 19:14:02 +0100 |
|---|---|---|
| committer | Nao Pross <np@0hm.ch> | 2021-11-10 19:14:02 +0100 |
| commit | 112a570e1bf93b01eae7c4ac597bed06854c2e5a (patch) | |
| tree | 458f3c65677796bdce1bc0be51b5216a7c86fadb /simulation/QAM | |
| parent | Update GUI sketch (diff) | |
| parent | Fading Model und Bilder (diff) | |
| download | Fading-112a570e1bf93b01eae7c4ac597bed06854c2e5a.tar.gz Fading-112a570e1bf93b01eae7c4ac597bed06854c2e5a.zip | |
Merge branch 'master' of github.com:NaoPross/Fading
Diffstat (limited to 'simulation/QAM')
| -rw-r--r-- | simulation/QAM/QAM16_Simulation.png | bin | 0 -> 75755 bytes | |||
| -rw-r--r-- | simulation/QAM/qam.grc | 6 | ||||
| -rwxr-xr-x | simulation/QAM/qam.py | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/simulation/QAM/QAM16_Simulation.png b/simulation/QAM/QAM16_Simulation.png Binary files differnew file mode 100644 index 0000000..1342db4 --- /dev/null +++ b/simulation/QAM/QAM16_Simulation.png diff --git a/simulation/QAM/qam.grc b/simulation/QAM/qam.grc index ebbb7dc..d74a8fb 100644 --- a/simulation/QAM/qam.grc +++ b/simulation/QAM/qam.grc @@ -54,7 +54,7 @@ blocks: rot_sym: '4' soft_dec_lut: None sym_map: '[0, 1, 3, 2]' - type: 16qam + type: 8psk states: bus_sink: false bus_source: false @@ -463,7 +463,7 @@ blocks: affinity: '' alias: '' comment: '' - constellation: qam_const + constellation: const maxoutbuf: '0' minoutbuf: '0' states: @@ -479,7 +479,7 @@ blocks: affinity: '' alias: '' comment: '' - constellation: qam_const + constellation: const differential: 'True' excess_bw: excess_bw log: 'False' diff --git a/simulation/QAM/qam.py b/simulation/QAM/qam.py index 2b64847..8977787 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_16qam().base() + self.const = const = digital.constellation_8psk().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=qam_const, + constellation=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(qam_const) + 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, 2) self.channels_channel_model_0 = channels.channel_model( noise_voltage=noise_volt, |
