t/gr-ieee802-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new message port names, fix lo_offset, add multiplier to transceiver

Browse Source
This commit is contained in:
Bastian Bloessl
2013-12-05 14:46:09 +01:00
parent 9b469a5e5b
commit a973870976
10 changed files with 2043 additions and 7464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/ofdm_transceiver.grc
+461 -323
View File
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
<timestamp>Sat Oct 12 19:42:08 2013</timestamp>
<timestamp>Thu Dec 5 14:40:29 2013</timestamp>
<block>
<key>options</key>
<param>
@@ -162,72 +162,6 @@
<value>0</value>
</param>
</block>
<block>
<key>ieee802_11_ether_encap</key>
<param>
<key>id</key>
<value>ieee802_11_ether_encap_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>debug</key>
<value>False</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(308, 156)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
</block>
<block>
<key>foo_wireshark_connector</key>
<param>
<key>id</key>
<value>foo_wireshark_connector_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>tech</key>
<value>127</value>
</param>
<param>
<key>debug</key>
<value>False</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(580, 307)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
</block>
<block>
<key>blocks_ctrlport_monitor_performance</key>
<param>
@@ -274,49 +208,6 @@
<value>0</value>
</param>
</block>
<block>
<key>blocks_file_sink</key>
<param>
<key>id</key>
<value>blocks_file_sink_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>file</key>
<value>/tmp/ofdm.pcap</value>
</param>
<param>
<key>type</key>
<value>byte</value>
</param>
<param>
<key>vlen</key>
<value>1</value>
</param>
<param>
<key>unbuffered</key>
<value>True</value>
</param>
<param>
<key>append</key>
<value>True</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_coordinate</key>
<value>(800, 299)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
</block>
<block>
<key>variable_slider</key>
<param>
@@ -427,169 +318,6 @@
<value>0</value>
</param>
</block>
<block>
<key>blocks_tuntap_pdu</key>
<param>
<key>id</key>
<value>blocks_tuntap_pdu_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>ifn</key>
<value>tap0</value>
</param>
<param>
<key>mtu</key>
<value>440</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(310, 74)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
</block>
<block>
<key>foo_packet_pad</key>
<param>
<key>id</key>
<value>foo_packet_pad_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>debug</key>
<value>False</value>
</param>
<param>
<key>pad_front</key>
<value>10000</value>
</param>
<param>
<key>pad_tail</key>
<value>0</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(73, 479)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
</block>
<block>
<key>ofdm_phy_hier</key>
<param>
<key>id</key>
<value>ofdm_phy_hier_1</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>encoding</key>
<value>encoding</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(325, 356)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
</block>
<block>
<key>ieee802_11_ofdm_mac</key>
<param>
<key>id</key>
<value>ieee802_11_ofdm_mac_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(339, 257)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
</block>
<block>
<key>ieee802_11_ofdm_parse_mac</key>
<param>
<key>id</key>
<value>ieee802_11_ofdm_parse_mac_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>log</key>
<value>False</value>
</param>
<param>
<key>debug</key>
<value>True</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_coordinate</key>
<value>(94, 279)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
</block>
<block>
<key>variable_chooser</key>
<param>
@@ -692,6 +420,224 @@
<value>0</value>
</param>
</block>
<block>
<key>blocks_tuntap_pdu</key>
<param>
<key>id</key>
<value>blocks_tuntap_pdu_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>ifn</key>
<value>tap0</value>
</param>
<param>
<key>mtu</key>
<value>440</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(310, 74)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
</block>
<block>
<key>ieee802_11_ether_encap</key>
<param>
<key>id</key>
<value>ieee802_11_ether_encap_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>debug</key>
<value>False</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(308, 156)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
</block>
<block>
<key>ieee802_11_ofdm_parse_mac</key>
<param>
<key>id</key>
<value>ieee802_11_ofdm_parse_mac_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>log</key>
<value>False</value>
</param>
<param>
<key>debug</key>
<value>True</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_coordinate</key>
<value>(94, 308)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
</block>
<block>
<key>ieee802_11_ofdm_mac</key>
<param>
<key>id</key>
<value>ieee802_11_ofdm_mac_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(339, 257)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
</block>
<block>
<key>foo_wireshark_connector</key>
<param>
<key>id</key>
<value>foo_wireshark_connector_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>tech</key>
<value>127</value>
</param>
<param>
<key>debug</key>
<value>False</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(580, 308)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
</block>
<block>
<key>blocks_file_sink</key>
<param>
<key>id</key>
<value>blocks_file_sink_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>file</key>
<value>/tmp/ofdm.pcap</value>
</param>
<param>
<key>type</key>
<value>byte</value>
</param>
<param>
<key>vlen</key>
<value>1</value>
</param>
<param>
<key>unbuffered</key>
<value>True</value>
</param>
<param>
<key>append</key>
<value>True</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_coordinate</key>
<value>(805, 300)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
</block>
<block>
<key>uhd_usrp_sink</key>
<param>
@@ -840,7 +786,7 @@
</param>
<param>
<key>center_freq0</key>
<value>uhd.tune_request(freq, lo_offset)</value>
<value>uhd.tune_request(freq - lo_offset, lo_offset)</value>
</param>
<param>
<key>gain0</key>
@@ -1511,7 +1457,7 @@
</param>
<param>
<key>center_freq0</key>
<value>uhd.tune_request(freq, lo_offset)</value>
<value>uhd.tune_request(freq - lo_offset, lo_offset)</value>
</param>
<param>
<key>gain0</key>
@@ -2029,6 +1975,10 @@
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(460, 483)</value>
@@ -2038,60 +1988,194 @@
<value>0</value>
</param>
</block>
<block>
<key>ofdm_phy_hier</key>
<param>
<key>id</key>
<value>ofdm_phy_hier_1</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>encoding</key>
<value>encoding</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(324, 355)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
</block>
<block>
<key>foo_packet_pad</key>
<param>
<key>id</key>
<value>foo_packet_pad_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>debug</key>
<value>False</value>
</param>
<param>
<key>pad_front</key>
<value>10000</value>
</param>
<param>
<key>pad_tail</key>
<value>0</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(73, 479)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
</block>
<block>
<key>blocks_multiply_const_vxx</key>
<param>
<key>id</key>
<value>blocks_multiply_const_vxx_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>type</key>
<value>complex</value>
</param>
<param>
<key>const</key>
<value>mult</value>
</param>
<param>
<key>vlen</key>
<value>1</value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(104, 385)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
</block>
<block>
<key>variable_slider</key>
<param>
<key>id</key>
<value>mult</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>label</key>
<value></value>
</param>
<param>
<key>value</key>
<value>0.38</value>
</param>
<param>
<key>min</key>
<value>0</value>
</param>
<param>
<key>max</key>
<value>1</value>
</param>
<param>
<key>num_steps</key>
<value>100</value>
</param>
<param>
<key>style</key>
<value>wx.SL_HORIZONTAL</value>
</param>
<param>
<key>converver</key>
<value>float_converter</value>
</param>
<param>
<key>grid_pos</key>
<value></value>
</param>
<param>
<key>notebook</key>
<value></value>
</param>
<param>
<key>_coordinate</key>
<value>(1140, 247)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
</block>
<connection>
<source_block_id>foo_wireshark_connector_0</source_block_id>
<sink_block_id>blocks_file_sink_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>ieee802_11_ofdm_mac_0</source_block_id>
<sink_block_id>ofdm_phy_hier_1</sink_block_id>
<source_key>1</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>ieee802_11_ofdm_mac_0</source_block_id>
<sink_block_id>ieee802_11_ether_encap_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>ieee802_11_ether_encap_0</source_block_id>
<sink_block_id>ieee802_11_ofdm_mac_0</sink_block_id>
<source_key>1</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>foo_packet_pad_0</source_block_id>
<sink_block_id>uhd_usrp_sink_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>ofdm_phy_hier_1</source_block_id>
<sink_block_id>foo_packet_pad_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>blocks_tuntap_pdu_0</source_block_id>
<sink_block_id>ieee802_11_ether_encap_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>ieee802_11_ether_encap_0</source_block_id>
<sink_block_id>blocks_tuntap_pdu_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>ieee802_11_ofdm_mac_0</source_block_id>
<sink_block_id>foo_wireshark_connector_0</sink_block_id>
<source_key>1</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>uhd_usrp_source_0</source_block_id>
<sink_block_id>ofdm_phy_hier_1</sink_block_id>
@@ -2099,15 +2183,69 @@
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>ofdm_phy_hier_1</source_block_id>
<sink_block_id>ieee802_11_ofdm_parse_mac_0</sink_block_id>
<source_key>1</source_key>
<sink_key>0</sink_key>
<source_block_id>ieee802_11_ofdm_mac_0</source_block_id>
<sink_block_id>ofdm_phy_hier_1</sink_block_id>
<source_key>phy out</source_key>
<sink_key>mac_in</sink_key>
</connection>
<connection>
<source_block_id>ofdm_phy_hier_1</source_block_id>
<sink_block_id>ieee802_11_ofdm_mac_0</sink_block_id>
<source_key>1</source_key>
<sink_key>1</sink_key>
<source_key>mac_out</source_key>
<sink_key>phy in</sink_key>
</connection>
<connection>
<source_block_id>ieee802_11_ether_encap_0</source_block_id>
<sink_block_id>blocks_tuntap_pdu_0</sink_block_id>
<source_key>to tap</source_key>
<sink_key>pdus</sink_key>
</connection>
<connection>
<source_block_id>blocks_tuntap_pdu_0</source_block_id>
<sink_block_id>ieee802_11_ether_encap_0</sink_block_id>
<source_key>pdus</source_key>
<sink_key>from tap</sink_key>
</connection>
<connection>
<source_block_id>ieee802_11_ofdm_mac_0</source_block_id>
<sink_block_id>ieee802_11_ether_encap_0</sink_block_id>
<source_key>app out</source_key>
<sink_key>from wifi</sink_key>
</connection>
<connection>
<source_block_id>ieee802_11_ether_encap_0</source_block_id>
<sink_block_id>ieee802_11_ofdm_mac_0</sink_block_id>
<source_key>to wifi</source_key>
<sink_key>app in</sink_key>
</connection>
<connection>
<source_block_id>ofdm_phy_hier_1</source_block_id>
<sink_block_id>ieee802_11_ofdm_parse_mac_0</sink_block_id>
<source_key>mac_out</source_key>
<sink_key>in</sink_key>
</connection>
<connection>
<source_block_id>ieee802_11_ofdm_mac_0</source_block_id>
<sink_block_id>foo_wireshark_connector_0</sink_block_id>
<source_key>phy out</source_key>
<sink_key>in</sink_key>
</connection>
<connection>
<source_block_id>ofdm_phy_hier_1</source_block_id>
<sink_block_id>foo_wireshark_connector_0</sink_block_id>
<source_key>mac_out</source_key>
<sink_key>in</sink_key>
</connection>
<connection>
<source_block_id>ofdm_phy_hier_1</source_block_id>
<sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>blocks_multiply_const_vxx_0</source_block_id>
<sink_block_id>foo_packet_pad_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
</flow_graph>