Merge branch 'master' into agc_and_csma

This commit is contained in:
Bastian Bloessl
2015-04-23 16:26:34 +02:00
9 changed files with 1130 additions and 1001 deletions
+457 -449
View File
File diff suppressed because it is too large Load Diff
+191 -39
View File
@@ -52,10 +52,18 @@
<key>realtime_scheduling</key> <key>realtime_scheduling</key>
<value></value> <value></value>
</param> </param>
<param>
<key>thread_safe_setters</key>
<value></value>
</param>
<param> <param>
<key>alias</key> <key>alias</key>
<value></value> <value></value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(10, 10)</value> <value>(10, 10)</value>
@@ -83,6 +91,10 @@
<key>alias</key> <key>alias</key>
<value></value> <value></value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(488, 11)</value> <value>(488, 11)</value>
@@ -110,6 +122,10 @@
<key>alias</key> <key>alias</key>
<value></value> <value></value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(296, 11)</value> <value>(296, 11)</value>
@@ -137,6 +153,10 @@
<key>alias</key> <key>alias</key>
<value></value> <value></value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(196, 14)</value> <value>(196, 14)</value>
@@ -164,6 +184,10 @@
<key>alias</key> <key>alias</key>
<value></value> <value></value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(648, 11)</value> <value>(648, 11)</value>
@@ -223,6 +247,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(1009, 908)</value> <value>(1009, 908)</value>
@@ -262,6 +290,10 @@
<key>optional</key> <key>optional</key>
<value>False</value> <value>False</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(390, 130)</value> <value>(390, 130)</value>
@@ -305,6 +337,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(283, 932)</value> <value>(283, 932)</value>
@@ -348,6 +384,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(135, 123)</value> <value>(135, 123)</value>
@@ -387,6 +427,10 @@
<key>alias</key> <key>alias</key>
<value></value> <value></value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(400, 11)</value> <value>(400, 11)</value>
@@ -426,6 +470,10 @@
<key>alias</key> <key>alias</key>
<value></value> <value></value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(760, 11)</value> <value>(760, 11)</value>
@@ -465,6 +513,10 @@
<key>optional</key> <key>optional</key>
<value>False</value> <value>False</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(69, 940)</value> <value>(69, 940)</value>
@@ -520,6 +572,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(752, 248)</value> <value>(752, 248)</value>
@@ -555,6 +611,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(504, 280)</value> <value>(504, 280)</value>
@@ -610,6 +670,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(504, 203)</value> <value>(504, 203)</value>
@@ -653,6 +717,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(232, 203)</value> <value>(232, 203)</value>
@@ -712,6 +780,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(1008, 219)</value> <value>(1008, 219)</value>
@@ -763,6 +835,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(704, 371)</value> <value>(704, 371)</value>
@@ -802,6 +878,10 @@
<key>optional</key> <key>optional</key>
<value>False</value> <value>False</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(472, 387)</value> <value>(472, 387)</value>
@@ -861,6 +941,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(1008, 355)</value> <value>(1008, 355)</value>
@@ -900,6 +984,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(600, 520)</value> <value>(600, 520)</value>
@@ -935,6 +1023,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(384, 608)</value> <value>(384, 608)</value>
@@ -986,6 +1078,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(232, 603)</value> <value>(232, 603)</value>
@@ -1033,6 +1129,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(608, 576)</value> <value>(608, 576)</value>
@@ -1072,6 +1172,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(976, 592)</value> <value>(976, 592)</value>
@@ -1111,6 +1215,10 @@
<key>optional</key> <key>optional</key>
<value>False</value> <value>False</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(56, 515)</value> <value>(56, 515)</value>
@@ -1154,6 +1262,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(880, 515)</value> <value>(880, 515)</value>
@@ -1205,6 +1317,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(440, 803)</value> <value>(440, 803)</value>
@@ -1252,6 +1368,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(1000, 787)</value> <value>(1000, 787)</value>
@@ -1261,45 +1381,6 @@
<value>0</value> <value>0</value>
</param> </param>
</block> </block>
<block>
<key>pad_sink</key>
<param>
<key>id</key>
<value>pad_sink_1</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>label</key>
<value>carriers</value>
</param>
<param>
<key>type</key>
<value>complex</value>
</param>
<param>
<key>vlen</key>
<value>1</value>
</param>
<param>
<key>num_streams</key>
<value>1</value>
</param>
<param>
<key>optional</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(176, 867)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
</block>
<block> <block>
<key>blocks_vector_to_stream</key> <key>blocks_vector_to_stream</key>
<param> <param>
@@ -1338,6 +1419,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(312, 867)</value> <value>(312, 867)</value>
@@ -1381,6 +1466,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(768, 587)</value> <value>(768, 587)</value>
@@ -1428,6 +1517,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(1128, 672)</value> <value>(1128, 672)</value>
@@ -1479,6 +1572,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(152, 744)</value> <value>(152, 744)</value>
@@ -1526,6 +1623,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(656, 771)</value> <value>(656, 771)</value>
@@ -1569,6 +1670,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(752, 931)</value> <value>(752, 931)</value>
@@ -1612,6 +1717,10 @@
<key>maxoutbuf</key> <key>maxoutbuf</key>
<value>0</value> <value>0</value>
</param> </param>
<param>
<key>comment</key>
<value></value>
</param>
<param> <param>
<key>_coordinate</key> <key>_coordinate</key>
<value>(525, 932)</value> <value>(525, 932)</value>
@@ -1621,6 +1730,49 @@
<value>180</value> <value>180</value>
</param> </param>
</block> </block>
<block>
<key>pad_sink</key>
<param>
<key>id</key>
<value>pad_sink_1</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>label</key>
<value>carrier</value>
</param>
<param>
<key>type</key>
<value>complex</value>
</param>
<param>
<key>vlen</key>
<value>1</value>
</param>
<param>
<key>num_streams</key>
<value>1</value>
</param>
<param>
<key>optional</key>
<value>False</value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_coordinate</key>
<value>(176, 867)</value>
</param>
<param>
<key>_rotation</key>
<value>180</value>
</param>
</block>
<connection> <connection>
<source_block_id>pad_source_1</source_block_id> <source_block_id>pad_source_1</source_block_id>
<sink_block_id>ieee802_11_ofdm_mapper_0</sink_block_id> <sink_block_id>ieee802_11_ofdm_mapper_0</sink_block_id>
+482 -269
View File
File diff suppressed because it is too large Load Diff
-38
View File
@@ -1,38 +0,0 @@
<?xml version="1.0"?>
<block>
<name>OFDM Preamble</name>
<key>ieee802_11_ofdm_preamble</key>
<category>IEEE802.11</category>
<import>import ieee802_11</import>
<make>ieee802_11.ofdm_preamble($debug)</make>
<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>
-1
View File
@@ -77,7 +77,6 @@ list(APPEND include_sources
ofdm_mac.h ofdm_mac.h
ofdm_mapper.h ofdm_mapper.h
ofdm_parse_mac.h ofdm_parse_mac.h
ofdm_preamble.h
ofdm_sync_long.h ofdm_sync_long.h
ofdm_sync_short.h ofdm_sync_short.h
wifi_edca.h wifi_edca.h
-38
View File
@@ -1,38 +0,0 @@
/*
* Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef INCLUDED_IEEE802_11_OFDM_PREAMBLE_H
#define INCLUDED_IEEE802_11_OFDM_PREAMBLE_H
#include <ieee802-11/api.h>
#include <gnuradio/tagged_stream_block.h>
namespace gr {
namespace ieee802_11 {
class IEEE802_11_API ofdm_preamble : virtual public tagged_stream_block
{
public:
typedef boost::shared_ptr<ofdm_preamble> sptr;
static sptr make(bool debug = false);
};
} // namespace ieee802_11
} // namespace gr
#endif /* INCLUDED_IEEE802_11_OFDM_PREAMBLE_H */
-1
View File
@@ -104,7 +104,6 @@ list(APPEND gr_ieee802_11_sources
ofdm_mac.cc ofdm_mac.cc
ofdm_mapper.cc ofdm_mapper.cc
ofdm_parse_mac.cc ofdm_parse_mac.cc
ofdm_preamble.cc
ofdm_sync_long.cc ofdm_sync_long.cc
ofdm_sync_short.cc ofdm_sync_short.cc
utils.cc utils.cc
-163
View File
@@ -1,163 +0,0 @@
/*
* Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <ieee802-11/ofdm_preamble.h>
#include "utils.h"
#include <gnuradio/io_signature.h>
using namespace gr::ieee802_11;
class ofdm_preamble_impl : public ofdm_preamble {
public:
ofdm_preamble_impl(bool debug) : tagged_stream_block("ofdm_preamble",
gr::io_signature::make(1, 1, sizeof(gr_complex)),
gr::io_signature::make(1, 1, sizeof(gr_complex)),
"packet_len"),
d_debug(debug) {
set_tag_propagation_policy(block::TPP_DONT);
}
~ofdm_preamble_impl(){
}
int calculate_output_stream_length(const gr_vector_int &ninput_items) {
return ninput_items[0] + 320;
}
int work (int noutput_items, gr_vector_int& ninput_items,
gr_vector_const_void_star& input_items,
gr_vector_void_star& output_items) {
const gr_complex *in = (const gr_complex*)input_items[0];
gr_complex *out = (gr_complex*)output_items[0];
std::memcpy(out, PREAMBLE, 320 * sizeof(gr_complex));
std::memcpy(out + 320, in, ninput_items[0] * sizeof(gr_complex));
int produced = ninput_items[0] + 320;
const pmt::pmt_t value = pmt::PMT_T;
const pmt::pmt_t src = pmt::string_to_symbol(alias());
add_item_tag(0, nitems_written(0), pmt::mp("tx_sob"), value, src);
add_item_tag(0, nitems_written(0) + produced - 1, pmt::mp("tx_eob"), value, src);
return produced;
}
void insert_eob(uint64_t item) {
dout << "OFDM PAD: insert eob at: " << item << std::endl;
const pmt::pmt_t eob_key = pmt::string_to_symbol("tx_eob");
const pmt::pmt_t value = pmt::PMT_T;
const pmt::pmt_t srcid = pmt::string_to_symbol(this->name());
}
private:
bool d_debug;
static gr_complex PREAMBLE[320];
};
ofdm_preamble::sptr
ofdm_preamble::make(bool debug) {
return gnuradio::get_initial_sptr(new ofdm_preamble_impl(debug));
}
gr_complex ofdm_preamble_impl::PREAMBLE[320] = {
gr_complex( 0.2041, 0.2041), gr_complex(-1.1755, 0.0208), gr_complex(-0.1196, -0.6969), gr_complex( 1.2670, -0.1123),
gr_complex( 0.8165, 0.0000), gr_complex( 1.2670, -0.1123), gr_complex(-0.1196, -0.6969), gr_complex(-1.1755, 0.0208),
gr_complex( 0.4082, 0.4082), gr_complex( 0.0208, -1.1755), gr_complex(-0.6969, -0.1196), gr_complex(-0.1123, 1.2670),
gr_complex( 0.0000, 0.8165), gr_complex(-0.1123, 1.2670), gr_complex(-0.6969, -0.1196), gr_complex( 0.0208, -1.1755),
gr_complex( 0.4082, 0.4082), gr_complex(-1.1755, 0.0208), gr_complex(-0.1196, -0.6969), gr_complex( 1.2670, -0.1123),
gr_complex( 0.8165, 0.0000), gr_complex( 1.2670, -0.1123), gr_complex(-0.1196, -0.6969), gr_complex(-1.1755, 0.0208),
gr_complex( 0.4082, 0.4082), gr_complex( 0.0208, -1.1755), gr_complex(-0.6969, -0.1196), gr_complex(-0.1123, 1.2670),
gr_complex( 0.0000, 0.8165), gr_complex(-0.1123, 1.2670), gr_complex(-0.6969, -0.1196), gr_complex( 0.0208, -1.1755),
gr_complex( 0.4082, 0.4082), gr_complex(-1.1755, 0.0208), gr_complex(-0.1196, -0.6969), gr_complex( 1.2670, -0.1123),
gr_complex( 0.8165, 0.0000), gr_complex( 1.2670, -0.1123), gr_complex(-0.1196, -0.6969), gr_complex(-1.1755, 0.0208),
gr_complex( 0.4082, 0.4082), gr_complex( 0.0208, -1.1755), gr_complex(-0.6969, -0.1196), gr_complex(-0.1123, 1.2670),
gr_complex( 0.0000, 0.8165), gr_complex(-0.1123, 1.2670), gr_complex(-0.6969, -0.1196), gr_complex( 0.0208, -1.1755),
gr_complex( 0.4082, 0.4082), gr_complex(-1.1755, 0.0208), gr_complex(-0.1196, -0.6969), gr_complex( 1.2670, -0.1123),
gr_complex( 0.8165, 0.0000), gr_complex( 1.2670, -0.1123), gr_complex(-0.1196, -0.6969), gr_complex(-1.1755, 0.0208),
gr_complex( 0.4082, 0.4082), gr_complex( 0.0208, -1.1755), gr_complex(-0.6969, -0.1196), gr_complex(-0.1123, 1.2670),
gr_complex( 0.0000, 0.8165), gr_complex(-0.1123, 1.2670), gr_complex(-0.6969, -0.1196), gr_complex( 0.0208, -1.1755),
gr_complex( 0.4082, 0.4082), gr_complex(-1.1755, 0.0208), gr_complex(-0.1196, -0.6969), gr_complex( 1.2670, -0.1123),
gr_complex( 0.8165, 0.0000), gr_complex( 1.2670, -0.1123), gr_complex(-0.1196, -0.6969), gr_complex(-1.1755, 0.0208),
gr_complex( 0.4082, 0.4082), gr_complex( 0.0208, -1.1755), gr_complex(-0.6969, -0.1196), gr_complex(-0.1123, 1.2670),
gr_complex( 0.0000, 0.8165), gr_complex(-0.1123, 1.2670), gr_complex(-0.6969, -0.1196), gr_complex( 0.0208, -1.1755),
gr_complex( 0.4082, 0.4082), gr_complex(-1.1755, 0.0208), gr_complex(-0.1196, -0.6969), gr_complex( 1.2670, -0.1123),
gr_complex( 0.8165, 0.0000), gr_complex( 1.2670, -0.1123), gr_complex(-0.1196, -0.6969), gr_complex(-1.1755, 0.0208),
gr_complex( 0.4082, 0.4082), gr_complex( 0.0208, -1.1755), gr_complex(-0.6969, -0.1196), gr_complex(-0.1123, 1.2670),
gr_complex( 0.0000, 0.8165), gr_complex(-0.1123, 1.2670), gr_complex(-0.6969, -0.1196), gr_complex( 0.0208, -1.1755),
gr_complex( 0.4082, 0.4082), gr_complex(-1.1755, 0.0208), gr_complex(-0.1196, -0.6969), gr_complex( 1.2670, -0.1123),
gr_complex( 0.8165, 0.0000), gr_complex( 1.2670, -0.1123), gr_complex(-0.1196, -0.6969), gr_complex(-1.1755, 0.0208),
gr_complex( 0.4082, 0.4082), gr_complex( 0.0208, -1.1755), gr_complex(-0.6969, -0.1196), gr_complex(-0.1123, 1.2670),
gr_complex( 0.0000, 0.8165), gr_complex(-0.1123, 1.2670), gr_complex(-0.6969, -0.1196), gr_complex( 0.0208, -1.1755),
gr_complex( 0.4082, 0.4082), gr_complex(-1.1755, 0.0208), gr_complex(-0.1196, -0.6969), gr_complex( 1.2670, -0.1123),
gr_complex( 0.8165, 0.0000), gr_complex( 1.2670, -0.1123), gr_complex(-0.1196, -0.6969), gr_complex(-1.1755, 0.0208),
gr_complex( 0.4082, 0.4082), gr_complex( 0.0208, -1.1755), gr_complex(-0.6969, -0.1196), gr_complex(-0.1123, 1.2670),
gr_complex( 0.0000, 0.8165), gr_complex(-0.1123, 1.2670), gr_complex(-0.6969, -0.1196), gr_complex( 0.0208, -1.1755),
gr_complex( 0.4082, 0.4082), gr_complex(-1.1755, 0.0208), gr_complex(-0.1196, -0.6969), gr_complex( 1.2670, -0.1123),
gr_complex( 0.8165, 0.0000), gr_complex( 1.2670, -0.1123), gr_complex(-0.1196, -0.6969), gr_complex(-1.1755, 0.0208),
gr_complex( 0.4082, 0.4082), gr_complex( 0.0208, -1.1755), gr_complex(-0.6969, -0.1196), gr_complex(-0.1123, 1.2670),
gr_complex( 0.0000, 0.8165), gr_complex(-0.1123, 1.2670), gr_complex(-0.6969, -0.1196), gr_complex( 0.0208, -1.1755),
gr_complex( 0.4082, 0.4082), gr_complex(-1.1755, 0.0208), gr_complex(-0.1196, -0.6969), gr_complex( 1.2670, -0.1123),
gr_complex( 0.8165, 0.0000), gr_complex( 1.2670, -0.1123), gr_complex(-0.1196, -0.6969), gr_complex(-1.1755, 0.0208),
gr_complex( 0.4082, 0.4082), gr_complex( 0.0208, -1.1755), gr_complex(-0.6969, -0.1196), gr_complex(-0.1123, 1.2670),
gr_complex( 0.0000, 0.8165), gr_complex(-0.1123, 1.2670), gr_complex(-0.6969, -0.1196), gr_complex( 0.0208, -1.1755),
gr_complex(-0.4893, 0.2041), gr_complex( 0.1090, -0.8662), gr_complex( 0.8140, -0.9396), gr_complex(-0.8155, -1.0218),
gr_complex(-0.0249, -0.4773), gr_complex( 0.6663, 0.6571), gr_complex(-1.1300, 0.1820), gr_complex(-1.0818, 0.1470),
gr_complex(-0.3110, 1.3392), gr_complex(-0.5011, 0.1935), gr_complex(-0.5353, -0.7214), gr_complex( 0.6173, -0.1253),
gr_complex( 0.7297, -0.8197), gr_complex(-1.1650, -0.5789), gr_complex(-0.5077, -0.3488), gr_complex( 0.3277, -0.8728),
gr_complex( 0.5547, 0.5547), gr_complex( 1.0583, 0.0363), gr_complex(-0.1995, -1.4259), gr_complex( 0.5207, 0.1326),
gr_complex( 0.2172, 0.5195), gr_complex(-1.2142, 0.4205), gr_complex( 0.0088, 1.0207), gr_complex( 0.4734, -0.0362),
gr_complex( 0.8657, 0.2298), gr_complex(-0.3401, 0.9423), gr_complex(-1.0218, 0.4897), gr_complex( 0.5309, 0.7784),
gr_complex( 0.1874, -0.2475), gr_complex( 0.8594, -0.7348), gr_complex( 0.3528, 0.9865), gr_complex(-0.0455, 1.0679),
gr_complex( 1.3868, 0.0000), gr_complex(-0.0455, -1.0679), gr_complex( 0.3528, -0.9865), gr_complex( 0.8594, 0.7348),
gr_complex( 0.1874, 0.2475), gr_complex( 0.5309, -0.7784), gr_complex(-1.0218, -0.4897), gr_complex(-0.3401, -0.9423),
gr_complex( 0.8657, -0.2298), gr_complex( 0.4734, 0.0362), gr_complex( 0.0088, -1.0207), gr_complex(-1.2142, -0.4205),
gr_complex( 0.2172, -0.5195), gr_complex( 0.5207, -0.1326), gr_complex(-0.1995, 1.4259), gr_complex( 1.0583, -0.0363),
gr_complex( 0.5547, -0.5547), gr_complex( 0.3277, 0.8728), gr_complex(-0.5077, 0.3488), gr_complex(-1.1650, 0.5789),
gr_complex( 0.7297, 0.8197), gr_complex( 0.6173, 0.1253), gr_complex(-0.5353, 0.7214), gr_complex(-0.5011, -0.1935),
gr_complex(-0.3110, -1.3392), gr_complex(-1.0818, -0.1470), gr_complex(-1.1300, -0.1820), gr_complex( 0.6663, -0.6571),
gr_complex(-0.0249, 0.4773), gr_complex(-0.8155, 1.0218), gr_complex( 0.8140, 0.9396), gr_complex( 0.1090, 0.8662),
gr_complex(-1.3868, 0.0000), gr_complex( 0.1090, -0.8662), gr_complex( 0.8140, -0.9396), gr_complex(-0.8155, -1.0218),
gr_complex(-0.0249, -0.4773), gr_complex( 0.6663, 0.6571), gr_complex(-1.1300, 0.1820), gr_complex(-1.0818, 0.1470),
gr_complex(-0.3110, 1.3392), gr_complex(-0.5011, 0.1935), gr_complex(-0.5353, -0.7214), gr_complex( 0.6173, -0.1253),
gr_complex( 0.7297, -0.8197), gr_complex(-1.1650, -0.5789), gr_complex(-0.5077, -0.3488), gr_complex( 0.3277, -0.8728),
gr_complex( 0.5547, 0.5547), gr_complex( 1.0583, 0.0363), gr_complex(-0.1995, -1.4259), gr_complex( 0.5207, 0.1326),
gr_complex( 0.2172, 0.5195), gr_complex(-1.2142, 0.4205), gr_complex( 0.0088, 1.0207), gr_complex( 0.4734, -0.0362),
gr_complex( 0.8657, 0.2298), gr_complex(-0.3401, 0.9423), gr_complex(-1.0218, 0.4897), gr_complex( 0.5309, 0.7784),
gr_complex( 0.1874, -0.2475), gr_complex( 0.8594, -0.7348), gr_complex( 0.3528, 0.9865), gr_complex(-0.0455, 1.0679),
gr_complex( 1.3868, 0.0000), gr_complex(-0.0455, -1.0679), gr_complex( 0.3528, -0.9865), gr_complex( 0.8594, 0.7348),
gr_complex( 0.1874, 0.2475), gr_complex( 0.5309, -0.7784), gr_complex(-1.0218, -0.4897), gr_complex(-0.3401, -0.9423),
gr_complex( 0.8657, -0.2298), gr_complex( 0.4734, 0.0362), gr_complex( 0.0088, -1.0207), gr_complex(-1.2142, -0.4205),
gr_complex( 0.2172, -0.5195), gr_complex( 0.5207, -0.1326), gr_complex(-0.1995, 1.4259), gr_complex( 1.0583, -0.0363),
gr_complex( 0.5547, -0.5547), gr_complex( 0.3277, 0.8728), gr_complex(-0.5077, 0.3488), gr_complex(-1.1650, 0.5789),
gr_complex( 0.7297, 0.8197), gr_complex( 0.6173, 0.1253), gr_complex(-0.5353, 0.7214), gr_complex(-0.5011, -0.1935),
gr_complex(-0.3110, -1.3392), gr_complex(-1.0818, -0.1470), gr_complex(-1.1300, -0.1820), gr_complex( 0.6663, -0.6571),
gr_complex(-0.0249, 0.4773), gr_complex(-0.8155, 1.0218), gr_complex( 0.8140, 0.9396), gr_complex( 0.1090, 0.8662),
gr_complex(-1.3868, 0.0000), gr_complex( 0.1090, -0.8662), gr_complex( 0.8140, -0.9396), gr_complex(-0.8155, -1.0218),
gr_complex(-0.0249, -0.4773), gr_complex( 0.6663, 0.6571), gr_complex(-1.1300, 0.1820), gr_complex(-1.0818, 0.1470),
gr_complex(-0.3110, 1.3392), gr_complex(-0.5011, 0.1935), gr_complex(-0.5353, -0.7214), gr_complex( 0.6173, -0.1253),
gr_complex( 0.7297, -0.8197), gr_complex(-1.1650, -0.5789), gr_complex(-0.5077, -0.3488), gr_complex( 0.3277, -0.8728),
gr_complex( 0.5547, 0.5547), gr_complex( 1.0583, 0.0363), gr_complex(-0.1995, -1.4259), gr_complex( 0.5207, 0.1326),
gr_complex( 0.2172, 0.5195), gr_complex(-1.2142, 0.4205), gr_complex( 0.0088, 1.0207), gr_complex( 0.4734, -0.0362),
gr_complex( 0.8657, 0.2298), gr_complex(-0.3401, 0.9423), gr_complex(-1.0218, 0.4897), gr_complex( 0.5309, 0.7784),
gr_complex( 0.1874, -0.2475), gr_complex( 0.8594, -0.7348), gr_complex( 0.3528, 0.9865), gr_complex(-0.0455, 1.0679)
};
-3
View File
@@ -34,7 +34,6 @@
#include "ieee802-11/ofdm_mac.h" #include "ieee802-11/ofdm_mac.h"
#include "ieee802-11/ofdm_mapper.h" #include "ieee802-11/ofdm_mapper.h"
#include "ieee802-11/ofdm_parse_mac.h" #include "ieee802-11/ofdm_parse_mac.h"
#include "ieee802-11/ofdm_preamble.h"
#include "ieee802-11/ofdm_sync_long.h" #include "ieee802-11/ofdm_sync_long.h"
#include "ieee802-11/ofdm_sync_short.h" #include "ieee802-11/ofdm_sync_short.h"
#include "ieee802-11/wifi_edca.h" #include "ieee802-11/wifi_edca.h"
@@ -53,7 +52,6 @@
%include "ieee802-11/ofdm_mac.h" %include "ieee802-11/ofdm_mac.h"
%include "ieee802-11/ofdm_mapper.h" %include "ieee802-11/ofdm_mapper.h"
%include "ieee802-11/ofdm_parse_mac.h" %include "ieee802-11/ofdm_parse_mac.h"
%include "ieee802-11/ofdm_preamble.h"
%include "ieee802-11/ofdm_sync_long.h" %include "ieee802-11/ofdm_sync_long.h"
%include "ieee802-11/ofdm_sync_short.h" %include "ieee802-11/ofdm_sync_short.h"
%include "ieee802-11/wifi_edca.h" %include "ieee802-11/wifi_edca.h"
@@ -69,7 +67,6 @@ GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_equalize_symbols);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_mac); GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_mac);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_mapper); GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_mapper);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_parse_mac); GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_parse_mac);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_preamble);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_sync_long); GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_sync_long);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_sync_short); GR_SWIG_BLOCK_MAGIC2(ieee802_11, ofdm_sync_short);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, wifi_edca); GR_SWIG_BLOCK_MAGIC2(ieee802_11, wifi_edca);