Merge remote-tracking branch 'origin/master'

1 files changed, 103 insertions, 26 deletions

diff --git a/flowgraphs/qam_sim.grc b/flowgraphs/qam_sim.grc
index 472e9d4..6ef347a 100644
--- a/flowgraphs/qam_sim.grc
+++ b/flowgraphs/qam_sim.grc
@@ -125,7 +125,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [336, 1332.0]
+    coordinate: [336, 1388.0]
     rotation: 0
     state: true
 - name: frame
@@ -163,7 +163,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [256, 1332.0]
+    coordinate: [256, 1388.0]
     rotation: 0
     state: true
 - name: qam_const
@@ -193,7 +193,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [432, 1332.0]
+    coordinate: [432, 1388.0]
     rotation: 0
     state: true
 - name: samp_rate
@@ -265,9 +265,81 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1088, 1272.0]
+    coordinate: [1088, 1320.0]
     rotation: 0
     state: enabled
+- name: blocks_file_sink_0
+  id: blocks_file_sink
+  parameters:
+    affinity: ''
+    alias: ''
+    append: 'False'
+    comment: ''
+    file: data/channel_qam_sim.dat
+    type: complex
+    unbuffered: 'False'
+    vlen: '1'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [984, 852.0]
+    rotation: 0
+    state: true
+- name: blocks_file_sink_1
+  id: blocks_file_sink
+  parameters:
+    affinity: ''
+    alias: ''
+    append: 'False'
+    comment: ''
+    file: data/synchronized_qam_sim.dat
+    type: complex
+    unbuffered: 'False'
+    vlen: '1'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [520, 1308.0]
+    rotation: 0
+    state: true
+- name: blocks_file_sink_2
+  id: blocks_file_sink
+  parameters:
+    affinity: ''
+    alias: ''
+    append: 'False'
+    comment: ''
+    file: data/equalized_qam_sim.dat
+    type: complex
+    unbuffered: 'False'
+    vlen: '1'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [792, 1316.0]
+    rotation: 0
+    state: true
+- name: blocks_file_sink_3
+  id: blocks_file_sink
+  parameters:
+    affinity: ''
+    alias: ''
+    append: 'False'
+    comment: ''
+    file: data/locked_qam_sim.dat
+    type: complex
+    unbuffered: 'False'
+    vlen: '1'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [1336, 1060.0]
+    rotation: 0
+    state: true
 - name: blocks_null_source_0
   id: blocks_null_source
   parameters:
@@ -304,7 +376,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [768, 1476.0]
+    coordinate: [768, 1532.0]
     rotation: 0
     state: true
 - name: blocks_stream_mux_0
@@ -360,7 +432,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1000, 1488.0]
+    coordinate: [1000, 1544.0]
     rotation: 0
     state: true
 - name: blocks_tagged_stream_align_0
@@ -378,7 +450,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [496, 1484.0]
+    coordinate: [496, 1540.0]
     rotation: 0
     state: true
 - name: blocks_throttle_0
@@ -464,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
@@ -497,7 +569,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [256, 1484.0]
+    coordinate: [256, 1540.0]
     rotation: 0
     state: true
 - name: digital_constellation_modulator_0
@@ -538,7 +610,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [792, 1148.0]
+    coordinate: [792, 1204.0]
     rotation: 0
     state: true
 - name: digital_lms_dd_equalizer_cc_0
@@ -557,7 +629,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [520, 1156.0]
+    coordinate: [520, 1212.0]
     rotation: 0
     state: enabled
 - name: digital_pfb_clock_sync_xxx_0
@@ -580,7 +652,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [248, 1180.0]
+    coordinate: [248, 1236.0]
     rotation: 0
     state: true
 - name: fadingui_ber_0
@@ -596,7 +668,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1200, 1468.0]
+    coordinate: [1200, 1524.0]
     rotation: 0
     state: true
 - name: fadingui_datasource_0
@@ -663,7 +735,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [800, 1100.0]
+    coordinate: [800, 1156.0]
     rotation: 0
     state: enabled
 - name: fadingui_netsink_3
@@ -679,7 +751,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1280, 1100.0]
+    coordinate: [1336, 1156.0]
     rotation: 0
     state: enabled
 - name: fadingui_netsink_4
@@ -695,7 +767,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [528, 1100.0]
+    coordinate: [528, 1156.0]
     rotation: 0
     state: enabled
 - name: fadingui_phasecorrection_0
@@ -711,7 +783,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1032, 1164.0]
+    coordinate: [1032, 1220.0]
     rotation: 0
     state: enabled
 - name: import_0
@@ -816,7 +888,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1304, 984.0]
+    coordinate: [1336, 952.0]
     rotation: 0
     state: enabled
 - name: qtgui_time_sink_x_0
@@ -913,7 +985,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1320, 1252.0]
+    coordinate: [1320, 1300.0]
     rotation: 0
     state: enabled
 - name: root_raised_cosine_filter_0
@@ -975,7 +1047,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1336, 1164.0]
+    coordinate: [1336, 1220.0]
     rotation: 0
     state: true
 - name: virtual_source_0
@@ -988,7 +1060,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [48, 1484.0]
+    coordinate: [48, 1540.0]
     rotation: 0
     state: true
 - name: virtual_source_1
@@ -1001,7 +1073,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [48, 1228.0]
+    coordinate: [48, 1284.0]
     rotation: 0
     state: true
 - name: virtual_source_2
@@ -1032,6 +1104,7 @@ connections:
 - [blocks_vector_source_x_1, '0', root_raised_cosine_filter_0, '0']
 - [channels_channel_model_0, '0', channels_selective_fading_model_0, '0']
 - [channels_channel_model_0, '0', fadingui_multipath_fading_0, '0']
+- [channels_selective_fading_model_0, '0', blocks_file_sink_0, '0']
 - [channels_selective_fading_model_0, '0', fadingui_netsink_0, '0']
 - [channels_selective_fading_model_0, '0', virtual_sink_1, '0']
 - [digital_constellation_decoder_cb_0, '0', blocks_tagged_stream_align_0, '0']
@@ -1039,15 +1112,19 @@ connections:
 - [digital_constellation_modulator_0, '0', blocks_throttle_0, '0']
 - [digital_corr_est_cc_0, '0', fadingui_phasecorrection_0, '0']
 - [digital_corr_est_cc_0, '1', blocks_complex_to_mag_0, '0']
+- [digital_lms_dd_equalizer_cc_0, '0', blocks_file_sink_2, '0']
 - [digital_lms_dd_equalizer_cc_0, '0', digital_corr_est_cc_0, '0']
 - [digital_lms_dd_equalizer_cc_0, '0', fadingui_netsink_1, '0']
 - [digital_lms_dd_equalizer_cc_0, '0', qtgui_const_sink_x_0, '1']
+- [digital_pfb_clock_sync_xxx_0, '0', blocks_file_sink_1, '0']
 - [digital_pfb_clock_sync_xxx_0, '0', digital_lms_dd_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']
 - [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_3, '0']
 - [fadingui_phasecorrection_0, '0', fadingui_netsink_3, '0']
 - [fadingui_phasecorrection_0, '0', qtgui_const_sink_x_0, '2']
 - [fadingui_phasecorrection_0, '0', virtual_sink_2, '0']