From a9738709763631b667d6a6c661f96fd87a06c1b9 Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Thu, 5 Dec 2013 14:46:09 +0100 Subject: [PATCH] new message port names, fix lo_offset, add multiplier to transceiver --- examples/ofdm_loopback.grc | 1016 +++++++------ examples/ofdm_phy_hier.grc | 354 +++-- examples/ofdm_rx.grc | 460 +++--- examples/ofdm_rx_nogui.grc | 1852 ------------------------ examples/ofdm_sim.grc | 710 --------- examples/ofdm_transceiver.grc | 784 +++++----- examples/ofdm_transceiver_no_gui.grc | 1989 -------------------------- examples/ofdm_tx.grc | 436 +++--- examples/ofdm_tx_nogui.grc | 1390 ------------------ examples/rx_demo.grc | 516 ++++--- 10 files changed, 2043 insertions(+), 7464 deletions(-) delete mode 100644 examples/ofdm_rx_nogui.grc delete mode 100644 examples/ofdm_sim.grc delete mode 100644 examples/ofdm_transceiver_no_gui.grc delete mode 100644 examples/ofdm_tx_nogui.grc diff --git a/examples/ofdm_loopback.grc b/examples/ofdm_loopback.grc index 6bca5c2..81257dd 100644 --- a/examples/ofdm_loopback.grc +++ b/examples/ofdm_loopback.grc @@ -1,6 +1,6 @@ - Mon Aug 26 12:18:50 2013 + Thu Dec 5 14:23:25 2013 options @@ -134,174 +134,6 @@ 0 - - analog_sig_source_x - - id - analog_sig_source_x_0 - - - _enabled - True - - - type - complex - - - samp_rate - samp_rate - - - waveform - analog.GR_COS_WAVE - - - freq - freq_offset - - - amp - 1 - - - offset - 0 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (344, 442) - - - _rotation - 0 - - - - foo_packet_pad - - id - foo_packet_pad_0 - - - _enabled - True - - - debug - False - - - pad_front - 60000 - - - pad_tail - 20000 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (365, 354) - - - _rotation - 0 - - - - foo_wireshark_connector - - id - foo_wireshark_connector_0 - - - _enabled - False - - - tech - 127 - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (629, 184) - - - _rotation - 0 - - - - blocks_file_sink - - id - blocks_file_sink_0 - - - _enabled - False - - - file - /tmp/ofdm.bin - - - type - byte - - - vlen - 1 - - - unbuffered - True - - - append - False - - - affinity - - - - _coordinate - (866, 176) - - - _rotation - 0 - - blocks_ctrlport_monitor_performance @@ -403,143 +235,6 @@ 0 - - analog_noise_source_x - - id - analog_noise_source_x_0 - - - _enabled - True - - - type - complex - - - noise_type - analog.GR_GAUSSIAN - - - amp - (noise_power/2.0)**0.5 - - - seed - 0 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (728, 258) - - - _rotation - 180 - - - - variable_slider - - id - noise_power - - - _enabled - True - - - label - - - - value - 0 - - - min - 0 - - - max - 5 - - - num_steps - 1000 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - - - - notebook - - - - _coordinate - (829, 5) - - - _rotation - 0 - - - - blocks_multiply_xx - - id - blocks_multiply_xx_0 - - - _enabled - True - - - type - complex - - - num_inputs - 2 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (551, 374) - - - _rotation - 0 - - blocks_add_xx @@ -570,6 +265,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (583, 278) @@ -579,127 +278,6 @@ 180 - - blocks_multiply_const_vxx - - id - blocks_multiply_const_vxx_0 - - - _enabled - True - - - type - complex - - - const - signal_power - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (721, 437) - - - _rotation - 0 - - - - variable_slider - - id - signal_power - - - _enabled - True - - - label - - - - value - 0.39 - - - min - 0 - - - max - 3 - - - num_steps - 1000 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - - - - notebook - - - - _coordinate - (687, 15) - - - _rotation - 0 - - - - ieee802_11_ofdm_mac - - id - ieee802_11_ofdm_mac_0 - - - _enabled - True - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (373, 162) - - - _rotation - 0 - - ieee802_11_ofdm_parse_mac @@ -753,6 +331,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (359, 261) @@ -762,6 +344,37 @@ 180 + + ieee802_11_ofdm_mac + + id + ieee802_11_ofdm_mac_0 + + + _enabled + True + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (374, 147) + + + _rotation + 0 + + blocks_message_strobe @@ -788,9 +401,502 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate - (62, 150) + (83, 135) + + + _rotation + 0 + + + + foo_packet_pad + + id + foo_packet_pad_0 + + + _enabled + True + + + debug + False + + + pad_front + 60000 + + + pad_tail + 20000 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (353, 408) + + + _rotation + 0 + + + + blocks_multiply_xx + + id + blocks_multiply_xx_0 + + + _enabled + True + + + type + complex + + + num_inputs + 2 + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (544, 428) + + + _rotation + 0 + + + + analog_sig_source_x + + id + analog_sig_source_x_0 + + + _enabled + True + + + type + complex + + + samp_rate + samp_rate + + + waveform + analog.GR_COS_WAVE + + + freq + freq_offset + + + amp + 1 + + + offset + 0 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (339, 547) + + + _rotation + 0 + + + + variable_slider + + id + signal_power + + + _enabled + True + + + label + + + + value + 0.39 + + + min + 0 + + + max + 3 + + + num_steps + 1000 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (693, 7) + + + _rotation + 0 + + + + blocks_multiply_const_vxx + + id + blocks_multiply_const_vxx_0 + + + _enabled + True + + + type + complex + + + const + signal_power**.5 + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (696, 441) + + + _rotation + 0 + + + + variable_slider + + id + noise_power + + + _enabled + True + + + label + + + + value + 0.01 + + + min + 0.01 + + + max + 5 + + + num_steps + 1000 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (829, 5) + + + _rotation + 0 + + + + import + + id + import_0 + + + _enabled + True + + + import + import math + + + _coordinate + (422, 11) + + + _rotation + 0 + + + + variable_static_text + + id + snr + + + _enabled + True + + + label + SNR + + + value + str(10 * math.log(signal_power/noise_power)) + "dB" + + + converver + str_converter + + + formatter + None + + + grid_pos + + + + notebook + + + + _coordinate + (515, 8) + + + _rotation + 0 + + + + analog_noise_source_x + + id + analog_noise_source_x_0 + + + _enabled + True + + + type + complex + + + noise_type + analog.GR_GAUSSIAN + + + amp + (noise_power/2.0)**0.5 + + + seed + 0 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (872, 258) + + + _rotation + 180 + + + + foo_wireshark_connector + + id + foo_wireshark_connector_0 + + + _enabled + False + + + tech + 127 + + + debug + False + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (628, 169) + + + _rotation + 0 + + + + blocks_file_sink + + id + blocks_file_sink_0 + + + _enabled + False + + + file + /tmp/ofdm.bin + + + type + byte + + + vlen + 1 + + + unbuffered + True + + + append + False + + + affinity + + + + _coordinate + (863, 161) _rotation @@ -833,30 +939,6 @@ 0 0 - - blocks_message_strobe_0 - ieee802_11_ofdm_mac_0 - 0 - 0 - - - ofdm_phy_hier_1 - ieee802_11_ofdm_mac_0 - 1 - 1 - - - ieee802_11_ofdm_mac_0 - ofdm_phy_hier_1 - 1 - 1 - - - ofdm_phy_hier_1 - ieee802_11_ofdm_parse_mac_0 - 1 - 0 - blocks_multiply_xx_0 blocks_multiply_const_vxx_0 @@ -869,4 +951,34 @@ 0 0 + + ofdm_phy_hier_1 + ieee802_11_ofdm_parse_mac_0 + mac_out + in + + + blocks_message_strobe_0 + ieee802_11_ofdm_mac_0 + strobe + app in + + + ofdm_phy_hier_1 + ieee802_11_ofdm_mac_0 + mac_out + phy in + + + ieee802_11_ofdm_mac_0 + ofdm_phy_hier_1 + phy out + mac_in + + + ieee802_11_ofdm_mac_0 + foo_wireshark_connector_0 + phy out + in + diff --git a/examples/ofdm_phy_hier.grc b/examples/ofdm_phy_hier.grc index 32956d6..fe7dad5 100644 --- a/examples/ofdm_phy_hier.grc +++ b/examples/ofdm_phy_hier.grc @@ -1,6 +1,6 @@ - Thu Oct 10 15:16:18 2013 + Wed Nov 27 17:35:35 2013 options @@ -60,29 +60,6 @@ 0 - - variable - - id - window_size - - - _enabled - True - - - value - 48 - - - _coordinate - (323, 14) - - - _rotation - 0 - - variable @@ -106,6 +83,29 @@ 0 + + variable + + id + window_size + + + _enabled + True + + + value + 48 + + + _coordinate + (323, 14) + + + _rotation + 0 + + pad_source @@ -163,6 +163,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (370, 480) @@ -206,6 +210,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (224, 476) @@ -237,6 +245,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (754, 809) @@ -311,6 +323,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (1013, 661) @@ -355,47 +371,12 @@ 0 - _coordinate - (449, 678) - - - _rotation + maxoutbuf 0 - - - pad_source - - id - pad_source_1 - - - _enabled - True - - - label - mac_in - - - type - message - - - vlen - 1 - - - num_streams - 1 - - - optional - False - _coordinate - (131, 116) + (449, 678) _rotation @@ -432,6 +413,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (596, 446) @@ -463,6 +448,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (960, 463) @@ -494,6 +483,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (586, 390) @@ -533,6 +526,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (1116, 540) @@ -576,6 +573,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (956, 238) @@ -607,6 +608,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (491, 254) @@ -616,41 +621,6 @@ 180 - - ieee802_11_ofdm_mapper - - id - ieee802_11_ofdm_mapper_0 - - - _enabled - True - - - encoding - encoding - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (382, 108) - - - _rotation - 0 - - ieee802_11_ofdm_pilot @@ -673,6 +643,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (630, 116) @@ -724,6 +698,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (850, 84) @@ -763,6 +741,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (741, 254) @@ -798,6 +780,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (759, 459) @@ -833,6 +819,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (867, 386) @@ -872,6 +862,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (669, 645) @@ -919,6 +913,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (169, 612) @@ -928,41 +926,6 @@ 0 - - ieee802_11_ofdm_decode_mac - - id - ieee802_11_ofdm_decode_mac_0 - - - _enabled - True - - - log - True - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (260, 801) - - - _rotation - 180 - - fft_vxx @@ -1005,6 +968,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (1000, 777) @@ -1040,6 +1007,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (511, 801) @@ -1088,6 +1059,123 @@ 180 + + pad_source + + id + pad_source_1 + + + _enabled + True + + + label + mac_in + + + type + message + + + vlen + 1 + + + num_streams + 1 + + + optional + False + + + _coordinate + (131, 116) + + + _rotation + 0 + + + + ieee802_11_ofdm_mapper + + id + ieee802_11_ofdm_mapper_0 + + + _enabled + True + + + encoding + encoding + + + debug + False + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (382, 108) + + + _rotation + 0 + + + + ieee802_11_ofdm_decode_mac + + id + ieee802_11_ofdm_decode_mac_0 + + + _enabled + True + + + log + True + + + debug + False + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (260, 801) + + + _rotation + 180 + + pad_sink @@ -1287,12 +1375,12 @@ pad_source_1 ieee802_11_ofdm_mapper_0 0 - 0 + in ieee802_11_ofdm_decode_mac_0 pad_sink_1 - 0 + out 0 diff --git a/examples/ofdm_rx.grc b/examples/ofdm_rx.grc index d47277e..9c94790 100644 --- a/examples/ofdm_rx.grc +++ b/examples/ofdm_rx.grc @@ -1,6 +1,6 @@ - Tue Nov 26 17:49:14 2013 + Thu Dec 5 14:06:08 2013 options @@ -60,29 +60,6 @@ 0 - - variable - - id - sync_length - - - _enabled - True - - - value - 320 - - - _coordinate - (459, 46) - - - _rotation - 0 - - variable @@ -106,6 +83,29 @@ 0 + + variable + + id + sync_length + + + _enabled + True + + + value + 320 + + + _coordinate + (459, 46) + + + _rotation + 0 + + fft_vxx @@ -148,6 +148,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (91, 697) @@ -175,6 +179,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (329, 320) @@ -206,6 +214,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (465, 729) @@ -351,6 +363,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (354, 539) @@ -390,6 +406,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (571, 506) @@ -429,6 +449,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (864, 522) @@ -460,6 +484,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (977, 303) @@ -495,6 +523,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (738, 299) @@ -534,6 +566,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (1154, 383) @@ -543,41 +579,6 @@ 270 - - ieee802_11_ofdm_decode_signal - - id - ieee802_11_ofdm_decode_signal_0 - - - _enabled - True - - - log - False - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (819, 721) - - - _rotation - 0 - - ieee802_11_moving_average_xx @@ -604,6 +605,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (626, 215) @@ -613,72 +618,6 @@ 0 - - ieee802_11_ofdm_parse_mac - - id - ieee802_11_ofdm_parse_mac_0 - - - _enabled - True - - - log - False - - - debug - True - - - affinity - - - - _coordinate - (1030, 857) - - - _rotation - 180 - - - - ieee802_11_ofdm_decode_mac - - id - ieee802_11_ofdm_decode_mac_0 - - - _enabled - True - - - log - False - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (1068, 721) - - - _rotation - 0 - - blocks_ctrlport_monitor @@ -759,6 +698,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (112, 316) @@ -790,6 +733,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (340, 219) @@ -829,6 +776,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (588, 286) @@ -889,6 +840,182 @@ 0 + + ieee802_11_ofdm_sync_short + + id + ieee802_11_ofdm_sync_short_0 + + + _enabled + True + + + log + False + + + debug + False + + + threshold + 0.8 + + + max_samples + 80 * 160 + + + min_plateau + 2 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (100, 473) + + + _rotation + 0 + + + + variable_slider + + id + gain + + + _enabled + True + + + label + + + + value + 14 + + + min + 0 + + + max + 100 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (680, 26) + + + _rotation + 0 + + + + ieee802_11_ofdm_decode_mac + + id + ieee802_11_ofdm_decode_mac_0 + + + _enabled + True + + + log + False + + + debug + False + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (1068, 721) + + + _rotation + 0 + + + + ieee802_11_ofdm_parse_mac + + id + ieee802_11_ofdm_parse_mac_0 + + + _enabled + True + + + log + False + + + debug + True + + + affinity + + + + _coordinate + (1030, 857) + + + _rotation + 180 + + uhd_usrp_source @@ -1037,7 +1164,7 @@ center_freq0 - uhd.tune_request(freq, lo_offset) + uhd.tune_request(freq - lo_offset, lo_offset) gain0 @@ -1555,6 +1682,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (24, 33) @@ -1565,10 +1696,10 @@ - ieee802_11_ofdm_sync_short + ieee802_11_ofdm_decode_signal id - ieee802_11_ofdm_sync_short_0 + ieee802_11_ofdm_decode_signal_0 _enabled @@ -1576,24 +1707,12 @@ log - False + True debug False - - threshold - 0.8 - - - max_samples - 80 * 160 - - - min_plateau - 2 - affinity @@ -1603,63 +1722,12 @@ 0 - _coordinate - (100, 473) - - - _rotation - 0 - - - - variable_slider - - id - gain - - - _enabled - True - - - label - - - - value - 14 - - - min + maxoutbuf 0 - - max - 100 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - - - - notebook - - _coordinate - (680, 26) + (819, 721) _rotation @@ -1789,7 +1857,7 @@ ieee802_11_ofdm_decode_mac_0 ieee802_11_ofdm_parse_mac_0 - 0 - 0 + out + in diff --git a/examples/ofdm_rx_nogui.grc b/examples/ofdm_rx_nogui.grc deleted file mode 100644 index 98458f5..0000000 --- a/examples/ofdm_rx_nogui.grc +++ /dev/null @@ -1,1852 +0,0 @@ - - - Sat Oct 12 19:44:55 2013 - - options - - id - ofdm_rx_nogui - - - _enabled - True - - - title - - - - author - - - - description - - - - window_size - 1280, 1024 - - - generate_options - no_gui - - - category - Custom - - - run_options - run - - - run - True - - - max_nouts - 0 - - - realtime_scheduling - - - - _coordinate - (292, 16) - - - _rotation - 0 - - - - variable - - id - freq - - - _enabled - True - - - value - 5.89e9 - - - _coordinate - (687, 27) - - - _rotation - 0 - - - - variable - - id - window_size - - - _enabled - True - - - value - 48 - - - _coordinate - (487, 24) - - - _rotation - 0 - - - - variable - - id - samp_rate - - - _enabled - True - - - value - 10e6 - - - _coordinate - (592, 24) - - - _rotation - 0 - - - - blocks_conjugate_cc - - id - blocks_conjugate_cc_0 - - - _enabled - True - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (376, 323) - - - _rotation - 0 - - - - ieee802_11_ofdm_sync_short - - id - ieee802_11_ofdm_sync_short_0 - - - _enabled - True - - - log - False - - - debug - False - - - threshold - 0.8 - - - max_samples - 80 * 160 - - - min_plateau - 2 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (279, 478) - - - _rotation - 0 - - - - fft_vxx - - id - fft_vxx_0 - - - _enabled - True - - - type - complex - - - fft_size - 64 - - - forward - True - - - window - - - - shift - True - - - nthreads - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (91, 697) - - - _rotation - 0 - - - - foo_wireshark_connector - - id - foo_wireshark_connector_0 - - - _enabled - True - - - tech - 127 - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (925, 943) - - - _rotation - 180 - - - - blocks_file_sink - - id - blocks_file_sink_0 - - - _enabled - True - - - file - /tmp/unex_sdr_90dB.pcap - - - type - byte - - - vlen - 1 - - - unbuffered - True - - - append - False - - - affinity - - - - _coordinate - (687, 935) - - - _rotation - 180 - - - - ieee802_11_ofdm_decode_signal - - id - ieee802_11_ofdm_decode_signal_0 - - - _enabled - True - - - log - False - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (660, 721) - - - _rotation - 0 - - - - ieee802_11_ofdm_decode_mac - - id - ieee802_11_ofdm_decode_mac_0 - - - _enabled - True - - - log - False - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (919, 721) - - - _rotation - 0 - - - - blocks_ctrlport_monitor - - id - blocks_ctrlport_monitor_0 - - - _enabled - True - - - en - True - - - _coordinate - (565, 135) - - - _rotation - 0 - - - - blocks_delay - - id - blocks_delay_0 - - - _enabled - True - - - type - complex - - - delay - 16 - - - num_ports - 1 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (133, 319) - - - _rotation - 0 - - - - blocks_complex_to_mag_squared - - id - blocks_complex_to_mag_squared_0 - - - _enabled - True - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (341, 218) - - - _rotation - 0 - - - - ieee802_11_moving_average_xx - - id - ieee802_11_moving_average_xx_0 - - - _enabled - True - - - type - float - - - length - window_size - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (650, 214) - - - _rotation - 0 - - - - blocks_divide_xx - - id - blocks_divide_xx_0 - - - _enabled - True - - - type - float - - - vlen - 1 - - - num_inputs - 2 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (1124, 384) - - - _rotation - 270 - - - - blocks_multiply_xx - - id - blocks_multiply_xx_0 - - - _enabled - True - - - type - complex - - - num_inputs - 2 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (601, 289) - - - _rotation - 0 - - - - blocks_complex_to_mag - - id - blocks_complex_to_mag_0 - - - _enabled - True - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (968, 306) - - - _rotation - 0 - - - - ieee802_11_moving_average_xx - - id - ieee802_11_moving_average_xx_1 - - - _enabled - True - - - type - complex - - - length - window_size - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (753, 302) - - - _rotation - 0 - - - - ieee802_11_ofdm_sync_long - - id - ieee802_11_ofdm_sync_long_0 - - - _enabled - True - - - log - False - - - debug - False - - - sync_length - delay - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (705, 511) - - - _rotation - 0 - - - - blocks_delay - - id - blocks_delay_0_0 - - - _enabled - True - - - type - complex - - - delay - delay - - - num_ports - 1 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (493, 544) - - - _rotation - 0 - - - - blocks_stream_to_vector - - id - blocks_stream_to_vector_0 - - - _enabled - True - - - type - complex - - - num_items - 64 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (951, 527) - - - _rotation - 0 - - - - parameter - - id - gain - - - _enabled - True - - - label - gain - - - value - 40 - - - type - intx - - - short_id - - - - _coordinate - (906, 21) - - - _rotation - 0 - - - - parameter - - id - plateau - - - _enabled - True - - - label - plateau - - - value - 2 - - - type - intx - - - short_id - - - - _coordinate - (1003, 20) - - - _rotation - 0 - - - - parameter - - id - threshold - - - _enabled - True - - - label - threshold - - - value - 0.8 - - - type - eng_float - - - short_id - - - - _coordinate - (1109, 17) - - - _rotation - 0 - - - - ieee802_11_ofdm_parse_mac - - id - ieee802_11_ofdm_parse_mac_0 - - - _enabled - True - - - log - False - - - debug - False - - - affinity - - - - _coordinate - (947, 840) - - - _rotation - 180 - - - - ieee802_11_ofdm_equalize_symbols - - id - ieee802_11_ofdm_equalize_symbols_0 - - - _enabled - True - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (382, 729) - - - _rotation - 0 - - - - parameter - - id - delay - - - _enabled - True - - - label - delay - - - value - 320 - - - type - intx - - - short_id - - - - _coordinate - (812, 19) - - - _rotation - 0 - - - - uhd_usrp_source - - id - uhd_usrp_source_0 - - - _enabled - True - - - type - fc32 - - - otw - - - - stream_args - - - - stream_chans - [] - - - dev_addr - - - - sync - - - - clock_rate - 0.0 - - - num_mboards - 1 - - - clock_source0 - - - - time_source0 - - - - sd_spec0 - - - - clock_source1 - - - - time_source1 - - - - sd_spec1 - - - - clock_source2 - - - - time_source2 - - - - sd_spec2 - - - - clock_source3 - - - - time_source3 - - - - sd_spec3 - - - - clock_source4 - - - - time_source4 - - - - sd_spec4 - - - - clock_source5 - - - - time_source5 - - - - sd_spec5 - - - - clock_source6 - - - - time_source6 - - - - sd_spec6 - - - - clock_source7 - - - - time_source7 - - - - sd_spec7 - - - - nchan - 1 - - - samp_rate - samp_rate - - - center_freq0 - uhd.tune_request(freq, lo_offset) - - - gain0 - gain - - - ant0 - - - - bw0 - 0 - - - center_freq1 - 0 - - - gain1 - 0 - - - ant1 - - - - bw1 - 0 - - - center_freq2 - 0 - - - gain2 - 0 - - - ant2 - - - - bw2 - 0 - - - center_freq3 - 0 - - - gain3 - 0 - - - ant3 - - - - bw3 - 0 - - - center_freq4 - 0 - - - gain4 - 0 - - - ant4 - - - - bw4 - 0 - - - center_freq5 - 0 - - - gain5 - 0 - - - ant5 - - - - bw5 - 0 - - - center_freq6 - 0 - - - gain6 - 0 - - - ant6 - - - - bw6 - 0 - - - center_freq7 - 0 - - - gain7 - 0 - - - ant7 - - - - bw7 - 0 - - - center_freq8 - 0 - - - gain8 - 0 - - - ant8 - - - - bw8 - 0 - - - center_freq9 - 0 - - - gain9 - 0 - - - ant9 - - - - bw9 - 0 - - - center_freq10 - 0 - - - gain10 - 0 - - - ant10 - - - - bw10 - 0 - - - center_freq11 - 0 - - - gain11 - 0 - - - ant11 - - - - bw11 - 0 - - - center_freq12 - 0 - - - gain12 - 0 - - - ant12 - - - - bw12 - 0 - - - center_freq13 - 0 - - - gain13 - 0 - - - ant13 - - - - bw13 - 0 - - - center_freq14 - 0 - - - gain14 - 0 - - - ant14 - - - - bw14 - 0 - - - center_freq15 - 0 - - - gain15 - 0 - - - ant15 - - - - bw15 - 0 - - - center_freq16 - 0 - - - gain16 - 0 - - - ant16 - - - - bw16 - 0 - - - center_freq17 - 0 - - - gain17 - 0 - - - ant17 - - - - bw17 - 0 - - - center_freq18 - 0 - - - gain18 - 0 - - - ant18 - - - - bw18 - 0 - - - center_freq19 - 0 - - - gain19 - 0 - - - ant19 - - - - bw19 - 0 - - - center_freq20 - 0 - - - gain20 - 0 - - - ant20 - - - - bw20 - 0 - - - center_freq21 - 0 - - - gain21 - 0 - - - ant21 - - - - bw21 - 0 - - - center_freq22 - 0 - - - gain22 - 0 - - - ant22 - - - - bw22 - 0 - - - center_freq23 - 0 - - - gain23 - 0 - - - ant23 - - - - bw23 - 0 - - - center_freq24 - 0 - - - gain24 - 0 - - - ant24 - - - - bw24 - 0 - - - center_freq25 - 0 - - - gain25 - 0 - - - ant25 - - - - bw25 - 0 - - - center_freq26 - 0 - - - gain26 - 0 - - - ant26 - - - - bw26 - 0 - - - center_freq27 - 0 - - - gain27 - 0 - - - ant27 - - - - bw27 - 0 - - - center_freq28 - 0 - - - gain28 - 0 - - - ant28 - - - - bw28 - 0 - - - center_freq29 - 0 - - - gain29 - 0 - - - ant29 - - - - bw29 - 0 - - - center_freq30 - 0 - - - gain30 - 0 - - - ant30 - - - - bw30 - 0 - - - center_freq31 - 0 - - - gain31 - 0 - - - ant31 - - - - bw31 - 0 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (104, 98) - - - _rotation - 180 - - - - parameter - - id - lo_offset - - - _enabled - True - - - label - lo_offset - - - value - 0 - - - type - eng_float - - - short_id - - - - _coordinate - (696, 99) - - - _rotation - 0 - - - - blocks_complex_to_mag_0 - blocks_divide_xx_0 - 0 - 0 - - - blocks_conjugate_cc_0 - blocks_multiply_xx_0 - 0 - 1 - - - blocks_delay_0 - blocks_conjugate_cc_0 - 0 - 0 - - - blocks_stream_to_vector_0 - fft_vxx_0 - 0 - 0 - - - ieee802_11_ofdm_sync_short_0 - ieee802_11_ofdm_sync_long_0 - 0 - 0 - - - ieee802_11_ofdm_equalize_symbols_0 - ieee802_11_ofdm_decode_signal_0 - 0 - 0 - - - blocks_divide_xx_0 - ieee802_11_ofdm_sync_short_0 - 0 - 1 - - - blocks_delay_0 - ieee802_11_ofdm_sync_short_0 - 0 - 0 - - - ieee802_11_ofdm_sync_short_0 - blocks_delay_0_0 - 0 - 0 - - - blocks_delay_0_0 - ieee802_11_ofdm_sync_long_0 - 0 - 1 - - - ieee802_11_ofdm_sync_long_0 - blocks_stream_to_vector_0 - 0 - 0 - - - fft_vxx_0 - ieee802_11_ofdm_equalize_symbols_0 - 0 - 0 - - - ieee802_11_ofdm_decode_signal_0 - ieee802_11_ofdm_decode_mac_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_ofdm_decode_mac_0 - ieee802_11_ofdm_parse_mac_0 - 0 - 0 - - - uhd_usrp_source_0 - blocks_complex_to_mag_squared_0 - 0 - 0 - - - uhd_usrp_source_0 - blocks_delay_0 - 0 - 0 - - - uhd_usrp_source_0 - blocks_multiply_xx_0 - 0 - 0 - - - blocks_complex_to_mag_squared_0 - ieee802_11_moving_average_xx_0 - 0 - 0 - - - ieee802_11_moving_average_xx_0 - blocks_divide_xx_0 - 0 - 1 - - - blocks_multiply_xx_0 - ieee802_11_moving_average_xx_1 - 0 - 0 - - - ieee802_11_moving_average_xx_1 - blocks_complex_to_mag_0 - 0 - 0 - - diff --git a/examples/ofdm_sim.grc b/examples/ofdm_sim.grc deleted file mode 100644 index 2d97838..0000000 --- a/examples/ofdm_sim.grc +++ /dev/null @@ -1,710 +0,0 @@ - - - Wed Aug 28 12:48:20 2013 - - options - - id - ofdm_sim - - - _enabled - True - - - title - - - - author - - - - description - - - - window_size - 1280, 1024 - - - generate_options - no_gui - - - category - Custom - - - run_options - run - - - run - True - - - max_nouts - 0 - - - realtime_scheduling - - - - _coordinate - (6, 5) - - - _rotation - 0 - - - - variable - - id - samp_rate - - - _enabled - True - - - value - 20000000 - - - _coordinate - (1067, 17) - - - _rotation - 0 - - - - parameter - - id - freq_offset - - - _enabled - True - - - label - - - - value - 0 - - - type - eng_float - - - short_id - - - - _coordinate - (967, 14) - - - _rotation - 0 - - - - analog_sig_source_x - - id - analog_sig_source_x_0 - - - _enabled - True - - - type - complex - - - samp_rate - samp_rate - - - waveform - analog.GR_COS_WAVE - - - freq - freq_offset - - - amp - 1 - - - offset - 0 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (459, 447) - - - _rotation - 0 - - - - blocks_add_xx - - id - blocks_add_xx_0 - - - _enabled - True - - - type - complex - - - num_inputs - 2 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (742, 282) - - - _rotation - 180 - - - - parameter - - id - seed - - - _enabled - True - - - label - - - - value - 0 - - - type - long - - - short_id - - - - _coordinate - (877, 16) - - - _rotation - 0 - - - - blocks_multiply_xx - - id - blocks_multiply_xx_0 - - - _enabled - True - - - type - complex - - - num_inputs - 2 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (695, 377) - - - _rotation - 0 - - - - parameter - - id - snr - - - _enabled - True - - - label - - - - value - 10 - - - type - eng_float - - - short_id - - - - _coordinate - (767, 19) - - - _rotation - 0 - - - - analog_noise_source_x - - id - analog_noise_source_x_0 - - - _enabled - True - - - type - complex - - - noise_type - analog.GR_GAUSSIAN - - - amp - ((10**(-snr/10.0))/2.0)**0.5 - - - seed - seed - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (860, 262) - - - _rotation - 180 - - - - parameter - - id - encoding - - - _enabled - True - - - label - - - - value - 0 - - - type - intx - - - short_id - - - - _coordinate - (676, 15) - - - _rotation - 0 - - - - ofdm_phy_hier - - id - ofdm_phy_hier_1 - - - _enabled - True - - - encoding - encoding - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (497, 265) - - - _rotation - 180 - - - - foo_packet_pad - - id - foo_packet_pad_0 - - - _enabled - True - - - debug - False - - - pad_front - 0 - - - pad_tail - 15000 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (467, 357) - - - _rotation - 0 - - - - ieee802_11_ofdm_mac - - id - ieee802_11_ofdm_mac_0 - - - _enabled - True - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (501, 166) - - - _rotation - 0 - - - - ieee802_11_ofdm_parse_mac - - id - ieee802_11_ofdm_parse_mac_0 - - - _enabled - True - - - log - True - - - debug - True - - - affinity - - - - _coordinate - (250, 253) - - - _rotation - 180 - - - - import - - id - import_0 - - - _enabled - True - - - import - import random - - - _coordinate - (467, 25) - - - _rotation - 0 - - - - import - - id - import_1 - - - _enabled - True - - - import - import string - - - _coordinate - (573, 25) - - - _rotation - 0 - - - - parameter - - id - packet_length - - - _enabled - True - - - label - - - - value - 133 - - - type - intx - - - short_id - - - - _coordinate - (339, 14) - - - _rotation - 0 - - - - foo_periodic_msg_source - - id - foo_periodic_msg_source_0_0 - - - _enabled - True - - - msg - pmt.intern(''.join(random.choice(string.ascii_letters + string.digits) for x in range(packet_length-24))) - - - interval - 50 - - - debug - False - - - num - 100 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (78, 138) - - - _rotation - 0 - - - - analog_sig_source_x_0 - blocks_multiply_xx_0 - 0 - 1 - - - foo_packet_pad_0 - blocks_multiply_xx_0 - 0 - 0 - - - blocks_add_xx_0 - ofdm_phy_hier_1 - 0 - 0 - - - blocks_multiply_xx_0 - blocks_add_xx_0 - 0 - 0 - - - analog_noise_source_x_0 - blocks_add_xx_0 - 0 - 1 - - - ofdm_phy_hier_1 - ieee802_11_ofdm_parse_mac_0 - 1 - 0 - - - ieee802_11_ofdm_mac_0 - ofdm_phy_hier_1 - 1 - 1 - - - ofdm_phy_hier_1 - foo_packet_pad_0 - 0 - 0 - - - foo_periodic_msg_source_0_0 - ieee802_11_ofdm_mac_0 - 0 - 0 - - - foo_periodic_msg_source_0_0 - ieee802_11_ofdm_parse_mac_0 - 0 - 0 - - diff --git a/examples/ofdm_transceiver.grc b/examples/ofdm_transceiver.grc index b6626f4..c4a0ebc 100644 --- a/examples/ofdm_transceiver.grc +++ b/examples/ofdm_transceiver.grc @@ -1,6 +1,6 @@ - Sat Oct 12 19:42:08 2013 + Thu Dec 5 14:40:29 2013 options @@ -162,72 +162,6 @@ 0 - - ieee802_11_ether_encap - - id - ieee802_11_ether_encap_0 - - - _enabled - True - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (308, 156) - - - _rotation - 0 - - - - foo_wireshark_connector - - id - foo_wireshark_connector_0 - - - _enabled - True - - - tech - 127 - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (580, 307) - - - _rotation - 0 - - blocks_ctrlport_monitor_performance @@ -274,49 +208,6 @@ 0 - - blocks_file_sink - - id - blocks_file_sink_0 - - - _enabled - True - - - file - /tmp/ofdm.pcap - - - type - byte - - - vlen - 1 - - - unbuffered - True - - - append - True - - - affinity - - - - _coordinate - (800, 299) - - - _rotation - 0 - - variable_slider @@ -427,169 +318,6 @@ 0 - - blocks_tuntap_pdu - - id - blocks_tuntap_pdu_0 - - - _enabled - True - - - ifn - tap0 - - - mtu - 440 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (310, 74) - - - _rotation - 180 - - - - foo_packet_pad - - id - foo_packet_pad_0 - - - _enabled - True - - - debug - False - - - pad_front - 10000 - - - pad_tail - 0 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (73, 479) - - - _rotation - 0 - - - - ofdm_phy_hier - - id - ofdm_phy_hier_1 - - - _enabled - True - - - encoding - encoding - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (325, 356) - - - _rotation - 180 - - - - ieee802_11_ofdm_mac - - id - ieee802_11_ofdm_mac_0 - - - _enabled - True - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (339, 257) - - - _rotation - 0 - - - - ieee802_11_ofdm_parse_mac - - id - ieee802_11_ofdm_parse_mac_0 - - - _enabled - True - - - log - False - - - debug - True - - - affinity - - - - _coordinate - (94, 279) - - - _rotation - 180 - - variable_chooser @@ -692,6 +420,224 @@ 0 + + blocks_tuntap_pdu + + id + blocks_tuntap_pdu_0 + + + _enabled + True + + + ifn + tap0 + + + mtu + 440 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (310, 74) + + + _rotation + 180 + + + + ieee802_11_ether_encap + + id + ieee802_11_ether_encap_0 + + + _enabled + True + + + debug + False + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (308, 156) + + + _rotation + 0 + + + + ieee802_11_ofdm_parse_mac + + id + ieee802_11_ofdm_parse_mac_0 + + + _enabled + True + + + log + False + + + debug + True + + + affinity + + + + _coordinate + (94, 308) + + + _rotation + 180 + + + + ieee802_11_ofdm_mac + + id + ieee802_11_ofdm_mac_0 + + + _enabled + True + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (339, 257) + + + _rotation + 0 + + + + foo_wireshark_connector + + id + foo_wireshark_connector_0 + + + _enabled + True + + + tech + 127 + + + debug + False + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (580, 308) + + + _rotation + 0 + + + + blocks_file_sink + + id + blocks_file_sink_0 + + + _enabled + True + + + file + /tmp/ofdm.pcap + + + type + byte + + + vlen + 1 + + + unbuffered + True + + + append + True + + + affinity + + + + _coordinate + (805, 300) + + + _rotation + 0 + + uhd_usrp_sink @@ -840,7 +786,7 @@ center_freq0 - uhd.tune_request(freq, lo_offset) + uhd.tune_request(freq - lo_offset, lo_offset) gain0 @@ -1511,7 +1457,7 @@ center_freq0 - uhd.tune_request(freq, lo_offset) + uhd.tune_request(freq - lo_offset, lo_offset) gain0 @@ -2029,6 +1975,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (460, 483) @@ -2038,60 +1988,194 @@ 0 + + ofdm_phy_hier + + id + ofdm_phy_hier_1 + + + _enabled + True + + + encoding + encoding + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (324, 355) + + + _rotation + 180 + + + + foo_packet_pad + + id + foo_packet_pad_0 + + + _enabled + True + + + debug + False + + + pad_front + 10000 + + + pad_tail + 0 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (73, 479) + + + _rotation + 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 + (104, 385) + + + _rotation + 180 + + + + variable_slider + + id + mult + + + _enabled + True + + + label + + + + value + 0.38 + + + min + 0 + + + max + 1 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (1140, 247) + + + _rotation + 0 + + foo_wireshark_connector_0 blocks_file_sink_0 0 0 - - ieee802_11_ofdm_mac_0 - ofdm_phy_hier_1 - 1 - 1 - - - ieee802_11_ofdm_mac_0 - ieee802_11_ether_encap_0 - 0 - 1 - - - ieee802_11_ether_encap_0 - ieee802_11_ofdm_mac_0 - 1 - 0 - foo_packet_pad_0 uhd_usrp_sink_0 0 0 - - ofdm_phy_hier_1 - foo_packet_pad_0 - 0 - 0 - - - blocks_tuntap_pdu_0 - ieee802_11_ether_encap_0 - 0 - 0 - - - ieee802_11_ether_encap_0 - blocks_tuntap_pdu_0 - 0 - 0 - - - ieee802_11_ofdm_mac_0 - foo_wireshark_connector_0 - 1 - 0 - uhd_usrp_source_0 ofdm_phy_hier_1 @@ -2099,15 +2183,69 @@ 0 - ofdm_phy_hier_1 - ieee802_11_ofdm_parse_mac_0 - 1 - 0 + ieee802_11_ofdm_mac_0 + ofdm_phy_hier_1 + phy out + mac_in ofdm_phy_hier_1 ieee802_11_ofdm_mac_0 - 1 - 1 + mac_out + phy in + + + ieee802_11_ether_encap_0 + blocks_tuntap_pdu_0 + to tap + pdus + + + blocks_tuntap_pdu_0 + ieee802_11_ether_encap_0 + pdus + from tap + + + ieee802_11_ofdm_mac_0 + ieee802_11_ether_encap_0 + app out + from wifi + + + ieee802_11_ether_encap_0 + ieee802_11_ofdm_mac_0 + to wifi + app in + + + ofdm_phy_hier_1 + ieee802_11_ofdm_parse_mac_0 + mac_out + in + + + ieee802_11_ofdm_mac_0 + foo_wireshark_connector_0 + phy out + in + + + ofdm_phy_hier_1 + foo_wireshark_connector_0 + mac_out + in + + + ofdm_phy_hier_1 + blocks_multiply_const_vxx_0 + 0 + 0 + + + blocks_multiply_const_vxx_0 + foo_packet_pad_0 + 0 + 0 diff --git a/examples/ofdm_transceiver_no_gui.grc b/examples/ofdm_transceiver_no_gui.grc deleted file mode 100644 index 79b8d9e..0000000 --- a/examples/ofdm_transceiver_no_gui.grc +++ /dev/null @@ -1,1989 +0,0 @@ - - - Sat Oct 12 19:48:41 2013 - - options - - id - ofdm_transceiver_no_gui - - - _enabled - True - - - title - - - - author - - - - description - - - - window_size - 1280, 1024 - - - generate_options - no_gui - - - category - Custom - - - run_options - run - - - run - True - - - max_nouts - 0 - - - realtime_scheduling - 1 - - - _coordinate - (12, 33) - - - _rotation - 0 - - - - ieee802_11_ofdm_parse_mac - - id - ieee802_11_ofdm_parse_mac_0 - - - _enabled - True - - - log - False - - - debug - True - - - affinity - - - - _coordinate - (48, 344) - - - _rotation - 180 - - - - ieee802_11_ether_encap - - id - ieee802_11_ether_encap_0 - - - _enabled - True - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (308, 156) - - - _rotation - 0 - - - - blocks_tuntap_pdu - - id - blocks_tuntap_pdu_0 - - - _enabled - True - - - ifn - tap0 - - - mtu - 260 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (310, 74) - - - _rotation - 180 - - - - ieee802_11_ofdm_mac - - id - ieee802_11_ofdm_mac_0 - - - _enabled - True - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (339, 257) - - - _rotation - 0 - - - - ofdm_phy_hier - - id - ofdm_phy_hier_1 - - - _enabled - True - - - encoding - encoding - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (324, 356) - - - _rotation - 180 - - - - parameter - - id - freq - - - _enabled - True - - - label - - - - value - 5860000000 - - - type - intx - - - short_id - - - - _coordinate - (586, 48) - - - _rotation - 0 - - - - parameter - - id - samp_rate - - - _enabled - True - - - label - - - - value - 10000000 - - - type - intx - - - short_id - - - - _coordinate - (683, 50) - - - _rotation - 0 - - - - parameter - - id - tx_gain - - - _enabled - True - - - label - - - - value - 15 - - - type - intx - - - short_id - - - - _coordinate - (781, 50) - - - _rotation - 0 - - - - blocks_ctrlport_monitor_performance - - id - blocks_ctrlport_monitor_performance_0 - - - _enabled - False - - - en - True - - - _coordinate - (10, 165) - - - _rotation - 0 - - - - blocks_ctrlport_monitor - - id - blocks_ctrlport_monitor_0 - - - _enabled - False - - - en - True - - - _coordinate - (32, 241) - - - _rotation - 0 - - - - parameter - - id - pad_tail - - - _enabled - True - - - label - - - - value - 100000 - - - type - intx - - - short_id - - - - _coordinate - (690, 143) - - - _rotation - 0 - - - - parameter - - id - rx_gain - - - _enabled - True - - - label - - - - value - 10 - - - type - intx - - - short_id - - - - _coordinate - (786, 152) - - - _rotation - 0 - - - - parameter - - id - encoding - - - _enabled - True - - - label - - - - value - 0 - - - type - intx - - - short_id - - - - _coordinate - (868, 54) - - - _rotation - 0 - - - - foo_packet_pad - - id - foo_packet_pad_0 - - - _enabled - True - - - debug - False - - - pad_front - pad_front - - - pad_tail - pad_tail - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (72, 447) - - - _rotation - 0 - - - - parameter - - id - pad_front - - - _enabled - True - - - label - - - - value - 100000 - - - type - intx - - - short_id - - - - _coordinate - (588, 149) - - - _rotation - 0 - - - - parameter - - id - lo_offset - - - _enabled - True - - - label - lo_offset - - - value - 0 - - - type - eng_float - - - short_id - - - - _coordinate - (575, 241) - - - _rotation - 0 - - - - uhd_usrp_source - - id - uhd_usrp_source_0 - - - _enabled - True - - - type - fc32 - - - otw - - - - stream_args - - - - stream_chans - [] - - - dev_addr - - - - sync - - - - clock_rate - 0.0 - - - num_mboards - 1 - - - clock_source0 - - - - time_source0 - - - - sd_spec0 - - - - clock_source1 - - - - time_source1 - - - - sd_spec1 - - - - clock_source2 - - - - time_source2 - - - - sd_spec2 - - - - clock_source3 - - - - time_source3 - - - - sd_spec3 - - - - clock_source4 - - - - time_source4 - - - - sd_spec4 - - - - clock_source5 - - - - time_source5 - - - - sd_spec5 - - - - clock_source6 - - - - time_source6 - - - - sd_spec6 - - - - clock_source7 - - - - time_source7 - - - - sd_spec7 - - - - nchan - 1 - - - samp_rate - samp_rate - - - center_freq0 - uhd.tune_request(freq, lo_offset) - - - gain0 - rx_gain - - - ant0 - - - - bw0 - 0 - - - center_freq1 - 0 - - - gain1 - 0 - - - ant1 - - - - bw1 - 0 - - - center_freq2 - 0 - - - gain2 - 0 - - - ant2 - - - - bw2 - 0 - - - center_freq3 - 0 - - - gain3 - 0 - - - ant3 - - - - bw3 - 0 - - - center_freq4 - 0 - - - gain4 - 0 - - - ant4 - - - - bw4 - 0 - - - center_freq5 - 0 - - - gain5 - 0 - - - ant5 - - - - bw5 - 0 - - - center_freq6 - 0 - - - gain6 - 0 - - - ant6 - - - - bw6 - 0 - - - center_freq7 - 0 - - - gain7 - 0 - - - ant7 - - - - bw7 - 0 - - - center_freq8 - 0 - - - gain8 - 0 - - - ant8 - - - - bw8 - 0 - - - center_freq9 - 0 - - - gain9 - 0 - - - ant9 - - - - bw9 - 0 - - - center_freq10 - 0 - - - gain10 - 0 - - - ant10 - - - - bw10 - 0 - - - center_freq11 - 0 - - - gain11 - 0 - - - ant11 - - - - bw11 - 0 - - - center_freq12 - 0 - - - gain12 - 0 - - - ant12 - - - - bw12 - 0 - - - center_freq13 - 0 - - - gain13 - 0 - - - ant13 - - - - bw13 - 0 - - - center_freq14 - 0 - - - gain14 - 0 - - - ant14 - - - - bw14 - 0 - - - center_freq15 - 0 - - - gain15 - 0 - - - ant15 - - - - bw15 - 0 - - - center_freq16 - 0 - - - gain16 - 0 - - - ant16 - - - - bw16 - 0 - - - center_freq17 - 0 - - - gain17 - 0 - - - ant17 - - - - bw17 - 0 - - - center_freq18 - 0 - - - gain18 - 0 - - - ant18 - - - - bw18 - 0 - - - center_freq19 - 0 - - - gain19 - 0 - - - ant19 - - - - bw19 - 0 - - - center_freq20 - 0 - - - gain20 - 0 - - - ant20 - - - - bw20 - 0 - - - center_freq21 - 0 - - - gain21 - 0 - - - ant21 - - - - bw21 - 0 - - - center_freq22 - 0 - - - gain22 - 0 - - - ant22 - - - - bw22 - 0 - - - center_freq23 - 0 - - - gain23 - 0 - - - ant23 - - - - bw23 - 0 - - - center_freq24 - 0 - - - gain24 - 0 - - - ant24 - - - - bw24 - 0 - - - center_freq25 - 0 - - - gain25 - 0 - - - ant25 - - - - bw25 - 0 - - - center_freq26 - 0 - - - gain26 - 0 - - - ant26 - - - - bw26 - 0 - - - center_freq27 - 0 - - - gain27 - 0 - - - ant27 - - - - bw27 - 0 - - - center_freq28 - 0 - - - gain28 - 0 - - - ant28 - - - - bw28 - 0 - - - center_freq29 - 0 - - - gain29 - 0 - - - ant29 - - - - bw29 - 0 - - - center_freq30 - 0 - - - gain30 - 0 - - - ant30 - - - - bw30 - 0 - - - center_freq31 - 0 - - - gain31 - 0 - - - ant31 - - - - bw31 - 0 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (477, 445) - - - _rotation - 0 - - - - uhd_usrp_sink - - id - uhd_usrp_sink_0 - - - _enabled - True - - - type - fc32 - - - otw - - - - stream_args - - - - stream_chans - [] - - - dev_addr - - - - sync - - - - clock_rate - 0.0 - - - num_mboards - 1 - - - clock_source0 - - - - time_source0 - - - - sd_spec0 - - - - clock_source1 - - - - time_source1 - - - - sd_spec1 - - - - clock_source2 - - - - time_source2 - - - - sd_spec2 - - - - clock_source3 - - - - time_source3 - - - - sd_spec3 - - - - clock_source4 - - - - time_source4 - - - - sd_spec4 - - - - clock_source5 - - - - time_source5 - - - - sd_spec5 - - - - clock_source6 - - - - time_source6 - - - - sd_spec6 - - - - clock_source7 - - - - time_source7 - - - - sd_spec7 - - - - nchan - 1 - - - samp_rate - samp_rate - - - center_freq0 - uhd.tune_request(freq, lo_offset) - - - gain0 - tx_gain - - - ant0 - - - - bw0 - 0 - - - center_freq1 - 0 - - - gain1 - 0 - - - ant1 - - - - bw1 - 0 - - - center_freq2 - 0 - - - gain2 - 0 - - - ant2 - - - - bw2 - 0 - - - center_freq3 - 0 - - - gain3 - 0 - - - ant3 - - - - bw3 - 0 - - - center_freq4 - 0 - - - gain4 - 0 - - - ant4 - - - - bw4 - 0 - - - center_freq5 - 0 - - - gain5 - 0 - - - ant5 - - - - bw5 - 0 - - - center_freq6 - 0 - - - gain6 - 0 - - - ant6 - - - - bw6 - 0 - - - center_freq7 - 0 - - - gain7 - 0 - - - ant7 - - - - bw7 - 0 - - - center_freq8 - 0 - - - gain8 - 0 - - - ant8 - - - - bw8 - 0 - - - center_freq9 - 0 - - - gain9 - 0 - - - ant9 - - - - bw9 - 0 - - - center_freq10 - 0 - - - gain10 - 0 - - - ant10 - - - - bw10 - 0 - - - center_freq11 - 0 - - - gain11 - 0 - - - ant11 - - - - bw11 - 0 - - - center_freq12 - 0 - - - gain12 - 0 - - - ant12 - - - - bw12 - 0 - - - center_freq13 - 0 - - - gain13 - 0 - - - ant13 - - - - bw13 - 0 - - - center_freq14 - 0 - - - gain14 - 0 - - - ant14 - - - - bw14 - 0 - - - center_freq15 - 0 - - - gain15 - 0 - - - ant15 - - - - bw15 - 0 - - - center_freq16 - 0 - - - gain16 - 0 - - - ant16 - - - - bw16 - 0 - - - center_freq17 - 0 - - - gain17 - 0 - - - ant17 - - - - bw17 - 0 - - - center_freq18 - 0 - - - gain18 - 0 - - - ant18 - - - - bw18 - 0 - - - center_freq19 - 0 - - - gain19 - 0 - - - ant19 - - - - bw19 - 0 - - - center_freq20 - 0 - - - gain20 - 0 - - - ant20 - - - - bw20 - 0 - - - center_freq21 - 0 - - - gain21 - 0 - - - ant21 - - - - bw21 - 0 - - - center_freq22 - 0 - - - gain22 - 0 - - - ant22 - - - - bw22 - 0 - - - center_freq23 - 0 - - - gain23 - 0 - - - ant23 - - - - bw23 - 0 - - - center_freq24 - 0 - - - gain24 - 0 - - - ant24 - - - - bw24 - 0 - - - center_freq25 - 0 - - - gain25 - 0 - - - ant25 - - - - bw25 - 0 - - - center_freq26 - 0 - - - gain26 - 0 - - - ant26 - - - - bw26 - 0 - - - center_freq27 - 0 - - - gain27 - 0 - - - ant27 - - - - bw27 - 0 - - - center_freq28 - 0 - - - gain28 - 0 - - - ant28 - - - - bw28 - 0 - - - center_freq29 - 0 - - - gain29 - 0 - - - ant29 - - - - bw29 - 0 - - - center_freq30 - 0 - - - gain30 - 0 - - - ant30 - - - - bw30 - 0 - - - center_freq31 - 0 - - - gain31 - 0 - - - ant31 - - - - bw31 - 0 - - - affinity - - - - _coordinate - (260, 447) - - - _rotation - 0 - - - - ofdm_phy_hier_1 - ieee802_11_ofdm_parse_mac_0 - 1 - 0 - - - ofdm_phy_hier_1 - ieee802_11_ofdm_mac_0 - 1 - 1 - - - ieee802_11_ofdm_mac_0 - ofdm_phy_hier_1 - 1 - 1 - - - ieee802_11_ofdm_mac_0 - ieee802_11_ether_encap_0 - 0 - 1 - - - ieee802_11_ether_encap_0 - ieee802_11_ofdm_mac_0 - 1 - 0 - - - foo_packet_pad_0 - uhd_usrp_sink_0 - 0 - 0 - - - ofdm_phy_hier_1 - foo_packet_pad_0 - 0 - 0 - - - blocks_tuntap_pdu_0 - ieee802_11_ether_encap_0 - 0 - 0 - - - ieee802_11_ether_encap_0 - blocks_tuntap_pdu_0 - 0 - 0 - - - uhd_usrp_source_0 - ofdm_phy_hier_1 - 0 - 0 - - diff --git a/examples/ofdm_tx.grc b/examples/ofdm_tx.grc index 89bbab8..1ad38f0 100644 --- a/examples/ofdm_tx.grc +++ b/examples/ofdm_tx.grc @@ -1,6 +1,6 @@ - Tue Nov 26 17:43:02 2013 + Thu Dec 5 14:11:27 2013 options @@ -240,56 +240,6 @@ 0 - - blocks_ctrlport_monitor - - id - blocks_ctrlport_monitor_0 - - - _enabled - False - - - en - True - - - _coordinate - (1027, 451) - - - _rotation - 0 - - - - ieee802_11_ofdm_mac - - id - ieee802_11_ofdm_mac_0 - - - _enabled - True - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (464, 192) - - - _rotation - 0 - - variable_chooser @@ -341,41 +291,6 @@ 0 - - blocks_message_strobe - - id - blocks_message_strobe_0 - - - _enabled - True - - - msg - pmt.intern("Hello World") - - - period - 100 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (176, 180) - - - _rotation - 0 - - foo_packet_pad @@ -406,6 +321,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (72, 428) @@ -415,76 +334,6 @@ 0 - - blocks_multiply_const_vxx - - id - blocks_multiply_const_vxx_1 - - - _enabled - True - - - type - complex - - - const - mult - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (225, 330) - - - _rotation - 180 - - - - ofdm_phy_hier - - id - ofdm_phy_hier_0 - - - _enabled - True - - - encoding - encoding - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (460, 300) - - - _rotation - 180 - - blocks_null_source @@ -511,6 +360,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (692, 334) @@ -571,6 +424,154 @@ 0 + + variable_slider + + id + mult + + + _enabled + True + + + label + + + + value + 0.35 + + + min + 0 + + + max + 2 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (979, 10) + + + _rotation + 0 + + + + ieee802_11_ofdm_mac + + id + ieee802_11_ofdm_mac_0 + + + _enabled + True + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (465, 191) + + + _rotation + 0 + + + + blocks_message_strobe + + id + blocks_message_strobe_0 + + + _enabled + True + + + msg + pmt.intern("Hello World") + + + period + 100 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (181, 179) + + + _rotation + 0 + + + + blocks_ctrlport_monitor + + id + blocks_ctrlport_monitor_0 + + + _enabled + False + + + en + True + + + _coordinate + (980, 366) + + + _rotation + 0 + + uhd_usrp_sink @@ -719,7 +720,7 @@ center_freq0 - uhd.tune_request(freq, lo_offset) + uhd.tune_request(freq - lo_offset, lo_offset) gain0 @@ -727,7 +728,7 @@ ant0 - TX/RX + bw0 @@ -1235,7 +1236,7 @@ _coordinate - (321, 412) + (307, 420) _rotation @@ -1243,66 +1244,83 @@ - variable_slider + blocks_multiply_const_vxx id - mult + blocks_multiply_const_vxx_1 _enabled True - label + type + complex + + + const + mult + + + vlen + 1 + + + affinity - value - 0.35 - - - min + minoutbuf 0 - max - 2 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - - - - notebook - + maxoutbuf + 0 _coordinate - (979, 10) + (162, 330) _rotation - 0 + 180 + + + + ofdm_phy_hier + + id + ofdm_phy_hier_0 + + + _enabled + True + + + encoding + encoding + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (449, 300) + + + _rotation + 180 - - blocks_message_strobe_0 - ieee802_11_ofdm_mac_0 - 0 - 0 - blocks_multiply_const_vxx_1 foo_packet_pad_0 @@ -1321,16 +1339,28 @@ 0 0 - - ieee802_11_ofdm_mac_0 - ofdm_phy_hier_0 - 1 - 1 - blocks_null_source_0 ofdm_phy_hier_0 0 0 + + blocks_message_strobe_0 + ieee802_11_ofdm_mac_0 + strobe + app in + + + ofdm_phy_hier_0 + ieee802_11_ofdm_mac_0 + mac_out + phy in + + + ieee802_11_ofdm_mac_0 + ofdm_phy_hier_0 + phy out + mac_in + diff --git a/examples/ofdm_tx_nogui.grc b/examples/ofdm_tx_nogui.grc deleted file mode 100644 index 6a98e96..0000000 --- a/examples/ofdm_tx_nogui.grc +++ /dev/null @@ -1,1390 +0,0 @@ - - - Sat Oct 12 19:45:42 2013 - - parameter - - id - encoding - - - _enabled - True - - - label - - - - value - 0 - - - type - intx - - - short_id - - - - _coordinate - (614, 123) - - - _rotation - 0 - - - - ieee802_11_ofdm_mac - - id - ieee802_11_ofdm_mac_0 - - - _enabled - True - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (406, 314) - - - _rotation - 0 - - - - parameter - - id - mult - - - _enabled - True - - - label - - - - value - 0.4 - - - type - eng_float - - - short_id - - - - _coordinate - (389, 121) - - - _rotation - 0 - - - - parameter - - id - gain - - - _enabled - True - - - label - - - - value - 40 - - - type - intx - - - short_id - - - - _coordinate - (829, 122) - - - _rotation - 0 - - - - parameter - - id - interval - - - _enabled - True - - - label - - - - value - 100 - - - type - intx - - - short_id - - - - _coordinate - (945, 125) - - - _rotation - 0 - - - - parameter - - id - nmessages - - - _enabled - True - - - label - - - - value - 100 - - - type - intx - - - short_id - - - - _coordinate - (1048, 129) - - - _rotation - 0 - - - - ofdm_phy_hier - - id - ofdm_phy_hier_0 - - - _enabled - True - - - encoding - encoding - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (372, 438) - - - _rotation - 180 - - - - blocks_head - - id - blocks_head_0 - - - _enabled - True - - - type - complex - - - num_items - 1 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (599, 468) - - - _rotation - 180 - - - - blocks_null_source - - id - blocks_null_source_0 - - - _enabled - True - - - type - complex - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (767, 472) - - - _rotation - 180 - - - - parameter - - id - freq - - - _enabled - True - - - label - - - - value - 5860000000 - - - type - intx - - - short_id - - - - _coordinate - (498, 121) - - - _rotation - 0 - - - - parameter - - id - samp_rate - - - _enabled - True - - - label - - - - value - 10000000 - - - type - intx - - - short_id - - - - _coordinate - (716, 125) - - - _rotation - 0 - - - - blocks_multiply_const_vxx - - id - blocks_multiply_const_vxx_1 - - - _enabled - True - - - type - complex - - - const - mult - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (145, 468) - - - _rotation - 180 - - - - foo_periodic_msg_source - - id - foo_periodic_msg_source_0 - - - _enabled - True - - - msg - pmt.intern(''.join(random.choice(string.ascii_letters + string.digits) for x in range(packet_length-24))) - - - interval - interval - - - debug - False - - - num - nmessages - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (113, 286) - - - _rotation - 0 - - - - import - - id - import_1 - - - _enabled - True - - - import - import string - - - _coordinate - (792, 28) - - - _rotation - 0 - - - - import - - id - import_0 - - - _enabled - True - - - import - import random - - - _coordinate - (686, 29) - - - _rotation - 0 - - - - foo_packet_pad - - id - foo_packet_pad_0 - - - _enabled - True - - - debug - False - - - pad_front - 200000 - - - pad_tail - 500000 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (137, 547) - - - _rotation - 0 - - - - options - - id - ofdm_tx_nogui - - - _enabled - True - - - title - - - - author - - - - description - - - - window_size - 1280, 1024 - - - generate_options - no_gui - - - category - Custom - - - run_options - run - - - run - True - - - max_nouts - 0 - - - realtime_scheduling - - - - _coordinate - (21, 10) - - - _rotation - 0 - - - - parameter - - id - packet_length - - - _enabled - True - - - label - - - - value - 133 - - - type - intx - - - short_id - - - - _coordinate - (262, 122) - - - _rotation - 0 - - - - parameter - - id - lo_offset - - - _enabled - True - - - label - lo_offset - - - value - 0 - - - type - eng_float - - - short_id - - - - _coordinate - (127, 122) - - - _rotation - 0 - - - - uhd_usrp_sink - - id - uhd_usrp_sink_0_0 - - - _enabled - True - - - type - fc32 - - - otw - sc16 - - - stream_args - - - - stream_chans - [] - - - dev_addr - - - - sync - - - - clock_rate - 0.0 - - - num_mboards - 1 - - - clock_source0 - - - - time_source0 - - - - sd_spec0 - - - - clock_source1 - - - - time_source1 - - - - sd_spec1 - - - - clock_source2 - - - - time_source2 - - - - sd_spec2 - - - - clock_source3 - - - - time_source3 - - - - sd_spec3 - - - - clock_source4 - - - - time_source4 - - - - sd_spec4 - - - - clock_source5 - - - - time_source5 - - - - sd_spec5 - - - - clock_source6 - - - - time_source6 - - - - sd_spec6 - - - - clock_source7 - - - - time_source7 - - - - sd_spec7 - - - - nchan - 1 - - - samp_rate - samp_rate - - - center_freq0 - uhd.tune_request(freq, lo_offset) - - - gain0 - gain - - - ant0 - TX/RX - - - bw0 - 0 - - - center_freq1 - 0 - - - gain1 - 0 - - - ant1 - - - - bw1 - 0 - - - center_freq2 - 0 - - - gain2 - 0 - - - ant2 - - - - bw2 - 0 - - - center_freq3 - 0 - - - gain3 - 0 - - - ant3 - - - - bw3 - 0 - - - center_freq4 - 0 - - - gain4 - 0 - - - ant4 - - - - bw4 - 0 - - - center_freq5 - 0 - - - gain5 - 0 - - - ant5 - - - - bw5 - 0 - - - center_freq6 - 0 - - - gain6 - 0 - - - ant6 - - - - bw6 - 0 - - - center_freq7 - 0 - - - gain7 - 0 - - - ant7 - - - - bw7 - 0 - - - center_freq8 - 0 - - - gain8 - 0 - - - ant8 - - - - bw8 - 0 - - - center_freq9 - 0 - - - gain9 - 0 - - - ant9 - - - - bw9 - 0 - - - center_freq10 - 0 - - - gain10 - 0 - - - ant10 - - - - bw10 - 0 - - - center_freq11 - 0 - - - gain11 - 0 - - - ant11 - - - - bw11 - 0 - - - center_freq12 - 0 - - - gain12 - 0 - - - ant12 - - - - bw12 - 0 - - - center_freq13 - 0 - - - gain13 - 0 - - - ant13 - - - - bw13 - 0 - - - center_freq14 - 0 - - - gain14 - 0 - - - ant14 - - - - bw14 - 0 - - - center_freq15 - 0 - - - gain15 - 0 - - - ant15 - - - - bw15 - 0 - - - center_freq16 - 0 - - - gain16 - 0 - - - ant16 - - - - bw16 - 0 - - - center_freq17 - 0 - - - gain17 - 0 - - - ant17 - - - - bw17 - 0 - - - center_freq18 - 0 - - - gain18 - 0 - - - ant18 - - - - bw18 - 0 - - - center_freq19 - 0 - - - gain19 - 0 - - - ant19 - - - - bw19 - 0 - - - center_freq20 - 0 - - - gain20 - 0 - - - ant20 - - - - bw20 - 0 - - - center_freq21 - 0 - - - gain21 - 0 - - - ant21 - - - - bw21 - 0 - - - center_freq22 - 0 - - - gain22 - 0 - - - ant22 - - - - bw22 - 0 - - - center_freq23 - 0 - - - gain23 - 0 - - - ant23 - - - - bw23 - 0 - - - center_freq24 - 0 - - - gain24 - 0 - - - ant24 - - - - bw24 - 0 - - - center_freq25 - 0 - - - gain25 - 0 - - - ant25 - - - - bw25 - 0 - - - center_freq26 - 0 - - - gain26 - 0 - - - ant26 - - - - bw26 - 0 - - - center_freq27 - 0 - - - gain27 - 0 - - - ant27 - - - - bw27 - 0 - - - center_freq28 - 0 - - - gain28 - 0 - - - ant28 - - - - bw28 - 0 - - - center_freq29 - 0 - - - gain29 - 0 - - - ant29 - - - - bw29 - 0 - - - center_freq30 - 0 - - - gain30 - 0 - - - ant30 - - - - bw30 - 0 - - - center_freq31 - 0 - - - gain31 - 0 - - - ant31 - - - - bw31 - 0 - - - affinity - - - - _coordinate - (356, 531) - - - _rotation - 0 - - - - foo_periodic_msg_source_0 - ieee802_11_ofdm_mac_0 - 0 - 0 - - - blocks_multiply_const_vxx_1 - foo_packet_pad_0 - 0 - 0 - - - ofdm_phy_hier_0 - blocks_multiply_const_vxx_1 - 0 - 0 - - - foo_packet_pad_0 - uhd_usrp_sink_0_0 - 0 - 0 - - - ieee802_11_ofdm_mac_0 - ofdm_phy_hier_0 - 1 - 1 - - - blocks_null_source_0 - blocks_head_0 - 0 - 0 - - - blocks_head_0 - ofdm_phy_hier_0 - 0 - 0 - - diff --git a/examples/rx_demo.grc b/examples/rx_demo.grc index e561fef..345f4e6 100644 --- a/examples/rx_demo.grc +++ b/examples/rx_demo.grc @@ -1,6 +1,6 @@ - Sat Oct 12 19:44:26 2013 + Thu Dec 5 14:05:11 2013 options @@ -60,29 +60,6 @@ 0 - - variable - - id - window_size - - - _enabled - True - - - value - 48 - - - _coordinate - (704, 18) - - - _rotation - 0 - - variable @@ -106,6 +83,29 @@ 0 + + variable + + id + window_size + + + _enabled + True + + + value + 48 + + + _coordinate + (704, 18) + + + _rotation + 0 + + ieee802_11_ofdm_sync_short @@ -144,6 +144,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (212, 501) @@ -175,6 +179,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (389, 720) @@ -218,6 +226,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (483, 567) @@ -257,6 +269,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (684, 534) @@ -296,6 +312,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (913, 550) @@ -331,6 +351,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (656, 712) @@ -370,6 +394,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (1193, 412) @@ -397,6 +425,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (421, 348) @@ -440,6 +472,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (259, 344) @@ -479,6 +515,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (662, 314) @@ -510,6 +550,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (1038, 331) @@ -545,6 +589,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (819, 327) @@ -605,138 +653,6 @@ 0 - - ieee802_11_ofdm_parse_mac - - id - ieee802_11_ofdm_parse_mac_0 - - - _enabled - True - - - log - False - - - debug - True - - - affinity - - - - _coordinate - (969, 820) - - - _rotation - 180 - - - - ieee802_11_ofdm_decode_mac - - id - ieee802_11_ofdm_decode_mac_0 - - - _enabled - True - - - log - False - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (930, 712) - - - _rotation - 0 - - - - blocks_tuntap_pdu - - id - blocks_tuntap_pdu_0 - - - _enabled - True - - - ifn - tap0 - - - mtu - 10000 - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (663, 942) - - - _rotation - 180 - - - - ieee802_11_ether_encap - - id - ieee802_11_ether_encap_0 - - - _enabled - True - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (904, 920) - - - _rotation - 180 - - blocks_file_sink @@ -780,41 +696,6 @@ 180 - - foo_wireshark_connector - - id - foo_wireshark_connector_0 - - - _enabled - True - - - tech - 127 - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - _coordinate - (947, 1051) - - - _rotation - 180 - - blocks_complex_to_mag_squared @@ -837,6 +718,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (461, 227) @@ -872,6 +757,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (782, 223) @@ -1017,6 +906,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (576, 846) @@ -1068,6 +961,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (138, 688) @@ -1207,6 +1104,189 @@ 0 + + ieee802_11_ofdm_parse_mac + + id + ieee802_11_ofdm_parse_mac_0 + + + _enabled + True + + + log + False + + + debug + True + + + affinity + + + + _coordinate + (969, 820) + + + _rotation + 180 + + + + blocks_tuntap_pdu + + id + blocks_tuntap_pdu_0 + + + _enabled + True + + + ifn + tap0 + + + mtu + 10000 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (663, 942) + + + _rotation + 180 + + + + foo_wireshark_connector + + id + foo_wireshark_connector_0 + + + _enabled + True + + + tech + 127 + + + debug + False + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (947, 1051) + + + _rotation + 180 + + + + ieee802_11_ofdm_decode_mac + + id + ieee802_11_ofdm_decode_mac_0 + + + _enabled + True + + + log + False + + + debug + False + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (930, 712) + + + _rotation + 0 + + + + ieee802_11_ether_encap + + id + ieee802_11_ether_encap_0 + + + _enabled + True + + + debug + False + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (904, 920) + + + _rotation + 180 + + uhd_usrp_source @@ -1355,7 +1435,7 @@ center_freq0 - uhd.tune_request(freq, lo_offset) + uhd.tune_request(freq - lo_offset, lo_offset) gain0 @@ -1873,6 +1953,10 @@ minoutbuf 0 + + maxoutbuf + 0 + _coordinate (3, 207) @@ -1948,12 +2032,6 @@ 0 0 - - ieee802_11_ofdm_decode_mac_0 - ieee802_11_ofdm_parse_mac_0 - 0 - 0 - blocks_vector_to_stream_0 wxgui_scopesink1 @@ -2020,28 +2098,34 @@ 0 0 - - ieee802_11_ofdm_decode_mac_0 - ieee802_11_ether_encap_0 - 0 - 1 - - - ieee802_11_ether_encap_0 - blocks_tuntap_pdu_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_ofdm_decode_mac_0 + ieee802_11_ofdm_parse_mac_0 + out + in + + + ieee802_11_ether_encap_0 + blocks_tuntap_pdu_0 + to tap + pdus + + + ieee802_11_ofdm_decode_mac_0 + foo_wireshark_connector_0 + out + in + + + ieee802_11_ofdm_decode_mac_0 + ieee802_11_ether_encap_0 + out + from wifi +