From b3dc15a5672b2f4749db83578792f72c49424ec2 Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Tue, 7 Jun 2022 12:59:01 +0200 Subject: [PATCH] update flowgraphs for 3.10 blocks --- examples/wifi_loopback.grc | 54 +++++++++++------------ examples/wifi_rx.grc | 40 +++++++++--------- examples/wifi_transceiver.grc | 80 ++++++++++++++++++----------------- examples/wifi_tx.grc | 44 ++++++++++--------- 4 files changed, 113 insertions(+), 105 deletions(-) diff --git a/examples/wifi_loopback.grc b/examples/wifi_loopback.grc index 1b9ab5e..16482fa 100644 --- a/examples/wifi_loopback.grc +++ b/examples/wifi_loopback.grc @@ -23,6 +23,7 @@ options: sizing_mode: fixed thread_safe_setters: '' title: '' + window_size: (1000,1000) states: bus_sink: false bus_source: false @@ -36,7 +37,7 @@ blocks: id: variable_qtgui_chooser parameters: comment: '' - gui_hint: 0,0,1,1 + gui_hint: '' label: '' label0: '' label1: '' @@ -45,13 +46,13 @@ blocks: label4: '' labels: '["LS", "LMS", "Linear Comb", "STA"]' num_opts: '0' - option0: '' - option1: '' - option2: '' - option3: '' + option0: '0' + option1: '1' + option2: '2' + option3: '3' option4: '4' options: '[0, 1, 2, 3]' - orient: Qt.QHBoxLayout + orient: Qt.QVBoxLayout type: int value: '0' widget: radio_buttons @@ -59,7 +60,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [192, 8] + coordinate: [200, 12.0] rotation: 0 state: enabled - name: encoding @@ -271,23 +272,6 @@ blocks: coordinate: [728, 620.0] rotation: 0 state: true -- name: blocks_pdu_to_tagged_stream_0_0 - id: blocks_pdu_to_tagged_stream - parameters: - affinity: '' - alias: '' - comment: '' - maxoutbuf: '0' - minoutbuf: '0' - tag: packet_len - type: complex - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [376, 348.0] - rotation: 180 - state: enabled - name: blocks_tag_debug_0 id: blocks_tag_debug parameters: @@ -433,6 +417,23 @@ blocks: coordinate: [328, 596.0] rotation: 180 state: enabled +- name: pdu_pdu_to_tagged_stream_0 + id: pdu_pdu_to_tagged_stream + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + tag: packet_len + type: complex + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [384, 348.0] + rotation: 180 + state: true - name: pfb_arb_resampler_xxx_0 id: pfb_arb_resampler_xxx parameters: @@ -668,7 +669,6 @@ connections: - [blocks_complex_to_mag_0, '0', blocks_vector_to_stream_0, '0'] - [blocks_message_strobe_0, strobe, ieee802_11_mac_0, app in] - [blocks_multiply_const_xx_0, '0', channels_channel_model_0, '0'] -- [blocks_pdu_to_tagged_stream_0_0, '0', qtgui_const_sink_x_0, '0'] - [blocks_vector_to_stream_0, '0', qtgui_time_sink_x_0, '0'] - [channels_channel_model_0, '0', pfb_arb_resampler_xxx_0, '0'] - [foo_packet_pad2_0, '0', blocks_multiply_const_xx_0, '0'] @@ -677,11 +677,13 @@ connections: - [ieee802_11_extract_csi_0, '0', blocks_tag_debug_0, '0'] - [ieee802_11_mac_0, phy out, wifi_phy_hier_0, mac_in] - [ieee802_11_parse_mac_0, out, ieee802_11_extract_csi_0, pdu in] +- [pdu_pdu_to_tagged_stream_0, '0', qtgui_const_sink_x_0, '0'] - [pfb_arb_resampler_xxx_0, '0', wifi_phy_hier_0, '0'] - [wifi_phy_hier_0, '0', foo_packet_pad2_0, '0'] -- [wifi_phy_hier_0, carrier, blocks_pdu_to_tagged_stream_0_0, pdus] +- [wifi_phy_hier_0, carrier, pdu_pdu_to_tagged_stream_0, pdus] - [wifi_phy_hier_0, mac_out, foo_wireshark_connector_0, in] - [wifi_phy_hier_0, mac_out, ieee802_11_parse_mac_0, in] metadata: file_format: 1 + grc_version: v3.10.2.0-68-g62a7e451 diff --git a/examples/wifi_rx.grc b/examples/wifi_rx.grc index fdf9a54..a407454 100644 --- a/examples/wifi_rx.grc +++ b/examples/wifi_rx.grc @@ -23,6 +23,7 @@ options: sizing_mode: fixed thread_safe_setters: '' title: '' + window_size: (1000,1000) states: bus_sink: false bus_source: false @@ -407,23 +408,6 @@ blocks: coordinate: [664, 296] rotation: 0 state: enabled -- name: blocks_pdu_to_tagged_stream_1 - id: blocks_pdu_to_tagged_stream - parameters: - affinity: '' - alias: '' - comment: '' - maxoutbuf: '0' - minoutbuf: '0' - tag: packet_len - type: complex - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [584, 836] - rotation: 180 - state: enabled - name: blocks_stream_to_vector_0 id: blocks_stream_to_vector parameters: @@ -571,6 +555,23 @@ blocks: coordinate: [304, 488.0] rotation: 0 state: enabled +- name: pdu_pdu_to_tagged_stream_0 + id: pdu_pdu_to_tagged_stream + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + tag: packet_len + type: complex + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [576, 836.0] + rotation: 180 + state: true - name: qtgui_const_sink_x_0 id: qtgui_const_sink_x parameters: @@ -1210,20 +1211,21 @@ connections: - [blocks_moving_average_xx_1, '0', blocks_complex_to_mag_0, '0'] - [blocks_moving_average_xx_1, '0', ieee802_11_sync_short_0, '1'] - [blocks_multiply_xx_0, '0', blocks_moving_average_xx_1, '0'] -- [blocks_pdu_to_tagged_stream_1, '0', qtgui_const_sink_x_0, '0'] - [blocks_stream_to_vector_0, '0', fft_vxx_0, '0'] - [fft_vxx_0, '0', ieee802_11_frame_equalizer_0, '0'] - [foo_wireshark_connector_0, '0', blocks_file_sink_0, '0'] - [ieee802_11_decode_mac_0, out, foo_wireshark_connector_0, in] - [ieee802_11_decode_mac_0, out, ieee802_11_parse_mac_0, in] - [ieee802_11_frame_equalizer_0, '0', ieee802_11_decode_mac_0, '0'] -- [ieee802_11_frame_equalizer_0, symbols, blocks_pdu_to_tagged_stream_1, pdus] +- [ieee802_11_frame_equalizer_0, symbols, pdu_pdu_to_tagged_stream_0, pdus] - [ieee802_11_sync_long_0, '0', blocks_stream_to_vector_0, '0'] - [ieee802_11_sync_short_0, '0', blocks_delay_0, '0'] - [ieee802_11_sync_short_0, '0', ieee802_11_sync_long_0, '0'] +- [pdu_pdu_to_tagged_stream_0, '0', qtgui_const_sink_x_0, '0'] - [uhd_usrp_source_0, '0', blocks_complex_to_mag_squared_0, '0'] - [uhd_usrp_source_0, '0', blocks_delay_0_0, '0'] - [uhd_usrp_source_0, '0', blocks_multiply_xx_0, '0'] metadata: file_format: 1 + grc_version: v3.10.2.0-68-g62a7e451 diff --git a/examples/wifi_transceiver.grc b/examples/wifi_transceiver.grc index 5f1d188..722f191 100644 --- a/examples/wifi_transceiver.grc +++ b/examples/wifi_transceiver.grc @@ -23,6 +23,7 @@ options: sizing_mode: fixed thread_safe_setters: '' title: '' + window_size: (1000,1000) states: bus_sink: false bus_source: false @@ -292,41 +293,6 @@ blocks: coordinate: [476.0, 568] rotation: 270 state: enabled -- name: blocks_pdu_to_tagged_stream_0_0 - id: blocks_pdu_to_tagged_stream - parameters: - affinity: '' - alias: '' - comment: '' - maxoutbuf: '0' - minoutbuf: '0' - tag: packet_len - type: complex - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [124.0, 560] - rotation: 270 - state: enabled -- name: blocks_tuntap_pdu_0 - id: blocks_tuntap_pdu - parameters: - affinity: '' - alias: '' - comment: '' - ifn: tap0 - istunflag: 'False' - maxoutbuf: '0' - minoutbuf: '0' - mtu: '440' - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [616, 157] - rotation: 180 - state: disabled - name: foo_packet_pad2_0 id: foo_packet_pad2 parameters: @@ -415,6 +381,41 @@ blocks: coordinate: [264, 340.0] rotation: 180 state: enabled +- name: network_tuntap_pdu_0 + id: network_tuntap_pdu + parameters: + affinity: '' + alias: '' + comment: '' + ifn: tap0 + istunflag: 'False' + maxoutbuf: '0' + minoutbuf: '0' + mtu: '440' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [616, 164.0] + rotation: 180 + state: disabled +- name: pdu_pdu_to_tagged_stream_0 + id: pdu_pdu_to_tagged_stream + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + tag: packet_len + type: complex + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [124.0, 552] + rotation: 270 + state: true - name: qtgui_const_sink_x_0 id: qtgui_const_sink_x parameters: @@ -1243,16 +1244,16 @@ blocks: connections: - [blocks_multiply_const_vxx_0, '0', foo_packet_pad2_0, '0'] -- [blocks_pdu_to_tagged_stream_0_0, '0', qtgui_const_sink_x_0, '0'] -- [blocks_tuntap_pdu_0, pdus, ieee802_11_ether_encap_0, from tap] - [foo_packet_pad2_0, '0', uhd_usrp_sink_0, '0'] - [foo_wireshark_connector_0, '0', blocks_file_sink_0, '0'] -- [ieee802_11_ether_encap_0, to tap, blocks_tuntap_pdu_0, pdus] +- [ieee802_11_ether_encap_0, to tap, network_tuntap_pdu_0, pdus] - [ieee802_11_ether_encap_0, to wifi, ieee802_11_mac_0, app in] - [ieee802_11_mac_0, phy out, wifi_phy_hier_0, mac_in] +- [network_tuntap_pdu_0, pdus, ieee802_11_ether_encap_0, from tap] +- [pdu_pdu_to_tagged_stream_0, '0', qtgui_const_sink_x_0, '0'] - [uhd_usrp_source_0, '0', wifi_phy_hier_0, '0'] - [wifi_phy_hier_0, '0', blocks_multiply_const_vxx_0, '0'] -- [wifi_phy_hier_0, carrier, blocks_pdu_to_tagged_stream_0_0, pdus] +- [wifi_phy_hier_0, carrier, pdu_pdu_to_tagged_stream_0, pdus] - [wifi_phy_hier_0, mac_out, foo_wireshark_connector_0, in] - [wifi_phy_hier_0, mac_out, ieee802_11_ether_encap_0, from wifi] - [wifi_phy_hier_0, mac_out, ieee802_11_mac_0, phy in] @@ -1260,3 +1261,4 @@ connections: metadata: file_format: 1 + grc_version: v3.10.2.0-68-g62a7e451 diff --git a/examples/wifi_tx.grc b/examples/wifi_tx.grc index d0cace8..3f154c6 100644 --- a/examples/wifi_tx.grc +++ b/examples/wifi_tx.grc @@ -23,6 +23,7 @@ options: sizing_mode: fixed thread_safe_setters: '' title: '' + window_size: (1000,1000) states: bus_sink: false bus_source: false @@ -294,26 +295,6 @@ blocks: coordinate: [240, 396.0] rotation: 180 state: enabled -- name: blocks_socket_pdu_0 - id: blocks_socket_pdu - parameters: - affinity: '' - alias: '' - comment: '' - host: '' - maxoutbuf: '0' - minoutbuf: '0' - mtu: '10000' - port: '52001' - tcp_no_delay: 'False' - type: TCP_SERVER - states: - bus_sink: false - bus_source: false - bus_structure: null - coordinate: [232, 260.0] - rotation: 0 - state: enabled - name: blocks_vector_source_x_0 id: blocks_vector_source_x parameters: @@ -372,6 +353,26 @@ blocks: coordinate: [440, 284] rotation: 0 state: enabled +- name: network_socket_pdu_0 + id: network_socket_pdu + parameters: + affinity: '' + alias: '' + comment: '' + host: '' + maxoutbuf: '0' + minoutbuf: '0' + mtu: '10000' + port: '52001' + tcp_no_delay: 'False' + type: TCP_SERVER + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [216, 260.0] + rotation: 0 + state: true - name: osmosdr_sink_0 id: osmosdr_sink parameters: @@ -934,12 +935,13 @@ blocks: connections: - [blocks_message_strobe_0_0, strobe, ieee802_11_mac_0, app in] - [blocks_multiply_const_vxx_0, '0', foo_packet_pad2_0, '0'] -- [blocks_socket_pdu_0, pdus, ieee802_11_mac_0, app in] - [blocks_vector_source_x_0, '0', wifi_phy_hier_0, '0'] - [foo_packet_pad2_0, '0', osmosdr_sink_0, '0'] - [foo_packet_pad2_0, '0', uhd_usrp_sink_0, '0'] - [ieee802_11_mac_0, phy out, wifi_phy_hier_0, mac_in] +- [network_socket_pdu_0, pdus, ieee802_11_mac_0, app in] - [wifi_phy_hier_0, '0', blocks_multiply_const_vxx_0, '0'] metadata: file_format: 1 + grc_version: v3.10.2.0-68-g62a7e451