From 534abdbfbfe23dee271f3d5c1e43cc64058b9e4b Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Sat, 1 Feb 2014 19:30:38 +0100 Subject: [PATCH] update flow graphs --- examples/rx_demo.grc | 114 +++--- examples/wifi_phy_hier.grc | 254 ++++++------- examples/wifi_transceiver.grc | 90 ++--- examples/wifi_tx.grc | 671 ++++++++++++++++++---------------- 4 files changed, 590 insertions(+), 539 deletions(-) diff --git a/examples/rx_demo.grc b/examples/rx_demo.grc index 345f4e6..50aaaeb 100644 --- a/examples/rx_demo.grc +++ b/examples/rx_demo.grc @@ -1,6 +1,6 @@ - Thu Dec 5 14:05:11 2013 + Sat Feb 1 18:56:56 2014 options @@ -60,29 +60,6 @@ 0 - - variable - - id - sync_length - - - _enabled - True - - - value - 320 - - - _coordinate - (601, 15) - - - _rotation - 0 - - variable @@ -107,50 +84,22 @@ - ieee802_11_ofdm_sync_short + variable id - ieee802_11_ofdm_sync_short_0 + sync_length _enabled True - log - False - - - debug - False - - - threshold - 0.8 - - - max_samples - 80 * 160 - - - min_plateau - 2 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 + value + 320 _coordinate - (212, 501) + (601, 15) _rotation @@ -1966,6 +1915,57 @@ 0 + + ieee802_11_ofdm_sync_short + + id + ieee802_11_ofdm_sync_short_0 + + + _enabled + True + + + log + False + + + debug + False + + + threshold + 0.85 + + + max_samples + 80 * 160 + + + min_plateau + 2 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (212, 501) + + + _rotation + 0 + + blocks_stream_to_vector_0 fft_vxx_0 diff --git a/examples/wifi_phy_hier.grc b/examples/wifi_phy_hier.grc index 75ce41d..637edd2 100644 --- a/examples/wifi_phy_hier.grc +++ b/examples/wifi_phy_hier.grc @@ -1,6 +1,6 @@ - Sat Feb 1 18:33:23 2014 + Sat Feb 1 19:26:09 2014 options @@ -1117,6 +1117,84 @@ 0 + + pad_source + + id + pad_source_0 + + + _enabled + True + + + label + samp_in + + + type + complex + + + vlen + 1 + + + num_streams + 1 + + + optional + False + + + _coordinate + (57, 549) + + + _rotation + 0 + + + + pad_sink + + id + pad_sink_0 + + + _enabled + True + + + label + samp_out + + + type + complex + + + vlen + 1 + + + num_streams + 1 + + + optional + False + + + _coordinate + (470, 427) + + + _rotation + 180 + + digital_ofdm_carrier_allocator_cvc @@ -1157,7 +1235,7 @@ minoutbuf - 1000 + 10000 maxoutbuf @@ -1172,6 +1250,53 @@ 0 + + digital_ofdm_cyclic_prefixer + + id + digital_ofdm_cyclic_prefixer_0_0 + + + _enabled + True + + + input_size + 64 + + + cp_len + 16 + + + rolloff + 2 + + + tagname + "packet_len" + + + affinity + + + + minoutbuf + 100000 + + + maxoutbuf + 0 + + + _coordinate + (703, 411) + + + _rotation + 180 + + fft_vxx @@ -1227,131 +1352,6 @@ 180 - - digital_ofdm_cyclic_prefixer - - id - digital_ofdm_cyclic_prefixer_0_0 - - - _enabled - True - - - input_size - 64 - - - cp_len - 16 - - - rolloff - 2 - - - tagname - "packet_len" - - - affinity - - - - minoutbuf - 48000 - - - maxoutbuf - 0 - - - _coordinate - (703, 411) - - - _rotation - 180 - - - - pad_sink - - id - pad_sink_0 - - - _enabled - True - - - label - samp_out - - - type - complex - - - vlen - 1 - - - num_streams - 1 - - - optional - False - - - _coordinate - (470, 427) - - - _rotation - 180 - - - - pad_source - - id - pad_source_0 - - - _enabled - True - - - label - samp_in - - - type - complex - - - vlen - 1 - - - num_streams - 1 - - - optional - True - - - _coordinate - (57, 549) - - - _rotation - 0 - - pad_source_1 ieee802_11_ofdm_mapper_0 diff --git a/examples/wifi_transceiver.grc b/examples/wifi_transceiver.grc index 8265b68..e6ae492 100644 --- a/examples/wifi_transceiver.grc +++ b/examples/wifi_transceiver.grc @@ -1,6 +1,6 @@ - Sat Feb 1 18:32:31 2014 + Sat Feb 1 19:26:54 2014 options @@ -2032,49 +2032,6 @@ 0 - - blocks_multiply_const_vxx - - id - blocks_multiply_const_vxx_0 - - - _enabled - True - - - type - complex - - - const - mult - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (108, 389) - - - _rotation - 180 - - foo_packet_pad2 @@ -2111,7 +2068,7 @@ minoutbuf - 0 + 100000 maxoutbuf @@ -2126,6 +2083,49 @@ 0 + + blocks_multiply_const_vxx + + id + blocks_multiply_const_vxx_0 + + + _enabled + True + + + type + complex + + + const + mult + + + vlen + 1 + + + affinity + + + + minoutbuf + 100000 + + + maxoutbuf + 0 + + + _coordinate + (108, 389) + + + _rotation + 180 + + foo_wireshark_connector_0 blocks_file_sink_0 diff --git a/examples/wifi_tx.grc b/examples/wifi_tx.grc index 331f4c3..9fef251 100644 --- a/examples/wifi_tx.grc +++ b/examples/wifi_tx.grc @@ -1,6 +1,6 @@ - Sat Feb 1 18:33:30 2014 + Sat Feb 1 19:26:11 2014 options @@ -115,57 +115,6 @@ 0 - - variable_chooser - - id - lo_offset - - - _enabled - True - - - label - LO Offset - - - value - 0 - - - choices - [0, 6e9, 11e9] - - - labels - ['0 MHz', '6 MHz', '11 MHz'] - - - type - drop_down - - - style - wx.RA_HORIZONTAL - - - grid_pos - - - - notebook - - - - _coordinate - (697, 165) - - - _rotation - 0 - - variable_chooser @@ -217,229 +166,6 @@ 0 - - variable_chooser - - id - samp_rate - - - _enabled - True - - - label - Sample Rate - - - value - 20e6 - - - choices - [10e6, 20e6] - - - labels - ["10 Mhz", "20 Mhz"] - - - type - radio_buttons - - - style - wx.RA_HORIZONTAL - - - grid_pos - - - - notebook - - - - _coordinate - (629, 14) - - - _rotation - 0 - - - - variable_chooser - - id - freq - - - _enabled - True - - - label - Channel - - - value - 5.22e9 - - - choices - [2412000000.0, 2417000000.0, 2422000000.0, 2427000000.0, 2432000000.0, 2437000000.0, 2442000000.0, 2447000000.0, 2452000000.0, 2457000000.0, 2462000000.0, 2467000000.0, 2472000000.0, 2484000000.0, 5170000000.0, 5180000000.0, 5190000000.0, 5200000000.0, 5210000000.0, 5220000000.0, 5230000000.0, 5240000000.0, 5260000000.0, 5280000000.0, 5300000000.0, 5320000000.0, 5500000000.0, 5520000000.0, 5540000000.0, 5560000000.0, 5580000000.0, 5600000000.0, 5620000000.0, 5640000000.0, 5660000000.0, 5680000000.0, 5700000000.0, 5745000000.0, 5765000000.0, 5785000000.0, 5805000000.0, 5825000000.0, 5860000000.0, 5870000000.0, 5880000000.0, 5890000000.0, 5900000000.0, 5910000000.0, 5920000000.0] - - - labels - [' 1 | 2412.0 | 11g', ' 2 | 2417.0 | 11g', ' 3 | 2422.0 | 11g', ' 4 | 2427.0 | 11g', ' 5 | 2432.0 | 11g', ' 6 | 2437.0 | 11g', ' 7 | 2442.0 | 11g', ' 8 | 2447.0 | 11g', ' 9 | 2452.0 | 11g', ' 10 | 2457.0 | 11g', ' 11 | 2462.0 | 11g', ' 12 | 2467.0 | 11g', ' 13 | 2472.0 | 11g', ' 14 | 2484.0 | 11g', ' 34 | 5170.0 | 11a', ' 36 | 5180.0 | 11a', ' 38 | 5190.0 | 11a', ' 40 | 5200.0 | 11a', ' 42 | 5210.0 | 11a', ' 44 | 5220.0 | 11a', ' 46 | 5230.0 | 11a', ' 48 | 5240.0 | 11a', ' 52 | 5260.0 | 11a', ' 56 | 5280.0 | 11a', ' 58 | 5300.0 | 11a', ' 60 | 5320.0 | 11a', '100 | 5500.0 | 11a', '104 | 5520.0 | 11a', '108 | 5540.0 | 11a', '112 | 5560.0 | 11a', '116 | 5580.0 | 11a', '120 | 5600.0 | 11a', '124 | 5620.0 | 11a', '128 | 5640.0 | 11a', '132 | 5660.0 | 11a', '136 | 5680.0 | 11a', '140 | 5700.0 | 11a', '149 | 5745.0 | 11a', '153 | 5765.0 | 11a', '157 | 5785.0 | 11a', '161 | 5805.0 | 11a', '165 | 5825.0 | 11a', '172 | 5860.0 | 11p', '174 | 5870.0 | 11p', '176 | 5880.0 | 11p', '178 | 5890.0 | 11p', '180 | 5900.0 | 11p', '182 | 5910.0 | 11p', '184 | 5920.0 | 11p'] - - - type - drop_down - - - style - wx.RA_HORIZONTAL - - - grid_pos - - - - notebook - - - - _coordinate - (419, 11) - - - _rotation - 0 - - - - variable_slider - - id - mult - - - _enabled - True - - - label - - - - value - 1 - - - min - 0 - - - max - 2 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - - - - notebook - - - - _coordinate - (979, 10) - - - _rotation - 0 - - - - wifi_phy_hier - - id - wifi_phy_hier_0 - - - _enabled - True - - - encoding - 0 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (443, 300) - - - _rotation - 180 - - - - ieee802_11_ofdm_mac - - id - ieee802_11_ofdm_mac_0 - - - _enabled - True - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (465, 191) - - - _rotation - 0 - - blocks_socket_pdu @@ -1198,34 +924,22 @@ - foo_packet_pad2 + blocks_null_source id - foo_packet_pad2_0 + blocks_null_source_0 _enabled True - debug - False + type + complex - delay - False - - - delay_sec - 0.001 - - - pad_front - 0 - - - pad_tail - 0 + vlen + 1 affinity @@ -1241,18 +955,18 @@ _coordinate - (86, 420) + (678, 333) _rotation - 0 + 180 blocks_multiply_const_vxx id - blocks_multiply_const_vxx_1 + blocks_multiply_const_vxx_0 _enabled @@ -1284,31 +998,344 @@ _coordinate - (199, 330) + (232, 329) _rotation 180 + + ieee802_11_ofdm_mac + + id + ieee802_11_ofdm_mac_0 + + + _enabled + True + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (465, 191) + + + _rotation + 0 + + + + variable_chooser + + id + lo_offset + + + _enabled + True + + + label + LO Offset + + + value + 6e9 + + + choices + [0, 6e9, 11e9] + + + labels + ['0 MHz', '6 MHz', '11 MHz'] + + + type + drop_down + + + style + wx.RA_HORIZONTAL + + + grid_pos + + + + notebook + + + + _coordinate + (697, 165) + + + _rotation + 0 + + + + variable_chooser + + id + freq + + + _enabled + True + + + label + Channel + + + value + 5.89e9 + + + choices + [2412000000.0, 2417000000.0, 2422000000.0, 2427000000.0, 2432000000.0, 2437000000.0, 2442000000.0, 2447000000.0, 2452000000.0, 2457000000.0, 2462000000.0, 2467000000.0, 2472000000.0, 2484000000.0, 5170000000.0, 5180000000.0, 5190000000.0, 5200000000.0, 5210000000.0, 5220000000.0, 5230000000.0, 5240000000.0, 5260000000.0, 5280000000.0, 5300000000.0, 5320000000.0, 5500000000.0, 5520000000.0, 5540000000.0, 5560000000.0, 5580000000.0, 5600000000.0, 5620000000.0, 5640000000.0, 5660000000.0, 5680000000.0, 5700000000.0, 5745000000.0, 5765000000.0, 5785000000.0, 5805000000.0, 5825000000.0, 5860000000.0, 5870000000.0, 5880000000.0, 5890000000.0, 5900000000.0, 5910000000.0, 5920000000.0] + + + labels + [' 1 | 2412.0 | 11g', ' 2 | 2417.0 | 11g', ' 3 | 2422.0 | 11g', ' 4 | 2427.0 | 11g', ' 5 | 2432.0 | 11g', ' 6 | 2437.0 | 11g', ' 7 | 2442.0 | 11g', ' 8 | 2447.0 | 11g', ' 9 | 2452.0 | 11g', ' 10 | 2457.0 | 11g', ' 11 | 2462.0 | 11g', ' 12 | 2467.0 | 11g', ' 13 | 2472.0 | 11g', ' 14 | 2484.0 | 11g', ' 34 | 5170.0 | 11a', ' 36 | 5180.0 | 11a', ' 38 | 5190.0 | 11a', ' 40 | 5200.0 | 11a', ' 42 | 5210.0 | 11a', ' 44 | 5220.0 | 11a', ' 46 | 5230.0 | 11a', ' 48 | 5240.0 | 11a', ' 52 | 5260.0 | 11a', ' 56 | 5280.0 | 11a', ' 58 | 5300.0 | 11a', ' 60 | 5320.0 | 11a', '100 | 5500.0 | 11a', '104 | 5520.0 | 11a', '108 | 5540.0 | 11a', '112 | 5560.0 | 11a', '116 | 5580.0 | 11a', '120 | 5600.0 | 11a', '124 | 5620.0 | 11a', '128 | 5640.0 | 11a', '132 | 5660.0 | 11a', '136 | 5680.0 | 11a', '140 | 5700.0 | 11a', '149 | 5745.0 | 11a', '153 | 5765.0 | 11a', '157 | 5785.0 | 11a', '161 | 5805.0 | 11a', '165 | 5825.0 | 11a', '172 | 5860.0 | 11p', '174 | 5870.0 | 11p', '176 | 5880.0 | 11p', '178 | 5890.0 | 11p', '180 | 5900.0 | 11p', '182 | 5910.0 | 11p', '184 | 5920.0 | 11p'] + + + type + drop_down + + + style + wx.RA_HORIZONTAL + + + grid_pos + + + + notebook + + + + _coordinate + (419, 11) + + + _rotation + 0 + + + + variable_slider + + id + mult + + + _enabled + True + + + label + + + + value + .38 + + + min + 0 + + + max + 2 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (979, 10) + + + _rotation + 0 + + + + variable_chooser + + id + samp_rate + + + _enabled + True + + + label + Sample Rate + + + value + 10e6 + + + choices + [10e6, 20e6] + + + labels + ["10 Mhz", "20 Mhz"] + + + type + radio_buttons + + + style + wx.RA_HORIZONTAL + + + grid_pos + + + + notebook + + + + _coordinate + (629, 14) + + + _rotation + 0 + + + + wifi_phy_hier + + id + wifi_phy_hier_0 + + + _enabled + True + + + encoding + encoding + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (461, 299) + + + _rotation + 180 + + + + foo_packet_pad2 + + id + foo_packet_pad2_0 + + + _enabled + True + + + debug + False + + + delay + True + + + delay_sec + 0.001 + + + pad_front + 10000 + + + pad_tail + 0 + + + affinity + + + + minoutbuf + 100000 + + + maxoutbuf + 0 + + + _coordinate + (86, 420) + + + _rotation + 0 + + blocks_message_strobe_0 ieee802_11_ofdm_mac_0 strobe app in - - wifi_phy_hier_0 - blocks_multiply_const_vxx_1 - 0 - 0 - - - ieee802_11_ofdm_mac_0 - wifi_phy_hier_0 - phy out - mac_in - blocks_socket_pdu_0 ieee802_11_ofdm_mac_0 @@ -1322,9 +1349,33 @@ 0 - blocks_multiply_const_vxx_1 + wifi_phy_hier_0 + blocks_multiply_const_vxx_0 + 0 + 0 + + + blocks_null_source_0 + wifi_phy_hier_0 + 0 + 0 + + + blocks_multiply_const_vxx_0 foo_packet_pad2_0 0 0 + + ieee802_11_ofdm_mac_0 + wifi_phy_hier_0 + phy out + mac_in + + + wifi_phy_hier_0 + ieee802_11_ofdm_mac_0 + mac_out + phy in +