mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-02-23 14:30:08 +00:00
Code Issues Releases Wiki Activity

Merge branch 'piyush0411-PVT' into next

Browse Source
This commit is contained in:
Carles Fernandez 2020-08-01 14:30:04 +02:00
commit 0f2db615c7
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
5 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/changelog.md
View File

@ -8,6 +8,15 @@ SPDX-FileCopyrightText: 2011-2020 Carles Fernandez-Prades <carles.fernandez@cttc
) )
<!-- prettier-ignore-end --> <!-- prettier-ignore-end -->
## [Unreleased](https://github.com/gnss-sdr/gnss-sdr/tree/next)
### Improvements in Usability:
- Fixed a bug when enabling pseudorange carrier smoothing in other bands than
L1.
&nbsp;
## [GNSS-SDR v0.0.13](https://github.com/gnss-sdr/gnss-sdr/releases/tag/v0.0.13) ## [GNSS-SDR v0.0.13](https://github.com/gnss-sdr/gnss-sdr/releases/tag/v0.0.13)
### Improvements in Efficiency: ### Improvements in Efficiency:

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

@ -134,6 +134,7 @@ rtklib_pvt_gs::rtklib_pvt_gs(uint32_t nchannels,
d_mapStringValues["L5"] = evGPS_L5; d_mapStringValues["L5"] = evGPS_L5;
d_mapStringValues["1B"] = evGAL_1B; d_mapStringValues["1B"] = evGAL_1B;
d_mapStringValues["5X"] = evGAL_5X; d_mapStringValues["5X"] = evGAL_5X;
d_mapStringValues["7X"] = evGAL_7X;
d_mapStringValues["1G"] = evGLO_1G; d_mapStringValues["1G"] = evGLO_1G;
d_mapStringValues["2G"] = evGLO_2G; d_mapStringValues["2G"] = evGLO_2G;
d_mapStringValues["B1"] = evBDS_B1; d_mapStringValues["B1"] = evBDS_B1;
@ -1802,6 +1803,9 @@ void rtklib_pvt_gs::apply_rx_clock_offset(std::map<int, Gnss_Synchro>& observabl
case evGAL_5X: case evGAL_5X:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ5 * TWO_PI; observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ5 * TWO_PI;
break; break;
case evGAL_7X:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ7 * TWO_PI;
break;
case evGPS_2S: case evGPS_2S:
observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ2 * TWO_PI; observables_iter->second.Carrier_phase_rads -= rx_clock_offset_s * FREQ2 * TWO_PI;
break; break;
@ -1898,6 +1902,9 @@ void rtklib_pvt_gs::initialize_and_apply_carrier_phase_offset()
case evGAL_5X: case evGAL_5X:
wavelength_m = SPEED_OF_LIGHT_M_S / FREQ5; wavelength_m = SPEED_OF_LIGHT_M_S / FREQ5;
break; break;
case evGAL_7X:
wavelength_m = SPEED_OF_LIGHT_M_S / FREQ7;
break;
case evGPS_2S: case evGPS_2S:
wavelength_m = SPEED_OF_LIGHT_M_S / FREQ2; wavelength_m = SPEED_OF_LIGHT_M_S / FREQ2;
break; break;
@ -1969,7 +1976,7 @@ int rtklib_pvt_gs::work(int noutput_items, gr_vector_const_void_star& input_item
if (tmp_eph_iter_gal != d_internal_pvt_solver->galileo_ephemeris_map.cend()) if (tmp_eph_iter_gal != d_internal_pvt_solver->galileo_ephemeris_map.cend())
{ {
const uint32_t prn_aux = tmp_eph_iter_gal->second.i_satellite_PRN; const uint32_t prn_aux = tmp_eph_iter_gal->second.i_satellite_PRN;
if ((prn_aux == in[i][epoch].PRN) and ((std::string(in[i][epoch].Signal) == "1B") or (std::string(in[i][epoch].Signal) == "5X"))) if ((prn_aux == in[i][epoch].PRN) and ((std::string(in[i][epoch].Signal) == "1B") or (std::string(in[i][epoch].Signal) == "5X") or (std::string(in[i][epoch].Signal) == "7X")))
{ {
store_valid_observable = true; store_valid_observable = true;
} }

1
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_gs.h
View File

@ -190,6 +190,7 @@ private:
evSBAS_1C, evSBAS_1C,
evGAL_1B, evGAL_1B,
evGAL_5X, evGAL_5X,
evGAL_7X,
evGLO_1G, evGLO_1G,
evGLO_2G, evGLO_2G,
evBDS_B1, evBDS_B1,

14
src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.cc
View File

@ -150,6 +150,17 @@ hybrid_observables_gs::hybrid_observables_gs(const Obs_Conf &conf_) : gr::block(
d_channel_last_carrier_phase_rads = std::vector<double>(d_nchannels_out, 0.0); d_channel_last_carrier_phase_rads = std::vector<double>(d_nchannels_out, 0.0);
d_smooth_filter_M = static_cast<double>(conf_.smoothing_factor); d_smooth_filter_M = static_cast<double>(conf_.smoothing_factor);
d_mapStringValues["1C"] = evGPS_1C;
d_mapStringValues["2S"] = evGPS_2S;
d_mapStringValues["L5"] = evGPS_L5;
d_mapStringValues["1B"] = evGAL_1B;
d_mapStringValues["5X"] = evGAL_5X;
d_mapStringValues["7X"] = evGAL_7X;
d_mapStringValues["1G"] = evGLO_1G;
d_mapStringValues["2G"] = evGLO_2G;
d_mapStringValues["B1"] = evBDS_B1;
d_mapStringValues["B2"] = evBDS_B2;
d_mapStringValues["B3"] = evBDS_B3;
} }
@ -561,6 +572,9 @@ void hybrid_observables_gs::smooth_pseudoranges(std::vector<Gnss_Synchro> &data)
case evGAL_5X: case evGAL_5X:
wavelength_m = SPEED_OF_LIGHT_M_S / FREQ5; wavelength_m = SPEED_OF_LIGHT_M_S / FREQ5;
break; break;
case evGAL_7X:
wavelength_m = SPEED_OF_LIGHT_M_S / FREQ7;
break;
case evGPS_2S: case evGPS_2S:
wavelength_m = SPEED_OF_LIGHT_M_S / FREQ2; wavelength_m = SPEED_OF_LIGHT_M_S / FREQ2;
break; break;

1
src/algorithms/observables/gnuradio_blocks/hybrid_observables_gs.h
View File

@ -90,6 +90,7 @@ private:
evSBAS_1C, evSBAS_1C,
evGAL_1B, evGAL_1B,
evGAL_5X, evGAL_5X,
evGAL_7X,
evGLO_1G, evGLO_1G,
evGLO_2G, evGLO_2G,
evBDS_B1, evBDS_B1,