mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-17 23:55:15 +00:00
Code Issues Releases Wiki Activity

Merge branch 'obs_sys_test' of https://github.com/antonioramosdet/gnss-sdr into antonioramosdet-obs_sys_test

Browse Source
This commit is contained in:
Carles Fernandez
2017-11-11 10:09:46 +01:00
parent 6e878920d5 218844cce5
commit 9496e66f3d
6 changed files with 986 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/algorithms/PVT/libs/rinex_printer.cc
View File

@@ -409,8 +409,6 @@ std::string Rinex_Printer::getLocalTime()
void Rinex_Printer::rinex_nav_header(std::fstream& out, const Galileo_Iono& iono, const Galileo_Utc_Model& utc_model, const Galileo_Almanac& galileo_almanac)
{
std::string line;
stringVersion = "3.02";
version = 3;
// -------- Line 1
line = std::string(5, ' ');
@@ -815,8 +813,6 @@ void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_Iono& iono, co
void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_Iono& gps_iono, const Gps_Utc_Model& gps_utc_model, const Galileo_Iono& galileo_iono, const Galileo_Utc_Model& galileo_utc_model, const Galileo_Almanac& galileo_almanac)
{
std::string line;
stringVersion = "3.02";
version = 3;
// -------- Line 1
line = std::string(5, ' ');
@@ -2909,11 +2905,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream & out, const Gps_Ephemeris & e
void Rinex_Printer::rinex_obs_header(std::fstream& out, const Galileo_Ephemeris& eph, const double d_TOW_first_observation, const std::string bands)
{
std::string line;
version = 3;
// -------- Line 1
line = std::string(5, ' ');
line += "3.02";
line += stringVersion;
line += std::string(11, ' ');
line += Rinex_Printer::leftJustify("OBSERVATION DATA", 20);
line += satelliteSystem["Galileo"];
@@ -3171,11 +3166,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_Ephemeris& gps
{
if(galileo_eph.e_1){} // avoid warning, not needed
std::string line;
version = 3;
// -------- Line 1
line = std::string(5, ' ');
line += "3.02";
line += stringVersion;
line += std::string(11, ' ');
line += Rinex_Printer::leftJustify("OBSERVATION DATA", 20);
line += satelliteSystem["Mixed"];

4
src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc
View File

@@ -412,8 +412,8 @@ void FreqXlatingFirFilter::init()
{
double default_bw = 2000000.0;
double bw_ = config_->property(role_ + ".bw", default_bw);
double default_tw = bw_ / 20.0;
double default_tw = bw_ / 10.0;
double tw_ = config_->property(role_ + ".tw", default_tw);
taps_ = gr::filter::firdes::low_pass(1.0, sampling_freq_, bw_ / 2.0, tw_);
taps_ = gr::filter::firdes::low_pass(1.0, sampling_freq_, bw_, tw_);
}
}

8
src/algorithms/input_filter/adapters/pulse_blanking_filter.cc
View File

@@ -44,6 +44,7 @@ PulseBlankingFilter::PulseBlankingFilter(ConfigurationInterface* configuration,
out_streams_(out_streams)
{
size_t item_size;
xlat_ = false;
std::string default_input_item_type = "gr_complex";
std::string default_output_item_type = "gr_complex";
std::string default_dump_filename = "../data/input_filter.dat";
@@ -79,6 +80,7 @@ PulseBlankingFilter::PulseBlankingFilter(ConfigurationInterface* configuration,
double if_ = config_->property(role_ + ".IF", if_aux);
if (std::abs(if_) > 1.0)
{
xlat_ = true;
double default_sampling_freq = 4000000.0;
double sampling_freq_ = config_->property(role_ + ".sampling_frequency", default_sampling_freq);
double default_bw = 2000000.0;
@@ -111,7 +113,7 @@ void PulseBlankingFilter::connect(gr::top_block_sptr top_block)
{
top_block->connect(pulse_blanking_cc_, 0, file_sink_, 0);
}
if (std::abs(config_->property(role_ + ".if", 0.0)) > 1.0)
if (xlat_)
{
top_block->connect(freq_xlating_, 0, pulse_blanking_cc_, 0);
}
@@ -133,7 +135,7 @@ void PulseBlankingFilter::disconnect(gr::top_block_sptr top_block)
{
top_block->disconnect(pulse_blanking_cc_, 0, file_sink_, 0);
}
if (std::abs(config_->property(role_ + ".if", 0.0)) > 1.0)
if (xlat_)
{
top_block->disconnect(freq_xlating_, 0, pulse_blanking_cc_, 0);
}
@@ -149,7 +151,7 @@ gr::basic_block_sptr PulseBlankingFilter::get_left_block()
{
if (input_item_type_.compare("gr_complex") == 0)
{
if (std::abs(config_->property(role_ + ".if", 0.0)) > 1.0)
if (xlat_)
{
return freq_xlating_;
}

1
src/algorithms/input_filter/adapters/pulse_blanking_filter.h
View File

@@ -73,6 +73,7 @@ public:
private:
ConfigurationInterface* config_;
bool dump_;
bool xlat_;
std::string dump_filename_;
std::string input_item_type_;
size_t input_size_;