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

add channel model with better noise source

Browse Source
This commit is contained in:
Bastian Bloessl
2017-02-11 12:10:03 +01:00
parent fb3ea60bc4
commit 555a0895a5
8 changed files with 342 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -95,7 +95,7 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks)
########################################################################
# Find gnuradio build dependencies
########################################################################
set(GR_REQUIRED_COMPONENTS RUNTIME PMT BLOCKS)
set(GR_REQUIRED_COMPONENTS RUNTIME PMT BLOCKS FILTER ANALOG)
find_package(Gnuradio)
find_package(CppUnit)
grc/foo_channel_model.xml
+74
View File
@@ -0,0 +1,74 @@
<?xml version="1.0"?>
<block>
<name>Channel Model</name>
<key>foo_channel_model</key>
<category>[Foo]</category>
<import>import foo</import>
<make>foo.channel_model(
noise_voltage=$noise_voltage,
frequency_offset=$freq_offset,
epsilon=$epsilon,
taps=$taps,
noise_seed=$seed,
block_tags=$block_tags
)</make>
<callback>set_noise_voltage($noise_voltage)</callback>
<callback>set_frequency_offset($freq_offset)</callback>
<callback>set_taps($taps)</callback>
<callback>set_timing_offset($epsilon)</callback>
<param>
<name>Noise Voltage</name>
<key>noise_voltage</key>
<value>0.0</value>
<type>real</type>
</param>
<param>
<name>Frequency Offset</name>
<key>freq_offset</key>
<value>0.0</value>
<type>real</type>
</param>
<param>
<name>Epsilon</name>
<key>epsilon</key>
<value>1.0</value>
<type>real</type>
</param>
<param>
<name>Taps</name>
<key>taps</key>
<value>1.0 + 1.0j</value>
<type>complex_vector</type>
</param>
<param>
<name>Seed</name>
<key>seed</key>
<value>0</value>
<type>int</type>
</param>
<param>
<name>Block Tag Propagation</name>
<key>block_tags</key>
<value>False</value>
<type>enum</type>
<hide>$block_tags.hide_block</hide>
<option>
<name>Yes</name>
<key>True</key>
<opt>hide_block:</opt>
</option>
<option>
<name>No</name>
<key>False</key>
<opt>hide_block:part</opt>
</option>
</param>
<sink>
<name>in</name>
<type>complex</type>
</sink>
<source>
<name>out</name>
<type>complex</type>
</source>
</block>
include/foo/CMakeLists.txt
+1
View File
@@ -23,6 +23,7 @@
install(FILES
api.h
burst_tagger.h
channel_model.h
packet_dropper.h
packet_pad.h
packet_pad2.h
include/foo/channel_model.h
+51
View File
@@ -0,0 +1,51 @@
/*
* Copyright (C) 2017 Bastian Bloessl <mail@bastibl.net>
*
* 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_FOO_CHANNEL_MODEL_H
#define INCLUDED_FOO_CHANNEL_MODEL_H
#include <foo/api.h>
#include <gnuradio/hier_block2.h>
#include <gnuradio/types.h>
namespace gr {
namespace foo {
class FOO_API channel_model : virtual public hier_block2
{
public:
typedef boost::shared_ptr<channel_model> sptr;
static sptr make(double noise_voltage = 0.0, double frequency_offset = 0.0,
double epsilon = 1.0,
const std::vector<gr_complex> &taps = std::vector<gr_complex>(1, 1),
double noise_seed = 0, bool block_tags = false);
virtual void set_noise_voltage(double noise_voltage) = 0;
virtual void set_frequency_offset(double frequency_offset) = 0;
virtual void set_taps(const std::vector<gr_complex> &taps) = 0;
virtual void set_timing_offset(double epsilon) = 0;
virtual double noise_voltage() const = 0;
virtual double frequency_offset() const = 0;
virtual std::vector<gr_complex> taps() const = 0;
virtual double timing_offset() const = 0;
};
} // namespace foo
} // namespace gr
#endif /* INCLUDED_FOO_CHANNEL_MODEL_H */
lib/CMakeLists.txt
+1
View File
@@ -33,6 +33,7 @@ link_directories(
list(APPEND foo_sources
burst_tagger_impl.cc
channel_model_impl.cc
packet_dropper_impl.cc
packet_pad2.cc
packet_pad_impl.cc
lib/channel_model_impl.cc
+140
View File
@@ -0,0 +1,140 @@
/*
* Copyright (C) 2017 Bastian Bloessl <mail@bastibl.net>
*
* 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 "channel_model_impl.h"
#include <gnuradio/io_signature.h>
#include <iostream>
namespace gr {
namespace foo {
channel_model::sptr
channel_model::make(double noise_voltage,
double frequency_offset,
double epsilon,
const std::vector<gr_complex> &taps,
double noise_seed,
bool block_tags)
{
return gnuradio::get_initial_sptr
(new channel_model_impl(noise_voltage,
frequency_offset,
epsilon,
taps,
noise_seed,
block_tags));
}
// Hierarchical block constructor
channel_model_impl::channel_model_impl(double noise_voltage,
double frequency_offset,
double epsilon,
const std::vector<gr_complex> &taps,
double noise_seed,
bool block_tags
)
: hier_block2("channel_model",
io_signature::make(1, 1, sizeof(gr_complex)),
io_signature::make(1, 1, sizeof(gr_complex)))
{
d_taps = taps;
while(d_taps.size() < 2) {
d_taps.push_back(0);
}
d_timing_offset = filter::fractional_resampler_cc::make(0, epsilon);
d_multipath = filter::fir_filter_ccc::make(1, d_taps);
d_noise_adder = blocks::add_cc::make();
d_noise = analog::noise_source_c::make(analog::GR_GAUSSIAN,
noise_voltage, noise_seed);
d_freq_offset = analog::sig_source_c::make(1, analog::GR_SIN_WAVE,
frequency_offset, 1.0, 0.0);
d_mixer_offset = blocks::multiply_cc::make();
connect(self(), 0, d_timing_offset, 0);
connect(d_timing_offset, 0, d_multipath, 0);
connect(d_multipath, 0, d_mixer_offset, 0);
connect(d_freq_offset, 0, d_mixer_offset, 1);
connect(d_mixer_offset, 0, d_noise_adder, 1);
connect(d_noise, 0, d_noise_adder, 0);
connect(d_noise_adder, 0, self(), 0);
if (block_tags) {
d_timing_offset->set_tag_propagation_policy(gr::block::TPP_DONT);
}
}
channel_model_impl::~channel_model_impl()
{
}
void
channel_model_impl::set_noise_voltage(double noise_voltage)
{
d_noise->set_amplitude(noise_voltage);
}
void
channel_model_impl::set_frequency_offset(double frequency_offset)
{
d_freq_offset->set_frequency(frequency_offset);
}
void
channel_model_impl::set_taps(const std::vector<gr_complex> &taps)
{
d_taps = taps;
while(d_taps.size() < 2) {
d_taps.push_back(0);
}
d_multipath->set_taps(d_taps);
}
void
channel_model_impl::set_timing_offset(double epsilon)
{
d_timing_offset->set_resamp_ratio(epsilon);
}
double
channel_model_impl::noise_voltage() const
{
return d_noise->amplitude();
}
double
channel_model_impl::frequency_offset() const
{
return d_freq_offset->frequency();
}
std::vector<gr_complex>
channel_model_impl::taps() const
{
return d_multipath->taps();
}
double
channel_model_impl::timing_offset() const
{
return d_timing_offset->resamp_ratio();
}
} /* namespace channels */
} /* namespace gr */
lib/channel_model_impl.h
+71
View File
@@ -0,0 +1,71 @@
/*
* Copyright (C) 2017 Bastian Bloessl <mail@bastibl.net>
*
* 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_FOO_CHANNEL_MODEL_IMPL_H
#define INCLUDED_FOO_CHANNEL_MODEL_IMPL_H
#include <foo/channel_model.h>
#include <gnuradio/top_block.h>
#include <gnuradio/blocks/add_cc.h>
#include <gnuradio/blocks/multiply_cc.h>
#include <gnuradio/analog/sig_source_c.h>
#include <gnuradio/analog/noise_source_c.h>
#include <gnuradio/filter/fractional_resampler_cc.h>
#include <gnuradio/filter/fir_filter_ccc.h>
namespace gr {
namespace foo {
class FOO_API channel_model_impl : public foo::channel_model
{
private:
blocks::add_cc::sptr d_noise_adder;
blocks::multiply_cc::sptr d_mixer_offset;
analog::sig_source_c::sptr d_freq_offset;
analog::noise_source_c::sptr d_noise;
filter::fractional_resampler_cc::sptr d_timing_offset;
filter::fir_filter_ccc::sptr d_multipath;
std::vector<gr_complex> d_taps;
public:
channel_model_impl(double noise_voltage,
double frequency_offset,
double epsilon,
const std::vector<gr_complex> &taps,
double noise_seed,
bool block_tags);
~channel_model_impl();
void set_noise_voltage(double noise_voltage);
void set_frequency_offset(double frequency_offset);
void set_taps(const std::vector<gr_complex> &taps);
void set_timing_offset(double epsilon);
double noise_voltage() const;
double frequency_offset() const;
std::vector<gr_complex> taps() const;
double timing_offset() const;
};
} // namespace foo
} // namespace gr
#endif /* INCLUDED_FOO_CHANNEL_MODEL_IMPL_H */
swig/foo_swig.i
+3
View File
@@ -7,6 +7,7 @@
%{
#include "foo/burst_tagger.h"
#include "foo/channel_model.h"
#include "foo/packet_dropper.h"
#include "foo/packet_pad.h"
#include "foo/packet_pad2.h"
@@ -18,6 +19,7 @@
%include "foo/burst_tagger.h"
%include "foo/channel_model.h"
%include "foo/packet_dropper.h"
%include "foo/packet_pad.h"
%include "foo/packet_pad2.h"
@@ -27,6 +29,7 @@
%include "foo/wireshark_connector.h"
GR_SWIG_BLOCK_MAGIC2(foo, burst_tagger);
GR_SWIG_BLOCK_MAGIC2(foo, channel_model);
GR_SWIG_BLOCK_MAGIC2(foo, packet_dropper);
GR_SWIG_BLOCK_MAGIC2(foo, packet_pad);
GR_SWIG_BLOCK_MAGIC2(foo, packet_pad2);