Corrections for QPSK on hardware

1 files changed, 39 insertions, 36 deletions

diff --git a/flowgraphs/qpsk_hw.grc b/flowgraphs/qpsk_hw.grc
index 0acdc61..2ebc340 100644
--- a/flowgraphs/qpsk_hw.grc
+++ b/flowgraphs/qpsk_hw.grc
@@ -36,10 +36,10 @@ blocks:
   id: variable
   parameters:
     comment: ''
-    value: '[(-0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j),
+    value: 2 * np.array([(-0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j),
       (0.7071067811865475+0.7071067811865475j), (0.7071067811865475+0.7071067811865475j),
       (-0.7071067811865475-0.7071067811865475j), (0.7071067811865475+0.7071067811865475j),
-      (0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j)]'
+      (0.7071067811865475-0.7071067811865475j), (0.7071067811865475-0.7071067811865475j)])
   states:
     bus_sink: false
     bus_source: false
@@ -124,7 +124,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [432, 1156.0]
+    coordinate: [256, 932.0]
     rotation: 0
     state: true
 - name: samp_rate
@@ -274,25 +274,6 @@ blocks:
     coordinate: [496, 1308.0]
     rotation: 0
     state: true
-- name: blocks_throttle_0
-  id: blocks_throttle
-  parameters:
-    affinity: ''
-    alias: ''
-    comment: ''
-    ignoretag: 'True'
-    maxoutbuf: '0'
-    minoutbuf: '0'
-    samples_per_second: samp_rate
-    type: complex
-    vlen: '1'
-  states:
-    bus_sink: false
-    bus_source: false
-    bus_structure: null
-    coordinate: [720, 428.0]
-    rotation: 0
-    state: true
 - name: blocks_vector_source_x_0
   id: blocks_vector_source_x
   parameters:
@@ -331,7 +312,7 @@ blocks:
     bus_structure: null
     coordinate: [528, 980.0]
     rotation: 0
-    state: true
+    state: disabled
 - name: digital_constellation_decoder_cb_0
   id: digital_constellation_decoder_cb
   parameters:
@@ -380,7 +361,7 @@ blocks:
     minoutbuf: '0'
     sps: '1'
     symbols: access_code_symbols
-    threshold: '0.9'
+    threshold: '0.85'
     threshold_method: digital.THRESHOLD_ABSOLUTE
   states:
     bus_sink: false
@@ -389,6 +370,25 @@ blocks:
     coordinate: [768, 972.0]
     rotation: 0
     state: true
+- name: digital_lms_dd_equalizer_cc_0
+  id: digital_lms_dd_equalizer_cc
+  parameters:
+    affinity: ''
+    alias: ''
+    cnst: qpsk_const
+    comment: ''
+    maxoutbuf: '0'
+    minoutbuf: '0'
+    mu: 3e-3
+    num_taps: '15'
+    sps: '1'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [520, 1100.0]
+    rotation: 0
+    state: enabled
 - name: digital_pfb_clock_sync_xxx_0
   id: digital_pfb_clock_sync_xxx
   parameters:
@@ -523,7 +523,7 @@ blocks:
     bus_structure: null
     coordinate: [1008, 988.0]
     rotation: 0
-    state: true
+    state: enabled
 - name: import_0
   id: import
   parameters:
@@ -557,7 +557,7 @@ blocks:
     color1: '"blue"'
     color10: '"red"'
     color2: '"red"'
-    color3: '"red"'
+    color3: '"dark green"'
     color4: '"red"'
     color5: '"red"'
     color6: '"red"'
@@ -589,7 +589,7 @@ blocks:
     marker8: '0'
     marker9: '0'
     name: '""'
-    nconnections: '2'
+    nconnections: '3'
     size: '1024'
     style1: '0'
     style10: '0'
@@ -626,7 +626,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1208, 804.0]
+    coordinate: [1128, 784.0]
     rotation: 0
     state: true
 - name: qtgui_time_sink_x_0
@@ -828,7 +828,7 @@ blocks:
     center_freq8: '0'
     center_freq9: '0'
     clock_rate: 0e0
-    clock_source0: internal
+    clock_source0: external
     clock_source1: ''
     clock_source2: ''
     clock_source3: ''
@@ -1105,7 +1105,7 @@ blocks:
     center_freq8: '0'
     center_freq9: '0'
     clock_rate: 0e0
-    clock_source0: ''
+    clock_source0: external
     clock_source1: ''
     clock_source2: ''
     clock_source3: ''
@@ -1372,7 +1372,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [696, 684.0]
+    coordinate: [696, 676.0]
     rotation: 0
     state: true
 - name: virtual_sink_0
@@ -1385,7 +1385,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [928, 428.0]
+    coordinate: [768, 428.0]
     rotation: 0
     state: true
 - name: virtual_sink_1
@@ -1450,7 +1450,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [56, 756.0]
+    coordinate: [56, 764.0]
     rotation: 0
     state: true
 
@@ -1461,21 +1461,24 @@ connections:
 - [blocks_stream_mux_0, '0', digital_constellation_modulator_0, '0']
 - [blocks_stream_to_vector_0, '0', fadingui_ber_0, '0']
 - [blocks_tagged_stream_align_0, '0', blocks_repack_bits_bb_0, '0']
-- [blocks_throttle_0, '0', virtual_sink_0, '0']
 - [blocks_vector_source_x_0, '0', blocks_stream_mux_0, '0']
 - [digital_cma_equalizer_cc_0, '0', digital_corr_est_cc_0, '0']
 - [digital_cma_equalizer_cc_0, '0', fadingui_netsink_1, '0']
+- [digital_cma_equalizer_cc_0, '0', qtgui_const_sink_x_0_0, '1']
 - [digital_constellation_decoder_cb_0, '0', blocks_tagged_stream_align_0, '0']
-- [digital_constellation_modulator_0, '0', blocks_throttle_0, '0']
 - [digital_constellation_modulator_0, '0', fadingui_netsink_0, '0']
+- [digital_constellation_modulator_0, '0', virtual_sink_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', digital_corr_est_cc_0, '0']
+- [digital_lms_dd_equalizer_cc_0, '0', qtgui_const_sink_x_0_0, '1']
 - [digital_pfb_clock_sync_xxx_0, '0', digital_cma_equalizer_cc_0, '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, '0']
 - [fadingui_datasource_0, '0', digital_constellation_modulator_0, '0']
 - [fadingui_phasecorrection_0, '0', fadingui_netsink_3, '0']
-- [fadingui_phasecorrection_0, '0', qtgui_const_sink_x_0_0, '1']
+- [fadingui_phasecorrection_0, '0', qtgui_const_sink_x_0_0, '2']
 - [fadingui_phasecorrection_0, '0', virtual_sink_2, '0']
 - [uhd_usrp_source_0, '0', virtual_sink_1, '0']
 - [virtual_source_0, '0', digital_constellation_decoder_cb_0, '0']