mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-09-12 23:39:46 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Carles Fernandez 2018-04-04 07:50:19 +02:00
commit f8d3283d47
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
View File

@ -1,6 +1,6 @@
/*! /*!
* \file hybrid_observables_cc.cc * \file hybrid_observables_cc.cc
* \brief Implementation of the pseudorange computation block * \brief Implementation of the observables computation block
* \author Javier Arribas 2017. jarribas(at)cttc.es * \author Javier Arribas 2017. jarribas(at)cttc.es
* \author Antonio Ramos 2018. antonio.ramos(at)cttc.es * \author Antonio Ramos 2018. antonio.ramos(at)cttc.es
* *
@ -30,6 +30,7 @@
*/ */
#include "hybrid_observables_cc.h" #include "hybrid_observables_cc.h"
#include "display.h"
#include "GPS_L1_CA.h" #include "GPS_L1_CA.h"
#include <armadillo> #include <armadillo>
#include <glog/logging.h> #include <glog/logging.h>
@ -39,7 +40,6 @@
#include <cmath> #include <cmath>
#include <iostream> #include <iostream>
#include <limits> #include <limits>
#include "display.h"
using google::LogMessage; using google::LogMessage;
@ -51,9 +51,12 @@ hybrid_observables_cc_sptr hybrid_make_observables_cc(unsigned int nchannels_in,
} }
hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, std::string dump_filename) : gr::block("hybrid_observables_cc", hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels_in,
gr::io_signature::make(nchannels_in, nchannels_in, sizeof(Gnss_Synchro)), unsigned int nchannels_out,
gr::io_signature::make(nchannels_out, nchannels_out, sizeof(Gnss_Synchro))) bool dump,
std::string dump_filename) : gr::block("hybrid_observables_cc",
gr::io_signature::make(nchannels_in, nchannels_in, sizeof(Gnss_Synchro)),
gr::io_signature::make(nchannels_out, nchannels_out, sizeof(Gnss_Synchro)))
{ {
d_dump = dump; d_dump = dump;
d_nchannels = nchannels_out; d_nchannels = nchannels_out;
@ -298,6 +301,7 @@ int hybrid_observables_cc::save_matfile()
return 0; return 0;
} }
bool hybrid_observables_cc::interpolate_data(Gnss_Synchro &out, std::deque<Gnss_Synchro> &data, const double &ti) bool hybrid_observables_cc::interpolate_data(Gnss_Synchro &out, std::deque<Gnss_Synchro> &data, const double &ti)
{ {
if ((ti < data.front().RX_time) or (ti > data.back().RX_time)) if ((ti < data.front().RX_time) or (ti > data.back().RX_time))
@ -334,6 +338,7 @@ bool hybrid_observables_cc::interpolate_data(Gnss_Synchro &out, std::deque<Gnss_
return result.is_finite(); return result.is_finite();
} }
double hybrid_observables_cc::compute_T_rx_s(const Gnss_Synchro &a) double hybrid_observables_cc::compute_T_rx_s(const Gnss_Synchro &a)
{ {
if (a.Flag_valid_word) if (a.Flag_valid_word)
@ -357,6 +362,7 @@ void hybrid_observables_cc::forecast(int noutput_items __attribute__((unused)),
ninput_items_required[d_nchannels] = 1; ninput_items_required[d_nchannels] = 1;
} }
void hybrid_observables_cc::clean_history(std::deque<Gnss_Synchro> &data) void hybrid_observables_cc::clean_history(std::deque<Gnss_Synchro> &data)
{ {
while (data.size() > 0) while (data.size() > 0)
@ -372,6 +378,7 @@ void hybrid_observables_cc::clean_history(std::deque<Gnss_Synchro> &data)
} }
} }
void hybrid_observables_cc::correct_TOW_and_compute_prange(std::vector<Gnss_Synchro> &data) void hybrid_observables_cc::correct_TOW_and_compute_prange(std::vector<Gnss_Synchro> &data)
{ {
std::vector<Gnss_Synchro>::iterator it; std::vector<Gnss_Synchro>::iterator it;

11
src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
View File

@ -36,11 +36,11 @@
#include "gnss_synchro.h" #include "gnss_synchro.h"
#include <gnuradio/block.h> #include <gnuradio/block.h>
#include <boost/dynamic_bitset.hpp>
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <vector> //std::vector #include <vector>
#include <deque> #include <deque>
#include <boost/dynamic_bitset.hpp>
class hybrid_observables_cc; class hybrid_observables_cc;
@ -57,9 +57,9 @@ class hybrid_observables_cc : public gr::block
{ {
public: public:
~hybrid_observables_cc(); ~hybrid_observables_cc();
int general_work(int noutput_items, gr_vector_int &ninput_items, int general_work(int noutput_items, gr_vector_int& ninput_items,
gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); gr_vector_const_void_star& input_items, gr_vector_void_star& output_items);
void forecast(int noutput_items, gr_vector_int &ninput_items_required); void forecast(int noutput_items, gr_vector_int& ninput_items_required);
private: private:
friend hybrid_observables_cc_sptr friend hybrid_observables_cc_sptr
@ -82,7 +82,6 @@ private:
unsigned int d_num_valid_channels; unsigned int d_num_valid_channels;
std::string d_dump_filename; std::string d_dump_filename;
std::ofstream d_dump_file; std::ofstream d_dump_file;
}; };
#endif #endif