From 200679541d95c7125d15219d50b1ea747968fee5 Mon Sep 17 00:00:00 2001
From: sara <sara.halter@gmx.ch>
Date: Wed, 10 Nov 2021 13:43:16 +0100
Subject: Fading Modulation v2

---
 simulation/QAM_Fading/qam_fading.grc | 309 ++++++++++++++++++++++++++++-------
 simulation/QAM_Fading/qam_fading.py  |  53 +++---
 2 files changed, 275 insertions(+), 87 deletions(-)

(limited to 'simulation/QAM_Fading')

diff --git a/simulation/QAM_Fading/qam_fading.grc b/simulation/QAM_Fading/qam_fading.grc
index d6fae2a..d88be78 100644
--- a/simulation/QAM_Fading/qam_fading.grc
+++ b/simulation/QAM_Fading/qam_fading.grc
@@ -149,7 +149,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1328, 496.0]
+    coordinate: [1312, 132.0]
     rotation: 0
     state: true
 - name: noise_volt
@@ -170,7 +170,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [568, 476.0]
+    coordinate: [576, 476.0]
     rotation: 0
     state: true
 - name: phase_bw
@@ -203,7 +203,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1392, 496.0]
+    coordinate: [1376, 132.0]
     rotation: 0
     state: true
 - name: samp_rate
@@ -248,7 +248,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [568, 620.0]
+    coordinate: [576, 620.0]
     rotation: 0
     state: true
 - name: timing_loop_bw
@@ -269,7 +269,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1328, 556.0]
+    coordinate: [1312, 196.0]
     rotation: 0
     state: true
 - name: analog_random_source_x_0
@@ -326,6 +326,23 @@ blocks:
     coordinate: [424, 1336.0]
     rotation: 0
     state: true
+- name: blocks_char_to_float_0_1
+  id: blocks_char_to_float
+  parameters:
+    affinity: ''
+    alias: ''
+    comment: ''
+    maxoutbuf: '0'
+    minoutbuf: '0'
+    scale: '1'
+    vlen: '1'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [2544, 692.0]
+    rotation: 0
+    state: true
 - name: blocks_delay_0
   id: blocks_delay
   parameters:
@@ -396,6 +413,22 @@ blocks:
     coordinate: [248, 1336.0]
     rotation: 0
     state: true
+- name: blocks_unpack_k_bits_bb_0_1
+  id: blocks_unpack_k_bits_bb
+  parameters:
+    affinity: ''
+    alias: ''
+    comment: ''
+    k: '2'
+    maxoutbuf: '0'
+    minoutbuf: '0'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [2448, 868.0]
+    rotation: 0
+    state: true
 - name: channels_channel_model_0
   id: channels_channel_model
   parameters:
@@ -420,13 +453,13 @@ blocks:
 - name: channels_fading_model_0
   id: channels_fading_model
   parameters:
-    K: '0.1'
+    K: '4.0'
     LOS: 'False'
-    N: '1'
+    N: '8'
     affinity: ''
     alias: ''
     comment: ''
-    fDTs: 10.0/samp_rate
+    fDTs: '0'
     maxoutbuf: '0'
     minoutbuf: '0'
     seed: '0'
@@ -434,77 +467,64 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [880, 332.0]
+    coordinate: [968, 324.0]
     rotation: 0
-    state: enabled
-- name: channels_selective_fading_model2_0
-  id: channels_selective_fading_model2
+    state: true
+- name: digital_cma_equalizer_cc_0
+  id: digital_cma_equalizer_cc
   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'
+    modulus: eq_mod
+    mu: eq_gain
+    num_taps: eq_ntaps
+    sps: '2'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [864, 812.0]
+    coordinate: [1648, 304.0]
     rotation: 0
     state: true
-- name: channels_selective_fading_model_0
-  id: channels_selective_fading_model
+- name: digital_cma_equalizer_cc_0_0
+  id: digital_cma_equalizer_cc
   parameters:
-    K: '4.0'
-    LOS: 'False'
-    N: '8'
     affinity: ''
     alias: ''
     comment: ''
-    delays: (0.0,0.1,1.3)
-    fDTs: 10.0/samp_rate
-    mags: (1,0.99,0.97)
     maxoutbuf: '0'
     minoutbuf: '0'
-    ntaps: '8'
-    seed: '0'
+    modulus: eq_mod
+    mu: eq_gain
+    num_taps: eq_ntaps
+    sps: '2'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [888, 652.0]
+    coordinate: [1600, 724.0]
     rotation: 0
     state: true
-- name: digital_cma_equalizer_cc_0
-  id: digital_cma_equalizer_cc
+- name: digital_constellation_decoder_cb_0
+  id: digital_constellation_decoder_cb
   parameters:
     affinity: ''
     alias: ''
     comment: ''
+    constellation: const
     maxoutbuf: '0'
     minoutbuf: '0'
-    modulus: eq_mod
-    mu: eq_gain
-    num_taps: eq_ntaps
-    sps: '2'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1648, 304.0]
+    coordinate: [2288, 296.0]
     rotation: 0
     state: true
-- name: digital_constellation_decoder_cb_0
+- name: digital_constellation_decoder_cb_0_0
   id: digital_constellation_decoder_cb
   parameters:
     affinity: ''
@@ -517,7 +537,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [2288, 296.0]
+    coordinate: [2224, 684.0]
     rotation: 0
     state: true
 - name: digital_constellation_modulator_0
@@ -556,7 +576,25 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1952, 288.0]
+    coordinate: [1952, 296.0]
+    rotation: 0
+    state: true
+- name: digital_costas_loop_cc_0_0
+  id: digital_costas_loop_cc
+  parameters:
+    affinity: ''
+    alias: ''
+    comment: ''
+    maxoutbuf: '0'
+    minoutbuf: '0'
+    order: '4'
+    use_snr: 'False'
+    w: phase_bw
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [1936, 688.0]
     rotation: 0
     state: true
 - name: digital_diff_decoder_bb_0
@@ -575,6 +613,22 @@ blocks:
     coordinate: [2288, 360.0]
     rotation: 180
     state: true
+- name: digital_diff_decoder_bb_0_0
+  id: digital_diff_decoder_bb
+  parameters:
+    affinity: ''
+    alias: ''
+    comment: ''
+    maxoutbuf: '0'
+    minoutbuf: '0'
+    modulus: '4'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [2264, 764.0]
+    rotation: 180
+    state: true
 - name: digital_map_bb_0
   id: digital_map_bb
   parameters:
@@ -591,6 +645,22 @@ blocks:
     coordinate: [2304, 456.0]
     rotation: 0
     state: true
+- name: digital_map_bb_0_0
+  id: digital_map_bb
+  parameters:
+    affinity: ''
+    alias: ''
+    comment: ''
+    map: '[0, 1, 3, 2]'
+    maxoutbuf: '0'
+    minoutbuf: '0'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [2272, 868.0]
+    rotation: 0
+    state: true
 - name: digital_pfb_clock_sync_xxx_0
   id: digital_pfb_clock_sync_xxx
   parameters:
@@ -614,6 +684,29 @@ blocks:
     coordinate: [1312, 324.0]
     rotation: 0
     state: true
+- name: digital_pfb_clock_sync_xxx_0_0
+  id: digital_pfb_clock_sync_xxx
+  parameters:
+    affinity: ''
+    alias: ''
+    comment: ''
+    filter_size: nfilts
+    init_phase: nfilts/2
+    loop_bw: timing_loop_bw
+    max_dev: '1.5'
+    maxoutbuf: '0'
+    minoutbuf: '0'
+    osps: '2'
+    sps: sps * 1.001
+    taps: rrc_taps
+    type: ccf
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [1088, 868.0]
+    rotation: 0
+    state: true
 - name: params
   id: qtgui_tab_widget
   parameters:
@@ -712,7 +805,7 @@ blocks:
     comment: ''
     grid: 'False'
     gui_hint: 'plots@0: 0,0,1,1'
-    label1: ''
+    label1: Fading
     label10: ''
     label2: ''
     label3: ''
@@ -734,7 +827,7 @@ blocks:
     marker8: '0'
     marker9: '0'
     name: '"Channel"'
-    nconnections: '1'
+    nconnections: '2'
     size: '2048'
     style1: '0'
     style10: '0'
@@ -771,7 +864,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1160.0, 144]
+    coordinate: [1044.0, -48]
     rotation: 90
     state: enabled
 - name: qtgui_const_sink_x_0_0
@@ -804,7 +897,7 @@ blocks:
     comment: ''
     grid: 'False'
     gui_hint: 'plots@0: 0,1,1,1'
-    label1: ''
+    label1: Fading
     label10: ''
     label2: ''
     label3: ''
@@ -826,7 +919,7 @@ blocks:
     marker8: '0'
     marker9: '0'
     name: '"Synchronized"'
-    nconnections: '1'
+    nconnections: '2'
     size: '2048'
     style1: '0'
     style10: '0'
@@ -863,7 +956,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1544.0, 96]
+    coordinate: [1572.0, 80]
     rotation: 90
     state: enabled
 - name: qtgui_const_sink_x_1
@@ -896,7 +989,7 @@ blocks:
     comment: ''
     grid: 'False'
     gui_hint: 'plots@0: 1,0,1,1'
-    label1: ''
+    label1: Fading
     label10: ''
     label2: ''
     label3: ''
@@ -918,7 +1011,7 @@ blocks:
     marker8: '0'
     marker9: '0'
     name: '"Equalized"'
-    nconnections: '1'
+    nconnections: '2'
     size: '1024'
     style1: '0'
     style10: '0'
@@ -955,7 +1048,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1848.0, 96]
+    coordinate: [1828.0, 96]
     rotation: 90
     state: true
 - name: qtgui_const_sink_x_2
@@ -988,7 +1081,7 @@ blocks:
     comment: ''
     grid: 'False'
     gui_hint: 'plots@0: 1,1,1,1'
-    label1: ''
+    label1: Fading
     label10: ''
     label2: ''
     label3: ''
@@ -1010,7 +1103,7 @@ blocks:
     marker8: '0'
     marker9: '0'
     name: '"Locked"'
-    nconnections: '1'
+    nconnections: '2'
     size: '1024'
     style1: '0'
     style10: '0'
@@ -1047,7 +1140,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [2184.0, 80]
+    coordinate: [2188.0, 0]
     rotation: 90
     state: true
 - name: qtgui_freq_sink_x_0
@@ -1087,7 +1180,7 @@ blocks:
     grid: 'False'
     gui_hint: 'plots@1: 0,0,1,1'
     label: Relative Gain
-    label1: ''
+    label1: Fading
     label10: ''''''
     label2: ''''''
     label3: ''''''
@@ -1101,7 +1194,7 @@ blocks:
     maxoutbuf: '0'
     minoutbuf: '0'
     name: '"Channel"'
-    nconnections: '1'
+    nconnections: '2'
     showports: 'False'
     tr_chan: '0'
     tr_level: '0.0'
@@ -1127,9 +1220,89 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1168.0, 480]
+    coordinate: [1024.0, 624]
     rotation: 270
     state: true
+- name: qtgui_freq_sink_x_2_1
+  id: qtgui_freq_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'
+    average: '1.0'
+    axislabels: 'True'
+    bw: samp_rate
+    color1: '"blue"'
+    color10: '"dark blue"'
+    color2: '"red"'
+    color3: '"green"'
+    color4: '"black"'
+    color5: '"cyan"'
+    color6: '"magenta"'
+    color7: '"yellow"'
+    color8: '"dark red"'
+    color9: '"dark green"'
+    comment: ''
+    ctrlpanel: 'False'
+    fc: '0'
+    fftsize: '1024'
+    freqhalf: 'True'
+    grid: 'False'
+    gui_hint: ''
+    label: Relative Gain
+    label1: Fading
+    label10: ''''''
+    label2: ''''''
+    label3: ''''''
+    label4: ''''''
+    label5: ''''''
+    label6: ''''''
+    label7: ''''''
+    label8: ''''''
+    label9: ''''''
+    legend: 'True'
+    maxoutbuf: '0'
+    minoutbuf: '0'
+    name: '""'
+    nconnections: '2'
+    showports: 'False'
+    tr_chan: '0'
+    tr_level: '0.0'
+    tr_mode: qtgui.TRIG_MODE_FREE
+    tr_tag: '""'
+    type: float
+    units: dB
+    update_time: '0.10'
+    width1: '1'
+    width10: '1'
+    width2: '1'
+    width3: '1'
+    width4: '1'
+    width5: '1'
+    width6: '1'
+    width7: '1'
+    width8: '1'
+    width9: '1'
+    wintype: firdes.WIN_BLACKMAN_hARRIS
+    ymax: '10'
+    ymin: '-140'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [2848, 488.0]
+    rotation: 0
+    state: true
 - name: qtgui_time_sink_x_0
   id: qtgui_time_sink_x
   parameters:
@@ -1184,7 +1357,7 @@ blocks:
     marker8: '-1'
     marker9: '-1'
     name: '"Decoded"'
-    nconnections: '2'
+    nconnections: '3'
     size: '1024'
     srate: samp_rate
     stemplot: 'False'
@@ -1231,26 +1404,42 @@ blocks:
 connections:
 - [analog_random_source_x_0, '0', blocks_unpack_k_bits_bb_0_0, '0']
 - [analog_random_source_x_0, '0', digital_constellation_modulator_0, '0']
+- [blocks_char_to_float_0, '0', qtgui_freq_sink_x_2_1, '0']
 - [blocks_char_to_float_0, '0', qtgui_time_sink_x_0, '0']
 - [blocks_char_to_float_0_0, '0', blocks_delay_0, '0']
+- [blocks_char_to_float_0_1, '0', qtgui_freq_sink_x_2_1, '1']
+- [blocks_char_to_float_0_1, '0', qtgui_time_sink_x_0, '2']
 - [blocks_delay_0, '0', qtgui_time_sink_x_0, '1']
 - [blocks_throttle_0, '0', channels_channel_model_0, '0']
 - [blocks_unpack_k_bits_bb_0, '0', blocks_char_to_float_0, '0']
 - [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']
 - [channels_channel_model_0, '0', channels_fading_model_0, '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_fading_model_0, '0', digital_pfb_clock_sync_xxx_0, '0']
 - [channels_fading_model_0, '0', qtgui_const_sink_x_0, '0']
 - [channels_fading_model_0, '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']
+- [digital_cma_equalizer_cc_0_0, '0', qtgui_const_sink_x_1, '1']
 - [digital_constellation_decoder_cb_0, '0', digital_diff_decoder_bb_0, '0']
+- [digital_constellation_decoder_cb_0_0, '0', digital_diff_decoder_bb_0_0, '0']
 - [digital_constellation_modulator_0, '0', blocks_throttle_0, '0']
 - [digital_costas_loop_cc_0, '0', digital_constellation_decoder_cb_0, '0']
 - [digital_costas_loop_cc_0, '0', qtgui_const_sink_x_2, '0']
+- [digital_costas_loop_cc_0_0, '0', digital_constellation_decoder_cb_0_0, '0']
+- [digital_costas_loop_cc_0_0, '0', qtgui_const_sink_x_2, '1']
 - [digital_diff_decoder_bb_0, '0', digital_map_bb_0, '0']
+- [digital_diff_decoder_bb_0_0, '0', digital_map_bb_0_0, '0']
 - [digital_map_bb_0, '0', blocks_unpack_k_bits_bb_0, '0']
+- [digital_map_bb_0_0, '0', blocks_unpack_k_bits_bb_0_1, '0']
 - [digital_pfb_clock_sync_xxx_0, '0', digital_cma_equalizer_cc_0, '0']
 - [digital_pfb_clock_sync_xxx_0, '0', qtgui_const_sink_x_0_0, '0']
+- [digital_pfb_clock_sync_xxx_0_0, '0', digital_cma_equalizer_cc_0_0, '0']
+- [digital_pfb_clock_sync_xxx_0_0, '0', qtgui_const_sink_x_0_0, '1']
 
 metadata:
   file_format: 1
diff --git a/simulation/QAM_Fading/qam_fading.py b/simulation/QAM_Fading/qam_fading.py
index 618ba3b..a15df20 100755
--- a/simulation/QAM_Fading/qam_fading.py
+++ b/simulation/QAM_Fading/qam_fading.py
@@ -216,7 +216,7 @@ class qam_fading(gr.top_block, Qt.QWidget):
             self.plots_grid_layout_2.setRowStretch(r, 1)
         for c in range(0, 1):
             self.plots_grid_layout_2.setColumnStretch(c, 1)
-        self.qtgui_freq_sink_x_1 = qtgui.freq_sink_f(
+        self.qtgui_freq_sink_x_2_1 = qtgui.freq_sink_f(
             1024, #size
             firdes.WIN_BLACKMAN_hARRIS, #wintype
             0, #fc
@@ -224,18 +224,18 @@ class qam_fading(gr.top_block, Qt.QWidget):
             "", #name
             2
         )
-        self.qtgui_freq_sink_x_1.set_update_time(0.10)
-        self.qtgui_freq_sink_x_1.set_y_axis(-140, 10)
-        self.qtgui_freq_sink_x_1.set_y_label('Relative Gain', 'dB')
-        self.qtgui_freq_sink_x_1.set_trigger_mode(qtgui.TRIG_MODE_FREE, 0.0, 0, "")
-        self.qtgui_freq_sink_x_1.enable_autoscale(False)
-        self.qtgui_freq_sink_x_1.enable_grid(False)
-        self.qtgui_freq_sink_x_1.set_fft_average(0.1)
-        self.qtgui_freq_sink_x_1.enable_axis_labels(True)
-        self.qtgui_freq_sink_x_1.enable_control_panel(False)
+        self.qtgui_freq_sink_x_2_1.set_update_time(0.10)
+        self.qtgui_freq_sink_x_2_1.set_y_axis(-140, 10)
+        self.qtgui_freq_sink_x_2_1.set_y_label('Relative Gain', 'dB')
+        self.qtgui_freq_sink_x_2_1.set_trigger_mode(qtgui.TRIG_MODE_FREE, 0.0, 0, "")
+        self.qtgui_freq_sink_x_2_1.enable_autoscale(False)
+        self.qtgui_freq_sink_x_2_1.enable_grid(False)
+        self.qtgui_freq_sink_x_2_1.set_fft_average(1.0)
+        self.qtgui_freq_sink_x_2_1.enable_axis_labels(True)
+        self.qtgui_freq_sink_x_2_1.enable_control_panel(False)
 
 
-        self.qtgui_freq_sink_x_1.set_plot_pos_half(not True)
+        self.qtgui_freq_sink_x_2_1.set_plot_pos_half(not True)
 
         labels = ['Fading', '', '', '', '',
             '', '', '', '', '']
@@ -248,15 +248,15 @@ class qam_fading(gr.top_block, Qt.QWidget):
 
         for i in range(2):
             if len(labels[i]) == 0:
-                self.qtgui_freq_sink_x_1.set_line_label(i, "Data {0}".format(i))
+                self.qtgui_freq_sink_x_2_1.set_line_label(i, "Data {0}".format(i))
             else:
-                self.qtgui_freq_sink_x_1.set_line_label(i, labels[i])
-            self.qtgui_freq_sink_x_1.set_line_width(i, widths[i])
-            self.qtgui_freq_sink_x_1.set_line_color(i, colors[i])
-            self.qtgui_freq_sink_x_1.set_line_alpha(i, alphas[i])
+                self.qtgui_freq_sink_x_2_1.set_line_label(i, labels[i])
+            self.qtgui_freq_sink_x_2_1.set_line_width(i, widths[i])
+            self.qtgui_freq_sink_x_2_1.set_line_color(i, colors[i])
+            self.qtgui_freq_sink_x_2_1.set_line_alpha(i, alphas[i])
 
-        self._qtgui_freq_sink_x_1_win = sip.wrapinstance(self.qtgui_freq_sink_x_1.pyqwidget(), Qt.QWidget)
-        self.top_grid_layout.addWidget(self._qtgui_freq_sink_x_1_win)
+        self._qtgui_freq_sink_x_2_1_win = sip.wrapinstance(self.qtgui_freq_sink_x_2_1.pyqwidget(), Qt.QWidget)
+        self.top_grid_layout.addWidget(self._qtgui_freq_sink_x_2_1_win)
         self.qtgui_freq_sink_x_0 = qtgui.freq_sink_c(
             1024, #size
             firdes.WIN_BLACKMAN_hARRIS, #wintype
@@ -497,7 +497,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, 10.0/samp_rate, False, 4.0, 0, (0.0,0.1,1.3), (1,0.99,0.97), 8 )
+        self.channels_fading_model_0 = channels.fading_model( 8, 0, False, 4.0, 0 )
         self.channels_channel_model_0 = channels.channel_model(
             noise_voltage=noise_volt,
             frequency_offset=freq_offset,
@@ -522,23 +522,23 @@ class qam_fading(gr.top_block, Qt.QWidget):
         ##################################################
         self.connect((self.analog_random_source_x_0, 0), (self.blocks_unpack_k_bits_bb_0_0, 0))
         self.connect((self.analog_random_source_x_0, 0), (self.digital_constellation_modulator_0, 0))
-        self.connect((self.blocks_char_to_float_0, 0), (self.qtgui_freq_sink_x_1, 0))
+        self.connect((self.blocks_char_to_float_0, 0), (self.qtgui_freq_sink_x_2_1, 0))
         self.connect((self.blocks_char_to_float_0, 0), (self.qtgui_time_sink_x_0, 0))
         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_freq_sink_x_1, 1))
+        self.connect((self.blocks_char_to_float_0_1, 0), (self.qtgui_freq_sink_x_2_1, 1))
         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_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.channels_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))
+        self.connect((self.channels_fading_model_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0))
+        self.connect((self.channels_fading_model_0, 0), (self.qtgui_const_sink_x_0, 0))
+        self.connect((self.channels_fading_model_0, 0), (self.qtgui_freq_sink_x_0, 0))
         self.connect((self.digital_cma_equalizer_cc_0, 0), (self.digital_costas_loop_cc_0, 0))
         self.connect((self.digital_cma_equalizer_cc_0, 0), (self.qtgui_const_sink_x_1, 0))
         self.connect((self.digital_cma_equalizer_cc_0_0, 0), (self.digital_costas_loop_cc_0_0, 0))
@@ -607,9 +607,8 @@ 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(10.0/self.samp_rate)
         self.qtgui_freq_sink_x_0.set_frequency_range(0, self.samp_rate)
-        self.qtgui_freq_sink_x_1.set_frequency_range(0, self.samp_rate)
+        self.qtgui_freq_sink_x_2_1.set_frequency_range(0, self.samp_rate)
         self.qtgui_time_sink_x_0.set_samp_rate(self.samp_rate)
 
     def get_rrc_taps(self):
-- 
cgit v1.2.1