From 75598c07d45478f43f58cc8a7ce84dbbea8899e0 Mon Sep 17 00:00:00 2001
From: Javier Arribas <jarribas@cttc.es>
Date: Fri, 9 May 2014 13:04:05 +0200
Subject: [PATCH] Adding GPS to Galileo time conversion parameters in Galileo
 almanac. Adding Galileo almanac push to Galileo almanac queues

---
 .gitignore                                          |  3 ++-
 conf/gnss-sdr_Galileo_E1.conf                       |  2 +-
 .../galileo_e1b_telemetry_decoder_cc.cc             | 13 +++++++++++++
 src/core/system_parameters/galileo_almanac.h        |  6 ++++++
 .../system_parameters/galileo_navigation_message.cc |  7 +++++++
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index f1f660755..904e9c41e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ docs/latex
 docs/GNSS-SDR_manual.pdf
 src/tests/data/output.dat
 thirdparty/
-.project
\ No newline at end of file
+.project
+/install
diff --git a/conf/gnss-sdr_Galileo_E1.conf b/conf/gnss-sdr_Galileo_E1.conf
index c65d4421f..73efd3f40 100644
--- a/conf/gnss-sdr_Galileo_E1.conf
+++ b/conf/gnss-sdr_Galileo_E1.conf
@@ -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
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
index fa087873f..a652c21b7 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.cc
@@ -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;
+
+    }
 }
 
 
diff --git a/src/core/system_parameters/galileo_almanac.h b/src/core/system_parameters/galileo_almanac.h
index 708736336..1e960e4db 100644
--- a/src/core/system_parameters/galileo_almanac.h
+++ b/src/core/system_parameters/galileo_almanac.h
@@ -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
 };
 
diff --git a/src/core/system_parameters/galileo_navigation_message.cc b/src/core/system_parameters/galileo_navigation_message.cc
index 1bf046aa9..76048f019 100644
--- a/src/core/system_parameters/galileo_navigation_message.cc
+++ b/src/core/system_parameters/galileo_navigation_message.cc
@@ -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;
 }