diff options
| author | Nao Pross <np@0hm.ch> | 2021-12-21 00:32:06 +0100 |
|---|---|---|
| committer | Nao Pross <np@0hm.ch> | 2021-12-21 00:32:06 +0100 |
| commit | 1de862c5e2ac6e2baa76daf9fbe6b64050da12fc (patch) | |
| tree | aa3f52261a3e1f0e1e2b359be8dd1435cca89135 /flowgraphs | |
| parent | Add data and flowgraph for (broken) QAM on hardware (diff) | |
| download | Fading-1de862c5e2ac6e2baa76daf9fbe6b64050da12fc.tar.gz Fading-1de862c5e2ac6e2baa76daf9fbe6b64050da12fc.zip | |
Add more data for QAM, fix colormap
Diffstat (limited to 'flowgraphs')
| -rw-r--r-- | flowgraphs/qam_sim.grc | 10 | ||||
| -rwxr-xr-x | flowgraphs/qam_sim.py | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/flowgraphs/qam_sim.grc b/flowgraphs/qam_sim.grc index f5724be..6ef347a 100644 --- a/flowgraphs/qam_sim.grc +++ b/flowgraphs/qam_sim.grc @@ -536,18 +536,18 @@ blocks: - name: channels_selective_fading_model_0 id: channels_selective_fading_model parameters: - K: '4.0' + K: '5' LOS: 'False' N: '8' affinity: '' alias: '' comment: '' - delays: (0,1.8) - fDTs: ((2*carrier_freq)/(3*10e8))/samp_rate - mags: (1,0.12) + delays: (0,0.05e-6/samp_rate,0.12e-6/samp_rate,0.2e-6/samp_rate,0.23e-6/samp_rate,0.5e-6/samp_rate,1.6e-6/samp_rate,2.3e-6/samp_rate,5e-6/samp_rate) + fDTs: 70/samp_rate + mags: (0.7943282347242815,0.7943282347242815,0.7943282347242815,1,1,1,0.5011872336272722,0.31622776601683794,0.19952623149688797) maxoutbuf: '0' minoutbuf: '0' - ntaps: '8' + ntaps: '9' seed: '21' states: bus_sink: false diff --git a/flowgraphs/qam_sim.py b/flowgraphs/qam_sim.py index d3b6580..3a218f3 100755 --- a/flowgraphs/qam_sim.py +++ b/flowgraphs/qam_sim.py @@ -195,7 +195,7 @@ class qam_sim(gr.top_block, Qt.QWidget): verbose=False, log=False) self.digital_constellation_decoder_cb_0 = digital.constellation_decoder_cb(qam_const) - self.channels_selective_fading_model_0 = channels.selective_fading_model( 8, ((2*carrier_freq)/(3*10e8))/samp_rate, False, 4.0, 21, (0,1.8), (1,0.12), 8 ) + self.channels_selective_fading_model_0 = channels.selective_fading_model( 8, 70/samp_rate, False, 5, 21, (0,0.05e-6/samp_rate,0.12e-6/samp_rate,0.2e-6/samp_rate,0.23e-6/samp_rate,0.5e-6/samp_rate,1.6e-6/samp_rate,2.3e-6/samp_rate,5e-6/samp_rate), (0.7943282347242815,0.7943282347242815,0.7943282347242815,1,1,1,0.5011872336272722,0.31622776601683794,0.19952623149688797), 9 ) self.channels_channel_model_0 = channels.channel_model( noise_voltage=100e-3, frequency_offset=1e-3, @@ -298,7 +298,7 @@ class qam_sim(gr.top_block, Qt.QWidget): def set_samp_rate(self, samp_rate): self.samp_rate = samp_rate self.blocks_throttle_0.set_sample_rate(self.samp_rate) - self.channels_selective_fading_model_0.set_fDTs(((2*self.carrier_freq)/(3*10e8))/self.samp_rate) + self.channels_selective_fading_model_0.set_fDTs(70/self.samp_rate) self.qtgui_time_sink_x_0.set_samp_rate(self.samp_rate / self.sps) def get_rrc_taps(self): @@ -325,7 +325,6 @@ class qam_sim(gr.top_block, Qt.QWidget): def set_carrier_freq(self, carrier_freq): self.carrier_freq = carrier_freq - self.channels_selective_fading_model_0.set_fDTs(((2*self.carrier_freq)/(3*10e8))/self.samp_rate) def get_access_code(self): return self.access_code |