Merge remote-tracking branch 'origin/master'

4 files changed, 10 insertions, 10 deletions

diff --git a/simulation/QAM_Fading/qam_fading_FIR_Filter_v1.grc b/simulation/QAM_Fading/Alte_versionen/qam_fading_FIR_Filter_v1.grc
index ffc47f6..ffc47f6 100644
--- a/simulation/QAM_Fading/qam_fading_FIR_Filter_v1.grc
+++ b/simulation/QAM_Fading/Alte_versionen/qam_fading_FIR_Filter_v1.grc
diff --git a/simulation/QAM_Fading/qam_fading_V2.grc b/simulation/QAM_Fading/Alte_versionen/qam_fading_V2.grc
index 16fa2e3..16fa2e3 100644
--- a/simulation/QAM_Fading/qam_fading_V2.grc
+++ b/simulation/QAM_Fading/Alte_versionen/qam_fading_V2.grc
diff --git a/simulation/QAM_Fading/qam_fading_V2_mehrere.grc b/simulation/QAM_Fading/Alte_versionen/qam_fading_V2_mehrere.grc
index d5444ad..d5444ad 100644
--- a/simulation/QAM_Fading/qam_fading_V2_mehrere.grc
+++ b/simulation/QAM_Fading/Alte_versionen/qam_fading_V2_mehrere.grc
diff --git a/simulation/QAM_Fading/qam_fading_frequency_selectiv_copy.grc b/simulation/QAM_Fading/Alte_versionen/qam_fading_frequency_selectiv.grc
index ce87db8..fc3cebd 100644
--- a/simulation/QAM_Fading/qam_fading_frequency_selectiv_copy.grc
+++ b/simulation/QAM_Fading/Alte_versionen/qam_fading_frequency_selectiv.grc
@@ -453,24 +453,24 @@ blocks:
 - name: channels_selective_fading_model_0
   id: channels_selective_fading_model
   parameters:
-    K: '4'
-    LOS: 'True'
+    K: '4.0'
+    LOS: 'False'
     N: '8'
     affinity: ''
     alias: ''
     comment: ''
-    delays: (0,0.3e-6)
+    delays: (0.0,0.1,1.3)
     fDTs: '0'
-    mags: (1,0.39)
+    mags: (1,0.99,0.97)
     maxoutbuf: '0'
     minoutbuf: '0'
-    ntaps: '3'
+    ntaps: '4'
     seed: '0'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [976, 308.0]
+    coordinate: [944, 316.0]
     rotation: 0
     state: true
 - name: digital_cma_equalizer_cc_0
@@ -700,7 +700,7 @@ blocks:
     maxoutbuf: '0'
     minoutbuf: '0'
     osps: '1'
-    sps: 'sps '
+    sps: sps * 1.001
     taps: rrc_taps
     type: ccf
   states:
@@ -867,7 +867,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1036.0, -64]
+    coordinate: [1044.0, -48]
     rotation: 90
     state: enabled
 - name: qtgui_const_sink_x_0_0
@@ -1223,7 +1223,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1080.0, 656]
+    coordinate: [1024.0, 624]
     rotation: 270
     state: true
 - name: qtgui_freq_sink_x_2_1
@@ -1305,7 +1305,7 @@ blocks:
     bus_structure: null
     coordinate: [2848, 488.0]
     rotation: 0
-    state: disabled
+    state: true
 - name: qtgui_time_sink_x_0
   id: qtgui_time_sink_x
   parameters: