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
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>