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

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	examples/wifi_loopback.grc
#	examples/wifi_transceiver.grc
#	examples/wifi_tx.grc
#	grc/ieee802_11_decode_mac.xml
#	grc/ieee802_11_mac.xml
#	grc/ieee802_11_mapper.xml
#	grc/ieee802_11_ofdm_decode_signal.xml
#	grc/ieee802_11_ofdm_equalize_symbols.xml
#	grc/ieee802_11_parse_mac.xml
#	grc/ieee802_11_sync_long.xml
#	grc/ieee802_11_sync_short.xml
This commit is contained in:
Bastian Bloessl
2016-06-22 12:58:11 +02:00
parent 30862c0ff8 5ddba507e5
commit cc0a56e341
12 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/wifi_loopback.grc
+1 -1
View File
@@ -1209,7 +1209,7 @@
</param>
<param>
<key>_coordinate</key>
<value>(408, 568)</value>
<value>(376, 368)</value>
</param>
<param>
<key>_rotation</key>
examples/wifi_phy_hier.grc
+1 -1
View File
@@ -14,7 +14,7 @@
</param>
<param>
<key>category</key>
<value>IEEE802.11</value>
<value>[IEEE802.11]</value>
</param>
<param>
<key>comment</key>
examples/wifi_transceiver.grc
+1 -1
View File
@@ -3226,7 +3226,7 @@
</param>
<param>
<key>_coordinate</key>
<value>(200, 744)</value>
<value>(288, 496)</value>
</param>
<param>
<key>_rotation</key>
grc/ieee802_11_chunks_to_symbols.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<block>
<name>Chunks to Symbols</name>
<key>ieee802_11_chunks_to_symbols_xx</key>
<category>IEEE802.11</category>
<category>[IEEE802.11]</category>
<import>import ieee802_11</import>
<make>ieee802_11.chunks_to_symbols()</make>
<sink>
grc/ieee802_11_decode_mac.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<block>
<name>WiFi Decode MAC</name>
<key>ieee802_11_decode_mac</key>
<category>IEEE802.11</category>
<category>[IEEE802.11]</category>
<import>import ieee802_11</import>
<make>ieee802_11.decode_mac($log, $debug)</make>
grc/ieee802_11_ether_encap.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<block>
<name>Ethernet Encapsulation</name>
<key>ieee802_11_ether_encap</key>
<category>IEEE802.11</category>
<category>[IEEE802.11]</category>
<import>import ieee802_11</import>
<make>ieee802_11.ether_encap($debug)</make>
grc/ieee802_11_mac.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<block>
<name>WiFi MAC</name>
<key>ieee802_11_mac</key>
<category>IEEE802.11</category>
<category>[IEEE802.11]</category>
<import>import ieee802_11</import>
<make>ieee802_11.mac($src_mac, $dst_mac, $bss_mac)</make>
grc/ieee802_11_mapper.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<block>
<name>WiFi Mapper</name>
<key>ieee802_11_mapper</key>
<category>IEEE802.11</category>
<category>[IEEE802.11]</category>
<import>import ieee802_11</import>
<make>ieee802_11.mapper($encoding, $debug)</make>
<callback>set_encoding($encoding)</callback>
grc/ieee802_11_moving_average_xx.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<block>
<name>Moving Average</name>
<key>ieee802_11_moving_average_xx</key>
<category>IEEE802.11</category>
<category>[IEEE802.11]</category>
<import>import ieee802_11</import>
<make>ieee802_11.moving_average_$(type.fcn)($length)</make>
<callback>set_length($length)</callback>
grc/ieee802_11_parse_mac.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<block>
<name>WiFi Parse MAC</name>
<key>ieee802_11_parse_mac</key>
<category>IEEE802.11</category>
<category>[IEEE802.11]</category>
<import>import ieee802_11</import>
<make>ieee802_11.parse_mac($log, $debug)</make>
grc/ieee802_11_sync_long.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<block>
<name>WiFi Sync Long</name>
<key>ieee802_11_sync_long</key>
<category>IEEE802.11</category>
<category>[IEEE802.11]</category>
<import>import ieee802_11</import>
<make>ieee802_11.sync_long($sync_length, $log, $debug)</make>
grc/ieee802_11_sync_short.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<block>
<name>WiFi Sync Short</name>
<key>ieee802_11_sync_short</key>
<category>IEEE802.11</category>
<category>[IEEE802.11]</category>
<import>import ieee802_11</import>
<make>ieee802_11.sync_short($threshold, $min_plateau, $log, $debug)</make>