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

Fixes for handling TOW_at_start

Browse Source 
also added some extra logging info
This commit is contained in:
Cillian O'Driscoll
2016-06-27 08:47:45 +01:00
parent 4cb6b78d04
commit b45854b4a8
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/algorithms/tracking/gnuradio_blocks/galileo_e1_prs_de_tracking_cc.cc
View File

@@ -1564,9 +1564,10 @@ void galileo_e1_prs_de_tracking_cc::start_tracking_prs()
double last_tow_round = std::ceil( last_tow/Galileo_E1_CODE_PERIOD ) * Galileo_E1_CODE_PERIOD;
double curr_tow = last_tow_round + code_periods_since_tow*Galileo_E1_CODE_PERIOD +
//std::fmod( d_code_phase_chips, Galileo_E1_B_CODE_LENGTH_CHIPS ) / Galileo_E1_CODE_CHIP_RATE_HZ;
d_rem_code_phase_samples / static_cast<double>( d_fs_in );
double curr_tow = std::floor(
(d_last_tow + time_since_tow)/Galileo_E1_CODE_PERIOD
+ 0.5 ) * Galileo_E1_CODE_PERIOD
+ d_rem_code_phase_samples/static_cast<double>(d_fs_in);
// Handle week rollover:
if( curr_tow > 604800.0 ){
@@ -1620,12 +1621,14 @@ void galileo_e1_prs_de_tracking_cc::start_tracking_prs()
std::cout << "PRS tracking start on channel " << d_channel << " for satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN) << std::endl;
LOG(INFO) << "Starting tracking of PRS for satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN) << " on channel " << d_channel;
DLOG(INFO) << "Starting params: current TOW estimate: " << curr_tow
DLOG(INFO) << "Starting params: current TOW estimate: " << std::fixed << std::setprecision(12) <<curr_tow
<< " Code phase " << d_integer_code_phase_chips_prs
<< std::setw(6) << std::fixed << d_fractional_code_phase_chips_prs << " chips."
<< " Subcarrier Phase " << ( d_subcarrier_phase_halfcycles_prs*2.0 ) << " cycles"
<< " Last TOW: " << d_last_tow << " @ " << d_timestamp_last_tow
<< " Correction: " << (curr_tow - d_last_tow);
<< " Last TOW: " << std::fixed << std::setprecision(12) << d_last_tow
<< " @ " << d_timestamp_last_tow
<< " Correction: " << (curr_tow - d_last_tow)
<< " Current Time: " << d_sample_counter/static_cast<double>(d_fs_in);
// enable tracking
d_prs_tracking_enabled = true;
d_prs_code_gen->set_prn( d_acquisition_gnss_synchro->PRN );
@@ -1652,7 +1655,7 @@ void galileo_e1_prs_de_tracking_cc::handle_gnss_message( pmt::pmt_t msg )
if( gnss_message::get_message( msg ) == "TOW_ACQUIRED" ){
d_tow_received = true;
d_last_tow = pmt::to_double( pmt::dict_ref( msg, pmt::mp( "TOW" ), not_found ) ) ;
log_str << ". TOW: " << d_last_tow;
log_str << ". TOW: " << std::fixed << std::setprecision(12) << d_last_tow;
d_timestamp_last_tow = gnss_message::get_timestamp( msg );
if( d_code_locked and !d_prs_tracking_enabled )

7
src/algorithms/tracking/gnuradio_blocks/galileo_e1_prs_veml_tracking_cc.cc
View File

@@ -1849,9 +1849,10 @@ void galileo_e1_prs_veml_tracking_cc::start_tracking_prs()
double last_tow_round = std::ceil( last_tow/Galileo_E1_CODE_PERIOD ) * Galileo_E1_CODE_PERIOD;
double curr_tow = last_tow_round + code_periods_since_tow*Galileo_E1_CODE_PERIOD +
//std::fmod( d_code_phase_chips, Galileo_E1_B_CODE_LENGTH_CHIPS ) / Galileo_E1_CODE_CHIP_RATE_HZ;
d_rem_code_phase_samples / static_cast<double>( d_fs_in );
double curr_tow = std::floor(
(d_last_tow + time_since_tow)/Galileo_E1_CODE_PERIOD
+ 0.5 ) * Galileo_E1_CODE_PERIOD
+ d_rem_code_phase_samples/static_cast<double>(d_fs_in);
// Handle week rollover:
if( curr_tow > 604800.0 ){

10
src/core/receiver/gnss_flowgraph.cc
View File

@@ -38,6 +38,7 @@
#include <algorithm>
#include <exception>
#include <iostream>
#include <iomanip> // setprecision
#include <set>
#include <boost/lexical_cast.hpp>
#include <boost/tokenizer.hpp>
@@ -351,10 +352,13 @@ void GNSSFlowgraph::connect()
"Prn" +
boost::lexical_cast<std::string>(
available_GNSS_signals_.front().get_satellite().get_PRN() ) +
".TOW_at_start", NAN );
".TOW_at_start", static_cast< double >( NAN ) );
if( !std::isnan( TOW_at_start ) )
{
DLOG(INFO) << "Read TOW_at_start for PRN: " <<
available_GNSS_signals_.front().get_satellite().get_PRN()
<< ". " << std::fixed << std::setprecision(12) << TOW_at_start;
bool has_gnss_message_port = channels_.at(i)->get_right_block()->has_msg_port(
GNSS_MESSAGE_PORT_ID );
if( has_gnss_message_port )
@@ -525,10 +529,12 @@ void GNSSFlowgraph::apply_action(unsigned int who, unsigned int what)
"Prn" +
boost::lexical_cast<std::string>(
the_sat.get_PRN() ) +
".TOW_at_start", NAN );
".TOW_at_start", static_cast< double>( NAN ) );
if( !std::isnan( TOW_at_start ) )
{
DLOG(INFO) << "Read TOW_at_start for PRN: " << the_sat.get_PRN()
<< ". " << std::fixed << std::setprecision(12) << TOW_at_start;
has_gnss_message_port = channels_.at(who)->get_right_block()->has_msg_port(
GNSS_MESSAGE_PORT_ID );
if( has_gnss_message_port )