From a80060e696c3415ceb9da126775947aa79995f91 Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Tue, 16 Jul 2013 13:05:21 +0200 Subject: [PATCH] update flow graphs --- examples/ofdm_rx.grc | 431 ++++++---------------------- examples/rx_demo.grc | 664 +++++++++++++++++++++---------------------- 2 files changed, 412 insertions(+), 683 deletions(-) diff --git a/examples/ofdm_rx.grc b/examples/ofdm_rx.grc index 99f277c..84389e6 100644 --- a/examples/ofdm_rx.grc +++ b/examples/ofdm_rx.grc @@ -1,6 +1,6 @@ - Fri May 31 10:55:49 2013 + Tue Jul 16 13:04:42 2013 options @@ -894,138 +894,6 @@ 0 - - blocks_file_sink - - id - gr_file_sink_0_1_0 - - - _enabled - False - - - file - /tmp/ofdm_sym.bin - - - type - complex - - - vlen - 1 - - - unbuffered - True - - - _coordinate - (1077, 661) - - - _rotation - 0 - - - - blocks_vector_to_stream - - id - gr_vector_to_stream_0_0 - - - _enabled - False - - - type - complex - - - num_items - 48 - - - vlen - 1 - - - _coordinate - (863, 669) - - - _rotation - 0 - - - - blocks_file_sink - - id - gr_file_sink_0_1 - - - _enabled - False - - - file - /tmp/ofdm_fft.bin - - - type - complex - - - vlen - 1 - - - unbuffered - True - - - _coordinate - (574, 663) - - - _rotation - 0 - - - - blocks_vector_to_stream - - id - gr_vector_to_stream_0 - - - _enabled - False - - - type - complex - - - num_items - 64 - - - vlen - 1 - - - _coordinate - (365, 671) - - - _rotation - 0 - - fft_vxx @@ -1069,41 +937,6 @@ 0 - - blocks_file_sink - - id - gr_file_sink_0 - - - _enabled - False - - - file - /tmp/ofdm_long.bin - - - type - complex - - - vlen - 1 - - - unbuffered - True - - - _coordinate - (770, 565) - - - _rotation - 0 - - blocks_complex_to_mag_squared @@ -1158,80 +991,6 @@ 0 - - blocks_tag_debug - - id - gr_tag_debug_0 - - - _enabled - False - - - type - complex - - - name - - - - num_inputs - 1 - - - vlen - 1 - - - display - True - - - _coordinate - (1088, 474) - - - _rotation - 0 - - - - blocks_file_sink - - id - gr_file_sink_0_0 - - - _enabled - False - - - file - /tmp/ofdm_short_in.bin - - - type - float - - - vlen - 1 - - - unbuffered - False - - - _coordinate - (869, 382) - - - _rotation - 180 - - variable_chooser @@ -1314,37 +1073,6 @@ 270 - - blocks_stream_to_vector - - id - gr_stream_to_vector_0 - - - _enabled - True - - - type - complex - - - num_items - 64 - - - vlen - 1 - - - _coordinate - (885, 514) - - - _rotation - 0 - - blocks_conjugate_cc @@ -1365,10 +1093,10 @@ - ieee802_1_ofdm_sync_long + ieee802_11_ofdm_sync_long id - ieee802_1_ofdm_sync_long_0 + ieee802_11_ofdm_sync_long_0 _enabled @@ -1563,10 +1291,10 @@ - ieee802_1_ofdm_equalize_symbols + ieee802_11_ofdm_equalize_symbols id - ieee802_1_ofdm_equalize_symbols_0 + ieee802_11_ofdm_equalize_symbols_0 _enabled @@ -1586,10 +1314,10 @@ - ieee802_1_ofdm_decode_signal + ieee802_11_ofdm_decode_signal id - ieee802_1_ofdm_decode_signal_0 + ieee802_11_ofdm_decode_signal_0 _enabled @@ -1609,10 +1337,10 @@ - ieee802_1_ofdm_sync_short + ieee802_11_ofdm_sync_short id - ieee802_1_ofdm_sync_short_0 + ieee802_11_ofdm_sync_short_0 _enabled @@ -1644,10 +1372,45 @@ - ieee802_1_ofdm_decode_mac + blocks_socket_pdu id - ieee802_1_ofdm_decode_mac_0 + gr_socket_pdu_0 + + + _enabled + True + + + type + "UDP_SERVER" + + + host + + + + port + 12345 + + + mtu + 10000 + + + _coordinate + (771, 839) + + + _rotation + 180 + + + + ieee802_11_ofdm_decode_mac + + id + ieee802_11_ofdm_decode_mac_0 _enabled @@ -1690,10 +1453,10 @@ - blocks_socket_pdu + blocks_stream_to_vector id - gr_socket_pdu_0 + gr_stream_to_vector_0 _enabled @@ -1701,27 +1464,23 @@ type - "UDP_SERVER" + complex - host - + num_items + 64 - port - 12345 - - - mtu - 10000 + vlen + 1 _coordinate - (771, 839) + (885, 514) _rotation - 180 + 0 @@ -1790,81 +1549,45 @@ 0 0 - - ieee802_1_ofdm_equalize_symbols_0 - gr_vector_to_stream_0_0 - 0 - 0 - - - gr_vector_to_stream_0_0 - gr_file_sink_0_1_0 - 0 - 0 - - - gr_divide_xx_0 - gr_file_sink_0_0 - 0 - 0 - fft_vxx_0 - ieee802_1_ofdm_equalize_symbols_0 + ieee802_11_ofdm_equalize_symbols_0 0 0 - fft_vxx_0 - gr_vector_to_stream_0 + ieee802_11_ofdm_equalize_symbols_0 + ieee802_11_ofdm_decode_signal_0 0 0 - gr_vector_to_stream_0 - gr_file_sink_0_1 + ieee802_11_ofdm_decode_signal_0 + ieee802_11_ofdm_decode_mac_0 0 0 - ieee802_1_ofdm_equalize_symbols_0 - ieee802_1_ofdm_decode_signal_0 - 0 - 0 - - - ieee802_1_ofdm_decode_signal_0 - ieee802_1_ofdm_decode_mac_0 - 0 - 0 - - - ieee802_1_ofdm_sync_short_0 + ieee802_11_ofdm_sync_short_0 gr_delay_0_0 0 0 gr_delay_0 - ieee802_1_ofdm_sync_short_0 + ieee802_11_ofdm_sync_short_0 0 0 gr_delay_0_0 - ieee802_1_ofdm_sync_long_0 + ieee802_11_ofdm_sync_long_0 0 1 - ieee802_1_ofdm_sync_short_0 - ieee802_1_ofdm_sync_long_0 - 0 - 0 - - - ieee802_1_ofdm_sync_long_0 - gr_stream_to_vector_0 + ieee802_11_ofdm_sync_short_0 + ieee802_11_ofdm_sync_long_0 0 0 @@ -1876,20 +1599,26 @@ gr_divide_xx_0 - ieee802_1_ofdm_sync_short_0 + ieee802_11_ofdm_sync_short_0 0 1 - - ieee802_1_ofdm_decode_mac_0 - ieee802_11_ofdm_parse_mac_0 - out - in - ieee802_11_ofdm_parse_mac_0 gr_socket_pdu_0 - out - pdus + 0 + 0 + + + ieee802_11_ofdm_decode_mac_0 + ieee802_11_ofdm_parse_mac_0 + 0 + 0 + + + ieee802_11_ofdm_sync_long_0 + gr_stream_to_vector_0 + 0 + 0 diff --git a/examples/rx_demo.grc b/examples/rx_demo.grc index 89218ad..b6dfab8 100644 --- a/examples/rx_demo.grc +++ b/examples/rx_demo.grc @@ -1,6 +1,6 @@ - Tue Jul 2 15:28:16 2013 + Tue Jul 16 13:03:58 2013 options @@ -61,10 +61,10 @@ - ieee802_1_ofdm_sync_long + ieee802_11_ofdm_sync_long id - ieee802_1_ofdm_sync_long_0 + ieee802_11_ofdm_sync_long_0 _enabled @@ -336,10 +336,10 @@ - ieee802_1_ofdm_sync_short + ieee802_11_ofdm_sync_short id - ieee802_1_ofdm_sync_short_0 + ieee802_11_ofdm_sync_short_0 _enabled @@ -1271,196 +1271,10 @@ - variable_slider + ieee802_11_ofdm_equalize_symbols id - gain - - - _enabled - True - - - label - - - - value - 30 - - - min - 0 - - - max - 100 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - - - - notebook - - - - _coordinate - (757, 26) - - - _rotation - 0 - - - - ieee802_1_ofdm_decode_mac - - id - ieee802_1_ofdm_decode_mac_0 - - - _enabled - True - - - debug - False - - - _coordinate - (989, 720) - - - _rotation - 0 - - - - blocks_socket_pdu - - id - blocks_socket_pdu_0 - - - _enabled - True - - - type - "UDP_SERVER" - - - host - - - - port - 52001 - - - mtu - 10000 - - - _coordinate - (772, 822) - - - _rotation - 180 - - - - ieee802_11_ofdm_parse_mac - - id - ieee802_11_ofdm_parse_mac_0 - - - _enabled - True - - - debug - True - - - _coordinate - (997, 846) - - - _rotation - 180 - - - - blocks_tuntap_pdu - - id - blocks_tuntap_pdu_0 - - - _enabled - False - - - ifn - tap0 - - - mtu - 10000 - - - _coordinate - (740, 934) - - - _rotation - 180 - - - - ieee802_11_ether_encap - - id - ieee802_11_ether_encap_0 - - - _enabled - False - - - debug - False - - - _coordinate - (960, 942) - - - _rotation - 180 - - - - ieee802_1_ofdm_equalize_symbols - - id - ieee802_1_ofdm_equalize_symbols_0 + ieee802_11_ofdm_equalize_symbols_0 _enabled @@ -1480,10 +1294,10 @@ - ieee802_1_ofdm_decode_signal + ieee802_11_ofdm_decode_signal id - ieee802_1_ofdm_decode_signal_0 + ieee802_11_ofdm_decode_signal_0 _enabled @@ -1502,37 +1316,6 @@ 0 - - blocks_vector_to_stream - - id - blocks_vector_to_stream_0 - - - _enabled - True - - - type - complex - - - num_items - 48 - - - vlen - 1 - - - _coordinate - (342, 932) - - - _rotation - 0 - - wxgui_scopesink2 @@ -1608,6 +1391,234 @@ 0 + + ieee802_11_ofdm_decode_mac + + id + ieee802_11_ofdm_decode_mac_0 + + + _enabled + True + + + debug + False + + + _coordinate + (989, 720) + + + _rotation + 0 + + + + blocks_vector_to_stream + + id + blocks_vector_to_stream_0 + + + _enabled + True + + + type + complex + + + num_items + 48 + + + vlen + 1 + + + _coordinate + (549, 791) + + + _rotation + 180 + + + + foo_wireshark_connector + + id + foo_wireshark_connector_0 + + + _enabled + True + + + tech + 127 + + + debug + False + + + _coordinate + (978, 1030) + + + _rotation + 180 + + + + blocks_file_sink + + id + blocks_file_sink_0 + + + _enabled + True + + + file + /tmp/ofdm.pcap + + + type + byte + + + vlen + 1 + + + unbuffered + True + + + append + True + + + _coordinate + (765, 1022) + + + _rotation + 180 + + + + ieee802_11_ether_encap + + id + ieee802_11_ether_encap_0 + + + _enabled + False + + + debug + False + + + _coordinate + (963, 957) + + + _rotation + 180 + + + + blocks_tuntap_pdu + + id + blocks_tuntap_pdu_0 + + + _enabled + False + + + ifn + tap0 + + + mtu + 10000 + + + _coordinate + (743, 949) + + + _rotation + 180 + + + + blocks_socket_pdu + + id + blocks_socket_pdu_0 + + + _enabled + True + + + type + "UDP_SERVER" + + + host + + + + port + 52001 + + + mtu + 10000 + + + _coordinate + (775, 837) + + + _rotation + 180 + + + + ieee802_11_ofdm_parse_mac + + id + ieee802_11_ofdm_parse_mac_0 + + + _enabled + True + + + debug + True + + + _coordinate + (1000, 861) + + + _rotation + 180 + + wxgui_scopesink2 @@ -1676,112 +1687,101 @@ _coordinate - (538, 900) + (432, 861) + + + _rotation + 270 + + + + variable_slider + + id + gain + + + _enabled + True + + + label + + + + value + 25 + + + min + 0 + + + max + 100 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (757, 26) _rotation 0 - - blocks_file_sink - - id - blocks_file_sink_0 - - - _enabled - True - - - file - /tmp/ofdm.pcap - - - type - byte - - - vlen - 1 - - - unbuffered - True - - - append - True - - - _coordinate - (762, 1007) - - - _rotation - 180 - - - - foo_wireshark_connector - - id - foo_wireshark_connector_0 - - - _enabled - True - - - tech - 127 - - - debug - False - - - _coordinate - (975, 1015) - - - _rotation - 180 - - - ieee802_1_ofdm_sync_short_0 - ieee802_1_ofdm_sync_long_0 + ieee802_11_ofdm_sync_short_0 + ieee802_11_ofdm_sync_long_0 0 0 - ieee802_1_ofdm_sync_long_0 + ieee802_11_ofdm_sync_long_0 blocks_stream_to_vector_0 0 0 - ieee802_1_ofdm_sync_short_0 + ieee802_11_ofdm_sync_short_0 blocks_delay_0 0 0 blocks_delay_0 - ieee802_1_ofdm_sync_long_0 + ieee802_11_ofdm_sync_long_0 0 1 - ieee802_1_ofdm_decode_mac_0 + ieee802_11_ofdm_decode_mac_0 ieee802_11_ofdm_parse_mac_0 0 0 blocks_divide_xx_0 - ieee802_1_ofdm_sync_short_0 + ieee802_11_ofdm_sync_short_0 0 1 @@ -1799,7 +1799,7 @@ blocks_delay_0_0 - ieee802_1_ofdm_sync_short_0 + ieee802_11_ofdm_sync_short_0 0 0 @@ -1835,7 +1835,7 @@ fft_vxx_0 - ieee802_1_ofdm_equalize_symbols_0 + ieee802_11_ofdm_equalize_symbols_0 0 0 @@ -1846,14 +1846,14 @@ 0 - ieee802_1_ofdm_equalize_symbols_0 - ieee802_1_ofdm_decode_signal_0 + ieee802_11_ofdm_equalize_symbols_0 + ieee802_11_ofdm_decode_signal_0 0 0 - ieee802_1_ofdm_decode_signal_0 - ieee802_1_ofdm_decode_mac_0 + ieee802_11_ofdm_decode_signal_0 + ieee802_11_ofdm_decode_mac_0 0 0 @@ -1882,35 +1882,11 @@ 0 - ieee802_1_ofdm_decode_mac_0 - foo_wireshark_connector_0 - 0 - 0 - - - ieee802_11_ofdm_parse_mac_0 - blocks_socket_pdu_0 - 0 - 0 - - - ieee802_11_ether_encap_0 - blocks_tuntap_pdu_0 - 0 - 0 - - - ieee802_1_ofdm_decode_mac_0 + ieee802_11_ofdm_decode_mac_0 ieee802_11_ether_encap_0 0 0 - - foo_wireshark_connector_0 - blocks_file_sink_0 - 0 - 0 - blocks_vector_to_stream_0 wxgui_scopesink1 @@ -1918,9 +1894,33 @@ 0 - ieee802_1_ofdm_decode_signal_0 + ieee802_11_ofdm_decode_signal_0 blocks_vector_to_stream_0 0 0 + + ieee802_11_ofdm_decode_mac_0 + foo_wireshark_connector_0 + 0 + 0 + + + foo_wireshark_connector_0 + blocks_file_sink_0 + 0 + 0 + + + ieee802_11_ether_encap_0 + blocks_tuntap_pdu_0 + 0 + 0 + + + ieee802_11_ofdm_parse_mac_0 + blocks_socket_pdu_0 + 0 + 0 +