mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-26 13:07:39 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marc Majoral
2019-11-05 15:04:20 +01:00
parent 0e9fc67e0e 510a3a15ba
commit 83b202a5f7
12 changed files with 125 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.cc
View File

@@ -4168,6 +4168,15 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
std::cout << std::setprecision(ss);
DLOG(INFO) << "RX clock offset: " << d_user_pvt_solver->get_time_offset_s() << "[s]";
std::cout
<< TEXT_BOLD_GREEN
<< "Velocity: " << std::fixed << std::setprecision(3)
<< "East: " << d_user_pvt_solver->get_rx_vel()[0] << " [m/s], North: " << d_user_pvt_solver->get_rx_vel()[1]
<< " [m/s], Up = " << d_user_pvt_solver->get_rx_vel()[2] << " [m/s]" << TEXT_RESET << std::endl;
std::cout << std::setprecision(ss);
DLOG(INFO) << "RX clock drift: " << d_user_pvt_solver->get_clock_drift_ppm() << " [ppm]";
// boost::posix_time::ptime p_time;
// gtime_t rtklib_utc_time = gpst2time(adjgpsweek(d_user_pvt_solver->gps_ephemeris_map.cbegin()->second.i_GPS_week), d_rx_time);
// p_time = boost::posix_time::from_time_t(rtklib_utc_time.time);

5
src/algorithms/PVT/libs/monitor_pvt.h
View File

@@ -89,6 +89,9 @@ public:
double hdop;
double vdop;
// User clock drift [ppm]
double user_clk_drift_ppm;
/*!
* \brief This member function serializes and restores
* Monitor_Pvt objects from a byte stream.
@@ -134,6 +137,8 @@ public:
ar& BOOST_SERIALIZATION_NVP(pdop);
ar& BOOST_SERIALIZATION_NVP(hdop);
ar& BOOST_SERIALIZATION_NVP(vdop);
ar& BOOST_SERIALIZATION_NVP(user_clk_drift_ppm);
}
};

21
src/algorithms/PVT/libs/pvt_solution.cc
View File

@@ -316,6 +316,16 @@ void Pvt_Solution::set_time_offset_s(double offset)
d_rx_dt_s = offset;
}
double Pvt_Solution::get_clock_drift_ppm() const
{
return d_rx_clock_drift_ppm;
}
void Pvt_Solution::set_clock_drift_ppm(double clock_drift_ppm)
{
d_rx_clock_drift_ppm = clock_drift_ppm;
}
double Pvt_Solution::get_latitude() const
{
@@ -409,6 +419,17 @@ arma::vec Pvt_Solution::get_rx_pos() const
return d_rx_pos;
}
void Pvt_Solution::set_rx_vel(const arma::vec &vel)
{
d_rx_vel = vel;
}
arma::vec Pvt_Solution::get_rx_vel() const
{
return d_rx_vel;
}
boost::posix_time::ptime Pvt_Solution::get_position_UTC_time() const
{

15
src/algorithms/PVT/libs/pvt_solution.h
View File

@@ -53,9 +53,11 @@ public:
double get_time_offset_s() const; //!< Get RX time offset [s]
void set_time_offset_s(double offset); //!< Set RX time offset [s]
double get_latitude() const; //!< Get RX position Latitude WGS84 [deg]
double get_longitude() const; //!< Get RX position Longitude WGS84 [deg]
double get_height() const; //!< Get RX position height WGS84 [m]
double get_clock_drift_ppm() const; //!< Get the Rx clock drift [ppm]
void set_clock_drift_ppm(double clock_drift_ppm); //!< Set the Rx clock drift [ppm]
double get_latitude() const; //!< Get RX position Latitude WGS84 [deg]
double get_longitude() const; //!< Get RX position Longitude WGS84 [deg]
double get_height() const; //!< Get RX position height WGS84 [m]
double get_speed_over_ground() const; //!< Get RX speed over ground [m/s]
void set_speed_over_ground(double speed_m_s); //!< Set RX speed over ground [m/s]
@@ -70,6 +72,9 @@ public:
void set_rx_pos(const arma::vec &pos); //!< Set position: Latitude [deg], longitude [deg], height [m]
arma::vec get_rx_pos() const;
void set_rx_vel(const arma::vec &vel); //!< Set velocity: East [m/s], North [m/s], Up [m/s]
arma::vec get_rx_vel() const;
bool is_valid_position() const;
void set_valid_position(bool is_valid);
@@ -132,7 +137,8 @@ public:
protected:
bool d_pre_2009_file; // Flag to correct week rollover in post processing mode for signals older than 2009
private:
double d_rx_dt_s; // RX time offset [s]
double d_rx_dt_s; // RX time offset [s]
double d_rx_clock_drift_ppm; // RX clock drift [ppm]
double d_latitude_d; // RX position Latitude WGS84 [deg]
double d_longitude_d; // RX position Longitude WGS84 [deg]
@@ -154,6 +160,7 @@ private:
int d_averaging_depth; // Length of averaging window
arma::vec d_rx_pos;
arma::vec d_rx_vel;
boost::posix_time::ptime d_position_UTC_time;
int d_valid_observations;
};

34
src/algorithms/PVT/libs/rtcm.cc
View File

@@ -147,7 +147,7 @@ std::string Rtcm::add_CRC(const std::string& message_without_crc) const
// 2) Computes CRC
CRC_RTCM.process_bytes(bytes.data(), bytes.size());
std::bitset<24> crc_frame = std::bitset<24>(CRC_RTCM.checksum());
auto crc_frame = std::bitset<24>(CRC_RTCM.checksum());
// 3) Builds the complete message
std::string complete_message = message_without_crc + crc_frame.to_string();
@@ -162,7 +162,7 @@ bool Rtcm::check_CRC(const std::string& message) const
std::string message_bin = Rtcm::binary_data_to_bin(message);
// Check CRC
std::string crc = message_bin.substr(message_bin.length() - 24, 24);
std::bitset<24> read_crc = std::bitset<24>(crc);
auto read_crc = std::bitset<24>(crc);
std::string msg_without_crc = message_bin.substr(0, message_bin.length() - 24);
boost::dynamic_bitset<uint8_t> frame_bits(msg_without_crc);
@@ -171,7 +171,7 @@ bool Rtcm::check_CRC(const std::string& message) const
std::reverse(bytes.begin(), bytes.end());
CRC_RTCM_CHECK.process_bytes(bytes.data(), bytes.size());
std::bitset<24> computed_crc = std::bitset<24>(CRC_RTCM_CHECK.checksum());
auto computed_crc = std::bitset<24>(CRC_RTCM_CHECK.checksum());
if (read_crc == computed_crc)
{
return true;
@@ -414,7 +414,7 @@ std::string Rtcm::build_message(const std::string& data) const
{
uint32_t msg_length_bits = data.length();
uint32_t msg_length_bytes = std::ceil(static_cast<float>(msg_length_bits) / 8.0);
std::bitset<10> message_length = std::bitset<10>(msg_length_bytes);
auto message_length = std::bitset<10>(msg_length_bytes);
uint32_t zeros_to_fill = 8 * msg_length_bytes - msg_length_bits;
std::string b(zeros_to_fill, '0');
std::string msg_content = data + b;
@@ -691,7 +691,7 @@ std::bitset<101> Rtcm::get_MT1003_sat_content(const Gps_Ephemeris& ephL1, const
Rtcm::set_DF011(gnss_synchroL1);
Rtcm::set_DF012(gnss_synchroL1);
Rtcm::set_DF013(ephL1, obs_time, gnss_synchroL1);
std::bitset<2> DF016_ = std::bitset<2>(0); // code indicator 0: C/A or L2C code 1: P(Y) code direct 2:P(Y) code cross-correlated 3: Correlated P/Y
auto DF016_ = std::bitset<2>(0); // code indicator 0: C/A or L2C code 1: P(Y) code direct 2:P(Y) code cross-correlated 3: Correlated P/Y
Rtcm::set_DF017(gnss_synchroL1, gnss_synchroL2);
Rtcm::set_DF018(gnss_synchroL1, gnss_synchroL2);
Rtcm::set_DF019(ephL2, obs_time, gnss_synchroL2);
@@ -802,7 +802,7 @@ std::bitset<125> Rtcm::get_MT1004_sat_content(const Gps_Ephemeris& ephL1, const
Rtcm::set_DF013(ephL1, obs_time, gnss_synchroL1);
Rtcm::set_DF014(gnss_synchroL1);
Rtcm::set_DF015(gnss_synchroL1);
std::bitset<2> DF016_ = std::bitset<2>(0); // code indicator 0: C/A or L2C code 1: P(Y) code direct 2:P(Y) code cross-correlated 3: Correlated P/Y
auto DF016_ = std::bitset<2>(0); // code indicator 0: C/A or L2C code 1: P(Y) code direct 2:P(Y) code cross-correlated 3: Correlated P/Y
Rtcm::set_DF017(gnss_synchroL1, gnss_synchroL2);
Rtcm::set_DF018(gnss_synchroL1, gnss_synchroL2);
Rtcm::set_DF019(ephL2, obs_time, gnss_synchroL2);
@@ -1058,7 +1058,7 @@ std::string Rtcm::print_MT1006(uint32_t ref_id, double ecef_x, double ecef_y, do
std::string Rtcm::print_MT1008(uint32_t ref_id, const std::string& antenna_descriptor, uint32_t antenna_setup_id, const std::string& antenna_serial_number)
{
uint32_t msg_number = 1008;
std::bitset<12> DF002_ = std::bitset<12>(msg_number);
auto DF002_ = std::bitset<12>(msg_number);
Rtcm::set_DF003(ref_id);
std::string ant_descriptor = antenna_descriptor;
uint32_t len = ant_descriptor.length();
@@ -1072,7 +1072,7 @@ std::string Rtcm::print_MT1008(uint32_t ref_id, const std::string& antenna_descr
std::string DF030_str_;
for (char c : ant_descriptor)
{
std::bitset<8> character = std::bitset<8>(c);
auto character = std::bitset<8>(c);
DF030_str_ += character.to_string();
}
@@ -1090,7 +1090,7 @@ std::string Rtcm::print_MT1008(uint32_t ref_id, const std::string& antenna_descr
std::string DF033_str_;
for (char c : ant_sn)
{
std::bitset<8> character = std::bitset<8>(c);
auto character = std::bitset<8>(c);
DF033_str_ += character.to_string();
}
@@ -1375,7 +1375,7 @@ std::bitset<107> Rtcm::get_MT1011_sat_content(const Glonass_Gnav_Ephemeris& ephL
Rtcm::set_DF041(gnss_synchroL1);
Rtcm::set_DF042(gnss_synchroL1);
Rtcm::set_DF043(ephL1, obs_time, gnss_synchroL1);
std::bitset<2> DF046_ = std::bitset<2>(0); // code indicator 0: C/A or L2C code 1: P(Y) code direct 2:P(Y) code cross-correlated 3: Correlated P/Y
auto DF046_ = std::bitset<2>(0); // code indicator 0: C/A or L2C code 1: P(Y) code direct 2:P(Y) code cross-correlated 3: Correlated P/Y
Rtcm::set_DF047(gnss_synchroL1, gnss_synchroL2);
Rtcm::set_DF048(gnss_synchroL1, gnss_synchroL2);
Rtcm::set_DF049(ephL2, obs_time, gnss_synchroL2);
@@ -1488,7 +1488,7 @@ std::bitset<130> Rtcm::get_MT1012_sat_content(const Glonass_Gnav_Ephemeris& ephL
Rtcm::set_DF043(ephL1, obs_time, gnss_synchroL1);
Rtcm::set_DF044(gnss_synchroL1);
Rtcm::set_DF045(gnss_synchroL1);
std::bitset<2> DF046_ = std::bitset<2>(0); // code indicator 0: C/A or L2C code 1: P(Y) code direct 2:P(Y) code cross-correlated 3: Correlated P/Y
auto DF046_ = std::bitset<2>(0); // code indicator 0: C/A or L2C code 1: P(Y) code direct 2:P(Y) code cross-correlated 3: Correlated P/Y
Rtcm::set_DF047(gnss_synchroL1, gnss_synchroL2);
Rtcm::set_DF048(gnss_synchroL1, gnss_synchroL2);
Rtcm::set_DF049(ephL2, obs_time, gnss_synchroL2);
@@ -2039,12 +2039,12 @@ std::string Rtcm::print_MT1029(uint32_t ref_id, const Gps_Ephemeris& gps_eph, do
first = false;
}
}
std::bitset<8> character = std::bitset<8>(c);
auto character = std::bitset<8>(c);
text_binary += character.to_string();
}
std::bitset<7> DF138_ = std::bitset<7>(i);
std::bitset<8> DF139_ = std::bitset<8>(message.length());
auto DF138_ = std::bitset<7>(i);
auto DF139_ = std::bitset<8>(message.length());
std::string data = DF002.to_string() +
DF003.to_string() +
@@ -2101,7 +2101,7 @@ std::string Rtcm::print_MT1045(const Galileo_Ephemeris& gal_eph)
Rtcm::set_DF314(gal_eph);
Rtcm::set_DF315(gal_eph);
uint32_t seven_zero = 0;
std::bitset<7> DF001_ = std::bitset<7>(seven_zero);
auto DF001_ = std::bitset<7>(seven_zero);
std::string data;
data.clear();
@@ -2357,7 +2357,7 @@ std::string Rtcm::get_MSM_header(uint32_t msg_number,
Rtcm::set_DF003(ref_id);
Rtcm::set_DF393(more_messages);
Rtcm::set_DF409(0); // Issue of Data Station. 0: not utilized
std::bitset<7> DF001_ = std::bitset<7>("0000000");
auto DF001_ = std::bitset<7>("0000000");
Rtcm::set_DF411(clock_steering_indicator);
Rtcm::set_DF412(external_clock_indicator);
Rtcm::set_DF417(divergence_free);
@@ -2956,7 +2956,7 @@ std::string Rtcm::get_MSM_5_content_sat_data(const std::map<int32_t, Gnss_Synchr
Rtcm::set_DF397(ordered_by_PRN_pos.at(nsat).second);
Rtcm::set_DF398(ordered_by_PRN_pos.at(nsat).second);
Rtcm::set_DF399(ordered_by_PRN_pos.at(nsat).second);
std::bitset<4> reserved = std::bitset<4>("0000");
auto reserved = std::bitset<4>("0000");
first_data_type += DF397.to_string();
second_data_type += reserved.to_string();
third_data_type += DF398.to_string();

13
src/algorithms/PVT/libs/rtklib_solver.cc
View File

@@ -1072,6 +1072,19 @@ bool Rtklib_Solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_
monitor_pvt.hdop = dop_[2];
monitor_pvt.vdop = dop_[3];
arma::vec rx_vel_enu(3);
rx_vel_enu(0) = enuv[0];
rx_vel_enu(1) = enuv[1];
rx_vel_enu(2) = enuv[2];
this->set_rx_vel(rx_vel_enu);
double clock_drift_ppm = pvt_sol.dtr[5] / GPS_C_M_S * 1e6;
this->set_clock_drift_ppm(clock_drift_ppm);
// User clock drift [ppm]
monitor_pvt.user_clk_drift_ppm = clock_drift_ppm;
// ######## LOG FILE #########
if (d_flag_dump_enabled == true)
{

2
src/algorithms/PVT/libs/serdes_monitor_pvt.h
View File

@@ -116,6 +116,7 @@ public:
monitor_.set_pdop(monitor->pdop);
monitor_.set_hdop(monitor->hdop);
monitor_.set_vdop(monitor->vdop);
monitor_.set_user_clk_drift_ppm(monitor->user_clk_drift_ppm);
monitor_.SerializeToString(&data);
return data;
@@ -153,6 +154,7 @@ public:
monitor.pdop = mon.pdop();
monitor.hdop = mon.hdop();
monitor.vdop = mon.vdop();
monitor.user_clk_drift_ppm = mon.user_clk_drift_ppm();
return monitor;
}

1
src/algorithms/libs/rtklib/rtklib_pntpos.cc
View File

@@ -972,6 +972,7 @@ void estvel(const obsd_t *obs, int n, const double *rs, const double *dts,
{
sol->rr[i + 3] = x[i];
}
sol->dtr[5] = x[3];
break;
}
}

2
src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
View File

@@ -37,10 +37,10 @@
#ifndef GNSS_SDR_GLONASS_L2_CA_DLL_PLL_C_AID_TRACKING_CC_H_
#define GNSS_SDR_GLONASS_L2_CA_DLL_PLL_C_AID_TRACKING_CC_H_
#include "cpu_multicorrelator.h"
#include "gnss_synchro.h"
#include "tracking_2nd_DLL_filter.h"
#include "tracking_FLL_PLL_filter.h"
#include "cpu_multicorrelator.h"
#include <gnuradio/block.h>
#include <pmt/pmt.h>
#include <volk_gnsssdr/volk_gnsssdr_alloc.h> // for volk_gnsssdr::vector

2
src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
View File

@@ -49,9 +49,9 @@
#include "gnss_synchro.h"
#include "tracking_2nd_DLL_filter.h"
#include "tracking_2nd_PLL_filter.h"
#include <volk_gnsssdr/volk_gnsssdr_alloc.h> // for volk_gnsssdr::vector
#include <armadillo>
#include <gnuradio/block.h>
#include <volk_gnsssdr/volk_gnsssdr_alloc.h> // for volk_gnsssdr::vector
#include <fstream>
#include <map>
#include <string>