From bb88daf41f64dd393f65fc22f45c4d46ccdf4841 Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Fri, 18 Jul 2014 09:47:26 +0200 Subject: [PATCH] grc: add blocks with mac address --- examples/wifi_transceiver.grc | 170 ++++---- examples/wifi_tx.grc | 740 +++++++++++++++++++++++++++------- 2 files changed, 691 insertions(+), 219 deletions(-) diff --git a/examples/wifi_transceiver.grc b/examples/wifi_transceiver.grc index 6d9746e..126ef84 100644 --- a/examples/wifi_transceiver.grc +++ b/examples/wifi_transceiver.grc @@ -1,6 +1,6 @@ - Fri Jul 18 08:47:35 2014 + Fri Jul 18 09:46:19 2014 options @@ -174,41 +174,6 @@ 0 - - ieee802_11_ofdm_mac - - id - ieee802_11_ofdm_mac_0 - - - _enabled - True - - - alias - - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (339, 257) - - - _rotation - 0 - - variable_slider @@ -480,41 +445,6 @@ 180 - - ieee802_11_ofdm_parse_mac - - id - ieee802_11_ofdm_parse_mac_0 - - - _enabled - True - - - log - False - - - debug - True - - - alias - - - - affinity - - - - _coordinate - (93, 296) - - - _rotation - 180 - - uhd_usrp_source @@ -2645,22 +2575,26 @@ - blocks_tuntap_pdu + ieee802_11_ofdm_mac id - blocks_tuntap_pdu_0 + ieee802_11_ofdm_mac_0 _enabled True - ifn - tap0 + src_mac + [0x23, 0x23, 0x23, 0x23, 0x23, 0x23] - mtu - 440 + dst_mac + [0x42, 0x42, 0x42, 0x42, 0x42, 0x42] + + + bss_mac + [0xff, 0xff, 0xff, 0xff, 0xff, 0xff] alias @@ -2680,7 +2614,42 @@ _coordinate - (310, 74) + (303, 258) + + + _rotation + 0 + + + + ieee802_11_ofdm_parse_mac + + id + ieee802_11_ofdm_parse_mac_0 + + + _enabled + True + + + log + False + + + debug + True + + + alias + + + + affinity + + + + _coordinate + (22, 290) _rotation @@ -2719,13 +2688,56 @@ _coordinate - (308, 156) + (314, 157) _rotation 0 + + blocks_tuntap_pdu + + id + blocks_tuntap_pdu_0 + + + _enabled + True + + + ifn + tap0 + + + mtu + 440 + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (319, 80) + + + _rotation + 180 + + ieee802_11_ether_encap_0 blocks_tuntap_pdu_0 diff --git a/examples/wifi_tx.grc b/examples/wifi_tx.grc index dd756a9..b334042 100644 --- a/examples/wifi_tx.grc +++ b/examples/wifi_tx.grc @@ -1,6 +1,6 @@ - Thu May 8 11:23:35 2014 + Fri Jul 18 09:46:28 2014 options @@ -51,6 +51,10 @@ realtime_scheduling + + alias + + _coordinate (56, 8) @@ -106,6 +110,10 @@ notebook + + alias + + _coordinate (291, 12) @@ -158,59 +166,12 @@ - _coordinate - (780, 17) - - - _rotation - 0 - - - - blocks_socket_pdu - - id - blocks_socket_pdu_0 - - - _enabled - True - - - type - "UDP_SERVER" - - - host + alias - - port - 52001 - - - mtu - 10000 - - - tcp_no_delay - False - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - _coordinate - (200, 210) + (780, 17) _rotation @@ -236,36 +197,9 @@ 300 - affinity + alias - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (113, 154) - - - _rotation - 0 - - - - ieee802_11_ofdm_mac - - id - ieee802_11_ofdm_mac_0 - - - _enabled - True - affinity @@ -280,7 +214,7 @@ _coordinate - (465, 191) + (113, 154) _rotation @@ -329,6 +263,10 @@ notebook + + alias + + _coordinate (697, 165) @@ -380,6 +318,10 @@ notebook + + alias + + _coordinate (419, 11) @@ -435,6 +377,10 @@ notebook + + alias + + _coordinate (979, 10) @@ -486,6 +432,10 @@ notebook + + alias + + _coordinate (629, 14) @@ -495,6 +445,143 @@ 0 + + wifi_phy_hier + + id + wifi_phy_hier_0 + + + _enabled + True + + + encoding + encoding + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (461, 299) + + + _rotation + 180 + + + + blocks_null_source + + id + blocks_null_source_0 + + + _enabled + True + + + type + complex + + + vlen + 1 + + + num_outputs + 1 + + + bus_conns + [[0,],] + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (668, 333) + + + _rotation + 180 + + + + blocks_multiply_const_vxx + + id + blocks_multiply_const_vxx_0 + + + _enabled + True + + + type + complex + + + const + mult + + + vlen + 1 + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (231, 329) + + + _rotation + 180 + + uhd_usrp_sink @@ -525,6 +612,10 @@ dev_addr + + dev_args + "" + sync pc_clock @@ -649,6 +740,18 @@ gain0 gain + + csma_enable0 + False + + + csma_slottime0 + 0 + + + csma_threshold0 + 0 + ant0 @@ -665,6 +768,18 @@ gain1 0 + + csma_enable1 + False + + + csma_slottime1 + 0 + + + csma_threshold1 + 0 + ant1 @@ -681,6 +796,18 @@ gain2 0 + + csma_enable2 + False + + + csma_slottime2 + 0 + + + csma_threshold2 + 0 + ant2 @@ -697,6 +824,18 @@ gain3 0 + + csma_enable3 + False + + + csma_slottime3 + 0 + + + csma_threshold3 + 0 + ant3 @@ -713,6 +852,18 @@ gain4 0 + + csma_enable4 + False + + + csma_slottime4 + 0 + + + csma_threshold4 + 0 + ant4 @@ -729,6 +880,18 @@ gain5 0 + + csma_enable5 + False + + + csma_slottime5 + 0 + + + csma_threshold5 + 0 + ant5 @@ -745,6 +908,18 @@ gain6 0 + + csma_enable6 + False + + + csma_slottime6 + 0 + + + csma_threshold6 + 0 + ant6 @@ -761,6 +936,18 @@ gain7 0 + + csma_enable7 + False + + + csma_slottime7 + 0 + + + csma_threshold7 + 0 + ant7 @@ -777,6 +964,18 @@ gain8 0 + + csma_enable8 + False + + + csma_slottime8 + 0 + + + csma_threshold8 + 0 + ant8 @@ -793,6 +992,18 @@ gain9 0 + + csma_enable9 + False + + + csma_slottime9 + 0 + + + csma_threshold9 + 0 + ant9 @@ -809,6 +1020,18 @@ gain10 0 + + csma_enable10 + False + + + csma_slottime10 + 0 + + + csma_threshold10 + 0 + ant10 @@ -825,6 +1048,18 @@ gain11 0 + + csma_enable11 + False + + + csma_slottime11 + 0 + + + csma_threshold11 + 0 + ant11 @@ -841,6 +1076,18 @@ gain12 0 + + csma_enable12 + False + + + csma_slottime12 + 0 + + + csma_threshold12 + 0 + ant12 @@ -857,6 +1104,18 @@ gain13 0 + + csma_enable13 + False + + + csma_slottime13 + 0 + + + csma_threshold13 + 0 + ant13 @@ -873,6 +1132,18 @@ gain14 0 + + csma_enable14 + False + + + csma_slottime14 + 0 + + + csma_threshold14 + 0 + ant14 @@ -889,6 +1160,18 @@ gain15 0 + + csma_enable15 + False + + + csma_slottime15 + 0 + + + csma_threshold15 + 0 + ant15 @@ -905,6 +1188,18 @@ gain16 0 + + csma_enable16 + False + + + csma_slottime16 + 0 + + + csma_threshold16 + 0 + ant16 @@ -921,6 +1216,18 @@ gain17 0 + + csma_enable17 + False + + + csma_slottime17 + 0 + + + csma_threshold17 + 0 + ant17 @@ -937,6 +1244,18 @@ gain18 0 + + csma_enable18 + False + + + csma_slottime18 + 0 + + + csma_threshold18 + 0 + ant18 @@ -953,6 +1272,18 @@ gain19 0 + + csma_enable19 + False + + + csma_slottime19 + 0 + + + csma_threshold19 + 0 + ant19 @@ -969,6 +1300,18 @@ gain20 0 + + csma_enable20 + False + + + csma_slottime20 + 0 + + + csma_threshold20 + 0 + ant20 @@ -985,6 +1328,18 @@ gain21 0 + + csma_enable21 + False + + + csma_slottime21 + 0 + + + csma_threshold21 + 0 + ant21 @@ -1001,6 +1356,18 @@ gain22 0 + + csma_enable22 + False + + + csma_slottime22 + 0 + + + csma_threshold22 + 0 + ant22 @@ -1017,6 +1384,18 @@ gain23 0 + + csma_enable23 + False + + + csma_slottime23 + 0 + + + csma_threshold23 + 0 + ant23 @@ -1033,6 +1412,18 @@ gain24 0 + + csma_enable24 + False + + + csma_slottime24 + 0 + + + csma_threshold24 + 0 + ant24 @@ -1049,6 +1440,18 @@ gain25 0 + + csma_enable25 + False + + + csma_slottime25 + 0 + + + csma_threshold25 + 0 + ant25 @@ -1065,6 +1468,18 @@ gain26 0 + + csma_enable26 + False + + + csma_slottime26 + 0 + + + csma_threshold26 + 0 + ant26 @@ -1081,6 +1496,18 @@ gain27 0 + + csma_enable27 + False + + + csma_slottime27 + 0 + + + csma_threshold27 + 0 + ant27 @@ -1097,6 +1524,18 @@ gain28 0 + + csma_enable28 + False + + + csma_slottime28 + 0 + + + csma_threshold28 + 0 + ant28 @@ -1113,6 +1552,18 @@ gain29 0 + + csma_enable29 + False + + + csma_slottime29 + 0 + + + csma_threshold29 + 0 + ant29 @@ -1129,6 +1580,18 @@ gain30 0 + + csma_enable30 + False + + + csma_slottime30 + 0 + + + csma_threshold30 + 0 + ant30 @@ -1145,6 +1608,18 @@ gain31 0 + + csma_enable31 + False + + + csma_slottime31 + 0 + + + csma_threshold31 + 0 + ant31 @@ -1155,6 +1630,10 @@ len_tag_name + packet_len + + + alias @@ -1163,7 +1642,7 @@ _coordinate - (274, 420) + (275, 420) _rotation @@ -1200,6 +1679,10 @@ pad_tail 10000 + + alias + + affinity @@ -1214,7 +1697,7 @@ _coordinate - (85, 420) + (86, 444) _rotation @@ -1222,18 +1705,30 @@ - wifi_phy_hier + ieee802_11_ofdm_mac id - wifi_phy_hier_0 + ieee802_11_ofdm_mac_0 _enabled True - encoding - encoding + src_mac + [0x23, 0x23, 0x23, 0x23, 0x23, 0x23] + + + dst_mac + [0x42, 0x42, 0x42, 0x42, 0x42, 0x42] + + + bss_mac + [0xff, 0xff, 0xff, 0xff, 0xff, 255] + + + alias + affinity @@ -1249,18 +1744,18 @@ _coordinate - (461, 299) + (446, 187) _rotation - 180 + 0 - blocks_null_source + blocks_socket_pdu id - blocks_null_source_0 + blocks_socket_pdu_0 _enabled @@ -1268,19 +1763,27 @@ type - complex + "UDP_SERVER" - vlen - 1 + host + - num_outputs - 1 + port + 52001 - bus_conns - [[0,],] + mtu + 10000 + + + tcp_no_delay + False + + + alias + affinity @@ -1296,55 +1799,12 @@ _coordinate - (668, 333) + (177, 222) _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 - (231, 329) - - - _rotation - 180 - blocks_message_strobe_0