Adding GPS to Galileo time conversion parameters in Galileo almanac.

Adding Galileo almanac push to Galileo almanac queues
This commit is contained in:
Javier Arribas 2014-05-09 13:04:05 +02:00
parent 7fc58001ec
commit 75598c07d4
5 changed files with 29 additions and 2 deletions

3
.gitignore vendored
View File

@ -5,4 +5,5 @@ docs/latex
docs/GNSS-SDR_manual.pdf
src/tests/data/output.dat
thirdparty/
.project
.project
/install

View File

@ -17,7 +17,7 @@ ControlThread.wait_for_flowgraph=false
SignalSource.implementation=File_Signal_Source
;#filename: path to file with the captured GNSS signal samples to be processed
SignalSource.filename=/media/DATALOGGER/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat
SignalSource.filename=/Users/javier/signals/2013_09_11_GNSS_SIGNAL_at_CTTC_SPAIN/2013_09_11_GNSS_SIGNAL_at_CTTC_SPAIN_run2.dat
;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
SignalSource.item_type=short

View File

@ -262,6 +262,19 @@ void galileo_e1b_telemetry_decoder_cc::decode_word(double *page_part_symbols,int
//std::cout<<"New Galileo UTC model received for SV "<<d_satellite.get_PRN()<<std::endl;
d_utc_model_queue->push(utc_model);
}
if (d_nav.have_new_almanac()==true)
{
Galileo_Almanac almanac=d_nav.get_almanac();
d_almanac_queue->push(almanac);
//debug
std::cout<<"Almanac received!"<<std::endl;
std::cout<<"GPS_to_Galileo time conversion:"<<std::endl;
std::cout<<"A0G="<<almanac.A_0G_10<<std::endl;
std::cout<<"A1G="<<almanac.A_1G_10<<std::endl;
std::cout<<"T0G="<<almanac.t_0G_10<<std::endl;
std::cout<<"WN_0G_10="<<almanac.WN_0G_10<<std::endl;
}
}

View File

@ -92,6 +92,12 @@ public:
double E5b_HS_10;
double E1B_HS_10;
/*GPS to Galileo GST conversion parameters*/
double A_0G_10 = 0;
double A_1G_10 = 0;
double t_0G_10 = 0;
double WN_0G_10 = 0;
Galileo_Almanac(); //!< Default constructor
};

View File

@ -642,6 +642,13 @@ Galileo_Almanac Galileo_Navigation_Message::get_almanac()
almanac.af1_10 = af1_10;
almanac.E5b_HS_10 = E5b_HS_10;
almanac.E1B_HS_10 = E1B_HS_10;
/*GPS to Galileo GST conversion parameters*/
almanac.A_0G_10 = A_0G_10;
almanac.A_1G_10 = A_1G_10;
almanac.t_0G_10 = t_0G_10;
almanac.WN_0G_10 = WN_0G_10;
return almanac;
}