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
include/ieee802-11/CMakeLists.txt
-1
View File
@@ -74,7 +74,6 @@ list(APPEND include_sources
ofdm_decode_mac.h
ofdm_decode_signal.h
ofdm_equalize_symbols.h
ofdm_freq_est.h
ofdm_mac.h
ofdm_mapper.h
ofdm_parse_mac.h
include/ieee802-11/ofdm_equalize_symbols.h
+8 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2013 Bastian Bloessl <bloessl@ccs-labs.org>
* Copyright (C) 2013, 2015 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
@@ -20,6 +20,11 @@
#include <ieee802-11/api.h>
#include <gnuradio/block.h>
enum Equalizer {
LMS = 0,
LINEAR_COMB = 1,
};
namespace gr {
namespace ieee802_11 {
@@ -28,7 +33,8 @@ class IEEE802_11_API ofdm_equalize_symbols : virtual public block
public:
typedef boost::shared_ptr<ofdm_equalize_symbols> sptr;
static sptr make(bool debug = false);
static sptr make(Equalizer algo, bool debug = false);
virtual void set_algorithm(Equalizer algo) = 0;
};
include/ieee802-11/ofdm_freq_est.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_FREQ_EST_H
#define INCLUDED_IEEE802_11_OFDM_FREQ_EST_H
#include <ieee802-11/api.h>
#include <gnuradio/block.h>
namespace gr {
namespace ieee802_11 {
class IEEE802_11_API ofdm_freq_est : virtual public block
{
public:
typedef boost::shared_ptr<ofdm_freq_est> sptr;
static sptr make(bool log = false, bool debug = false);
};
} // namespace ieee802_11
} // namespace gr
#endif /* INCLUDED_IEEE802_11_OFDM_FREQ_EST_H */
include/ieee802-11/ofdm_sync_short.h
+1 -2
View File
@@ -28,8 +28,7 @@ class IEEE802_11_API ofdm_sync_short : virtual public block
public:
typedef boost::shared_ptr<ofdm_sync_short> sptr;
static sptr make(double threshold, unsigned int max_samples,
unsigned int min_plateau, bool log = false, bool debug = false);
static sptr make(double threshold, unsigned int min_plateau, bool log = false, bool debug = false);
};