From 983bf13b7f12530ed0b86ee50b915cafa6937d18 Mon Sep 17 00:00:00 2001
From: Bastian Bloessl <mail@bastibl.net>
Date: Tue, 20 Jul 2021 08:50:23 +0200
Subject: [PATCH] update flowgraphs

---
 examples/wifi_loopback.grc               | 28 ++++++++--------
 examples/wifi_phy_hier.grc               | 41 ++++++++++++++++++------
 grc/ieee802_11_frame_equalizer.block.yml |  2 +-
 grc/ieee802_11_mapper.block.yml          |  4 +--
 4 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/examples/wifi_loopback.grc b/examples/wifi_loopback.grc
index d79ca5f..1b9ab5e 100644
--- a/examples/wifi_loopback.grc
+++ b/examples/wifi_loopback.grc
@@ -1,6 +1,7 @@
 options:
   parameters:
     author: ''
+    catch_exceptions: 'True'
     category: Custom
     cmake_opt: ''
     comment: ''
@@ -22,7 +23,6 @@ options:
     sizing_mode: fixed
     thread_safe_setters: ''
     title: ''
-    window_size: 1280, 1024
   states:
     bus_sink: false
     bus_source: false
@@ -43,18 +43,18 @@ blocks:
     label2: ''
     label3: ''
     label4: ''
-    labels: '["LS", "LMS", "STA", "Linear Comb"]'
+    labels: '["LS", "LMS", "Linear Comb", "STA"]'
     num_opts: '0'
-    option0: '0'
-    option1: '1'
-    option2: '2'
-    option3: '3'
+    option0: ''
+    option1: ''
+    option2: ''
+    option3: ''
     option4: '4'
-    options: '[ieee802_11.LS, ieee802_11.LMS, ieee802_11.STA, ieee802_11.COMB]'
+    options: '[0, 1, 2, 3]'
     orient: Qt.QHBoxLayout
     type: int
     value: '0'
-    widget: combo_box
+    widget: radio_buttons
   states:
     bus_sink: false
     bus_source: false
@@ -100,7 +100,7 @@ blocks:
     gui_hint: 3,1,1,1
     label: ''
     min_len: '200'
-    orient: Qt.Horizontal
+    orient: QtCore.Qt.Horizontal
     rangeType: float
     start: -20e-6
     step: 1e-6
@@ -121,7 +121,7 @@ blocks:
     gui_hint: 2,1,1,1
     label: ''
     min_len: '200'
-    orient: Qt.Horizontal
+    orient: QtCore.Qt.Horizontal
     rangeType: int
     start: '10'
     step: '1'
@@ -154,7 +154,7 @@ blocks:
     gui_hint: 3,0,1,1
     label: ''
     min_len: '200'
-    orient: Qt.Horizontal
+    orient: QtCore.Qt.Horizontal
     rangeType: int
     start: '0'
     step: '1'
@@ -175,7 +175,7 @@ blocks:
     gui_hint: 2,0,1,1
     label: ''
     min_len: '200'
-    orient: Qt.Horizontal
+    orient: QtCore.Qt.Horizontal
     rangeType: float
     start: '-15'
     step: '0.1'
@@ -649,9 +649,9 @@ blocks:
     affinity: ''
     alias: ''
     bandwidth: 10e6
-    chan_est: chan_est
+    chan_est: ieee802_11.Equalizer(chan_est)
     comment: ''
-    encoding: encoding
+    encoding: ieee802_11.Encoding(encoding)
     frequency: 5.9e6
     maxoutbuf: '0'
     minoutbuf: '0'
diff --git a/examples/wifi_phy_hier.grc b/examples/wifi_phy_hier.grc
index ecbfd25..1634fea 100644
--- a/examples/wifi_phy_hier.grc
+++ b/examples/wifi_phy_hier.grc
@@ -1,6 +1,7 @@
 options:
   parameters:
     author: ''
+    catch_exceptions: 'True'
     category: '[IEEE802.11]'
     cmake_opt: ''
     comment: ''
@@ -22,7 +23,6 @@ options:
     sizing_mode: fixed
     thread_safe_setters: ''
     title: WiFi PHY Hier
-    window_size: 1280, 1024
   states:
     bus_sink: false
     bus_source: false
@@ -53,7 +53,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [528, 12]
+    coordinate: [584, 12.0]
     rotation: 0
     state: enabled
 - name: sync_length
@@ -94,7 +94,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1008, 12]
+    coordinate: [1064, 12.0]
     rotation: 0
     state: enabled
 - name: blocks_complex_to_mag_0
@@ -276,6 +276,25 @@ blocks:
     coordinate: [880, 776.0]
     rotation: 0
     state: enabled
+- name: blocks_tag_debug_0
+  id: blocks_tag_debug
+  parameters:
+    affinity: ''
+    alias: ''
+    comment: ''
+    display: 'True'
+    filter: '""'
+    name: ''
+    num_inputs: '2'
+    type: complex
+    vlen: '1'
+  states:
+    bus_sink: false
+    bus_source: false
+    bus_structure: null
+    coordinate: [776, 156.0]
+    rotation: 0
+    state: true
 - name: blocks_tagged_stream_mux_0
   id: blocks_tagged_stream_mux
   parameters:
@@ -310,7 +329,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [640, 12]
+    coordinate: [688, 12.0]
     rotation: 0
     state: enabled
 - name: digital_chunks_to_symbols_xx_0
@@ -447,13 +466,13 @@ blocks:
     hide: none
     label: ''
     short_id: ''
-    type: intx
+    type: ''
     value: ieee802_11.BPSK_1_2
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [728, 12]
+    coordinate: [808, 12.0]
     rotation: 0
     state: enabled
 - name: fft_vxx_0_0
@@ -512,7 +531,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [920, 12]
+    coordinate: [960, 12.0]
     rotation: 0
     state: enabled
 - name: ieee802_11_chunks_to_symbols_xx_0
@@ -551,7 +570,7 @@ blocks:
   id: ieee802_11_frame_equalizer
   parameters:
     affinity: ''
-    algo: chan_est
+    algo: ieee802_11.LS
     alias: ''
     bw: bandwidth
     comment: ''
@@ -574,7 +593,7 @@ blocks:
     alias: ''
     comment: ''
     debug: 'False'
-    encoding: encoding
+    encoding: ieee802_11.BPSK_1_2
     maxoutbuf: '0'
     minoutbuf: '0'
   states:
@@ -692,7 +711,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [824, 12]
+    coordinate: [1152, 12.0]
     rotation: 0
     state: enabled
 - name: sync_long
@@ -747,12 +766,14 @@ connections:
 - [blocks_multiply_xx_0, '0', blocks_moving_average_xx_0, '0']
 - [blocks_stream_to_vector_0, '0', fft_vxx_0_1, '0']
 - [blocks_tagged_stream_mux_0, '0', digital_ofdm_carrier_allocator_cvc_0_0_0, '0']
+- [digital_chunks_to_symbols_xx_0, '0', blocks_tag_debug_0, '0']
 - [digital_chunks_to_symbols_xx_0, '0', blocks_tagged_stream_mux_0, '0']
 - [digital_ofdm_carrier_allocator_cvc_0_0_0, '0', fft_vxx_0_0, '0']
 - [digital_ofdm_cyclic_prefixer_0_0, '0', pad_sink_0, '0']
 - [digital_packet_headergenerator_bb_0, '0', digital_chunks_to_symbols_xx_0, '0']
 - [fft_vxx_0_0, '0', digital_ofdm_cyclic_prefixer_0_0, '0']
 - [fft_vxx_0_1, '0', ieee802_11_frame_equalizer_0, '0']
+- [ieee802_11_chunks_to_symbols_xx_0, '0', blocks_tag_debug_0, '1']
 - [ieee802_11_chunks_to_symbols_xx_0, '0', blocks_tagged_stream_mux_0, '1']
 - [ieee802_11_decode_mac_0, out, pad_sink_2, in]
 - [ieee802_11_frame_equalizer_0, '0', ieee802_11_decode_mac_0, '0']
diff --git a/grc/ieee802_11_frame_equalizer.block.yml b/grc/ieee802_11_frame_equalizer.block.yml
index a834a58..48c7bfa 100644
--- a/grc/ieee802_11_frame_equalizer.block.yml
+++ b/grc/ieee802_11_frame_equalizer.block.yml
@@ -7,7 +7,7 @@ category: '[IEEE802.11]'
 parameters:
 -   id: algo
     label: Algorithm
-    dtype: int
+    dtype: enum
     default: ieee802_11.LS
     options: [ieee802_11.LS, ieee802_11.LMS, ieee802_11.COMB, ieee802_11.STA]
     option_labels: [LS, LMS, Comb, STA]
diff --git a/grc/ieee802_11_mapper.block.yml b/grc/ieee802_11_mapper.block.yml
index a26a214..273b26f 100644
--- a/grc/ieee802_11_mapper.block.yml
+++ b/grc/ieee802_11_mapper.block.yml
@@ -7,7 +7,7 @@ category: '[IEEE802.11]'
 parameters:
 -   id: encoding
     label: Encoding
-    dtype: int
+    dtype: enum
     default: ieee802_11.BPSK_1_2
     options: [ieee802_11.BPSK_1_2, ieee802_11.BPSK_3_4, ieee802_11.QPSK_1_2, ieee802_11.QPSK_3_4,
         ieee802_11.16QAM_1_2, ieee802_11.16QAM_3_4, ieee802_11.64QAM_2_3, ieee802_11.64QAM_3_4]
@@ -28,8 +28,6 @@ outputs:
 -   domain: stream
     dtype: byte
     multiplicity: '1'
-asserts:
-- ${ encoding in range(8) }
 
 templates:
     imports: import ieee802_11