aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/thesis/Makefile2
-rw-r--r--doc/thesis/chapters/implementation.tex10
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_LOS_5_K5.datbin0 -> 4387016 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_LOS_70_K5.datbin0 -> 2355520 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_NLOS_5.datbin0 -> 2989000 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_NLOS_70.datbin0 -> 3404032 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_LOS_5_K5.datbin0 -> 1096424 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_LOS_70_K5.datbin0 -> 588544 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_NLOS_5.datbin0 -> 746920 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_NLOS_70.datbin0 -> 849864 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_LOS_5_K5.datbin0 -> 1096416 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_LOS_70_K5.datbin0 -> 588528 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_NLOS_5.datbin0 -> 746856 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_NLOS_70.datbin0 -> 849816 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_LOS_5_K5.datbin0 -> 1096424 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_LOS_70_K5.datbin0 -> 588544 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_NLOS_5.datbin0 -> 746920 bytes
-rw-r--r--doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_NLOS_70.datbin0 -> 849864 bytes
-rw-r--r--doc/thesis/figures/data/qpsk_sim_constellations_dynamic_exp_NLOS_5.py34
-rw-r--r--doc/thesis/figures/tikz/qpsk-sim-constellations-dynamic-exp-NLOS-5.tex75
-rw-r--r--flowgraphs/qpsk_sim.grc129
-rwxr-xr-xflowgraphs/qpsk_sim.py147
-rw-r--r--notebooks/Fading Channel Taps.ipynb12
-rw-r--r--references/channel/ts_136104v110400p.pdfbin0 -> 924111 bytes
-rwxr-xr-xsimulation/QAM_Fading/qam_fading.py61
-rw-r--r--simulation/QAM_Fading/qam_fading_frequency_selectiv.grc70
26 files changed, 399 insertions, 141 deletions
diff --git a/doc/thesis/Makefile b/doc/thesis/Makefile
index 63cc851..db843b8 100644
--- a/doc/thesis/Makefile
+++ b/doc/thesis/Makefile
@@ -31,6 +31,7 @@ SOURCES := \
figures/tikz/qpsk-sim-constellations-static-symb-NLOS.tex \
figures/tikz/qpsk-sim-constellations-static-symb-vec.tex \
figures/tikz/qpsk-sim-constellations-dynamic.tex\
+ figures/tikz/qpsk-sim-constellations-dynamic-exp-NLOS-5.tex\
figures/tikz/qpsk-sim-constellations-without-effects.tex\
@@ -41,6 +42,7 @@ DATA := \
figures/data/qpsk_sim_constellations_static_symb_NLOS.dat \
figures/data/qpsk_sim_constellations_static_symb_vec.dat \
figures/data/qpsk_sim_constellations_dynamic.dat\
+ figures/data/qpsk_sim_constellations_dynamic_exp_NLOS_5.dat\
figures/data/qpsk_sim_constellations_without_effects.dat \
figures/data/rice_pdf.dat
diff --git a/doc/thesis/chapters/implementation.tex b/doc/thesis/chapters/implementation.tex
index ff80f2e..748982c 100644
--- a/doc/thesis/chapters/implementation.tex
+++ b/doc/thesis/chapters/implementation.tex
@@ -426,6 +426,16 @@ In order to obtain a realistic simulation the values for multi-path fading propa
\caption{Values used for the simulation\label{tab:values}}
\end{table}
+\begin{figure}
+ \centering
+ \input{figures/tikz/qpsk-sim-constellations-dynamic-exp-NLOS-5}
+ \caption{
+ TODO
+ }
+ \label{fig:dynamic-exp-real}
+\end{figure}
+
+
\subsection{Measurements}
\skelpar[5]{
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_LOS_5_K5.dat b/doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_LOS_5_K5.dat
new file mode 100644
index 0000000..b4accdd
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_LOS_5_K5.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_LOS_70_K5.dat b/doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_LOS_70_K5.dat
new file mode 100644
index 0000000..350fb3b
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_LOS_70_K5.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_NLOS_5.dat b/doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_NLOS_5.dat
new file mode 100644
index 0000000..1322947
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_NLOS_5.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_NLOS_70.dat b/doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_NLOS_70.dat
new file mode 100644
index 0000000..ffe47ce
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_channel_dynamic_exp_NLOS_70.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_LOS_5_K5.dat b/doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_LOS_5_K5.dat
new file mode 100644
index 0000000..ce683a0
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_LOS_5_K5.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_LOS_70_K5.dat b/doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_LOS_70_K5.dat
new file mode 100644
index 0000000..a0399b9
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_LOS_70_K5.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_NLOS_5.dat b/doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_NLOS_5.dat
new file mode 100644
index 0000000..28eaeb8
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_NLOS_5.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_NLOS_70.dat b/doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_NLOS_70.dat
new file mode 100644
index 0000000..596e0a9
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_equalized_dynamic_exp_NLOS_70.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_LOS_5_K5.dat b/doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_LOS_5_K5.dat
new file mode 100644
index 0000000..c0c30e0
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_LOS_5_K5.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_LOS_70_K5.dat b/doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_LOS_70_K5.dat
new file mode 100644
index 0000000..1d55afc
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_LOS_70_K5.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_NLOS_5.dat b/doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_NLOS_5.dat
new file mode 100644
index 0000000..1c53fed
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_NLOS_5.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_NLOS_70.dat b/doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_NLOS_70.dat
new file mode 100644
index 0000000..5e2a983
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_locked_dynamic_exp_NLOS_70.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_LOS_5_K5.dat b/doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_LOS_5_K5.dat
new file mode 100644
index 0000000..513dfa8
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_LOS_5_K5.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_LOS_70_K5.dat b/doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_LOS_70_K5.dat
new file mode 100644
index 0000000..86d472a
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_LOS_70_K5.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_NLOS_5.dat b/doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_NLOS_5.dat
new file mode 100644
index 0000000..327a07d
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_NLOS_5.dat
Binary files differ
diff --git a/doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_NLOS_70.dat b/doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_NLOS_70.dat
new file mode 100644
index 0000000..35971b0
--- /dev/null
+++ b/doc/thesis/figures/data/flowgraphs/qpsk_sync_dynamic_exp_NLOS_70.dat
Binary files differ
diff --git a/doc/thesis/figures/data/qpsk_sim_constellations_dynamic_exp_NLOS_5.py b/doc/thesis/figures/data/qpsk_sim_constellations_dynamic_exp_NLOS_5.py
new file mode 100644
index 0000000..c48b87b
--- /dev/null
+++ b/doc/thesis/figures/data/qpsk_sim_constellations_dynamic_exp_NLOS_5.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+
+import os
+import numpy as np
+
+DATA_DIR = "./figures/data/flowgraphs"
+SPS = 4
+
+channel = np.fromfile(f"{DATA_DIR}/qpsk_channel_dynamic_exp_NLOS_5.dat", dtype=np.complex64)[::SPS]
+sync = np.fromfile(f"{DATA_DIR}/qpsk_sync_dynamic_exp_NLOS_5.dat", dtype=np.complex64)
+equalized = np.fromfile(f"{DATA_DIR}/qpsk_equalized_dynamic_exp_NLOS_5.dat", dtype=np.complex64)
+locked = np.fromfile(f"{DATA_DIR}/qpsk_locked_dynamic_exp_NLOS_5.dat", dtype=np.complex64)
+
+samples = [channel, sync, equalized, locked]
+
+# print(list(map(len, samples)))
+
+start = 67.8e3
+end = start + 500
+# start = 80e3
+# end = start + 1000
+
+get_range = lambda arr: arr[int(start):int(end)]
+get_parts = lambda v: (np.real(v), np.imag(v))
+
+values = map(get_range, samples)
+parts = [p for v in map(get_parts, values) for p in v]
+data = np.array(list(zip(*parts)))
+
+# save to file
+location = os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__)))
+name, _ = os.path.splitext(os.path.basename(__file__))
+filename = os.path.join(location, name + ".dat")
+np.savetxt(filename, data, fmt='%.6e')
diff --git a/doc/thesis/figures/tikz/qpsk-sim-constellations-dynamic-exp-NLOS-5.tex b/doc/thesis/figures/tikz/qpsk-sim-constellations-dynamic-exp-NLOS-5.tex
new file mode 100644
index 0000000..4afaa09
--- /dev/null
+++ b/doc/thesis/figures/tikz/qpsk-sim-constellations-dynamic-exp-NLOS-5.tex
@@ -0,0 +1,75 @@
+% vim: set ts=2 sw=2 noet:
+\begin{tikzpicture}
+ \begin{axis}[
+ title = {Channel with ISI},
+ width = 5cm, height = 5cm,
+ % ylabel = {Quadrature},
+ % xlabel = {In-Phase},
+ xlabel near ticks,
+ ylabel near ticks,
+ grid = major,
+ xmin = -5, xmax = 5,
+ ymin = -5, ymax = 5,
+ ]
+
+ \addplot[magenta, only marks] table[x index = 0, y index = 1]
+ {figures/data/qpsk_sim_constellations_dynamic_exp_NLOS_5.dat};
+ \end{axis}
+\end{tikzpicture}
+\hspace{5mm}
+\begin{tikzpicture}
+ \begin{axis}[
+ title = {Synchronized},
+ width = 5cm, height = 5cm,
+ % ylabel = {Quadrature},
+ % xlabel = {In-Phase},
+ xlabel near ticks,
+ ylabel near ticks,
+ grid = major,
+ xmin = -5, xmax = 5,
+ ymin = -5, ymax = 5,
+ ]
+
+ \addplot[magenta!80!blue, only marks] table[x index = 2, y index = 3]
+ {figures/data/qpsk_sim_constellations_dynamic_exp_NLOS_5.dat};
+ \end{axis}
+\end{tikzpicture}
+
+\vspace{5mm}
+
+\begin{tikzpicture}
+ \begin{axis}[
+ title = {Equalized},
+ width = 5cm, height = 5cm,
+ % ylabel = {Quadrature},
+ % xlabel = {In-Phase},
+ xlabel near ticks,
+ ylabel near ticks,
+ grid = major,
+ xmin = -1.5, xmax = 1.5,
+ ymin = -1.5, ymax = 1.5,
+ ]
+
+ \addplot[magenta!50!blue, only marks] table[x index = 4, y index = 5]
+ {figures/data/qpsk_sim_constellations_dynamic_exp_NLOS_5.dat};
+ \end{axis}
+\end{tikzpicture}
+\hspace{5mm}
+\begin{tikzpicture}
+ \begin{axis}[
+ title = {Locked},
+ width = 5cm, height = 5cm,
+ % ylabel = {Quadrature},
+ % xlabel = {In-Phase},
+ xlabel near ticks,
+ ylabel near ticks,
+ grid = major,
+ xmin = -1.5, xmax = 1.5,
+ ymin = -1.5, ymax = 1.5,
+ ]
+
+ \addplot[magenta!30!blue, only marks] table[x index = 6, y index = 7]
+ {figures/data/qpsk_sim_constellations_dynamic_exp_NLOS_5.dat};
+ \end{axis}
+\end{tikzpicture}
+
diff --git a/flowgraphs/qpsk_sim.grc b/flowgraphs/qpsk_sim.grc
index de46d9a..5bdbb47 100644
--- a/flowgraphs/qpsk_sim.grc
+++ b/flowgraphs/qpsk_sim.grc
@@ -8,7 +8,7 @@ options:
description: ''
gen_cmake: 'On'
gen_linking: dynamic
- generate_options: no_gui
+ generate_options: qt_gui
hier_block_src_path: '.:'
id: qpsk_sim
max_nouts: '0'
@@ -94,7 +94,7 @@ blocks:
bus_sink: false
bus_source: false
bus_structure: null
- coordinate: [224, 252.0]
+ coordinate: [184, 252.0]
rotation: 0
state: enabled
- name: frame_len
@@ -179,7 +179,7 @@ blocks:
id: variable
parameters:
comment: ''
- value: '[0x1f, 0x35] + [0x12, 0x48, 0x12, 0x45] '
+ value: '[0x1f, 0x35] + [0x12, 0x48] '
states:
bus_sink: false
bus_source: false
@@ -257,7 +257,7 @@ blocks:
bus_structure: null
coordinate: [992, 524.0]
rotation: 0
- state: disabled
+ state: enabled
- name: blocks_file_sink_1
id: blocks_file_sink
parameters:
@@ -275,7 +275,7 @@ blocks:
bus_structure: null
coordinate: [1280, 820.0]
rotation: 0
- state: disabled
+ state: enabled
- name: blocks_file_sink_2
id: blocks_file_sink
parameters:
@@ -293,7 +293,7 @@ blocks:
bus_structure: null
coordinate: [528, 1084.0]
rotation: 0
- state: disabled
+ state: enabled
- name: blocks_file_sink_3
id: blocks_file_sink
parameters:
@@ -311,7 +311,7 @@ blocks:
bus_structure: null
coordinate: [768, 828.0]
rotation: 0
- state: disabled
+ state: enabled
- name: blocks_null_source_0
id: blocks_null_source
parameters:
@@ -484,23 +484,23 @@ blocks:
bus_structure: null
coordinate: [312, 716.0]
rotation: 0
- state: enabled
+ state: bypassed
- name: channels_selective_fading_model_0
id: channels_selective_fading_model
parameters:
- K: '4.0'
- LOS: 'False'
+ K: '5'
+ LOS: 'True'
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: 5/samp_rate
+ mags: (0.7943282347242815,0.7943282347242815,0.7943282347242815,1,1,1,0.5011872336272722,0.31622776601683794,0.19952623149688797)
maxoutbuf: '0'
minoutbuf: '0'
- ntaps: '8'
- seed: '21'
+ ntaps: '9'
+ seed: '0'
states:
bus_sink: false
bus_source: false
@@ -645,9 +645,9 @@ blocks:
parameters:
affinity: ''
alias: ''
- amplitudes: '[0.12]'
+ amplitudes: '[0.2]'
comment: ''
- delays: '[1.8]'
+ delays: '[sps]'
los: 'True'
maxoutbuf: '0'
minoutbuf: '0'
@@ -859,6 +859,98 @@ blocks:
coordinate: [536, 852.0]
rotation: 0
state: disabled
+- name: qtgui_const_sink_x_1
+ id: qtgui_const_sink_x
+ parameters:
+ affinity: ''
+ alias: ''
+ alpha1: '1.0'
+ alpha10: '1.0'
+ alpha2: '1.0'
+ alpha3: '1.0'
+ alpha4: '1.0'
+ alpha5: '1.0'
+ alpha6: '1.0'
+ alpha7: '1.0'
+ alpha8: '1.0'
+ alpha9: '1.0'
+ autoscale: 'False'
+ axislabels: 'True'
+ color1: '"blue"'
+ color10: '"red"'
+ color2: '"red"'
+ color3: '"red"'
+ color4: '"red"'
+ color5: '"red"'
+ color6: '"red"'
+ color7: '"red"'
+ color8: '"red"'
+ color9: '"red"'
+ comment: ''
+ grid: 'False'
+ gui_hint: ''
+ label1: ''
+ label10: ''
+ label2: ''
+ label3: ''
+ label4: ''
+ label5: ''
+ label6: ''
+ label7: ''
+ label8: ''
+ label9: ''
+ legend: 'True'
+ marker1: '0'
+ marker10: '0'
+ marker2: '0'
+ marker3: '0'
+ marker4: '0'
+ marker5: '0'
+ marker6: '0'
+ marker7: '0'
+ marker8: '0'
+ marker9: '0'
+ name: '""'
+ nconnections: '2'
+ size: '1024'
+ style1: '0'
+ style10: '0'
+ style2: '0'
+ style3: '0'
+ style4: '0'
+ style5: '0'
+ style6: '0'
+ style7: '0'
+ style8: '0'
+ style9: '0'
+ tr_chan: '0'
+ tr_level: '0.0'
+ tr_mode: qtgui.TRIG_MODE_FREE
+ tr_slope: qtgui.TRIG_SLOPE_POS
+ tr_tag: '""'
+ type: complex
+ update_time: '0.10'
+ width1: '1'
+ width10: '1'
+ width2: '1'
+ width3: '1'
+ width4: '1'
+ width5: '1'
+ width6: '1'
+ width7: '1'
+ width8: '1'
+ width9: '1'
+ xmax: '2'
+ xmin: '-2'
+ ymax: '2'
+ ymin: '-2'
+ states:
+ bus_sink: false
+ bus_source: false
+ bus_structure: null
+ coordinate: [1232, 740.0]
+ rotation: 0
+ state: true
- name: qtgui_time_sink_x_0
id: qtgui_time_sink_x
parameters:
@@ -1064,11 +1156,14 @@ connections:
- [digital_pfb_clock_sync_xxx_0, '0', digital_cma_equalizer_cc_0, '0']
- [digital_pfb_clock_sync_xxx_0, '0', fadingui_netsink_4, '0']
- [digital_pfb_clock_sync_xxx_0, '0', qtgui_const_sink_x_0, '0']
+- [digital_pfb_clock_sync_xxx_0, '0', qtgui_const_sink_x_1, '1']
- [fadingui_datasource_0, '0', digital_constellation_modulator_0, '0']
+- [fadingui_multipath_fading_0, '0', blocks_file_sink_0, '0']
- [fadingui_multipath_fading_0, '0', fadingui_netsink_0, '0']
- [fadingui_multipath_fading_0, '0', virtual_sink_1, '0']
- [fadingui_phasecorrection_0, '0', blocks_file_sink_1, '0']
- [fadingui_phasecorrection_0, '0', fadingui_netsink_3, '0']
+- [fadingui_phasecorrection_0, '0', qtgui_const_sink_x_1, '0']
- [fadingui_phasecorrection_0, '0', virtual_sink_2, '0']
- [virtual_source_0, '0', digital_constellation_decoder_cb_0, '0']
- [virtual_source_1, '0', digital_pfb_clock_sync_xxx_0, '0']
diff --git a/flowgraphs/qpsk_sim.py b/flowgraphs/qpsk_sim.py
index a7820ae..3c2b288 100755
--- a/flowgraphs/qpsk_sim.py
+++ b/flowgraphs/qpsk_sim.py
@@ -9,6 +9,21 @@
# Author: Naoki Sean Pross, Sara Cinzia Halter
# GNU Radio version: 3.8.2.0
+from distutils.version import StrictVersion
+
+if __name__ == '__main__':
+ import ctypes
+ import sys
+ if sys.platform.startswith('linux'):
+ try:
+ x11 = ctypes.cdll.LoadLibrary('libX11.so')
+ x11.XInitThreads()
+ except:
+ print("Warning: failed to XInitThreads()")
+
+from PyQt5 import Qt
+from gnuradio import qtgui
+import sip
from gnuradio import blocks
import numpy
from gnuradio import channels
@@ -23,16 +38,45 @@ from gnuradio import eng_notation
import fadingui
import numpy as np
+from gnuradio import qtgui
-class qpsk_sim(gr.top_block):
+class qpsk_sim(gr.top_block, Qt.QWidget):
def __init__(self):
gr.top_block.__init__(self, "QPSK Sim")
+ Qt.QWidget.__init__(self)
+ self.setWindowTitle("QPSK Sim")
+ qtgui.util.check_set_qss()
+ try:
+ self.setWindowIcon(Qt.QIcon.fromTheme('gnuradio-grc'))
+ except:
+ pass
+ self.top_scroll_layout = Qt.QVBoxLayout()
+ self.setLayout(self.top_scroll_layout)
+ self.top_scroll = Qt.QScrollArea()
+ self.top_scroll.setFrameStyle(Qt.QFrame.NoFrame)
+ self.top_scroll_layout.addWidget(self.top_scroll)
+ self.top_scroll.setWidgetResizable(True)
+ self.top_widget = Qt.QWidget()
+ self.top_scroll.setWidget(self.top_widget)
+ self.top_layout = Qt.QVBoxLayout(self.top_widget)
+ self.top_grid_layout = Qt.QGridLayout()
+ self.top_layout.addLayout(self.top_grid_layout)
+
+ self.settings = Qt.QSettings("GNU Radio", "qpsk_sim")
+
+ try:
+ if StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"):
+ self.restoreGeometry(self.settings.value("geometry").toByteArray())
+ else:
+ self.restoreGeometry(self.settings.value("geometry"))
+ except:
+ pass
##################################################
# Variables
##################################################
- self.testvec = testvec = [0x1f, 0x35] + [0x12, 0x48, 0x12, 0x45]
+ self.testvec = testvec = [0x1f, 0x35] + [0x12, 0x48]
self.sps = sps = 4
self.nfilts = nfilts = 32
self.excess_bw = excess_bw = 0.35
@@ -46,6 +90,46 @@ class qpsk_sim(gr.top_block):
##################################################
# Blocks
##################################################
+ self.qtgui_const_sink_x_1 = qtgui.const_sink_c(
+ 1024, #size
+ "", #name
+ 2 #number of inputs
+ )
+ self.qtgui_const_sink_x_1.set_update_time(0.10)
+ self.qtgui_const_sink_x_1.set_y_axis(-2, 2)
+ self.qtgui_const_sink_x_1.set_x_axis(-2, 2)
+ self.qtgui_const_sink_x_1.set_trigger_mode(qtgui.TRIG_MODE_FREE, qtgui.TRIG_SLOPE_POS, 0.0, 0, "")
+ self.qtgui_const_sink_x_1.enable_autoscale(False)
+ self.qtgui_const_sink_x_1.enable_grid(False)
+ self.qtgui_const_sink_x_1.enable_axis_labels(True)
+
+
+ labels = ['', '', '', '', '',
+ '', '', '', '', '']
+ widths = [1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1]
+ colors = ["blue", "red", "red", "red", "red",
+ "red", "red", "red", "red", "red"]
+ styles = [0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0]
+ markers = [0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0]
+ alphas = [1.0, 1.0, 1.0, 1.0, 1.0,
+ 1.0, 1.0, 1.0, 1.0, 1.0]
+
+ for i in range(2):
+ if len(labels[i]) == 0:
+ self.qtgui_const_sink_x_1.set_line_label(i, "Data {0}".format(i))
+ else:
+ self.qtgui_const_sink_x_1.set_line_label(i, labels[i])
+ self.qtgui_const_sink_x_1.set_line_width(i, widths[i])
+ self.qtgui_const_sink_x_1.set_line_color(i, colors[i])
+ self.qtgui_const_sink_x_1.set_line_style(i, styles[i])
+ self.qtgui_const_sink_x_1.set_line_marker(i, markers[i])
+ self.qtgui_const_sink_x_1.set_line_alpha(i, alphas[i])
+
+ self._qtgui_const_sink_x_1_win = sip.wrapinstance(self.qtgui_const_sink_x_1.pyqwidget(), Qt.QWidget)
+ self.top_grid_layout.addWidget(self._qtgui_const_sink_x_1_win)
self.fadingui_phasecorrection_0 = fadingui.phasecorrection(frame_len)
self.fadingui_netsink_4 = fadingui.netsink(address='udp://localhost:31417', dtype="complex", vlen=1)
self.fadingui_netsink_3 = fadingui.netsink(address='udp://localhost:31419', dtype="complex", vlen=1)
@@ -65,20 +149,21 @@ class qpsk_sim(gr.top_block):
log=False)
self.digital_constellation_decoder_cb_0 = digital.constellation_decoder_cb(qpsk_const)
self.digital_cma_equalizer_cc_0 = digital.cma_equalizer_cc(15, 1, 2e-3, 1)
- 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_channel_model_0 = channels.channel_model(
- noise_voltage=100e-3,
- frequency_offset=2e-3,
- epsilon=1.0,
- taps=[np.exp(1j * 30 / 180 * np.pi)],
- noise_seed=243,
- block_tags=False)
+ self.channels_selective_fading_model_0 = channels.selective_fading_model( 8, 5/samp_rate, True, 5, 0, (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.blocks_vector_source_x_0 = blocks.vector_source_b(testvec, True, 1, [])
self.blocks_throttle_0 = blocks.throttle(gr.sizeof_gr_complex*1, samp_rate,True)
self.blocks_tagged_stream_align_0 = blocks.tagged_stream_align(gr.sizeof_char*1, 'frame_start')
self.blocks_stream_to_vector_0 = blocks.stream_to_vector(gr.sizeof_char*1, frame_len)
self.blocks_stream_mux_0 = blocks.stream_mux(gr.sizeof_char*1, [len(testvec), 4])
self.blocks_repack_bits_bb_0 = blocks.repack_bits_bb(2, 8, "", False, gr.GR_LSB_FIRST)
+ self.blocks_file_sink_3 = blocks.file_sink(gr.sizeof_gr_complex*1, 'data/qpsk_equalized.dat', False)
+ self.blocks_file_sink_3.set_unbuffered(False)
+ self.blocks_file_sink_2 = blocks.file_sink(gr.sizeof_gr_complex*1, 'data/qpsk_sync.dat', False)
+ self.blocks_file_sink_2.set_unbuffered(False)
+ self.blocks_file_sink_1 = blocks.file_sink(gr.sizeof_gr_complex*1, 'data/qpsk_locked.dat', False)
+ self.blocks_file_sink_1.set_unbuffered(False)
+ self.blocks_file_sink_0 = blocks.file_sink(gr.sizeof_gr_complex*1, 'data/qpsk_channel.dat', False)
+ self.blocks_file_sink_0.set_unbuffered(False)
self.blocks_complex_to_mag_0 = blocks.complex_to_mag(1)
self.analog_random_source_x_0 = blocks.vector_source_b(list(map(int, numpy.random.randint(0, 255, 400))), True)
@@ -93,23 +178,33 @@ class qpsk_sim(gr.top_block):
self.connect((self.blocks_stream_mux_0, 0), (self.digital_constellation_modulator_0, 0))
self.connect((self.blocks_stream_to_vector_0, 0), (self.fadingui_ber_0, 0))
self.connect((self.blocks_tagged_stream_align_0, 0), (self.blocks_repack_bits_bb_0, 0))
- self.connect((self.blocks_throttle_0, 0), (self.channels_channel_model_0, 0))
+ self.connect((self.blocks_throttle_0, 0), (self.channels_selective_fading_model_0, 0))
self.connect((self.blocks_vector_source_x_0, 0), (self.blocks_stream_mux_0, 0))
- self.connect((self.channels_channel_model_0, 0), (self.channels_selective_fading_model_0, 0))
+ self.connect((self.channels_selective_fading_model_0, 0), (self.blocks_file_sink_0, 0))
self.connect((self.channels_selective_fading_model_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0))
self.connect((self.channels_selective_fading_model_0, 0), (self.fadingui_netsink_0, 0))
+ self.connect((self.digital_cma_equalizer_cc_0, 0), (self.blocks_file_sink_3, 0))
self.connect((self.digital_cma_equalizer_cc_0, 0), (self.digital_corr_est_cc_0, 0))
self.connect((self.digital_cma_equalizer_cc_0, 0), (self.fadingui_netsink_1, 0))
self.connect((self.digital_constellation_decoder_cb_0, 0), (self.blocks_tagged_stream_align_0, 0))
self.connect((self.digital_constellation_modulator_0, 0), (self.blocks_throttle_0, 0))
self.connect((self.digital_corr_est_cc_0, 1), (self.blocks_complex_to_mag_0, 0))
self.connect((self.digital_corr_est_cc_0, 0), (self.fadingui_phasecorrection_0, 0))
+ self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.blocks_file_sink_2, 0))
self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.digital_cma_equalizer_cc_0, 0))
self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.fadingui_netsink_4, 0))
+ self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.qtgui_const_sink_x_1, 1))
+ self.connect((self.fadingui_phasecorrection_0, 0), (self.blocks_file_sink_1, 0))
self.connect((self.fadingui_phasecorrection_0, 0), (self.digital_constellation_decoder_cb_0, 0))
self.connect((self.fadingui_phasecorrection_0, 0), (self.fadingui_netsink_3, 0))
+ self.connect((self.fadingui_phasecorrection_0, 0), (self.qtgui_const_sink_x_1, 0))
+ def closeEvent(self, event):
+ self.settings = Qt.QSettings("GNU Radio", "qpsk_sim")
+ self.settings.setValue("geometry", self.saveGeometry())
+ event.accept()
+
def get_testvec(self):
return self.testvec
@@ -145,7 +240,7 @@ class qpsk_sim(gr.top_block):
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(5/self.samp_rate)
def get_rrc_taps(self):
return self.rrc_taps
@@ -171,7 +266,6 @@ class qpsk_sim(gr.top_block):
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_symbols(self):
return self.access_code_symbols
@@ -187,21 +281,34 @@ class qpsk_sim(gr.top_block):
def main(top_block_cls=qpsk_sim, options=None):
if gr.enable_realtime_scheduling() != gr.RT_OK:
print("Error: failed to enable real-time scheduling.")
+
+ if StrictVersion("4.5.0") <= StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"):
+ style = gr.prefs().get_string('qtgui', 'style', 'raster')
+ Qt.QApplication.setGraphicsSystem(style)
+ qapp = Qt.QApplication(sys.argv)
+
tb = top_block_cls()
- def sig_handler(sig=None, frame=None):
- tb.stop()
- tb.wait()
+ tb.start()
- sys.exit(0)
+ tb.show()
+
+ def sig_handler(sig=None, frame=None):
+ Qt.QApplication.quit()
signal.signal(signal.SIGINT, sig_handler)
signal.signal(signal.SIGTERM, sig_handler)
- tb.start()
+ timer = Qt.QTimer()
+ timer.start(500)
+ timer.timeout.connect(lambda: None)
- tb.wait()
+ def quitting():
+ tb.stop()
+ tb.wait()
+ qapp.aboutToQuit.connect(quitting)
+ qapp.exec_()
if __name__ == '__main__':
main()
diff --git a/notebooks/Fading Channel Taps.ipynb b/notebooks/Fading Channel Taps.ipynb
index feeb815..2dfecc2 100644
--- a/notebooks/Fading Channel Taps.ipynb
+++ b/notebooks/Fading Channel Taps.ipynb
@@ -12,17 +12,17 @@
},
{
"cell_type": "code",
- "execution_count": 4,
+ "execution_count": 10,
"id": "9790f979",
"metadata": {},
"outputs": [],
"source": [
- "db = -9\n"
+ "db = 0.0\n"
]
},
{
"cell_type": "code",
- "execution_count": 5,
+ "execution_count": 11,
"id": "041264af",
"metadata": {},
"outputs": [],
@@ -32,17 +32,17 @@
},
{
"cell_type": "code",
- "execution_count": 6,
+ "execution_count": 12,
"id": "7b6019fe",
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
- "0.12589254117941673"
+ "1.0"
]
},
- "execution_count": 6,
+ "execution_count": 12,
"metadata": {},
"output_type": "execute_result"
}
diff --git a/references/channel/ts_136104v110400p.pdf b/references/channel/ts_136104v110400p.pdf
new file mode 100644
index 0000000..c0291a7
--- /dev/null
+++ b/references/channel/ts_136104v110400p.pdf
Binary files differ
diff --git a/simulation/QAM_Fading/qam_fading.py b/simulation/QAM_Fading/qam_fading.py
index cc1bd08..ea8917c 100755
--- a/simulation/QAM_Fading/qam_fading.py
+++ b/simulation/QAM_Fading/qam_fading.py
@@ -116,13 +116,6 @@ class qam_fading(gr.top_block, Qt.QWidget):
self.params_grid_layout_0.setRowStretch(r, 1)
for c in range(1, 2):
self.params_grid_layout_0.setColumnStretch(c, 1)
- self._time_offset_range = Range(0.999, 1.001, 0.0001, 1.0, 200)
- self._time_offset_win = RangeWidget(self._time_offset_range, self.set_time_offset, 'Timing Offset', "counter_slider", float)
- self.params_grid_layout_0.addWidget(self._time_offset_win, 0, 1, 1, 1)
- for r in range(0, 1):
- self.params_grid_layout_0.setRowStretch(r, 1)
- for c in range(1, 2):
- self.params_grid_layout_0.setColumnStretch(c, 1)
self.plots = Qt.QTabWidget()
self.plots_widget_0 = Qt.QWidget()
self.plots_layout_0 = Qt.QBoxLayout(Qt.QBoxLayout.TopToBottom, self.plots_widget_0)
@@ -147,20 +140,6 @@ class qam_fading(gr.top_block, Qt.QWidget):
self.params_grid_layout_1.setRowStretch(r, 1)
for c in range(0, 1):
self.params_grid_layout_1.setColumnStretch(c, 1)
- self._noise_volt_range = Range(0, 1, 0.01, 0.0001, 200)
- self._noise_volt_win = RangeWidget(self._noise_volt_range, self.set_noise_volt, 'Noise Voltage', "counter_slider", float)
- self.params_grid_layout_0.addWidget(self._noise_volt_win, 0, 0, 1, 1)
- for r in range(0, 1):
- self.params_grid_layout_0.setRowStretch(r, 1)
- for c in range(0, 1):
- self.params_grid_layout_0.setColumnStretch(c, 1)
- self._freq_offset_range = Range(-100e-3, 100e-3, 1e-3, 0, 200)
- self._freq_offset_win = RangeWidget(self._freq_offset_range, self.set_freq_offset, 'Frequency Offset', "counter_slider", float)
- self.params_grid_layout_0.addWidget(self._freq_offset_win, 1, 0, 1, 1)
- for r in range(1, 2):
- self.params_grid_layout_0.setRowStretch(r, 1)
- for c in range(0, 1):
- self.params_grid_layout_0.setColumnStretch(c, 1)
self._fc_range = Range(0, 10, 1, 2.4, 200)
self._fc_win = RangeWidget(self._fc_range, self.set_fc, 'fc', "counter_slider", float)
self.params_grid_layout_0.addWidget(self._fc_win, 1, 2, 1, 1)
@@ -175,6 +154,13 @@ class qam_fading(gr.top_block, Qt.QWidget):
self.params_grid_layout_1.setRowStretch(r, 1)
for c in range(0, 1):
self.params_grid_layout_1.setColumnStretch(c, 1)
+ self._time_offset_range = Range(0.999, 1.001, 0.0001, 1.0, 200)
+ self._time_offset_win = RangeWidget(self._time_offset_range, self.set_time_offset, 'Timing Offset', "counter_slider", float)
+ self.params_grid_layout_0.addWidget(self._time_offset_win, 0, 1, 1, 1)
+ for r in range(0, 1):
+ self.params_grid_layout_0.setRowStretch(r, 1)
+ for c in range(1, 2):
+ self.params_grid_layout_0.setColumnStretch(c, 1)
self.qtgui_time_sink_x_0 = qtgui.time_sink_f(
1024, #size
samp_rate, #samp_rate
@@ -446,6 +432,20 @@ class qam_fading(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._noise_volt_range = Range(0, 1, 0.01, 0.0001, 200)
+ self._noise_volt_win = RangeWidget(self._noise_volt_range, self.set_noise_volt, 'Noise Voltage', "counter_slider", float)
+ self.params_grid_layout_0.addWidget(self._noise_volt_win, 0, 0, 1, 1)
+ for r in range(0, 1):
+ self.params_grid_layout_0.setRowStretch(r, 1)
+ for c in range(0, 1):
+ self.params_grid_layout_0.setColumnStretch(c, 1)
+ self._freq_offset_range = Range(-100e-3, 100e-3, 1e-3, 0, 200)
+ self._freq_offset_win = RangeWidget(self._freq_offset_range, self.set_freq_offset, 'Frequency Offset', "counter_slider", float)
+ self.params_grid_layout_0.addWidget(self._freq_offset_win, 1, 0, 1, 1)
+ for r in range(1, 2):
+ self.params_grid_layout_0.setRowStretch(r, 1)
+ for c in range(0, 1):
+ self.params_grid_layout_0.setColumnStretch(c, 1)
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])
@@ -466,14 +466,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, ((2*fc*1e9)/(3*10e8))/samp_rate, False, 4, 21, (0,1.8), (1,0.12), 8 )
- self.channels_channel_model_0 = channels.channel_model(
- noise_voltage=noise_volt,
- frequency_offset=freq_offset,
- epsilon=time_offset,
- taps=chn_taps,
- noise_seed=0,
- block_tags=False)
+ self.channels_selective_fading_model_0 = channels.selective_fading_model( 8, 70/samp_rate, False, 4, 0, (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.blocks_unpack_k_bits_bb_0_1 = blocks.unpack_k_bits_bb(2)
self.blocks_unpack_k_bits_bb_0_0 = blocks.unpack_k_bits_bb(2)
self.blocks_unpack_k_bits_bb_0 = blocks.unpack_k_bits_bb(2)
@@ -495,14 +488,13 @@ class qam_fading(gr.top_block, Qt.QWidget):
self.connect((self.blocks_char_to_float_0_0, 0), (self.blocks_delay_0, 0))
self.connect((self.blocks_char_to_float_0_1, 0), (self.qtgui_time_sink_x_0, 2))
self.connect((self.blocks_delay_0, 0), (self.qtgui_time_sink_x_0, 1))
- self.connect((self.blocks_throttle_0, 0), (self.channels_channel_model_0, 0))
+ self.connect((self.blocks_throttle_0, 0), (self.digital_pfb_clock_sync_xxx_0_0, 0))
+ self.connect((self.blocks_throttle_0, 0), (self.qtgui_const_sink_x_0, 1))
+ self.connect((self.blocks_throttle_0, 0), (self.qtgui_freq_sink_x_0, 1))
self.connect((self.blocks_unpack_k_bits_bb_0, 0), (self.blocks_char_to_float_0, 0))
self.connect((self.blocks_unpack_k_bits_bb_0_0, 0), (self.blocks_char_to_float_0_0, 0))
self.connect((self.blocks_unpack_k_bits_bb_0_1, 0), (self.blocks_char_to_float_0_1, 0))
self.connect((self.channels_channel_model_0, 0), (self.channels_selective_fading_model_0, 0))
- self.connect((self.channels_channel_model_0, 0), (self.digital_pfb_clock_sync_xxx_0_0, 0))
- self.connect((self.channels_channel_model_0, 0), (self.qtgui_const_sink_x_0, 1))
- self.connect((self.channels_channel_model_0, 0), (self.qtgui_freq_sink_x_0, 1))
self.connect((self.channels_selective_fading_model_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0))
self.connect((self.channels_selective_fading_model_0, 0), (self.qtgui_const_sink_x_0, 0))
self.connect((self.channels_selective_fading_model_0, 0), (self.qtgui_freq_sink_x_0, 0))
@@ -580,7 +572,7 @@ class qam_fading(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.fc*1e9)/(3*10e8))/self.samp_rate)
+ self.channels_selective_fading_model_0.set_fDTs(70/self.samp_rate)
self.qtgui_freq_sink_x_0.set_frequency_range(0, self.samp_rate)
self.qtgui_time_sink_x_0.set_samp_rate(self.samp_rate)
@@ -619,7 +611,6 @@ class qam_fading(gr.top_block, Qt.QWidget):
def set_fc(self, fc):
self.fc = fc
- self.channels_selective_fading_model_0.set_fDTs(((2*self.fc*1e9)/(3*10e8))/self.samp_rate)
def get_eq_ntaps(self):
return self.eq_ntaps
diff --git a/simulation/QAM_Fading/qam_fading_frequency_selectiv.grc b/simulation/QAM_Fading/qam_fading_frequency_selectiv.grc
index 109a74d..6ee63b3 100644
--- a/simulation/QAM_Fading/qam_fading_frequency_selectiv.grc
+++ b/simulation/QAM_Fading/qam_fading_frequency_selectiv.grc
@@ -502,32 +502,7 @@ blocks:
bus_structure: null
coordinate: [648, 316.0]
rotation: 0
- state: enabled
-- name: channels_selective_fading_model2_1
- id: channels_selective_fading_model2
- parameters:
- K: '4.0'
- LOS: 'False'
- N: '8'
- affinity: ''
- alias: ''
- comment: ''
- delay_maxdev: (0.5,0.7,0.9)
- delay_std: (1e-4,1e-4,1e-4)
- delays: (1.0,1.9,2.7)
- fDTs: 0.2/samp_rate
- mags: (1,0.95,0.8)
- maxoutbuf: '0'
- minoutbuf: '0'
- ntaps: '8'
- seed: '0'
- states:
- bus_sink: false
- bus_source: false
- bus_structure: null
- coordinate: [888, 276.0]
- rotation: 0
- state: disabled
+ state: bypassed
- name: channels_selective_fading_model_0
id: channels_selective_fading_model
parameters:
@@ -537,43 +512,20 @@ blocks:
affinity: ''
alias: ''
comment: ''
- delays: (0,1.8)
- fDTs: ((2*fc*1e9)/(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'
- seed: '21'
- states:
- bus_sink: false
- bus_source: false
- bus_structure: null
- coordinate: [976, 404.0]
- rotation: 0
- state: enabled
-- name: channels_selective_fading_model_2
- id: channels_selective_fading_model
- parameters:
- K: '4.0'
- LOS: 'False'
- N: '30'
- affinity: ''
- alias: ''
- comment: ''
- delays: (0.0,0.1,1.3)
- fDTs: '0'
- mags: (1,0.99,0.97)
- maxoutbuf: '0'
- minoutbuf: '0'
- ntaps: '8'
+ ntaps: '9'
seed: '0'
states:
bus_sink: false
bus_source: false
bus_structure: null
- coordinate: [928, 140.0]
+ coordinate: [960, 300.0]
rotation: 0
- state: disabled
+ state: enabled
- name: digital_cma_equalizer_cc_0
id: digital_cma_equalizer_cc
parameters:
@@ -1532,21 +1484,13 @@ connections:
- [blocks_unpack_k_bits_bb_0_0, '0', blocks_char_to_float_0_0, '0']
- [blocks_unpack_k_bits_bb_0_1, '0', blocks_char_to_float_0_1, '0']
- [blocks_vector_source_x_0, '0', digital_constellation_modulator_0, '0']
-- [channels_channel_model_0, '0', channels_selective_fading_model2_1, '0']
- [channels_channel_model_0, '0', channels_selective_fading_model_0, '0']
-- [channels_channel_model_0, '0', channels_selective_fading_model_2, '0']
- [channels_channel_model_0, '0', digital_pfb_clock_sync_xxx_0_0, '0']
- [channels_channel_model_0, '0', qtgui_const_sink_x_0, '1']
- [channels_channel_model_0, '0', qtgui_freq_sink_x_0, '1']
-- [channels_selective_fading_model2_1, '0', digital_pfb_clock_sync_xxx_0, '0']
-- [channels_selective_fading_model2_1, '0', qtgui_const_sink_x_0, '0']
-- [channels_selective_fading_model2_1, '0', qtgui_freq_sink_x_0, '0']
- [channels_selective_fading_model_0, '0', digital_pfb_clock_sync_xxx_0, '0']
- [channels_selective_fading_model_0, '0', qtgui_const_sink_x_0, '0']
- [channels_selective_fading_model_0, '0', qtgui_freq_sink_x_0, '0']
-- [channels_selective_fading_model_2, '0', digital_pfb_clock_sync_xxx_0, '0']
-- [channels_selective_fading_model_2, '0', qtgui_const_sink_x_0, '0']
-- [channels_selective_fading_model_2, '0', qtgui_freq_sink_x_0, '0']
- [digital_cma_equalizer_cc_0, '0', digital_costas_loop_cc_0, '0']
- [digital_cma_equalizer_cc_0, '0', qtgui_const_sink_x_1, '0']
- [digital_cma_equalizer_cc_0_0, '0', digital_costas_loop_cc_0_0, '0']