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

Merge branch 'release' into agc_and_csma

Browse Source
This commit is contained in:
Bastian Bloessl
2015-04-20 15:12:54 +02:00
parent 9614b4a459 05dbde69d6
commit c664ac99a7
34 changed files with 5988 additions and 4426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grc/ieee802_11_ofdm_equalize_symbols.xml
+18 -1
View File
@@ -5,7 +5,24 @@
<key>ieee802_11_ofdm_equalize_symbols</key>
<category>IEEE802.11</category>
<import>import ieee802_11</import>
<make>ieee802_11.ofdm_equalize_symbols($debug)</make>
<make>ieee802_11.ofdm_equalize_symbols($algo, $debug)</make>
<callback>set_algorithm($algo)</callback>
<param>
<name>Algorithm</name>
<key>algo</key>
<value>ieee802_11.LINEAR_COMB</value>
<type>int</type>
<option>
<name>LMS</name>
<key>ieee802_11.LMS</key>
</option>
<option>
<name>linear comb</name>
<key>ieee802_11.LINEAR_COMB</key>
</option>
</param>
<param>
<name>Debug</name>
grc/ieee802_11_ofdm_freq_est.xml
-54
View File
@@ -1,54 +0,0 @@
<?xml version="1.0"?>
<block>
<name>OFDM Freq Est</name>
<key>ieee802_11_ofdm_freq_est</key>
<category>IEEE802.11</category>
<import>import ieee802_11</import>
<make>ieee802_11.ofdm_freq_est($log, $debug)</make>
<param>
<name>Log</name>
<key>log</key>
<value>False</value>
<type>bool</type>
<option>
<name>Enable</name>
<key>True</key>
</option>
<option>
<name>Disable</name>
<key>False</key>
</option>
</param>
<param>
<name>Debug</name>
<key>debug</key>
<value>False</value>
<type>bool</type>
<option>
<name>Enable</name>
<key>True</key>
</option>
<option>
<name>Disable</name>
<key>False</key>
</option>
</param>
<sink>
<name>in</name>
<type>complex</type>
<nports>1</nports>
</sink>
<source>
<name>out</name>
<type>complex</type>
<nports>1</nports>
</source>
</block>
grc/ieee802_11_ofdm_mapper.xml
+34 -1
View File
@@ -11,8 +11,41 @@
<param>
<name>Encoding</name>
<key>encoding</key>
<value>0</value>
<value>ieee802_11.BPSK_1_2</value>
<type>int</type>
<option>
<name>BPSK 1/2</name>
<key>ieee802_11.BPSK_1_2</key>
</option>
<option>
<name>BPSK 3/4</name>
<key>ieee802_11.BPSK_3_4</key>
</option>
<option>
<name>QPSK 1/2</name>
<key>ieee802_11.QPSK_1_2</key>
</option>
<option>
<name>QPSK 3/4</name>
<key>ieee802_11.QPSK_3_4</key>
</option>
<option>
<name>16QAM 1/2</name>
<key>ieee802_11.16QAM_1_2</key>
</option>
<option>
<name>16QAM 3/4</name>
<key>ieee802_11.16QAM_3_4</key>
</option>
<option>
<name>64QAM 2/3</name>
<key>ieee802_11.64QAM_2_3</key>
</option>
<option>
<name>64QAM 3/4</name>
<key>ieee802_11.64QAM_3_4</key>
</option>
</param>
<param>
grc/ieee802_11_ofdm_parse_mac.xml
+6
View File
@@ -44,5 +44,11 @@
<type>message</type>
</sink>
<source>
<name>fer</name>
<type>message</type>
<optional>1</optional>
</source>
</block>
grc/ieee802_11_ofdm_sync_short.xml
+7 -9
View File
@@ -5,7 +5,7 @@
<key>ieee802_11_ofdm_sync_short</key>
<category>IEEE802.11</category>
<import>import ieee802_11</import>
<make>ieee802_11.ofdm_sync_short($threshold, $max_samples, $min_plateau, $log, $debug)</make>
<make>ieee802_11.ofdm_sync_short($threshold, $min_plateau, $log, $debug)</make>
<param>
<name>Log</name>
@@ -46,13 +46,6 @@
<type>real</type>
</param>
<param>
<name>Max Samples</name>
<key>max_samples</key>
<value>5200</value>
<type>int</type>
</param>
<param>
<name>Min Plateau</name>
<key>min_plateau</key>
@@ -61,7 +54,6 @@
</param>
<check>$threshold > 0</check>
<check>$max_samples > 400</check>
<check>$min_plateau > 0</check>
<sink>
@@ -70,6 +62,12 @@
<nports>1</nports>
</sink>
<sink>
<name>abs</name>
<type>complex</type>
<nports>1</nports>
</sink>
<sink>
<name>cor</name>
<type>float</type>