diff options
Diffstat (limited to '')
| -rwxr-xr-x | simulation/QAM_Fading/qam_fading.py | 4 | ||||
| -rw-r--r-- | simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc | 2 | ||||
| -rwxr-xr-x | simulation/QAM_Fading/qam_fading_block.py | 2 | ||||
| -rw-r--r-- | simulation/QAM_Fading/qam_fading_frequency_selectiv_copy.grc | 14 |
4 files changed, 11 insertions, 11 deletions
diff --git a/simulation/QAM_Fading/qam_fading.py b/simulation/QAM_Fading/qam_fading.py index 42199d1..30f2262 100755 --- a/simulation/QAM_Fading/qam_fading.py +++ b/simulation/QAM_Fading/qam_fading.py @@ -88,7 +88,7 @@ class qam_fading(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_qpsk().base() self.chn_taps = chn_taps = [1.0 + 0.0j, ] ################################################## @@ -456,7 +456,7 @@ class qam_fading(gr.top_block, Qt.QWidget): self.digital_constellation_decoder_cb_0 = digital.constellation_decoder_cb(const) self.digital_cma_equalizer_cc_0_0 = digital.cma_equalizer_cc(eq_ntaps, eq_mod, eq_gain, 2) self.digital_cma_equalizer_cc_0 = digital.cma_equalizer_cc(eq_ntaps, eq_mod, eq_gain, 2) - self.channels_selective_fading_model_0 = channels.selective_fading_model( 8, 0, False, 1.0, 0, (0,7), (1,0.2), 2 ) + self.channels_selective_fading_model_0 = channels.selective_fading_model( 8, 0, True, 4, 0, (0,0.3e-6), (1,0.39), 3 ) self.channels_channel_model_0 = channels.channel_model( noise_voltage=noise_volt, frequency_offset=freq_offset, diff --git a/simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc b/simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc index 641d78e..42a922b 100644 --- a/simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc +++ b/simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc @@ -811,7 +811,7 @@ blocks: amplitudes: '[amp_1]' comment: '' delays: '[fading_1]' - los: 'False' + los: 'True' maxoutbuf: '0' minoutbuf: '0' states: diff --git a/simulation/QAM_Fading/qam_fading_block.py b/simulation/QAM_Fading/qam_fading_block.py index 89c4a32..416799c 100755 --- a/simulation/QAM_Fading/qam_fading_block.py +++ b/simulation/QAM_Fading/qam_fading_block.py @@ -505,7 +505,7 @@ class qam_fading_block(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.fadingui_multipath_fading_0 = fadingui.multipath_fading(amplitudes=[amp_1], delays=[fading_1], los =False) + self.fadingui_multipath_fading_0 = fadingui.multipath_fading(amplitudes=[amp_1], delays=[fading_1], los =True) self.digital_pfb_clock_sync_xxx_0_0 = digital.pfb_clock_sync_ccf(sps , timing_loop_bw, rrc_taps, nfilts, nfilts/2, 1.5, 1) 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_0 = digital.map_bb([0, 1, 3, 2]) diff --git a/simulation/QAM_Fading/qam_fading_frequency_selectiv_copy.grc b/simulation/QAM_Fading/qam_fading_frequency_selectiv_copy.grc index a960ec8..ce87db8 100644 --- a/simulation/QAM_Fading/qam_fading_frequency_selectiv_copy.grc +++ b/simulation/QAM_Fading/qam_fading_frequency_selectiv_copy.grc @@ -54,7 +54,7 @@ blocks: rot_sym: '4' soft_dec_lut: None sym_map: '[0, 1, 3, 2]' - type: 16qam + type: qpsk states: bus_sink: false bus_source: false @@ -453,24 +453,24 @@ blocks: - name: channels_selective_fading_model_0 id: channels_selective_fading_model parameters: - K: '1.0' - LOS: 'False' + K: '4' + LOS: 'True' N: '8' affinity: '' alias: '' comment: '' - delays: (0,7) + delays: (0,0.3e-6) fDTs: '0' - mags: (1,0.2) + mags: (1,0.39) maxoutbuf: '0' minoutbuf: '0' - ntaps: '2' + ntaps: '3' seed: '0' states: bus_sink: false bus_source: false bus_structure: null - coordinate: [960, 308.0] + coordinate: [976, 308.0] rotation: 0 state: true - name: digital_cma_equalizer_cc_0 |