diff --git a/examples/wifi_phy_hier.grc b/examples/wifi_phy_hier.grc index 637edd2..6f00e91 100644 --- a/examples/wifi_phy_hier.grc +++ b/examples/wifi_phy_hier.grc @@ -1,6 +1,6 @@ - Sat Feb 1 19:26:09 2014 + Fri Jul 18 08:46:33 2014 options @@ -51,6 +51,10 @@ realtime_scheduling + + alias + + _coordinate (10, 10) @@ -60,52 +64,6 @@ 0 - - variable - - id - window_size - - - _enabled - True - - - value - 48 - - - _coordinate - (323, 14) - - - _rotation - 0 - - - - variable - - id - sync_length - - - _enabled - True - - - value - 320 - - - _coordinate - (196, 14) - - - _rotation - 0 - - variable @@ -120,6 +78,10 @@ value ieee802_11.wifi_signal_field() + + alias + + _coordinate (518, 18) @@ -129,6 +91,60 @@ 0 + + variable + + id + sync_length + + + _enabled + True + + + value + 320 + + + alias + + + + _coordinate + (196, 14) + + + _rotation + 0 + + + + variable + + id + window_size + + + _enabled + True + + + value + 48 + + + alias + + + + _coordinate + (323, 14) + + + _rotation + 0 + + parameter @@ -155,6 +171,10 @@ short_id + + alias + + _coordinate (429, 10) @@ -164,96 +184,6 @@ 0 - - ieee802_11_ofdm_sync_short - - id - sync_short - - - _enabled - True - - - log - False - - - debug - False - - - threshold - 0.7 - - - max_samples - 80 * 140 - - - min_plateau - 2 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (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 - - blocks_divide_xx @@ -276,6 +206,10 @@ num_inputs 2 + + alias + + affinity @@ -311,6 +245,10 @@ vlen 1 + + alias + + affinity @@ -366,6 +304,10 @@ nthreads 1 + + alias + + affinity @@ -436,6 +378,10 @@ _enabled True + + alias + + affinity @@ -483,6 +429,10 @@ vlen 1 + + alias + + affinity @@ -526,6 +476,10 @@ sync_length sync_length + + alias + + affinity @@ -573,6 +527,10 @@ vlen 1 + + alias + + affinity @@ -616,6 +574,10 @@ vlen 1 + + alias + + affinity @@ -651,6 +613,10 @@ debug False + + alias + + affinity @@ -690,6 +656,10 @@ debug False + + alias + + affinity @@ -729,6 +699,10 @@ debug False + + alias + + affinity @@ -811,6 +785,10 @@ vlen 1 + + alias + + affinity @@ -850,6 +828,10 @@ length window_size + + alias + + affinity @@ -885,6 +867,10 @@ vlen 1 + + alias + + affinity @@ -924,6 +910,10 @@ debug False + + alias + + affinity @@ -963,6 +953,10 @@ len_tag_key "packet_len" + + alias + + affinity @@ -1014,6 +1008,10 @@ num_ports 1 + + alias + + affinity @@ -1045,6 +1043,10 @@ _enabled True + + alias + + affinity @@ -1096,6 +1098,10 @@ tag_preserve_head_pos 1 + + alias + + affinity @@ -1229,6 +1235,10 @@ len_tag_key "packet_len" + + alias + + affinity @@ -1276,6 +1286,10 @@ tagname "packet_len" + + alias + + affinity @@ -1331,6 +1345,10 @@ nthreads 1 + + alias + + affinity @@ -1352,6 +1370,104 @@ 180 + + ieee802_11_moving_average_xx + + id + ieee802_11_moving_average_xx_0 + + + _enabled + True + + + type + float + + + length + window_size + 16 + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (876, 549) + + + _rotation + 0 + + + + ieee802_11_ofdm_sync_short + + id + sync_short + + + _enabled + True + + + log + False + + + debug + False + + + threshold + 0.7 * 0.75 + + + max_samples + 80 * 140 + + + min_plateau + 2 + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (178, 775) + + + _rotation + 0 + + pad_source_1 ieee802_11_ofdm_mapper_0 diff --git a/examples/wifi_rx.grc b/examples/wifi_rx.grc index 76b7598..009b0b7 100644 --- a/examples/wifi_rx.grc +++ b/examples/wifi_rx.grc @@ -1,6 +1,6 @@ - Fri Jul 18 08:11:01 2014 + Fri Jul 18 08:45:51 2014 variable @@ -282,53 +282,6 @@ 0 - - blocks_divide_xx - - id - blocks_divide_xx_0 - - - _enabled - True - - - type - float - - - vlen - 1 - - - num_inputs - 2 - - - alias - - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (1193, 412) - - - _rotation - 270 - - blocks_conjugate_cc @@ -599,53 +552,6 @@ 0 - - blocks_file_sink - - id - blocks_file_sink_0 - - - _enabled - True - - - file - /tmp/ofdm.pcap - - - type - byte - - - vlen - 1 - - - unbuffered - True - - - append - True - - - alias - - - - affinity - - - - _coordinate - (721, 1043) - - - _rotation - 180 - - blocks_complex_to_mag_squared @@ -685,49 +591,6 @@ 0 - - ieee802_11_moving_average_xx - - id - ieee802_11_moving_average_xx_1 - - - _enabled - True - - - type - float - - - length - window_size - - - alias - - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (782, 223) - - - _rotation - 0 - - variable_slider @@ -1121,92 +984,6 @@ 180 - - blocks_tuntap_pdu - - id - blocks_tuntap_pdu_0 - - - _enabled - True - - - ifn - tap0 - - - mtu - 10000 - - - alias - - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (663, 942) - - - _rotation - 180 - - - - foo_wireshark_connector - - id - foo_wireshark_connector_0 - - - _enabled - True - - - tech - 127 - - - debug - False - - - alias - - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (947, 1051) - - - _rotation - 180 - - ieee802_11_ofdm_decode_mac @@ -1250,100 +1027,6 @@ 0 - - ieee802_11_ether_encap - - id - ieee802_11_ether_encap_0 - - - _enabled - True - - - debug - False - - - alias - - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (904, 920) - - - _rotation - 180 - - - - ieee802_11_ofdm_sync_short - - id - ieee802_11_ofdm_sync_short_0 - - - _enabled - True - - - log - False - - - debug - False - - - threshold - 0.85 - - - max_samples - 80 * 160 - - - min_plateau - 2 - - - alias - - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (212, 501) - - - _rotation - 0 - - options @@ -2222,6 +1905,406 @@ 0 + + ieee802_11_ether_encap + + id + ieee802_11_ether_encap_0 + + + _enabled + False + + + debug + False + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (904, 920) + + + _rotation + 180 + + + + foo_wireshark_connector + + id + foo_wireshark_connector_0 + + + _enabled + False + + + tech + 127 + + + debug + False + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (947, 1051) + + + _rotation + 180 + + + + blocks_tuntap_pdu + + id + blocks_tuntap_pdu_0 + + + _enabled + False + + + ifn + tap0 + + + mtu + 10000 + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (663, 942) + + + _rotation + 180 + + + + blocks_file_sink + + id + blocks_file_sink_0 + + + _enabled + False + + + file + /tmp/ofdm.pcap + + + type + byte + + + vlen + 1 + + + unbuffered + True + + + append + True + + + alias + + + + affinity + + + + _coordinate + (721, 1043) + + + _rotation + 180 + + + + blocks_divide_xx + + id + blocks_divide_xx_0 + + + _enabled + True + + + type + float + + + vlen + 1 + + + num_inputs + 2 + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (1193, 412) + + + _rotation + 270 + + + + ieee802_11_moving_average_xx + + id + ieee802_11_moving_average_xx_1 + + + _enabled + True + + + type + float + + + length + window_size + 16 + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (782, 223) + + + _rotation + 0 + + + + ieee802_11_ofdm_sync_short + + id + ieee802_11_ofdm_sync_short_0 + + + _enabled + True + + + log + False + + + debug + False + + + threshold + 0.85 * 0.75 + + + max_samples + 80 * 160 + + + min_plateau + 2 + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (212, 501) + + + _rotation + 0 + + + + wxgui_scopesink2 + + id + wxgui_scopesink2_0 + + + _enabled + True + + + type + float + + + title + Scope Plot + + + samp_rate + samp_rate + + + v_scale + 0 + + + v_offset + 0 + + + t_scale + 0 + + + ac_couple + False + + + xy_mode + False + + + num_inputs + 1 + + + win_size + + + + grid_pos + + + + notebook + + + + trig_mode + wxgui.TRIG_MODE_AUTO + + + y_axis_label + Counts + + + alias + + + + affinity + + + + _coordinate + (1182, 571) + + + _rotation + 270 + + blocks_stream_to_vector_0 fft_vxx_0 @@ -2355,14 +2438,20 @@ 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_ofdm_decode_mac_0 - ieee802_11_ofdm_parse_mac_0 + ieee802_11_ether_encap_0 + out + from wifi + + + ieee802_11_ofdm_decode_mac_0 + foo_wireshark_connector_0 out in @@ -2373,15 +2462,15 @@ pdus - ieee802_11_ofdm_decode_mac_0 - foo_wireshark_connector_0 - out - in + foo_wireshark_connector_0 + blocks_file_sink_0 + 0 + 0 - ieee802_11_ofdm_decode_mac_0 - ieee802_11_ether_encap_0 - out - from wifi + blocks_divide_xx_0 + wxgui_scopesink2_0 + 0 + 0 diff --git a/examples/wifi_transceiver.grc b/examples/wifi_transceiver.grc index 13438ed..6d9746e 100644 --- a/examples/wifi_transceiver.grc +++ b/examples/wifi_transceiver.grc @@ -1,6 +1,6 @@ - Thu May 8 13:06:18 2014 + Fri Jul 18 08:47:35 2014 options @@ -51,6 +51,10 @@ realtime_scheduling + + alias + + _coordinate (12, 33) @@ -102,6 +106,10 @@ notebook + + alias + + _coordinate (930, 5) @@ -153,6 +161,10 @@ notebook + + alias + + _coordinate (584, 7) @@ -162,88 +174,6 @@ 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 - - - - 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 - - ieee802_11_ofdm_mac @@ -254,6 +184,10 @@ _enabled True + + alias + + affinity @@ -321,6 +255,10 @@ notebook + + alias + + _coordinate (963, 247) @@ -376,6 +314,10 @@ notebook + + alias + + _coordinate (642, 132) @@ -431,6 +373,10 @@ notebook + + alias + + _coordinate (759, 132) @@ -482,6 +428,10 @@ notebook + + alias + + _coordinate (929, 123) @@ -505,6 +455,10 @@ encoding 0 + + alias + + affinity @@ -526,45 +480,6 @@ 180 - - foo_wireshark_connector - - id - foo_wireshark_connector_0 - - - _enabled - True - - - tech - 127 - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (580, 308) - - - _rotation - 0 - - ieee802_11_ofdm_parse_mac @@ -583,6 +498,10 @@ debug True + + alias + + affinity @@ -626,6 +545,10 @@ dev_addr + + dev_args + "" + sync pc_clock @@ -750,6 +673,10 @@ gain0 rx_gain + + agc0 + False + ant0 @@ -766,6 +693,10 @@ gain1 0 + + agc1 + False + ant1 @@ -782,6 +713,10 @@ gain2 0 + + agc2 + False + ant2 @@ -798,6 +733,10 @@ gain3 0 + + agc3 + False + ant3 @@ -814,6 +753,10 @@ gain4 0 + + agc4 + False + ant4 @@ -830,6 +773,10 @@ gain5 0 + + agc5 + False + ant5 @@ -846,6 +793,10 @@ gain6 0 + + agc6 + False + ant6 @@ -862,6 +813,10 @@ gain7 0 + + agc7 + False + ant7 @@ -878,6 +833,10 @@ gain8 0 + + agc8 + False + ant8 @@ -894,6 +853,10 @@ gain9 0 + + agc9 + False + ant9 @@ -910,6 +873,10 @@ gain10 0 + + agc10 + False + ant10 @@ -926,6 +893,10 @@ gain11 0 + + agc11 + False + ant11 @@ -942,6 +913,10 @@ gain12 0 + + agc12 + False + ant12 @@ -958,6 +933,10 @@ gain13 0 + + agc13 + False + ant13 @@ -974,6 +953,10 @@ gain14 0 + + agc14 + False + ant14 @@ -990,6 +973,10 @@ gain15 0 + + agc15 + False + ant15 @@ -1006,6 +993,10 @@ gain16 0 + + agc16 + False + ant16 @@ -1022,6 +1013,10 @@ gain17 0 + + agc17 + False + ant17 @@ -1038,6 +1033,10 @@ gain18 0 + + agc18 + False + ant18 @@ -1054,6 +1053,10 @@ gain19 0 + + agc19 + False + ant19 @@ -1070,6 +1073,10 @@ gain20 0 + + agc20 + False + ant20 @@ -1086,6 +1093,10 @@ gain21 0 + + agc21 + False + ant21 @@ -1102,6 +1113,10 @@ gain22 0 + + agc22 + False + ant22 @@ -1118,6 +1133,10 @@ gain23 0 + + agc23 + False + ant23 @@ -1134,6 +1153,10 @@ gain24 0 + + agc24 + False + ant24 @@ -1150,6 +1173,10 @@ gain25 0 + + agc25 + False + ant25 @@ -1166,6 +1193,10 @@ gain26 0 + + agc26 + False + ant26 @@ -1182,6 +1213,10 @@ gain27 0 + + agc27 + False + ant27 @@ -1198,6 +1233,10 @@ gain28 0 + + agc28 + False + ant28 @@ -1214,6 +1253,10 @@ gain29 0 + + agc29 + False + ant29 @@ -1230,6 +1273,10 @@ gain30 0 + + agc30 + False + ant30 @@ -1246,6 +1293,10 @@ gain31 0 + + agc31 + False + ant31 @@ -1254,6 +1305,10 @@ bw31 0 + + alias + + affinity @@ -1297,6 +1352,10 @@ vlen 1 + + alias + + affinity @@ -1360,6 +1419,10 @@ notebook + + alias + + _coordinate (755, 3) @@ -1399,6 +1462,10 @@ dev_addr + + dev_args + "" + sync pc_clock @@ -1523,6 +1590,18 @@ gain0 tx_gain + + csma_enable0 + False + + + csma_slottime0 + 0 + + + csma_threshold0 + 0 + ant0 @@ -1539,6 +1618,18 @@ gain1 0 + + csma_enable1 + False + + + csma_slottime1 + 0 + + + csma_threshold1 + 0 + ant1 @@ -1555,6 +1646,18 @@ gain2 0 + + csma_enable2 + False + + + csma_slottime2 + 0 + + + csma_threshold2 + 0 + ant2 @@ -1571,6 +1674,18 @@ gain3 0 + + csma_enable3 + False + + + csma_slottime3 + 0 + + + csma_threshold3 + 0 + ant3 @@ -1587,6 +1702,18 @@ gain4 0 + + csma_enable4 + False + + + csma_slottime4 + 0 + + + csma_threshold4 + 0 + ant4 @@ -1603,6 +1730,18 @@ gain5 0 + + csma_enable5 + False + + + csma_slottime5 + 0 + + + csma_threshold5 + 0 + ant5 @@ -1619,6 +1758,18 @@ gain6 0 + + csma_enable6 + False + + + csma_slottime6 + 0 + + + csma_threshold6 + 0 + ant6 @@ -1635,6 +1786,18 @@ gain7 0 + + csma_enable7 + False + + + csma_slottime7 + 0 + + + csma_threshold7 + 0 + ant7 @@ -1651,6 +1814,18 @@ gain8 0 + + csma_enable8 + False + + + csma_slottime8 + 0 + + + csma_threshold8 + 0 + ant8 @@ -1667,6 +1842,18 @@ gain9 0 + + csma_enable9 + False + + + csma_slottime9 + 0 + + + csma_threshold9 + 0 + ant9 @@ -1683,6 +1870,18 @@ gain10 0 + + csma_enable10 + False + + + csma_slottime10 + 0 + + + csma_threshold10 + 0 + ant10 @@ -1699,6 +1898,18 @@ gain11 0 + + csma_enable11 + False + + + csma_slottime11 + 0 + + + csma_threshold11 + 0 + ant11 @@ -1715,6 +1926,18 @@ gain12 0 + + csma_enable12 + False + + + csma_slottime12 + 0 + + + csma_threshold12 + 0 + ant12 @@ -1731,6 +1954,18 @@ gain13 0 + + csma_enable13 + False + + + csma_slottime13 + 0 + + + csma_threshold13 + 0 + ant13 @@ -1747,6 +1982,18 @@ gain14 0 + + csma_enable14 + False + + + csma_slottime14 + 0 + + + csma_threshold14 + 0 + ant14 @@ -1763,6 +2010,18 @@ gain15 0 + + csma_enable15 + False + + + csma_slottime15 + 0 + + + csma_threshold15 + 0 + ant15 @@ -1779,6 +2038,18 @@ gain16 0 + + csma_enable16 + False + + + csma_slottime16 + 0 + + + csma_threshold16 + 0 + ant16 @@ -1795,6 +2066,18 @@ gain17 0 + + csma_enable17 + False + + + csma_slottime17 + 0 + + + csma_threshold17 + 0 + ant17 @@ -1811,6 +2094,18 @@ gain18 0 + + csma_enable18 + False + + + csma_slottime18 + 0 + + + csma_threshold18 + 0 + ant18 @@ -1827,6 +2122,18 @@ gain19 0 + + csma_enable19 + False + + + csma_slottime19 + 0 + + + csma_threshold19 + 0 + ant19 @@ -1843,6 +2150,18 @@ gain20 0 + + csma_enable20 + False + + + csma_slottime20 + 0 + + + csma_threshold20 + 0 + ant20 @@ -1859,6 +2178,18 @@ gain21 0 + + csma_enable21 + False + + + csma_slottime21 + 0 + + + csma_threshold21 + 0 + ant21 @@ -1875,6 +2206,18 @@ gain22 0 + + csma_enable22 + False + + + csma_slottime22 + 0 + + + csma_threshold22 + 0 + ant22 @@ -1891,6 +2234,18 @@ gain23 0 + + csma_enable23 + False + + + csma_slottime23 + 0 + + + csma_threshold23 + 0 + ant23 @@ -1907,6 +2262,18 @@ gain24 0 + + csma_enable24 + False + + + csma_slottime24 + 0 + + + csma_threshold24 + 0 + ant24 @@ -1923,6 +2290,18 @@ gain25 0 + + csma_enable25 + False + + + csma_slottime25 + 0 + + + csma_threshold25 + 0 + ant25 @@ -1939,6 +2318,18 @@ gain26 0 + + csma_enable26 + False + + + csma_slottime26 + 0 + + + csma_threshold26 + 0 + ant26 @@ -1955,6 +2346,18 @@ gain27 0 + + csma_enable27 + False + + + csma_slottime27 + 0 + + + csma_threshold27 + 0 + ant27 @@ -1971,6 +2374,18 @@ gain28 0 + + csma_enable28 + False + + + csma_slottime28 + 0 + + + csma_threshold28 + 0 + ant28 @@ -1987,6 +2402,18 @@ gain29 0 + + csma_enable29 + False + + + csma_slottime29 + 0 + + + csma_threshold29 + 0 + ant29 @@ -2003,6 +2430,18 @@ gain30 0 + + csma_enable30 + False + + + csma_slottime30 + 0 + + + csma_threshold30 + 0 + ant30 @@ -2019,6 +2458,18 @@ gain31 0 + + csma_enable31 + False + + + csma_slottime31 + 0 + + + csma_threshold31 + 0 + ant31 @@ -2031,6 +2482,10 @@ len_tag_name + + alias + + affinity @@ -2044,41 +2499,6 @@ 0 - - ieee802_11_ether_encap - - id - ieee802_11_ether_encap_0 - - - _enabled - True - - - debug - False - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (308, 156) - - - _rotation - 0 - - foo_packet_pad2 @@ -2109,6 +2529,10 @@ pad_tail 10000 + + alias + + affinity @@ -2130,12 +2554,178 @@ 0 - - foo_wireshark_connector_0 - blocks_file_sink_0 - 0 - 0 - + + blocks_file_sink + + id + blocks_file_sink_0 + + + _enabled + True + + + file + /tmp/ofdm.pcap + + + type + byte + + + vlen + 1 + + + unbuffered + True + + + append + True + + + alias + + + + affinity + + + + _coordinate + (805, 300) + + + _rotation + 0 + + + + foo_wireshark_connector + + id + foo_wireshark_connector_0 + + + _enabled + True + + + tech + 127 + + + debug + False + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (580, 308) + + + _rotation + 0 + + + + blocks_tuntap_pdu + + id + blocks_tuntap_pdu_0 + + + _enabled + True + + + ifn + tap0 + + + mtu + 440 + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (310, 74) + + + _rotation + 180 + + + + ieee802_11_ether_encap + + id + ieee802_11_ether_encap_0 + + + _enabled + True + + + debug + False + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (308, 156) + + + _rotation + 0 + + ieee802_11_ether_encap_0 blocks_tuntap_pdu_0 @@ -2214,4 +2804,10 @@ 0 0 + + foo_wireshark_connector_0 + blocks_file_sink_0 + 0 + 0 +