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

restructure receiver

Browse Source
This commit is contained in:
Bastian Bloessl
2016-05-31 15:39:15 +02:00
parent dd89949184
commit 1ed08f6e9a
14 changed files with 586 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ieee802-11/CMakeLists.txt
+1 -2
View File
@@ -72,9 +72,8 @@ list(APPEND include_sources
chunks_to_symbols.h
constellations.h
decode_mac.h
decode_signal.h
equalize_symbols.h
ether_encap.h
frame_equalizer.h
mac.h
mapper.h
parse_mac.h
include/ieee802-11/decode_signal.h
-39
View File
@@ -1,39 +0,0 @@
/*
* Copyright (C) 2013, 2016 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_DECODE_SIGNAL_H
#define INCLUDED_IEEE802_11_DECODE_SIGNAL_H
#include <ieee802-11/api.h>
#include <gnuradio/block.h>
namespace gr {
namespace ieee802_11 {
class IEEE802_11_API decode_signal : virtual public block
{
public:
typedef boost::shared_ptr<decode_signal> sptr;
static sptr make(bool log = false, bool debug = false);
};
} // namespace ieee802_11
} // namespace gr
#endif /* INCLUDED_IEEE802_11_DECODE_SIGNAL_H */
include/ieee802-11/equalize_symbols.h → include/ieee802-11/frame_equalizer.h
+20 -14
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2013, 2015, 2016 Bastian Bloessl <bloessl@ccs-labs.org>
* Copyright (C) 2016 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
@@ -13,33 +13,39 @@
*
* 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_EQUALIZE_SYMBOLS_H
#define INCLUDED_IEEE802_11_EQUALIZE_SYMBOLS_H
#ifndef INCLUDED_IEEE802_11_FRAME_EQUALIZER_H
#define INCLUDED_IEEE802_11_FRAME_EQUALIZER_H
#include <ieee802-11/api.h>
#include <gnuradio/block.h>
enum Equalizer {
LMS = 0,
LINEAR_COMB = 1,
LS = 0,
LMS = 1,
COMB = 2,
STA = 3,
};
namespace gr {
namespace ieee802_11 {
class IEEE802_11_API equalize_symbols : virtual public block
class IEEE802_11_API frame_equalizer : virtual public gr::block
{
public:
typedef boost::shared_ptr<equalize_symbols> sptr;
static sptr make(Equalizer algo, bool debug = false);
typedef boost::shared_ptr<frame_equalizer> sptr;
static sptr make(Equalizer algo, double freq, double bw,
bool log, bool debug);
virtual void set_algorithm(Equalizer algo) = 0;
virtual void set_bandwidth(double bw) = 0;
virtual void set_frequency(double freq) = 0;
};
} // namespace ieee802_11
} // namespace gr
#endif /* INCLUDED_IEEE802_11_EQUALIZE_SYMBOLS_H*/
} // namespace ieee802_11
} // namespace gr
#endif /* INCLUDED_IEEE802_11_FRAME_EQUALIZER_H */