From f1401a29aaf1468445bcfa8b255b3201cc8878e5 Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Tue, 31 Dec 2013 12:55:42 +0100 Subject: [PATCH] rename and update flow graphs --- .../{ofdm_loopback.grc => wifi_loopback.grc} | 1238 +++++----- .../{ofdm_phy_hier.grc => wifi_phy_hier.grc} | 2144 +++++++++-------- examples/{ofdm_rx.grc => wifi_rx.grc} | 50 +- ...m_transceiver.grc => wifi_transceiver.grc} | 900 ++++--- examples/{ofdm_tx.grc => wifi_tx.grc} | 384 ++- 5 files changed, 2363 insertions(+), 2353 deletions(-) rename examples/{ofdm_loopback.grc => wifi_loopback.grc} (91%) rename examples/{ofdm_phy_hier.grc => wifi_phy_hier.grc} (72%) rename examples/{ofdm_rx.grc => wifi_rx.grc} (97%) rename examples/{ofdm_transceiver.grc => wifi_transceiver.grc} (96%) rename examples/{ofdm_tx.grc => wifi_tx.grc} (95%) diff --git a/examples/ofdm_loopback.grc b/examples/wifi_loopback.grc similarity index 91% rename from examples/ofdm_loopback.grc rename to examples/wifi_loopback.grc index 81257dd..b1b3e3c 100644 --- a/examples/ofdm_loopback.grc +++ b/examples/wifi_loopback.grc @@ -1,11 +1,11 @@ - Thu Dec 5 14:23:25 2013 + Tue Dec 31 11:44:27 2013 options id - ofdm_loopback + wifi_loopback _enabled @@ -134,52 +134,6 @@ 0 - - blocks_ctrlport_monitor_performance - - id - blocks_ctrlport_monitor_performance_0 - - - _enabled - False - - - en - True - - - _coordinate - (1055, 164) - - - _rotation - 0 - - - - blocks_ctrlport_monitor - - id - blocks_ctrlport_monitor_0 - - - _enabled - False - - - en - True - - - _coordinate - (1089, 216) - - - _rotation - 0 - - variable_slider @@ -235,479 +189,6 @@ 0 - - blocks_add_xx - - id - blocks_add_xx_0 - - - _enabled - True - - - type - complex - - - num_inputs - 2 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (583, 278) - - - _rotation - 180 - - - - ieee802_11_ofdm_parse_mac - - id - ieee802_11_ofdm_parse_mac_0 - - - _enabled - True - - - log - False - - - debug - True - - - affinity - - - - _coordinate - (113, 249) - - - _rotation - 180 - - - - ofdm_phy_hier - - id - ofdm_phy_hier_1 - - - _enabled - True - - - encoding - encoding - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (359, 261) - - - _rotation - 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 - - id - blocks_message_strobe_0 - - - _enabled - True - - - msg - pmt.intern("Hello World") - - - period - 200 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (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 @@ -774,92 +255,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 - - - 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 @@ -903,6 +298,573 @@ 0 + + ieee802_11_ofdm_mac + + id + ieee802_11_ofdm_mac_0 + + + _enabled + True + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (374, 147) + + + _rotation + 0 + + + + blocks_add_xx + + id + blocks_add_xx_0 + + + _enabled + True + + + type + complex + + + num_inputs + 2 + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (583, 278) + + + _rotation + 180 + + + + blocks_multiply_xx + + id + blocks_multiply_xx_0 + + + _enabled + True + + + type + complex + + + num_inputs + 2 + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (544, 440) + + + _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 + (338, 548) + + + _rotation + 0 + + + + foo_wireshark_connector + + id + foo_wireshark_connector_0 + + + _enabled + False + + + tech + 127 + + + debug + False + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (628, 169) + + + _rotation + 0 + + + + ieee802_11_ofdm_parse_mac + + id + ieee802_11_ofdm_parse_mac_0 + + + _enabled + True + + + log + False + + + debug + True + + + affinity + + + + _coordinate + (110, 251) + + + _rotation + 180 + + + + foo_packet_pad + + id + foo_packet_pad_0 + + + _enabled + True + + + debug + False + + + delay + False + + + delay_sec + 0.001 + + + pad_front + 60000 + + + pad_tail + 20000 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (308, 408) + + + _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 + (814, 8) + + + _rotation + 0 + + + + blocks_message_strobe + + id + blocks_message_strobe_0 + + + _enabled + True + + + msg + pmt.intern("Hello World!") + + + period + 300 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (83, 136) + + + _rotation + 0 + + + + wifi_phy_hier + + id + wifi_phy_hier_0 + + + _enabled + True + + + encoding + encoding + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (360, 262) + + + _rotation + 180 + + + + 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 + (865, 260) + + + _rotation + 180 + + + + 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, 452) + + + _rotation + 0 + + + + variable_slider + + id + signal_power + + + _enabled + True + + + label + + + + value + 2.0 + + + min + 0 + + + max + 3 + + + num_steps + 1000 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (693, 7) + + + _rotation + 0 + + foo_wireshark_connector_0 blocks_file_sink_0 @@ -921,24 +883,12 @@ 0 0 - - ofdm_phy_hier_1 - foo_packet_pad_0 - 0 - 0 - analog_noise_source_x_0 blocks_add_xx_0 0 1 - - blocks_add_xx_0 - ofdm_phy_hier_1 - 0 - 0 - blocks_multiply_xx_0 blocks_multiply_const_vxx_0 @@ -952,7 +902,37 @@ 0 - ofdm_phy_hier_1 + ieee802_11_ofdm_mac_0 + foo_wireshark_connector_0 + phy out + in + + + ieee802_11_ofdm_mac_0 + wifi_phy_hier_0 + phy out + mac_in + + + blocks_add_xx_0 + wifi_phy_hier_0 + 0 + 0 + + + wifi_phy_hier_0 + foo_packet_pad_0 + 0 + 0 + + + wifi_phy_hier_0 + ieee802_11_ofdm_mac_0 + mac_out + phy in + + + wifi_phy_hier_0 ieee802_11_ofdm_parse_mac_0 mac_out in @@ -963,22 +943,4 @@ 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/wifi_phy_hier.grc similarity index 72% rename from examples/ofdm_phy_hier.grc rename to examples/wifi_phy_hier.grc index fe7dad5..db4af1c 100644 --- a/examples/ofdm_phy_hier.grc +++ b/examples/wifi_phy_hier.grc @@ -1,11 +1,11 @@ - Wed Nov 27 17:35:35 2013 + Tue Dec 31 11:49:08 2013 options id - ofdm_phy_hier + wifi_phy_hier _enabled @@ -13,7 +13,7 @@ title - OFDM PHY Hier + WiFi PHY Hier author @@ -64,7 +64,7 @@ variable id - sync_length + header_formatter _enabled @@ -72,11 +72,11 @@ value - 320 + ieee802_11.wifi_signal_field() _coordinate - (213, 13) + (518, 18) _rotation @@ -107,157 +107,28 @@ - pad_source + variable id - pad_source_0 + sync_length _enabled True - label - samp_in - - - type - complex - - - vlen - 1 - - - num_streams - 1 - - - optional - False + value + 320 _coordinate - (48, 386) + (196, 14) _rotation 0 - - blocks_conjugate_cc - - id - blocks_conjugate_cc_0 - - - _enabled - True - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (370, 480) - - - _rotation - 0 - - - - blocks_delay - - id - blocks_delay_0_0 - - - _enabled - True - - - type - complex - - - delay - 16 - - - num_ports - 1 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (224, 476) - - - _rotation - 0 - - - - ieee802_11_ofdm_equalize_symbols - - id - ieee802_11_ofdm_equalize_symbols_0 - - - _enabled - True - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (754, 809) - - - _rotation - 180 - - parameter @@ -293,588 +164,6 @@ 0 - - blocks_stream_to_vector - - id - blocks_stream_to_vector_0 - - - _enabled - True - - - type - complex - - - num_items - 64 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (1013, 661) - - - _rotation - 0 - - - - blocks_delay - - id - blocks_delay_0 - - - _enabled - True - - - type - complex - - - delay - sync_length - - - num_ports - 1 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (449, 678) - - - _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 - (596, 446) - - - _rotation - 0 - - - - blocks_complex_to_mag - - id - blocks_complex_to_mag_0 - - - _enabled - True - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (960, 463) - - - _rotation - 0 - - - - blocks_complex_to_mag_squared - - id - blocks_complex_to_mag_squared_0 - - - _enabled - True - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (586, 390) - - - _rotation - 0 - - - - blocks_divide_xx - - id - blocks_divide_xx_0 - - - _enabled - True - - - type - float - - - vlen - 1 - - - num_inputs - 2 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (1116, 540) - - - _rotation - 270 - - - - digital_ofdm_cyclic_prefixer - - id - digital_ofdm_cyclic_prefixer_0 - - - _enabled - True - - - input_size - 64 - - - cp_len - 16 - - - rolloff - 2 - - - tagname - - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (956, 238) - - - _rotation - 180 - - - - ieee802_11_ofdm_preamble - - id - ieee802_11_ofdm_preamble_0 - - - _enabled - True - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (491, 254) - - - _rotation - 180 - - - - ieee802_11_ofdm_pilot - - id - ieee802_11_ofdm_pilot_0 - - - _enabled - True - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (630, 116) - - - _rotation - 0 - - - - fft_vxx - - id - fft_vxx_0 - - - _enabled - True - - - type - complex - - - fft_size - 64 - - - forward - False - - - window - window.rectangular(64) - - - shift - True - - - nthreads - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (850, 84) - - - _rotation - 0 - - - - blocks_multiply_const_vxx - - id - blocks_multiply_const_vxx_0 - - - _enabled - True - - - type - complex - - - const - 1/52**0.5 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (741, 254) - - - _rotation - 180 - - - - ieee802_11_moving_average_xx - - id - ieee802_11_moving_average_xx_1 - - - _enabled - True - - - type - complex - - - length - window_size - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (759, 459) - - - _rotation - 0 - - - - ieee802_11_moving_average_xx - - id - ieee802_11_moving_average_xx_0 - - - _enabled - True - - - type - float - - - length - window_size - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (867, 386) - - - _rotation - 0 - - - - ieee802_11_ofdm_sync_long - - id - sync_long - - - _enabled - True - - - log - False - - - debug - False - - - sync_length - sync_length - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (669, 645) - - - _rotation - 0 - - ieee802_11_ofdm_sync_short @@ -919,7 +208,237 @@ _coordinate - (169, 612) + (178, 775) + + + _rotation + 0 + + + + ieee802_11_moving_average_xx + + id + ieee802_11_moving_average_xx_0 + + + _enabled + True + + + type + float + + + length + window_size + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (876, 549) + + + _rotation + 0 + + + + ieee802_11_moving_average_xx + + id + ieee802_11_moving_average_xx_1 + + + _enabled + True + + + type + complex + + + length + window_size + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (768, 622) + + + _rotation + 0 + + + + blocks_divide_xx + + id + blocks_divide_xx_0 + + + _enabled + True + + + type + float + + + vlen + 1 + + + num_inputs + 2 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (1125, 703) + + + _rotation + 270 + + + + blocks_complex_to_mag_squared + + id + blocks_complex_to_mag_squared_0 + + + _enabled + True + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (595, 553) + + + _rotation + 0 + + + + blocks_complex_to_mag + + id + blocks_complex_to_mag_0 + + + _enabled + True + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (969, 626) + + + _rotation + 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 @@ -974,7 +493,7 @@ _coordinate - (1000, 777) + (1009, 908) _rotation @@ -982,19 +501,15 @@ - ieee802_11_ofdm_decode_signal + ieee802_11_ofdm_equalize_symbols id - ieee802_11_ofdm_decode_signal_0 + ieee802_11_ofdm_equalize_symbols_0 _enabled True - - log - False - debug False @@ -1013,130 +528,13 @@ _coordinate - (511, 801) + (757, 936) _rotation 180 - - pad_sink - - id - pad_sink_0 - - - _enabled - True - - - label - samp_out - - - type - complex - - - vlen - 1 - - - num_streams - 1 - - - optional - False - - - _coordinate - (175, 254) - - - _rotation - 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 @@ -1169,7 +567,7 @@ _coordinate - (260, 801) + (276, 929) _rotation @@ -1208,124 +606,846 @@ _coordinate - (65, 809) + (63, 936) _rotation 180 + + pad_source + + id + pad_source_1 + + + _enabled + True + + + label + mac_in + + + type + message + + + vlen + 1 + + + num_streams + 1 + + + optional + False + + + _coordinate + (390, 130) + + + _rotation + 180 + + + + digital_ofdm_carrier_allocator_cvc + + id + digital_ofdm_carrier_allocator_cvc_0 + + + _enabled + True + + + fft_len + 64 + + + occupied_carriers + (range(-26, -21) + range(-20, -7) + range(-6, 0) + range(1, 7) + range(8, 21) + range(22, 27),) + + + pilot_carriers + ((-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21), (-21, -7, 7, 21)) + + + pilot_symbols + ((1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1)) + + + sync_words + () + + + len_tag_key + "packet_len" + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (993, 246) + + + _rotation + 0 + + + + digital_ofdm_cyclic_prefixer + + id + digital_ofdm_cyclic_prefixer_0 + + + _enabled + True + + + input_size + 64 + + + cp_len + 16 + + + rolloff + 2 + + + tagname + "packet_len" + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (741, 410) + + + _rotation + 180 + + + + ieee802_11_ofdm_preamble + + id + ieee802_11_ofdm_preamble_0 + + + _enabled + True + + + debug + False + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (498, 424) + + + _rotation + 180 + + + + pad_sink + + id + pad_sink_0 + + + _enabled + True + + + label + samp_out + + + type + complex + + + vlen + 1 + + + num_streams + 1 + + + optional + False + + + _coordinate + (280, 424) + + + _rotation + 180 + + + + digital_chunks_to_symbols_xx + + id + digital_chunks_to_symbols_xx_0 + + + _enabled + True + + + in_type + byte + + + out_type + complex + + + symbol_table + [-1, 1] + + + dimension + 1 + + + num_ports + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (494, 230) + + + _rotation + 0 + + + + ieee802_11_packet_headergenerator + + id + ieee802_11_packet_headergenerator_0 + + + _enabled + True + + + header_formatter + header_formatter.formatter() + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (181, 237) + + + _rotation + 0 + + + + ieee802_11_ofdm_sync_long + + id + sync_long + + + _enabled + True + + + log + False + + + debug + False + + + sync_length + sync_length + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (678, 805) + + + _rotation + 0 + + + + blocks_delay + + id + blocks_delay_0 + + + _enabled + True + + + type + complex + + + delay + sync_length + + + num_ports + 1 + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (458, 835) + + + _rotation + 0 + + + + blocks_stream_to_vector + + id + blocks_stream_to_vector_0 + + + _enabled + True + + + type + complex + + + num_items + 64 + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (1017, 819) + + + _rotation + 0 + + + + ieee802_11_ofdm_decode_signal + + id + ieee802_11_ofdm_decode_signal_0 + + + _enabled + True + + + log + False + + + debug + False + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (522, 929) + + + _rotation + 180 + + + + blocks_multiply_xx + + id + blocks_multiply_xx_0 + + + _enabled + True + + + type + complex + + + num_inputs + 2 + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (607, 610) + + + _rotation + 0 + + + + blocks_conjugate_cc + + id + blocks_conjugate_cc_0 + + + _enabled + True + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (379, 642) + + + _rotation + 0 + + + + blocks_delay + + id + blocks_delay_0_0 + + + _enabled + True + + + type + complex + + + delay + 16 + + + num_ports + 1 + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (233, 638) + + + _rotation + 0 + + + + ieee802_11_ofdm_mapper + + id + ieee802_11_ofdm_mapper_0 + + + _enabled + True + + + encoding + encoding + + + debug + False + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (135, 123) + + + _rotation + 180 + + + + fft_vxx + + id + fft_vxx_0 + + + _enabled + True + + + type + complex + + + fft_size + 64 + + + forward + False + + + window + tuple([1/52**.5] * 64) + + + shift + True + + + nthreads + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (973, 396) + + + _rotation + 180 + + + + blocks_tagged_stream_mux + + id + blocks_tagged_stream_mux_0 + + + _enabled + True + + + type + complex + + + ninputs + 2 + + + lengthtagname + "packet_len" + + + vlen + 1 + + + tag_preserve_head_pos + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (743, 269) + + + _rotation + 0 + + + + ieee802_11_chunks_to_symbols_xx + + id + ieee802_11_chunks_to_symbols_xx_0 + + + _enabled + True + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (495, 301) + + + _rotation + 0 + + fft_vxx_0 digital_ofdm_cyclic_prefixer_0 0 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_0 - blocks_conjugate_cc_0 - 0 - 0 - - - pad_source_0 - blocks_delay_0_0 - 0 - 0 - - - pad_source_0 - blocks_complex_to_mag_squared_0 - 0 - 0 - - - pad_source_0 - blocks_multiply_xx_0 - 0 - 0 - - - blocks_stream_to_vector_0 - fft_vxx_0_1 - 0 - 0 - - - digital_ofdm_cyclic_prefixer_0 - blocks_multiply_const_vxx_0 - 0 - 0 - - - blocks_delay_0_0 - sync_short - 0 - 0 - - - sync_long - blocks_stream_to_vector_0 - 0 - 0 - - - ieee802_11_ofdm_decode_signal_0 - ieee802_11_ofdm_decode_mac_0 - 0 - 0 - - - ieee802_11_ofdm_equalize_symbols_0 - ieee802_11_ofdm_decode_signal_0 - 0 - 0 - - - fft_vxx_0_1 - ieee802_11_ofdm_equalize_symbols_0 - 0 - 0 - - - blocks_multiply_const_vxx_0 - ieee802_11_ofdm_preamble_0 - 0 - 0 - - - ieee802_11_ofdm_mapper_0 - ieee802_11_ofdm_pilot_0 - 0 - 0 - - - ieee802_11_ofdm_pilot_0 - fft_vxx_0 - 0 - 0 - ieee802_11_ofdm_preamble_0 pad_sink_0 0 0 + + pad_source_1 + ieee802_11_ofdm_mapper_0 + 0 + in + + + digital_chunks_to_symbols_xx_0 + blocks_tagged_stream_mux_0 + 0 + 0 + + + ieee802_11_ofdm_decode_mac_0 + pad_sink_1 + out + 0 + + + ieee802_11_moving_average_xx_0 + blocks_divide_xx_0 + 0 + 1 + + + blocks_complex_to_mag_squared_0 + ieee802_11_moving_average_xx_0 + 0 + 0 + + + ieee802_11_moving_average_xx_1 + blocks_complex_to_mag_0 + 0 + 0 + + + blocks_multiply_xx_0 + ieee802_11_moving_average_xx_1 + 0 + 0 + + + blocks_divide_xx_0 + sync_short + 0 + 1 + sync_short - blocks_delay_0 + sync_long 0 0 @@ -1337,50 +1457,122 @@ sync_short - sync_long + blocks_delay_0 0 0 - blocks_divide_xx_0 + fft_vxx_0_1 + ieee802_11_ofdm_equalize_symbols_0 + 0 + 0 + + + ieee802_11_ofdm_equalize_symbols_0 + ieee802_11_ofdm_decode_signal_0 + 0 + 0 + + + ieee802_11_ofdm_decode_signal_0 + ieee802_11_ofdm_decode_mac_0 + 0 + 0 + + + sync_long + blocks_stream_to_vector_0 + 0 + 0 + + + blocks_delay_0_0 sync_short 0 + 0 + + + blocks_stream_to_vector_0 + fft_vxx_0_1 + 0 + 0 + + + pad_source_0 + blocks_multiply_xx_0 + 0 + 0 + + + pad_source_0 + blocks_complex_to_mag_squared_0 + 0 + 0 + + + pad_source_0 + blocks_delay_0_0 + 0 + 0 + + + blocks_delay_0_0 + blocks_conjugate_cc_0 + 0 + 0 + + + blocks_conjugate_cc_0 + blocks_multiply_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 - - - blocks_complex_to_mag_squared_0 - ieee802_11_moving_average_xx_0 - 0 - 0 - - - ieee802_11_moving_average_xx_0 + blocks_complex_to_mag_0 blocks_divide_xx_0 0 + 0 + + + digital_ofdm_carrier_allocator_cvc_0 + fft_vxx_0 + 0 + 0 + + + blocks_tagged_stream_mux_0 + digital_ofdm_carrier_allocator_cvc_0 + 0 + 0 + + + digital_ofdm_cyclic_prefixer_0 + ieee802_11_ofdm_preamble_0 + 0 + 0 + + + ieee802_11_packet_headergenerator_0 + digital_chunks_to_symbols_xx_0 + 0 + 0 + + + ieee802_11_ofdm_mapper_0 + ieee802_11_packet_headergenerator_0 + 0 + 0 + + + ieee802_11_chunks_to_symbols_xx_0 + blocks_tagged_stream_mux_0 + 0 1 - pad_source_1 - ieee802_11_ofdm_mapper_0 + ieee802_11_ofdm_mapper_0 + ieee802_11_chunks_to_symbols_xx_0 0 - in - - - ieee802_11_ofdm_decode_mac_0 - pad_sink_1 - out 0 diff --git a/examples/ofdm_rx.grc b/examples/wifi_rx.grc similarity index 97% rename from examples/ofdm_rx.grc rename to examples/wifi_rx.grc index 9c94790..bfb105c 100644 --- a/examples/ofdm_rx.grc +++ b/examples/wifi_rx.grc @@ -1,11 +1,11 @@ - Thu Dec 5 14:06:08 2013 + Mon Dec 30 11:05:22 2013 options id - ofdm_rx + wifi_rx _enabled @@ -618,52 +618,6 @@ 0 - - blocks_ctrlport_monitor - - id - blocks_ctrlport_monitor_0 - - - _enabled - False - - - en - True - - - _coordinate - (828, 166) - - - _rotation - 0 - - - - blocks_ctrlport_monitor_performance - - id - blocks_ctrlport_monitor_performance_0 - - - _enabled - False - - - en - True - - - _coordinate - (972, 169) - - - _rotation - 0 - - blocks_delay diff --git a/examples/ofdm_transceiver.grc b/examples/wifi_transceiver.grc similarity index 96% rename from examples/ofdm_transceiver.grc rename to examples/wifi_transceiver.grc index bee6a69..5c5de1e 100644 --- a/examples/ofdm_transceiver.grc +++ b/examples/wifi_transceiver.grc @@ -1,51 +1,59 @@ - Fri Dec 6 17:59:08 2013 + Mon Dec 30 10:04:24 2013 - variable_chooser + options id - encoding + wifi_transceiver _enabled True - label - Encoding - - - value - 0 - - - choices - [0,1,2,3,4,5,6,7] - - - labels - ["BPSK 1/2", "BPSK 3/4", "QPSK 1/2", "QPSK 3/4", "16QAM 1/2", "16QAM 3/4", "64QAM 2/3", "64QAM 3/4"] - - - type - radio_buttons - - - style - wx.RA_HORIZONTAL - - - grid_pos + title - notebook + author + + + + description + + + + window_size + 1280, 1024 + + + generate_options + wx_gui + + + category + Custom + + + run_options + prompt + + + run + True + + + max_nouts + 0 + + + realtime_scheduling _coordinate - (1111, 6) + (12, 33) _rotation @@ -103,162 +111,6 @@ 0 - - blocks_ctrlport_monitor_performance - - id - blocks_ctrlport_monitor_performance_0 - - - _enabled - False - - - en - True - - - _coordinate - (611, 163) - - - _rotation - 0 - - - - blocks_ctrlport_monitor - - id - blocks_ctrlport_monitor_0 - - - _enabled - False - - - en - True - - - _coordinate - (807, 164) - - - _rotation - 0 - - - - variable_slider - - id - tx_gain - - - _enabled - True - - - label - - - - value - 15 - - - min - 0 - - - max - 100 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - - - - notebook - - - - _coordinate - (1050, 134) - - - _rotation - 0 - - - - variable_slider - - id - rx_gain - - - _enabled - True - - - label - - - - value - 5 - - - min - 0 - - - max - 100 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - - - - notebook - - - - _coordinate - (1162, 133) - - - _rotation - 0 - - variable_chooser @@ -435,68 +287,6 @@ 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 @@ -579,139 +369,6 @@ 0 - - ofdm_phy_hier - - id - ofdm_phy_hier_1 - - - _enabled - True - - - encoding - encoding - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (324, 355) - - - _rotation - 180 - - - - 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 - - uhd_usrp_sink @@ -1383,6 +1040,197 @@ 0 + + foo_packet_pad + + id + foo_packet_pad_0 + + + _enabled + True + + + debug + False + + + delay + True + + + delay_sec + 0.001 + + + pad_front + 0 + + + pad_tail + 0 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (73, 479) + + + _rotation + 0 + + + + ieee802_11_ofdm_mac + + id + ieee802_11_ofdm_mac_0 + + + _enabled + True + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 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 + (90, 304) + + + _rotation + 180 + + + + blocks_multiply_const_vxx + + id + blocks_multiply_const_vxx_0 + + + _enabled + True + + + type + complex + + + const + mult + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (106, 388) + + + _rotation + 180 + + + + wifi_phy_hier + + id + wifi_phy_hier_0 + + + _enabled + True + + + encoding + 0 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (334, 360) + + + _rotation + 180 + + uhd_usrp_source @@ -2063,50 +1911,54 @@ - foo_packet_pad + variable_slider id - foo_packet_pad_0 + mult _enabled True - debug - False - - - delay - True - - - delay_sec - 0.001 - - - pad_front - 0 - - - pad_tail - 0 - - - affinity + label - minoutbuf + value + 0.38 + + + min 0 - maxoutbuf - 0 + max + 1 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + _coordinate - (73, 479) + (963, 247) _rotation @@ -2114,58 +1966,160 @@ - options + variable_slider id - ofdm_transceiver + tx_gain _enabled True - title + label - author - + value + 15 - description - - - - window_size - 1280, 1024 - - - generate_options - wx_gui - - - category - Custom - - - run_options - prompt - - - run - True - - - max_nouts + min 0 - realtime_scheduling + max + 100 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook _coordinate - (12, 33) + (642, 132) + + + _rotation + 0 + + + + variable_slider + + id + rx_gain + + + _enabled + True + + + label + + + + value + 5 + + + min + 0 + + + max + 100 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (759, 132) + + + _rotation + 0 + + + + variable_chooser + + id + encoding + + + _enabled + True + + + label + Encoding + + + value + 0 + + + choices + [0,1,2,3,4,5,6,7] + + + labels + ["BPSK 1/2", "BPSK 3/4", "QPSK 1/2", "QPSK 3/4", "16QAM 1/2", "16QAM 3/4", "64QAM 2/3", "64QAM 3/4"] + + + type + radio_buttons + + + style + wx.RA_HORIZONTAL + + + grid_pos + + + + notebook + + + + _coordinate + (929, 123) _rotation @@ -2184,24 +2138,6 @@ 0 0 - - uhd_usrp_source_0 - ofdm_phy_hier_1 - 0 - 0 - - - ieee802_11_ofdm_mac_0 - ofdm_phy_hier_1 - phy out - mac_in - - - ofdm_phy_hier_1 - ieee802_11_ofdm_mac_0 - mac_out - phy in - ieee802_11_ether_encap_0 blocks_tuntap_pdu_0 @@ -2226,34 +2162,46 @@ 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 + + wifi_phy_hier_0 + blocks_multiply_const_vxx_0 + 0 + 0 + + + wifi_phy_hier_0 + ieee802_11_ofdm_parse_mac_0 + mac_out + in + + + wifi_phy_hier_0 + ieee802_11_ofdm_mac_0 + mac_out + phy in + + + ieee802_11_ofdm_mac_0 + wifi_phy_hier_0 + phy out + mac_in + + + uhd_usrp_source_0 + wifi_phy_hier_0 + 0 + 0 + diff --git a/examples/ofdm_tx.grc b/examples/wifi_tx.grc similarity index 95% rename from examples/ofdm_tx.grc rename to examples/wifi_tx.grc index 38251d4..8dffed8 100644 --- a/examples/ofdm_tx.grc +++ b/examples/wifi_tx.grc @@ -1,11 +1,11 @@ - Fri Dec 6 18:16:38 2013 + Mon Dec 30 10:03:51 2013 options id - ofdm_tx + wifi_tx _enabled @@ -115,68 +115,6 @@ 0 - - blocks_ctrlport_monitor_performance - - id - blocks_ctrlport_monitor_performance_0 - - - _enabled - False - - - en - True - - - _coordinate - (982, 299) - - - _rotation - 0 - - - - blocks_null_source - - id - blocks_null_source_0 - - - _enabled - True - - - type - complex - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (692, 334) - - - _rotation - 180 - - variable_chooser @@ -283,95 +221,6 @@ 0 - - blocks_ctrlport_monitor - - id - blocks_ctrlport_monitor_0 - - - _enabled - False - - - en - True - - - _coordinate - (980, 366) - - - _rotation - 0 - - - - ofdm_phy_hier - - id - ofdm_phy_hier_0 - - - _enabled - True - - - encoding - encoding - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (449, 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 - - variable_chooser @@ -474,49 +323,6 @@ 0 - - blocks_multiply_const_vxx - - id - blocks_multiply_const_vxx_1 - - - _enabled - True - - - type - complex - - - const - mult - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (162, 330) - - - _rotation - 180 - - uhd_usrp_sink @@ -1329,30 +1135,166 @@ 0 + + blocks_multiply_const_vxx + + id + blocks_multiply_const_vxx_1 + + + _enabled + True + + + type + complex + + + const + mult + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (162, 330) + + + _rotation + 180 + + + + blocks_null_source + + id + blocks_null_source_0 + + + _enabled + True + + + type + complex + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (692, 334) + + + _rotation + 180 + + + + ieee802_11_ofdm_mac + + id + ieee802_11_ofdm_mac_0 + + + _enabled + True + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (465, 191) + + + _rotation + 0 + + + + wifi_phy_hier + + id + wifi_phy_hier_0 + + + _enabled + True + + + encoding + 0 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (445, 302) + + + _rotation + 180 + + 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 - - blocks_null_source_0 - ofdm_phy_hier_0 - 0 - 0 - blocks_message_strobe_0 ieee802_11_ofdm_mac_0 @@ -1360,15 +1302,27 @@ app in - ofdm_phy_hier_0 + wifi_phy_hier_0 + blocks_multiply_const_vxx_1 + 0 + 0 + + + blocks_null_source_0 + wifi_phy_hier_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 - - ieee802_11_ofdm_mac_0 - ofdm_phy_hier_0 - phy out - mac_in -