From 01dd425e58c77e448e3edaf9226bafa97d9a74f8 Mon Sep 17 00:00:00 2001
From: Javier Arribas <javiarribas@gmail.com>
Date: Tue, 30 Jul 2013 16:40:20 +0000
Subject: [PATCH] Mara Branzanti contribution for Google Summer of Code (GSoC
 2013)

- Galileo Telemetry page decoder
- Galileo Ephemeris and almanac decoder  (still experimental!)


git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@399 64b25241-fba3-4117-9849-534c7e92360d
---
 README                                        |    5 +
 .../galileo_e1b_telemetry_decoder_cc.cc       |   98 +-
 .../galileo_e1b_telemetry_decoder_cc.h        |    2 +
 src/core/system_parameters/Galileo_E1.h       |  213 +++-
 src/core/system_parameters/MATH_CONSTANTS.h   |   14 +
 .../galileo_navigation_message.cc             | 1007 ++++++++++-------
 .../galileo_navigation_message.h              |  165 ++-
 .../gps_navigation_message.h                  |    2 +-
 8 files changed, 987 insertions(+), 519 deletions(-)

diff --git a/README b/README
index 25735d328..d71af80fd 100644
--- a/README
+++ b/README
@@ -215,6 +215,11 @@ By default, CMake will build the Release version, meaning that the compiler will
 
 $ cd gnss-sdr/build
 $ cmake -DCMAKE_BUILD_TYPE=Debug ../
+
+for eclipse
+cmake -G "Eclipse CDT4 - Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DECLIPSE_CDT4_GENERATE_SOURCE_PROJECT=TRUE -DCMAKE_ECLIPSE_VERSION=3.7 -DCMAKE_ECLIPSE_MAKE_ARGUMENTS=-j8 ../
+
+
 $ make
 $ make install
 
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 b8fc4bb6c..4d165fa6a 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
@@ -229,8 +229,8 @@ int galileo_e1b_telemetry_decoder_cc::general_work (int noutput_items, gr_vector
                     if (abs(preamble_diff - GALILEO_INAV_PREAMBLE_PERIOD_SYMBOLS) < 1)
                         {
 
-                    		//std::cout<<"d_sample_counter="<<d_sample_counter<<std::endl;
-                    		//std::cout<<"corr_value="<<corr_value<<std::endl;
+                    		std::cout<<"d_sample_counter="<<d_sample_counter<<std::endl;
+                    		std::cout<<"corr_value="<<corr_value<<std::endl;
                     		// NEW Galileo page part is received
                     	    // 0. fetch the symbols into an array
                     	    int frame_length=GALILEO_INAV_PAGE_PART_SYMBOLS-d_symbols_per_preamble;
@@ -239,9 +239,14 @@ int galileo_e1b_telemetry_decoder_cc::general_work (int noutput_items, gr_vector
 
                     	    for (int i=0;i<frame_length;i++)
                     	    {
-                    	    	page_part_symbols[i]=in[0][i+d_symbols_per_preamble].Prompt_I; // because last symbol of the preamble is just received now!
-                    	    }
+                    	    	if (corr_value>0)
+                    	    	{
+                    	    		page_part_symbols[i]=in[0][i+d_symbols_per_preamble].Prompt_I; // because last symbol of the preamble is just received now!
 
+                    	    	}else{
+                    	    		page_part_symbols[i]=-in[0][i+d_symbols_per_preamble].Prompt_I; // because last symbol of the preamble is just received now!
+                    	    	}
+                    	    }
                     		// 1. De-interleave
                     	    deinterleaver(GALILEO_INAV_INTERLEAVER_ROWS,GALILEO_INAV_INTERLEAVER_COLS,page_part_symbols, page_part_symbols_deint);
 
@@ -250,11 +255,7 @@ int galileo_e1b_telemetry_decoder_cc::general_work (int noutput_items, gr_vector
                     	    // 2.2 Take into account the possible inversion of the polarity due to PLL lock at 180º
                     	    for (int i=0;i<frame_length;i++)
                     	    {
-                    	    	if (corr_value<0)
-                    	    	{
-                    	    		page_part_symbols_deint[i]=-page_part_symbols_deint[i];
-                    	    	}
-                    	    	if (i%2==0)
+                    	    	if ((i+1)%2==0)
                     	    	{
                     	    		page_part_symbols_deint[i]=-page_part_symbols_deint[i];
                     	    	}
@@ -265,49 +266,44 @@ int galileo_e1b_telemetry_decoder_cc::general_work (int noutput_items, gr_vector
 
                     		// 3. Call the Galileo page decoder
 
-//                    	    std::cout<<"frame_symbols=[";
-//                    	    for (int i=0;i<frame_length;i++)
-//                    	     {
-//                    	    	if (page_part_symbols[i]>0)
-//                    	    	{
-//                    	    		std::cout<<",1";
-//                    	    	}else{
-//                    	    		std::cout<<",0";
-//                    	    	}
-//                    	     }
-//                    	    std::cout<<"]"<<std::endl;
-//                      	    std::cout<<"frame_symbols_deint=[";
-//                        	    for (int i=0;i<frame_length;i++)
-//                        	     {
-//                        	    	if (page_part_symbols_deint[i]>0)
-//                        	    	{
-//                        	    		std::cout<<",1";
-//                        	    	}else{
-//                        	    		std::cout<<",0";
-//                        	    	}
-//                        	     }
-//                        	    std::cout<<"]"<<std::endl;
-//
-//                          	    std::cout<<"frame_bits=[";
-//                            	    for (int i=0;i<frame_length/2;i++)
-//                            	     {
-//                            	    	if (page_part_bits[i]>0)
-//                            	    	{
-//                            	    		std::cout<<",1";
-//                            	    	}else{
-//                            	    		std::cout<<",0";
-//                            	    	}
-//                            	     }
-//                            	    std::cout<<"]"<<std::endl;
+                     	    std::string page_String;
+
+                      	    //std::cout<<"frame_bits=[";
+                     	    for(int i=0; i < (frame_length/2); i++)
+                     	    {
+                     	    	if (page_part_bits[i]>0)
+                     	    	{
+                     	    		page_String.push_back('1');
+                    	    		//std::cout<<",1";
+                     	    	}else{
+                     	    		page_String.push_back('0');
+                    	    		//std::cout<<",0";
+                     	    	}
+
+                     	    	//sprintf(&page_String[i], "%d", page_part_bits[i]); // this produces a memory core dumped...
+                     	    }
+                    	    //std::cout<<"]"<<std::endl;
+
+                     	    Galileo_Navigation_Message decode_page;
+
+                     	    std::cout<<"page_string="<<page_String<<std::endl; //correctly transformed to char
+
+
+             	             if (page_part_bits[0]==1)
+                              {
+                             	 std::cout<<"Page Odd"<<std::endl;
+                             	 decode_page.split_page(page_String.c_str(), flag_even_word_arrived);
+                             	 flag_even_word_arrived=0;
+                             	 std::cout<<"Page type ="<< page_part_bits[1]<<std::endl;
+                               }
+                              else
+                              {
+                             	 std::cout<<"Page Even"<<std::endl;
+                             	 decode_page.split_page(page_String.c_str(), flag_even_word_arrived);
+                             	 flag_even_word_arrived=1;
+                             	 std::cout<<"Page type ="<< page_part_bits[1]<<std::endl;
+                              }
 
-                             if (page_part_bits[0]==1)
-                             {
-                            	 std::cout<<"Page Odd"<<std::endl;
-                             }else
-                             {
-                            	 std::cout<<"Page Even"<<std::endl;
-                             }
-                            //ToDo: Call here the frame decoder
 
 
                             d_flag_preamble = true;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h
index 0d523fdc5..9bc90e831 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_e1b_telemetry_decoder_cc.h
@@ -70,6 +70,7 @@ public:
     ~galileo_e1b_telemetry_decoder_cc();
     void set_satellite(Gnss_Satellite satellite);  //!< Set satellite PRN
     void set_channel(int channel);                 //!< Set receiver's channel
+    int flag_even_word_arrived;
     /*!
      * \brief Set the satellite data queue
      */
@@ -109,6 +110,7 @@ private:
 
     long d_fs_in;
 
+
     //gr::trellis::interleaver d_interleaver;
 
     // navigation message vars
diff --git a/src/core/system_parameters/Galileo_E1.h b/src/core/system_parameters/Galileo_E1.h
index 0ec661147..9fa7e761c 100644
--- a/src/core/system_parameters/Galileo_E1.h
+++ b/src/core/system_parameters/Galileo_E1.h
@@ -67,18 +67,209 @@ const int GALILEO_PAGE_TYPE_BITS = 6;
 const int GALILEO_DATA_JK_BITS =128;
 
 const std::vector<std::pair<int,int>> type({{1,6}});
+const std::vector<std::pair<int,int>> PAGE_TYPE_bit({{1,6}});;
+
+/*Page 1 - Word type 1: Ephemeris (1/4)*/
+const std::vector<std::pair<int,int>> IOD_nav_1_bit({{7,10}});
+const std::vector<std::pair<int,int>> T0E_1_bit({{17,14}});
+const double t0e_1_LSB = 60;
+const std::vector<std::pair<int,int>> M0_1_bit({{31,32}});
+const double M0_1_LSB = TWO_N31;
+const std::vector<std::pair<int,int>> e_1_bit({{63,32}});
+const double e_1_LSB = TWO_N33;
+const std::vector<std::pair<int,int>> A_1_bit({{95,32}});
+const double A_1_LSB_gal = TWO_N19;
+//last two bits are reserved
+
+
+/*Page 2 - Word type 2: Ephemeris (2/4)*/
+const std::vector<std::pair<int,int>> IOD_nav_2_bit({{7,10}});
+const std::vector<std::pair<int,int>> OMEGA_0_2_bit({{17,32}});
+const double OMEGA_0_2_LSB = TWO_N31;
+const std::vector<std::pair<int,int>> i_0_2_bit({{49,32}});
+const double i_0_2_LSB = TWO_N31;
+const std::vector<std::pair<int,int>> omega_2_bit({{81,32}});
+const double omega_2_LSB = TWO_N31;
+const std::vector<std::pair<int,int>> iDot_2_bit({{113,14}});
+const double iDot_2_LSB = TWO_N43;
+//last two bits are reserved
+
+
+/*Word type 3: Ephemeris (3/4) and SISA*/
+const std::vector<std::pair<int,int>> IOD_nav_3_bit({{7,10}});
+const std::vector<std::pair<int,int>> OMEGA_dot_3_bit({{17,24}});
+const double OMEGA_dot_3_LSB = TWO_N43;
+const std::vector<std::pair<int,int>> delta_n_3_bit({{41,16}});
+const double delta_n_3_LSB = TWO_N43;
+const std::vector<std::pair<int,int>> C_uc_3_bit({{57,16}});
+const double C_uc_3_LSB = TWO_N29;
+const std::vector<std::pair<int,int>> C_us_3_bit({{73,16}});
+const double C_us_3_LSB = TWO_N29;
+const std::vector<std::pair<int,int>> C_rc_3_bit({{89,16}});
+const double C_rc_3_LSB = TWO_N5;
+const std::vector<std::pair<int,int>> C_rs_3_bit({{105,16}});
+const double C_rs_3_LSB = TWO_N5;
+const std::vector<std::pair<int,int>> SISA_3_bit({{121,8}});
+
+
+/*Word type 4: Ephemeris (4/4) and Clock correction parameters*/
+const std::vector<std::pair<int,int>> IOD_nav_4_bit({{7,10}});
+const std::vector<std::pair<int,int>> SV_ID_PRN_4_bit({{17,6}});
+const std::vector<std::pair<int,int>> C_ic_4_bit({{23,16}});
+const double C_ic_4_LSB = TWO_N29;
+const std::vector<std::pair<int,int>> C_is_4_bit({{39,16}});
+const double C_is_4_LSB = TWO_N29;
+const std::vector<std::pair<int,int>> t0c_4_bit({{55,14}});			//
+const double t0c_4_LSB = 60;
+const std::vector<std::pair<int,int>> af0_4_bit({{69,31}});			//
+const double af0_4_LSB = TWO_N34;
+const std::vector<std::pair<int,int>> af1_4_bit({{100,21}});			//
+const double af1_4_LSB = TWO_N46;
+const std::vector<std::pair<int,int>> af2_4_bit({{121,6}});
+const double af2_4_LSB = TWO_N59;
+const std::vector<std::pair<int,int>> spare_4_bit({{121,6}});
+//last two bits are reserved
+
+
+/*Word type 5: Ionospheric correction, BGD, signal health and data validity status and GST*/
+/*Ionospheric correction*/
+/*Az*/
+const std::vector<std::pair<int,int>> ai0_5_bit({{7,11}});		//
+const double ai0_5_LSB = TWO_N2;
+const std::vector<std::pair<int,int>> ai1_5_bit({{18,11}});		//
+const double ai1_5_LSB = TWO_N8;
+const std::vector<std::pair<int,int>> ai2_5_bit({{29,14}});		//
+const double ai2_5_LSB = TWO_N15;
+/*Ionospheric disturbance flag*/
+const std::vector<std::pair<int,int>> Region1_5_bit({{43,1}});	//
+const std::vector<std::pair<int,int>> Region2_5_bit({{44,1}});	//
+const std::vector<std::pair<int,int>> Region3_5_bit({{45,1}});	//
+const std::vector<std::pair<int,int>> Region4_5_bit({{46,1}});	//
+const std::vector<std::pair<int,int>> Region5_5_bit({{47,1}});	//
+const std::vector<std::pair<int,int>> BGD_E1E5a_5_bit({{48,10}});	//
+const double BGD_E1E5a_5_LSB = TWO_N32;
+const std::vector<std::pair<int,int>> BGD_E1E5b_5_bit({{58,10}});	//
+const double BGD_E1E5b_5_LSB = TWO_N35;
+const std::vector<std::pair<int,int>> E5b_HS_5_bit({{68,2}});		//
+const std::vector<std::pair<int,int>> E1B_HS_5_bit({{70,2}});		//
+const std::vector<std::pair<int,int>> E5b_DVS_5_bit({{72,1}});	//
+const std::vector<std::pair<int,int>> E1B_DVS_5_bit({{73,1}});	//
+/*GST*/
+const std::vector<std::pair<int,int>> WN_5_bit({{74,12}});
+const std::vector<std::pair<int,int>> TOW_5_bit({{86,20}});
+const std::vector<std::pair<int,int>> spare_5_bit({{106,23}});
+
+
+/* Page 6 */
+const std::vector<std::pair<int,int>> A0_6_bit({{7,32}});
+const double A0_6_LSB = TWO_N30;
+const std::vector<std::pair<int,int>> A1_6_bit({{39,24}});
+const double A1_6_LSB = TWO_N50;
+const std::vector<std::pair<int,int>> Delta_tLS_6_bit({{63,8}});
+const std::vector<std::pair<int,int>> t0t_6_bit({{71,8}});
+const double t0t_6_LSB = 3600;
+const std::vector<std::pair<int,int>> WNot_6_bit({{79,8}});
+const std::vector<std::pair<int,int>> WN_LSF_6_bit({{86,8}});
+const std::vector<std::pair<int,int>> DN_6_bit({{95,3}});
+const std::vector<std::pair<int,int>> Delta_tLSF_6_bit({{97,8}});
+const std::vector<std::pair<int,int>> TOW_6_bit({{106,20}});
+
+/* Page 7 */
+const std::vector<std::pair<int,int>>IOD_a_7_bit({{7,4}});
+const std::vector<std::pair<int,int>>WN_a_7_bit({{11,2}});
+const std::vector<std::pair<int,int>>t0a_7_bit({{13,10}});
+const double t0a_7_LSB = 600;
+const std::vector<std::pair<int,int>>SVID1_7_bit({{23,6}});
+const std::vector<std::pair<int,int>>Delta_alpha_7_bit({{29,13}});
+const double Delta_alpha_7_LSB = TWO_N9;
+const std::vector<std::pair<int,int>>e_7_bit({{42,11}});
+const double e_7_LSB = TWO_N16;
+const std::vector<std::pair<int,int>>omega_7_bit({{53,16}});
+const double omega_7_LSB = TWO_N15;
+const std::vector<std::pair<int,int>>delta_i_7_bit({{69,11}});
+const double delta_i_7_LSB = TWO_N14;
+const std::vector<std::pair<int,int>>Omega0_7_bit({{80,16}});
+const double Omega0_7_LSB = TWO_N15;
+const std::vector<std::pair<int,int>>Omega_dot_7_bit({{96,11}});
+const double Omega_dot_7_LSB = TWO_N33;
+const std::vector<std::pair<int,int>>M0_7_bit({{107,16}});
+const double M0_7_LSB = TWO_N15;
+/* Page 8 */
+const std::vector<std::pair<int,int>>IOD_a_8_bit({{7,4}});
+const std::vector<std::pair<int,int>>af0_8_bit({{11,16}});
+const double af0_8_LSB = TWO_N19;
+const std::vector<std::pair<int,int>>af1_8_bit({{27,13}});
+const double af1_8_LSB = TWO_N38;
+const std::vector<std::pair<int,int>>E5b_HS_8_bit({{40,2}});
+const std::vector<std::pair<int,int>>E1B_HS_8_bit({{42,2}});
+const std::vector<std::pair<int,int>>SVID2_8_bit({{44,6}});
+const std::vector<std::pair<int,int>>DELTA_A_8_bit({{50,13}});
+const double DELTA_A_8_LSB = TWO_N9;
+const std::vector<std::pair<int,int>>e_8_bit({{63,11}});
+const double e_8_LSB = TWO_N16;
+const std::vector<std::pair<int,int>>omega_8_bit({{74,16}});
+const double omega_8_LSB = TWO_N15;
+const std::vector<std::pair<int,int>>delta_i_8_bit({{90,11}});
+const double delta_i_8_LSB = TWO_N14;
+const std::vector<std::pair<int,int>>Omega0_8_bit({{101,16}});
+const double Omega0_8_LSB = TWO_N15;
+const std::vector<std::pair<int,int>>Omega_dot_8_bit({{117,11}});
+const double Omega_dot_8_LSB = TWO_N33;
+
+/* Page 9 */
+const std::vector<std::pair<int,int>>IOD_a_9_bit({{7,4}});
+const std::vector<std::pair<int,int>>WN_a_9_bit({{11,2}});
+const std::vector<std::pair<int,int>>t0a_9_bit({{13,10}});
+const double t0a_9_LSB = 600;
+const std::vector<std::pair<int,int>>M0_9_bit({{23,16}});
+const double M0_9_LSB = TWO_N15;
+const std::vector<std::pair<int,int>>af0_9_bit({{39,16}});
+const double af0_9_LSB = TWO_N19;
+const std::vector<std::pair<int,int>>af1_9_bit({{54,13}});
+const double af1_9_LSB = TWO_N38;
+const std::vector<std::pair<int,int>>E5b_HS_9_bit({{68,2}});
+const std::vector<std::pair<int,int>>E1B_HS_9_bit({{70,2}});
+const std::vector<std::pair<int,int>>SVID3_9_bit({{72,6}});
+const std::vector<std::pair<int,int>>DELTA_A_9_bit({{78,13}});
+const double DELTA_A_9_LSB = TWO_N9;
+const std::vector<std::pair<int,int>>e_9_bit({{91,11}});
+const double e_9_LSB = TWO_N16;
+const std::vector<std::pair<int,int>>omega_9_bit({{102,16}});
+const double omega_9_LSB = TWO_N15;
+const std::vector<std::pair<int,int>>delta_i_9_bit({{118,11}});
+const double delta_i_9_LSB = TWO_N14;
+
+/* Page 10 */
+const std::vector<std::pair<int,int>>IOD_a_10_bit({{7,4}});
+const std::vector<std::pair<int,int>>Omega0_10_bit({{11,16}});
+const double Omega0_10_LSB = TWO_N15;
+const std::vector<std::pair<int,int>>Omega_dot_10_bit({{27,11}});
+const double Omega_dot_10_LSB = TWO_N33;
+const std::vector<std::pair<int,int>>M0_10_bit({{38,16}});
+const double M0_10_LSB = TWO_N15;
+const std::vector<std::pair<int,int>>af0_10_bit({{54,16}});
+const double af0_10_LSB = TWO_N19;
+const std::vector<std::pair<int,int>>af1_10_bit({{70,13}});
+const double af1_10_LSB = TWO_N38;
+const std::vector<std::pair<int,int>>E5b_HS_10_bit({{83,2}});
+const std::vector<std::pair<int,int>>E1B_HS_10_bit({{85,2}});
+const std::vector<std::pair<int,int>> A_0G_10_bit({{87,16}});
+const double A_0G_10_LSB = TWO_N35;
+const std::vector<std::pair<int,int>>A_1G_10_bit({{103,12}});
+const double A_1G_10_LSB = TWO_N51;
+
+const std::vector<std::pair<int,int>>t_0G_10_bit({{115,9}});
+const double t_0G_10_LSB = 3600;
+const std::vector<std::pair<int,int>>WN_0G_10_bit({{123,6}});
+
+
+/* Page 0 */
+const std::vector<std::pair<int,int>>Time_0_bit({{7,2}});
+const std::vector<std::pair<int,int>>WN_0_bit({{97,12}});
+const std::vector<std::pair<int,int>> TOW_0_bit({{109,20}});
+
+
 
-/*Page 1*/
-const std::vector<std::pair<int,int>> PAGE_TYPE_bit({{1,6}});
-const std::vector<std::pair<int,int>> IOD_nav_page1({{7,10}});
-const std::vector<std::pair<int,int>> T0E_bit({{17,14}});
-const double t0e_LSB = 60;
-const std::vector<std::pair<int,int>> M0_bit({{31,32}});
-const double M0_LSB = TWO_N31;
-const std::vector<std::pair<int,int>> e_bit({{63,32}});
-const double e_LSB = TWO_N33;
-const std::vector<std::pair<int,int>> A_bit({{95,32}});
-const double A_LSB = TWO_N19;
 
 // Galileo E1 primary codes
 
diff --git a/src/core/system_parameters/MATH_CONSTANTS.h b/src/core/system_parameters/MATH_CONSTANTS.h
index 147783631..b8eeabb92 100644
--- a/src/core/system_parameters/MATH_CONSTANTS.h
+++ b/src/core/system_parameters/MATH_CONSTANTS.h
@@ -51,8 +51,15 @@ const double TWO_P32 = (4294967296.0);            //!< 2^32 this is too big for
 const double TWO_P56 = (7.205759403792794e+016);  //!< 2^56
 const double TWO_P57 = (1.441151880758559e+017);  //!< 2^57
 
+const double TWO_N2 = (0.25);					  //!< 2^-2
 const double TWO_N5 = (0.03125);                  //!< 2^-5
+const double TWO_N8 = (0.00390625);				  //!< 2^-8
+const double TWO_N9 = (0.001953125);   			  //!< 2^-9
+
 const double TWO_N11 = (4.882812500000000e-004);  //!< 2^-11
+const double TWO_N14 = (0.00006103515625);          //!< 2^-14
+const double TWO_N15 = (0.00003051757813);		  //!< 2^-15
+const double TWO_N16 = (0.0000152587890625);      //!< 2^-16
 const double TWO_N19 = (1.907348632812500e-006);  //!< 2^-19
 const double TWO_N20 = (9.536743164062500e-007);  //!< 2^-20
 const double TWO_N21 = (4.768371582031250e-007);  //!< 2^-21
@@ -64,10 +71,17 @@ const double TWO_N30 = (9.313225746154785e-010);  //!< 2^-30
 const double TWO_N31 = (4.656612873077393e-010);  //!< 2^-31
 const double TWO_N32 = (2.328306436538696e-010);  //!< 2^-32
 const double TWO_N33 = (1.164153218269348e-010);  //!< 2^-33
+const double TWO_N34 = (5.82076609134674e-011);	  //!< 2^-34
+const double TWO_N35 = (2.91038304567337e-011);	  //!< 2^-35
+
 const double TWO_N38 = (3.637978807091713e-012);  //!< 2^-38
 const double TWO_N43 = (1.136868377216160e-013);  //!< 2^-43
+const double TWO_N46 = (1.4210854715202e-014);    //!< 2^-46
+
 const double TWO_N50 = (8.881784197001252e-016);  //!< 2^-50
+const double TWO_N51 = (4.44089209850063e+016);   //!< 2^-51
 const double TWO_N55 = (2.775557561562891e-017);  //!< 2^-55
+const double TWO_N59 = (1.73472347597681e-018);   //!< 2^-59
 
 const double PI_TWO_N19 = (5.992112452678286e-006);  //!< Pi*2^-19
 const double PI_TWO_N43 = (3.571577341960839e-013);  //!< Pi*2^-43
diff --git a/src/core/system_parameters/galileo_navigation_message.cc b/src/core/system_parameters/galileo_navigation_message.cc
index c232536ac..4f3a53eba 100644
--- a/src/core/system_parameters/galileo_navigation_message.cc
+++ b/src/core/system_parameters/galileo_navigation_message.cc
@@ -31,154 +31,155 @@
 
 #include "galileo_navigation_message.h"
 #include "boost/date_time/posix_time/posix_time.hpp"
+#include <iostream>
+#include <cstring>
+#include <string>
 
 using namespace std;
 
 void Galileo_Navigation_Message::reset()
 {
-
+	flag_even_word = 0;
 	/*Word type 1: Ephemeris (1/4)*/
-    IOD_nav_1 = 0;
-    t0e = 0;
-    M0 = 0;
-    e = 0;
-    A = 0;
+	     IOD_nav_1 = 0;
+	     t0e_1 = 0;
+	     M0_1 = 0;
+	     e_1 = 0;
+	     A_1 = 0;
 
-    /*d_TOW_SF1 = 0;
-    d_TOW_SF2 = 0;
-    d_TOW_SF3 = 0;
-    d_TOW_SF4 = 0;
-    d_TOW_SF5 = 0;
+	     /*Word type 2: Ephemeris (2/4)*/
+	     IOD_nav_2 = 0;  // IOD_nav page 2
+	     OMEGA_0_2 = 0; // Longitude of ascending node of orbital plane at weekly epoch [semi-circles]
+	     i_0_2 = 0;     // Inclination angle at reference time  [semi-circles]
+	     omega_2 = 0;   // Argument of perigee [semi-circles]
+	     iDot_2 = 0;    // Rate of inclination angle [semi-circles/sec]
 
-    d_IODE_SF2 = 0;
-    d_IODE_SF3 = 0;
-    d_Crs = 0;
-    d_Delta_n = 0;
-    d_M_0 = 0;
-    d_Cuc = 0;
-    d_e_eccentricity = 0;
-    d_Cus = 0;
-    d_sqrt_A = 0;
-    d_Toe = 0;
-    d_Toc = 0;
-    d_Cic = 0;
-    d_OMEGA0 = 0;
-    d_Cis = 0;
-    d_i_0 = 0;
-    d_Crc = 0;
-    d_OMEGA = 0;
-    d_OMEGA_DOT = 0;
-    d_IDOT = 0;
-    i_code_on_L2 = 0;
-    i_GPS_week = 0;
-    b_L2_P_data_flag = false;
-    i_SV_accuracy = 0;
-    i_SV_health = 0;
-    d_TGD = 0;
-    d_IODC = -1;
-    i_AODO = 0;
 
-    b_fit_interval_flag = false;
-    d_spare1 = 0;
-    d_spare2 = 0;
+	     /*Word type 3: Ephemeris (3/4) and SISA*/
+	     IOD_nav_3 = 0;  		//
+	     OMEGA_dot_3 = 0;		// Rate of right ascension [semi-circles/sec]
+	     delta_n_3 = 0;		    // Mean motion difference from computed value  [semi-circles/sec]
+	     C_uc_3 = 0;			// Amplitude of the cosine harmonic correction term to the argument of latitude [radians]
+	     C_us_3 = 0;			// Amplitude of the sine harmonic correction term to the argument of latitude [radians]
+	     C_rc_3 = 0;			// Amplitude of the cosine harmonic correction term to the orbit radius [meters]
+	     C_rs_3 = 0;			// Amplitude of the sine harmonic correction term to the orbit radius [meters]
+	     SISA_3 = 0;			//
 
-    d_A_f0 = 0;
-    d_A_f1 = 0;
-    d_A_f2 = 0;
 
-    //clock terms
-    //d_master_clock=0;
-    d_dtr = 0;
-    d_satClkCorr = 0;
+	     /*Word type 4: Ephemeris (4/4) and Clock correction parameters*/
+	     IOD_nav_4 = 0;		//
+	     SV_ID_PRN_4 = 0;	//
+	     C_ic_4 = 0;		// Amplitude of the cosine harmonic correction 	term to the angle of inclination [radians]
+	     C_is_4 = 0;		// Amplitude of the sine harmonic correction term to the angle of inclination [radians]
+	   	 /*Clock correction parameters*/
+	     t0c_4 = 0;			//
+	     af0_4 = 0;			//
+	     af1_4 = 0;			//
+	     af2_4 = 0;			//
+	     spare_4 = 0;
 
-    // satellite positions
-    d_satpos_X = 0;
-    d_satpos_Y = 0;
-    d_satpos_Z = 0;
+	     /*Word type 5: Ionospheric correction, BGD, signal health and data validity status and GST*/
+	     /*Ionospheric correction*/
+	     /*Az*/
+	   	 ai0_5 = 0;		//
+	   	 ai1_5 = 0;		//
+	   	 ai2_5 = 0;		//
+	   	 /*Ionospheric disturbance flag*/
+	   	 Region1_flag_5 = 0;	//Region1_flag_5;
+	   	 Region2_flag_5 = 0;	//
+	   	 Region3_flag_5 = 0;	//
+	   	 Region4_flag_5 = 0;	//
+	   	 Region5_flag_5 = 0;	//
+	   	 BGD_E1E5a_5 = 0;	//
+	   	 BGD_E1E5b_5 = 0;	//
+	   	 E5b_HS_5 = 0;		//
+	   	 E1B_HS_5 = 0;		//
+	  	 E5b_DVS_5 = 0;	//
+	   	 E1B_DVS_5 = 0;	//
+	    /*GST*/
+	   	 WN_5 = 0;
+	   	 TOW_5 = 0;
+	   	 spare_5 = 0;
 
-    // info
-    i_channel_ID = 0;
-    i_satellite_PRN = 0;
+	   	/*Word type 6: GST-UTC conversion parameters*/
+	   		A0_6 = 0;
+	   		A1_6 = 0;
+	   		Delta_tLS_6 = 0;
+	   		t0t_6 = 0;
+	   		WNot_6 = 0;
+	   		WN_LSF_6 = 0;
+	   		DN_6 = 0;
+	   		Delta_tLSF_6 = 0;
+	   		TOW_6 = 0;
 
-    // time synchro
-    d_subframe_timestamp_ms = 0;
 
-    // flags
-    b_alert_flag = false;
-    b_integrity_status_flag = false;
-    b_antispoofing_flag = false;
+	   		/*Word type 7: Almanac for SVID1 (1/2), almanac reference time and almanac reference week number*/
+	   		IOD_a_7 = 0;
+	   		WN_a_7 = 0;
+	   		t0a_7 = 0;
+	   		SVID1_7 = 0;
+	   		Delta_alpha_7 = 0;
+	   		e_7 = 0;
+	   		omega_7 = 0;
+	   		delta_i_7 = 0;
+	   		Omega0_7 = 0;
+	   		Omega_dot_7 = 0;
+	   		M0_7 = 0;
+
+	   		/*Word type 8: Almanac for SVID1 (2/2) and SVID2 (1/2)*/
+	   		IOD_a_8 = 0;
+	   		af0_8 = 0;
+	   		af1_8 = 0;
+	   		E5b_HS_8 = 0;
+	   		E1B_HS_8 = 0;
+	   		SVID2_8 = 0;
+	   		DELTA_A_8 = 0;
+	   		e_8 = 0;
+	   		omega_8 = 0;
+	   		delta_i_8 = 0;
+	   		Omega0_8 = 0;
+	   		Omega_dot_8 = 0;
+
+	   		/*Word type 9: Almanac for SVID2 (2/2) and SVID3 (1/2)*/
+
+	   		IOD_a_9 = 0;
+	   		WN_a_9 = 0;
+	   		t0a_9 = 0;
+	   		M0_9 = 0;
+	   		af0_9 = 0;
+	   		af1_9 = 0;
+	   		E5b_HS_9 = 0;
+	   		E1B_HS_9 = 0;
+	   		SVID3_9 = 0;
+	   		DELTA_A_9 = 0;
+	   		e_9 = 0;
+	   		omega_9 = 0;
+	   		delta_i_9 = 0;
+
+	   		/*Word type 10: Almanac for SVID3 (2/2) and GST-GPS conversion parameters*/
+
+	   		IOD_a_10 = 0;
+	   		Omega0_10 = 0;
+	   		Omega_dot_10 = 0;
+	   		M0_10 = 0;
+	   		af0_10 = 0;
+	   		af1_10 = 0;
+	   		E5b_HS_10 = 0;
+	   		E1B_HS_10 = 0;
+	   		A_0G_10 = 0;
+	   		A_1G_10 = 0;
+	   		t_0G_10 = 0;
+	   		WN_0G_10 = 0;
+
+	   		/*Word type 0: I/NAV Spare Word*/
+
+	   		Time_0 = 0;
+	   		WN_0 = 0;
+	   		TOW_0 = 0;
 
-    // Ionosphere and UTC
-    flag_iono_valid = false;
-    flag_utc_model_valid = true;
-    d_alpha0 = 0;
-    d_alpha1 = 0;
-    d_alpha2 = 0;
-    d_alpha3 = 0;
-    d_beta0 = 0;
-    d_beta1 = 0;
-    d_beta2 = 0;
-    d_beta3 = 0;
-    d_A1 = 0;
-    d_A0 = 0;
-    d_t_OT = 0;
-    i_WN_T = 0;
-    d_DeltaT_LS = 0;
-    i_WN_LSF = 0;
-    i_DN = 0;
-    d_DeltaT_LSF= 0;
 
-    //Almanac
-    d_Toa = 0;
-    i_WN_A = 0;
-    for (int i=1; i < 32; i++ )
-        {
-            almanacHealth[i] = 0;
-        }
 
-    // Satellite velocity
-    d_satvel_X = 0;
-    d_satvel_Y = 0;
-    d_satvel_Z = 0;
 
-    //Plane A (info from http://www.navcen.uscg.gov/?Do=constellationStatus)
-    satelliteBlock[9] = "IIA";
-    satelliteBlock[31] = "IIR-M";
-    satelliteBlock[8] = "IIA";
-    satelliteBlock[7] = "IIR-M";
-    satelliteBlock[27] = "IIA";
-    //Plane B
-    satelliteBlock[16] = "IIR";
-    satelliteBlock[25] = "IIF";
-    satelliteBlock[28] = "IIR";
-    satelliteBlock[12] = "IIR-M";
-    satelliteBlock[30] = "IIA";
-    //Plane C
-    satelliteBlock[29] = "IIR-M";
-    satelliteBlock[3] = "IIA";
-    satelliteBlock[19] = "IIR";
-    satelliteBlock[17] = "IIR-M";
-    satelliteBlock[6] = "IIA";
-    //Plane D
-    satelliteBlock[2] = "IIR";
-    satelliteBlock[1] = "IIF";
-    satelliteBlock[21] = "IIR";
-    satelliteBlock[4] = "IIA";
-    satelliteBlock[11] = "IIR";
-    satelliteBlock[24] = "IIA"; // Decommissioned from active service on 04 Nov 2011
-    //Plane E
-    satelliteBlock[20] = "IIR";
-    satelliteBlock[22] = "IIR";
-    satelliteBlock[5] = "IIR-M";
-    satelliteBlock[18] = "IIR";
-    satelliteBlock[32] = "IIA";
-    satelliteBlock[10] = "IIA";
-    //Plane F
-    satelliteBlock[14] = "IIR";
-    satelliteBlock[15] = "IIR-M";
-    satelliteBlock[13] = "IIR";
-    satelliteBlock[23] = "IIR";
-    satelliteBlock[26] = "IIA";*/
 }
 
 
@@ -227,7 +228,7 @@ unsigned long int Galileo_Navigation_Message::read_page_type_unsigned(std::bitse
 
 
 
-/*signed long int Galileo_Navigation_Message::read_navigation_signed(std::bitset<GALILEO_SUBFRAME_BITS> bits, const std::vector<std::pair<int,int> > parameter)
+signed long int Galileo_Navigation_Message::read_navigation_signed(std::bitset<GALILEO_DATA_JK_BITS> bits, const std::vector<std::pair<int,int> > parameter)
 {
     signed long int value = 0;
     int num_of_slices = parameter.size();
@@ -236,7 +237,7 @@ unsigned long int Galileo_Navigation_Message::read_page_type_unsigned(std::bitse
     if (long_int_size_bytes == 8) // if a long int takes 8 bytes, we are in a 64 bits system
         {
             // read the MSB and perform the sign extension
-            if (bits[GALILEO_SUBFRAME_BITS - parameter[0].first] == 1)
+            if (bits[GALILEO_DATA_JK_BITS - parameter[0].first] == 1)
                 {
                     value ^= 0xFFFFFFFFFFFFFFFF; //64 bits variable
                 }
@@ -251,7 +252,7 @@ unsigned long int Galileo_Navigation_Message::read_page_type_unsigned(std::bitse
                         {
                             value <<= 1; //shift left
                             value &= 0xFFFFFFFFFFFFFFFE; //reset the corresponding bit (for the 64 bits variable)
-                            if (bits[GALILEO_SUBFRAME_BITS - parameter[i].first - j] == 1)
+                            if (bits[GALILEO_DATA_JK_BITS - parameter[i].first - j] == 1)
                                 {
                                     value += 1; // insert the bit
                                 }
@@ -261,7 +262,7 @@ unsigned long int Galileo_Navigation_Message::read_page_type_unsigned(std::bitse
     else  // we assume we are in a 32 bits system
         {
             // read the MSB and perform the sign extension
-            if (bits[GALILEO_SUBFRAME_BITS - parameter[0].first] == 1)
+            if (bits[GALILEO_DATA_JK_BITS - parameter[0].first] == 1)
                 {
                     value ^= 0xFFFFFFFF;
                 }
@@ -276,7 +277,7 @@ unsigned long int Galileo_Navigation_Message::read_page_type_unsigned(std::bitse
                         {
                             value <<= 1; //shift left
                             value &= 0xFFFFFFFE; //reset the corresponding bit
-                            if (bits[GALILEO_SUBFRAME_BITS - parameter[i].first - j] == 1)
+                            if (bits[GALILEO_DATA_JK_BITS - parameter[i].first - j] == 1)
                                 {
                                     value += 1; // insert the bit
                                 }
@@ -284,13 +285,13 @@ unsigned long int Galileo_Navigation_Message::read_page_type_unsigned(std::bitse
                 }
         }
     return value;
-}*/
+}
 
-/*bool Galileo_Navigation_Message::read_navigation_bool(std::bitset<GALILEO_SUBFRAME_BITS> bits, const std::vector<std::pair<int,int> > parameter)
+bool Galileo_Navigation_Message::read_navigation_bool(std::bitset<GALILEO_DATA_JK_BITS> bits, const std::vector<std::pair<int,int> > parameter)
 {
     bool value;
 
-    if (bits[GALILEO_SUBFRAME_BITS - parameter[0].first] == 1)
+    if (bits[GALILEO_DATA_JK_BITS - parameter[0].first] == 1)
         {
             value = true;
         }
@@ -299,8 +300,7 @@ unsigned long int Galileo_Navigation_Message::read_page_type_unsigned(std::bitse
             value = false;
         }
     return value;
-}*/
-
+}
 
 /*void Galileo_Navigation_Message::print_galileo_word_bytes(unsigned int GPS_word)
 {
@@ -311,65 +311,80 @@ unsigned long int Galileo_Navigation_Message::read_page_type_unsigned(std::bitse
 
 
 
-void Galileo_Navigation_Message::split_page(char *page){
+void Galileo_Navigation_Message::split_page(const char *page, int flag_even_word){
 	cout << "--------------------------------------------------------------------------" << endl;
 	cout << "Entered in Galileo_Navigation_Message::split_page(char *page)" << endl << endl;;
 
 	char Even_bit[2]={'\0'}, Odd_bit[2]={'\0'}, Page_type_Odd[2]={'\0'}, Page_type_even[2]={'\0'}, tail_Even[7]={'\0'}; //HO DATO A TUTTI UNO SPAZIO IN PIÙ PER L'ULTIMO CARATTERE
-	char page_Odd[121]={'\0'},  page_INAV[235]={'\0'};
+	char page_Odd[121]={'\0'};
+	char page_INAV[235]={'\0'};
 	char Data_j[16]={'\0'}, Data_k[112]={'\0'}, page_number_bits[6]={'\0'};
-	char Data_jk_ephemeris[128]={'\0'};
+	char Data_jk_ephemeris[129]={'\0'};
 	char Reserved_1[40]={'\0'};
 	char SAR[22]={'\0'};
 	char Spare[2]={'\0'};
 	char CRC_data[24]={'\0'};
 	char Reserved_2[8]={'\0'};
 	char Tail_odd[6]={'\0'};
-	char correct_tail[7]="000000";
-	int flag_even_word_arrived=1; /*******************REMEMBER TO CHANGE flag_even_word_arrived=0 *****+**********/
+	//char correct_tail[7]="000000";
+	char correct_tail[7]="011110"; //the viterbi decoder output change the tail to this value (why?)
+
 	int Page_type=0;
-
+	static char page_Even[114];
 	/* Test to decode page 1 even joined to its corresponding
-	 The Even pages given here are without their tails bits*/
-	char page_Even[115]="000000010001011111010111101101100111110110101110101111100011001000000000001101110101110010000100101010100000010011";
-	//test to detect page 3------> char page_Even[115]="000000110001011111111111111100001001100110001000110001011111110011111100110001011000111110000011011111000011110000";
-	//test to detect page 10-----> char page_Even[115]="000010101111101010101010101010101010101010101010101010101010101010101010101010101010111100000000000000000000000000";
-	//test to detect page 5------> char page_Even[115]="000001010010000010000000100010000010111010100000011111110001111111000111111001011000110010110011111111110110000000";
-	//test to detect page 2------> char page_Even[115]="000000100001011111110010111010111100000010111100000010011100000000100001011110100111000111100111000000100000000010";
+		 The Even pages given here are without their tails bits*/
+		//test to detect page 1------> char page_Even[115]="000000010001011111010111101101100111110110101110101111100011001000000000001101110101110010000100101010100000010011";
+		//test to detect page 2------> char page_Even[115]="000000100001011111110010111010111100000010111100000010011100000000100001011110100111000111100111000000100000000010";
+		//test to detect page 3------>char page_Even[115]="000000110001011111111111111100001001100110001000110001011111110011111100110001011000111110000011011111000011110000";
+		//test to detect page 4------>char page_Even[115]="000001000001011111001100000000000000101100000000000111010101111011011000000001000101001111101010011100000000010110://
+		/*test to detect page 5------>char page_Even[115]="000001010010000010000000100010000010111010100000011111110001111111000111111001011000110010110011111111110110000000";*/
+		//test to detect page 10-----> char page_Even[115]="000010101111101010101010101010101010101010101010101010101010101010101010101010101010111100000000000000000000000000";
+		//test to detect page 6------>char page_Even[115]="000001100000000000000000000000011100001100000000000000000000000000100011010111111010001101000011100001000110101101
+		/* test to detect page 7------> char page_Even[115]="000001111111101001011111010011000000000110100000001110010111111110010111110111101001000001110000111111110000101101"; */
+		/* test to detect page 8------> char page_Even[115]="000010001111000000100001111100000011000001111010100000000000110100000001111010011110111000011110111101001000001110"; */
+		/* test to detect page 9------> char page_Even[115]="000010011111101001011111111000101110001100000000011010100000000010111111100000001010101010101010101010101010101010"; */
+		/* test to detect page 10------> char page_Even[115]="000010101111101010101010101010101010101010101010101010101010101010101010101010101010111100000000000000000000000000"; */
 
+		/* test to detect page 0------>  char page_Even[115]="000000001001010101010101010101010101010101010101010101010101010101010101010101010101010101010101010010110001100101";*/
 
 	cout << "Start decoding Galileo I/NAV " << endl;
+//	cout<<"page input"<<page<<endl;
+	cout<<page_Even<<endl;
 
+;
 	if(page[0]=='1') // if page is odd
-		{
-			strcpy(page_Odd, page);
-			//cout << "Page Odd " << endl << page_Odd<< endl;
 
-			if (flag_even_word_arrived==1) //to test the function and satisfy this condition the flag is INITIALIZED AT 1
+	{
+		std::cout<< "page[0] split page="<<page[0]<<endl;
+//		std::cout << "Page Odd mara split page" << endl;
+		strcpy(page_Odd, page);
+		std::cout<<"Page odd in split page"<< endl << page_Odd << endl;
+
+		if (flag_even_word==1)
 				{
+					/*Under this condition An odd page has been received but the previous even page in keep in memory and it is considered to join pages*/
 
-				    strncpy(page_INAV, page_Even, 114); //Join pages: Even+Odd=INAV page
-				    strncat(page_INAV, page_Odd,120);
+					strncpy(page_INAV, page_Even, 114); //Join pages: Even+Odd=INAV page
+					strncat(page_INAV, page_Odd,120);
+					//std::cout << "Page INAV  Even+Odd " << endl << page_INAV << endl;
 
-					//cout << "Page INAV  Even+Odd " << endl << page_INAV << endl;
-
-					strncpy(Even_bit, &page_INAV[0], 1);
-					//cout << "Even bit = " << Even_bit << endl;
+				    strncpy(Even_bit, &page_INAV[0], 1);
+					//std::cout << "Even bit = " << Even_bit << endl;
 					strncpy(Page_type_even, &page_INAV[1], 1);
-					//cout << "Page type even = " << Page_type_even << endl;
+					//std::cout << "Page type even = " << Page_type_even << endl;
 
-					if(atoi(Page_type_even)==1) cout << "Alert frame "<< endl;
-					else cout << "Nominal Page" << endl;
+					if(atoi(Page_type_even)==1) std::cout << "Alert frame "<< endl;
+					else std::cout << "Nominal Page" << endl;
 
 					strncpy(Data_k, &page_INAV[2], 112);
-					//cout << "Data_k " << endl << Data_k << endl;
+					//std::cout << "Data_k " << endl << Data_k << endl;
 
 					strncpy(Odd_bit, &page_INAV[114], 1);
-					//cout << "Odd bit: " << Odd_bit << endl;
+					//std::cout << "Odd bit: " << Odd_bit << endl;
 					strncpy(Page_type_Odd, &page_INAV[115], 1);
-					//cout << "Page_type_Odd: " << Page_type_Odd << endl;
+					//std::cout << "Page_type_Odd: " << Page_type_Odd << endl;
 					strncpy(Data_j, &page_INAV[116], 16);
-					//cout << "Data_j: " << endl << Data_j << endl;
+					//std::cout << "Data_j: " << endl << Data_j << endl;
 
 					strncpy(Reserved_1, &page_INAV[132], 40);
 					strncpy(SAR, &page_INAV[172], 22);
@@ -377,15 +392,15 @@ void Galileo_Navigation_Message::split_page(char *page){
 					strncpy(CRC_data, &page_INAV[196], 24);
 					strncpy(Reserved_2, &page_INAV[220], 8);
 					strncpy(Tail_odd, &page_INAV[228], 6);
-					//cout << "tail odd: " << endl << Tail_odd << endl;
+					std::cout << "tail odd: " << endl << Tail_odd << endl;
 					if(strcmp (Tail_odd,correct_tail) != 0)
-								cout << "Tail odd is not correct!" << endl;
-					else cout<<"Tail odd is correct!"<<endl;
+								std::cout << "Tail odd is not correct!" << endl;
+					else std::cout<<"Tail odd is correct!"<<endl;
 
-					/************* CRC cycle control ***********/
+					/************ CRC cycle control *********/
 
 					strncpy(page_number_bits, &Data_k[0], 6);
-					//cout << "Page number bits from Data k" << endl << page_number_bits << endl;
+					std::cout << "Page number bits from Data k" << endl << page_number_bits << endl;
 
 					stringstream ss_page_number;
 					string s_page_number;
@@ -396,43 +411,42 @@ void Galileo_Navigation_Message::split_page(char *page){
 
 					Page_type = (int)read_page_type_unsigned(page_type_bits, type);
 
-					cout << "Page number (first 6 bits of Data k converted to decimal) = " << Page_type << endl;
+					std::cout << "Page number (first 6 bits of Data k converted to decimal) = " << Page_type << endl;
 
-					strncpy(Data_jk_ephemeris, Data_k, 112); 	// 	Join data_j + data_k = Data_jk_ephemeris;
-					strncat(Data_jk_ephemeris, Data_j, 16); 	//  Data_jk_ephemeris is the input for the function page decoder*/
+					strncpy(Data_jk_ephemeris, &Data_k[0], 112); 	// 	Join data_j + data_k = Data_jk_ephemeris;
+					strncat(Data_jk_ephemeris, Data_j, 16); 	//  Data_jk_ephemeris is the input for the function page decoder
 
-					//cout<<"Data j k ephemeris" << endl << Data_jk_ephemeris << endl;
+					//std::cout<<"Data j k ephemeris" << endl << Data_jk_ephemeris << endl;
 
 					page_jk_decoder(Data_jk_ephemeris); // Corresponding to ephemeris_decode.m in matlab code
 
-					flag_even_word_arrived=0;
+					//internal_flag_even_word_arrived=0;
 
 				}
 
 		} /*if(page[0]=='1') */
 
 	else{
-	cout << "Page Even" << endl;
-	strncpy(page_Even, &page[0], 114);
-	//cout << page_Even << endl;
+
+	strncpy(page_Even, &page[0], 114); //ora che ha memorizzato page even dovrebbe mantenerla per la prossima volta che entro nella funzione
+	std::cout << "Page even in split page" << std::endl << page_Even << std::endl;
 	strncpy(tail_Even, &page[114], 6);
 
 	if(strcmp (tail_Even,correct_tail) != 0)
-			cout << "Tail even is not correct!" << endl;
-	else cout<<"Tail even is correct!"<<endl;
+			std::cout << "Tail even is not correct!" << endl;
+	else std::cout<<"Tail even is correct!"<<endl;
 
-	flag_even_word_arrived=1;
+	//flag_even_word=1;
 
 	}
-	cout << "flag EVEN word arrived = " << flag_even_word_arrived << endl;
-	cout << "--------------------------------------------------------------------------" << endl;
+
 }
 
 
 int Galileo_Navigation_Message::page_jk_decoder(char *data_jk)
 {
-	cout << "--------------------------------------------------------------------------" << endl;
-	cout<< "Entered in function Galileo_Navigation_Message::page_jk_decoder(char *data_jk)" << endl << endl;
+	std::cout << "--------------------------------------------------------------------------" << endl;
+	std::cout<< "Entered in function Galileo_Navigation_Message::page_jk_decoder(char *data_jk)" << endl << endl;
 
     int page_number = 0;
 
@@ -443,261 +457,392 @@ int Galileo_Navigation_Message::page_jk_decoder(char *data_jk)
 
     std::bitset<GALILEO_DATA_JK_BITS> data_jk_bits (str);
 
-    //cout << "Data_jk_bits (bitset)  "<< endl << data_jk_bits << endl;
+    //std::cout << "Data_jk_bits (bitset)  "<< endl << data_jk_bits << endl;
 
     page_number = (int)read_navigation_unsigned(data_jk_bits, PAGE_TYPE_bit);
-    cout << "Page number (for the test it must return page 1) = " << page_number << endl;
+    std::cout << "Page number = " << page_number << endl;
 
     switch (page_number)
         {
-    	case 1: /*Word type 1: Ephemeris (1/4)*/
+    case 1: /*Word type 1: Ephemeris (1/4)*/
+        		IOD_nav_1=(int)read_navigation_unsigned(data_jk_bits, IOD_nav_1_bit);
+        		std::cout<<"IOD_nav_1= "<< IOD_nav_1 <<std::endl;
 
-    		IOD_nav_1=(int)read_navigation_unsigned(data_jk_bits, IOD_nav_page1);
-    		cout<<"IOD_nav_1= "<< IOD_nav_1 <<endl;
+        		t0e_1=(double)read_navigation_unsigned(data_jk_bits, T0E_1_bit);
+        		t0e_1 = t0e_1 * t0e_1_LSB;
+        		std::cout << "t0e_1= " << t0e_1 <<std::endl;
 
-    		t0e=(double)read_navigation_unsigned(data_jk_bits, T0E_bit);
-    		t0e = t0e * t0e_LSB;
-    		cout << "t0e= " << t0e <<endl;
+        		M0_1 = (double)read_navigation_unsigned(data_jk_bits, M0_1_bit);
+        		M0_1 =  M0_1 * M0_1_LSB;
+        		std::cout << "M0_1= " << M0_1<<std::endl;
 
-    		M0 = (double)read_navigation_unsigned(data_jk_bits, M0_bit);
-    		M0 =  M0 * M0_LSB;
-    		cout << "M0= " << M0<<endl;
+        		e_1 = (double)read_navigation_unsigned(data_jk_bits, e_1_bit);
+        		e_1 = e_1 * e_1_LSB;
+        		std::cout << "e_1= " << e_1 <<std::endl;
 
-    		e = (double)read_navigation_unsigned(data_jk_bits, e_bit);
-    		e = e * e_LSB;
-    		cout << "e= " << e <<endl;
+        		A_1 = (double)read_navigation_unsigned(data_jk_bits, A_1_bit);
+        		A_1 = A_1 * A_1_LSB_gal;
+        		std::cout << "A_1= " << A_1 <<std::endl;
 
-    		A = (double)read_navigation_unsigned(data_jk_bits, A_bit);
-    		A = A * A_LSB;
-    		cout << "A= " << A <<endl;
+        		break;
+
+        	case 2:  /*Word type 2: Ephemeris (2/4)*/
+        		IOD_nav_2 = (int)read_navigation_unsigned(data_jk_bits, IOD_nav_2_bit);
+        		std::cout<<"IOD_nav_2= "<< IOD_nav_2 <<std::endl;
+
+        		OMEGA_0_2 = (double)read_navigation_unsigned(data_jk_bits, OMEGA_0_2_bit);
+        		OMEGA_0_2 = OMEGA_0_2 * OMEGA_0_2_LSB;
+        		std::cout<<"OMEGA_0_2= "<< OMEGA_0_2 <<std::endl;
+        		i_0_2 = (double)read_navigation_unsigned(data_jk_bits, i_0_2_bit);
+        		i_0_2 = i_0_2 * i_0_2_LSB;
+        		std::cout<<"i_0_2= "<< i_0_2 <<std::endl;
+        		omega_2 = (double)read_navigation_unsigned(data_jk_bits, omega_2_bit);
+        		omega_2 = omega_2 * omega_2_LSB;
+        		std::cout<<"omega_2= "<< omega_2 <<std::endl;
+        		iDot_2 = (double)read_navigation_unsigned(data_jk_bits, iDot_2_bit);
+        		iDot_2 = iDot_2 * iDot_2_LSB;
+        		std::cout<<"iDot_2= "<< iDot_2 <<std::endl;
+        		break;
+
+        	case 3:  /*Word type 3: Ephemeris (3/4) and SISA*/
+        		IOD_nav_3 = (int)read_navigation_unsigned(data_jk_bits, IOD_nav_3_bit);
+        		std::cout<<"IOD_nav_3= "<< IOD_nav_3 <<std::endl;
+        		OMEGA_dot_3 = (double)read_navigation_unsigned(data_jk_bits, OMEGA_dot_3_bit);
+        		OMEGA_dot_3 = OMEGA_dot_3 * OMEGA_dot_3_LSB;
+        		std::cout<<"OMEGA_dot_3= "<< OMEGA_dot_3 <<std::endl;
+        		delta_n_3 = (double)read_navigation_unsigned(data_jk_bits, delta_n_3_bit);
+        		delta_n_3 = delta_n_3 * delta_n_3_LSB;
+        		std::cout<<"delta_n_3= "<< delta_n_3 <<std::endl;
+        		C_uc_3 = (double)read_navigation_unsigned(data_jk_bits, C_uc_3_bit);
+        		C_uc_3 = C_uc_3 * C_uc_3_LSB;
+        		std::cout<<"C_uc_3= "<< C_uc_3 <<std::endl;
+        		C_us_3 = (double)read_navigation_unsigned(data_jk_bits, C_us_3_bit);
+        		C_us_3 = C_us_3 * C_us_3_LSB;
+        		std::cout<<"C_us_3= "<< C_us_3 <<std::endl;
+        		C_rc_3 = (double)read_navigation_unsigned(data_jk_bits, C_rc_3_bit);
+        		C_rc_3 = C_rc_3 * C_rc_3_LSB;
+        		std::cout<<"C_rc_3= "<< C_rc_3 <<std::endl;
+        		C_rs_3 = (double)read_navigation_unsigned(data_jk_bits, C_rs_3_bit);
+        		C_rs_3 = C_rs_3 * C_rs_3_LSB;
+        		std::cout<<"C_rs_3= "<< C_rs_3 <<std::endl;
+        		SISA_3 = (double)read_navigation_unsigned(data_jk_bits, SISA_3_bit);
+        		std::cout<<"SISA_3= "<< SISA_3 <<std::endl;
+        		break;
+
+        	case 4: /* Word type 4: Ephemeris (4/4) and Clock correction parameters*/
+        		IOD_nav_4 = (int)read_navigation_unsigned(data_jk_bits, IOD_nav_4_bit);
+        		std::cout<<"IOD_nav_4= "<< IOD_nav_4 <<std::endl;
+        		SV_ID_PRN_4 = (int)read_navigation_unsigned(data_jk_bits, SV_ID_PRN_4_bit);
+        		std::cout<<"SV_ID_PRN_4= "<< SV_ID_PRN_4 <<std::endl;
+        		C_ic_4 = (double)read_navigation_unsigned(data_jk_bits, C_ic_4_bit);
+        		C_ic_4 = C_ic_4 * C_ic_4_LSB;
+        		std::cout<<"C_ic_4= "<< C_ic_4 <<std::endl;
+        		C_is_4 = (double)read_navigation_unsigned(data_jk_bits, C_is_4_bit);
+        		C_is_4 = C_is_4 * C_is_4_LSB;
+        		std::cout<<"C_is_4= "<< C_is_4 <<std::endl;
+        		/*Clock correction parameters*/
+        		t0c_4 = (double)read_navigation_unsigned(data_jk_bits, t0c_4_bit);
+        		t0c_4 = t0c_4 * t0c_4_LSB;
+        		std::cout<<"t0c_4= "<< t0c_4 <<std::endl;
+        		af0_4 = (double)read_navigation_unsigned(data_jk_bits, af0_4_bit);
+        		af0_4 = af0_4 * af0_4_LSB;
+        		std::cout<<"af0_4 = "<< af0_4  <<std::endl;
+        		af1_4 = (double)read_navigation_unsigned(data_jk_bits, af1_4_bit);
+        		af1_4 = af1_4 * af1_4_LSB;
+        		std::cout<<"af1_4 = "<< af1_4  <<std::endl;
+        		af2_4 = (double)read_navigation_unsigned(data_jk_bits, af2_4_bit);
+        		af2_4 = af2_4 * af2_4_LSB;
+        		std::cout<<"af2_4 = "<< af2_4  <<std::endl;
+        		spare_4 = (double)read_navigation_unsigned(data_jk_bits, spare_4_bit);
+        		std::cout<<"spare_4 = "<< spare_4  <<std::endl;
+        		break;
+
+        	case 5: /*Word type 5: Ionospheric correction, BGD, signal health and data validity status and GST*/
+        		 /*Ionospheric correction*/
+        		 /*Az*/
+        		ai0_5 = (double)read_navigation_unsigned(data_jk_bits, ai0_5_bit);
+        		ai0_5 = ai0_5 * ai0_5_LSB;
+        		std::cout<<"ai0_5= "<< ai0_5 <<std::endl;
+        		ai1_5 = (double)read_navigation_unsigned(data_jk_bits, ai1_5_bit);
+        		ai1_5 = ai1_5 * ai1_5_LSB;
+        		std::cout<<"ai1_5= "<< ai1_5 <<std::endl;
+        		ai2_5 = (double)read_navigation_unsigned(data_jk_bits, ai2_5_bit);
+        		ai2_5 = ai2_5 * ai2_5_LSB;
+        		std::cout<<"ai2_5= "<< ai2_5 <<std::endl;
+        		/*Ionospheric disturbance flag*/
+        		Region1_flag_5 = (bool)read_navigation_bool(data_jk_bits, Region1_5_bit);
+        		std::cout<<"Region1_flag_5= "<< Region1_flag_5 <<std::endl;
+        		Region2_flag_5 = (bool)read_navigation_bool(data_jk_bits, Region2_5_bit);
+        		std::cout<<"Region2_flag_5= "<< Region2_flag_5 <<std::endl;
+        		Region3_flag_5 = (bool)read_navigation_bool(data_jk_bits, Region3_5_bit);
+        		std::cout<<"Region3_flag_5= "<< Region3_flag_5 <<std::endl;
+        		Region4_flag_5 = (bool)read_navigation_bool(data_jk_bits, Region4_5_bit);
+        		std::cout<<"Region4_flag_5= "<< Region4_flag_5 <<std::endl;
+        		Region5_flag_5 = (bool)read_navigation_bool(data_jk_bits, Region5_5_bit);
+        		std::cout<<"Region5_flag_5= "<< Region5_flag_5 <<std::endl;
+        		BGD_E1E5a_5 = (double)read_navigation_unsigned(data_jk_bits, BGD_E1E5a_5_bit);
+        		BGD_E1E5a_5 = BGD_E1E5a_5 * BGD_E1E5a_5_LSB;
+        		std::cout<<"BGD_E1E5a_5= "<< BGD_E1E5a_5 <<std::endl;
+        		BGD_E1E5b_5 = (double)read_navigation_unsigned(data_jk_bits, BGD_E1E5b_5_bit);
+        		BGD_E1E5b_5 = BGD_E1E5b_5 * BGD_E1E5b_5_LSB;
+        		std::cout<<"BGD_E1E5b_5= "<< BGD_E1E5b_5 <<std::endl;
+        		E5b_HS_5 = (double)read_navigation_unsigned(data_jk_bits, E5b_HS_5_bit);
+        		std::cout<<"E5b_HS_5= "<< E5b_HS_5 <<std::endl;
+        		E1B_HS_5 = (double)read_navigation_unsigned(data_jk_bits, E1B_HS_5_bit);
+        		std::cout<<"E1B_HS_5= "<< E1B_HS_5 <<std::endl;
+        		E5b_DVS_5 = (double)read_navigation_unsigned(data_jk_bits, E5b_DVS_5_bit);
+        		std::cout<<"E5b_DVS_5= "<< E5b_DVS_5 <<std::endl;
+        		E1B_DVS_5 = (double)read_navigation_unsigned(data_jk_bits, E1B_DVS_5_bit);
+        		std::cout<<"E1B_DVS_5= "<< E1B_DVS_5 <<std::endl;
+        		/*GST*/
+        		WN_5 = (double)read_navigation_unsigned(data_jk_bits, WN_5_bit);
+        		std::cout<<"WN_5= "<< WN_5 <<std::endl;
+        		TOW_5 = (double)read_navigation_unsigned(data_jk_bits, TOW_5_bit);
+        		std::cout<<"TOW_5= "<< TOW_5 <<std::endl;
+        		spare_5 = (double)read_navigation_unsigned(data_jk_bits, spare_5_bit);
+        		std::cout<<"spare_5= "<< spare_5 <<std::endl;
+        		break;
+
+        	case 6: /*Word type 6: GST-UTC conversion parameters*/
+        	    A0_6= (double)read_navigation_unsigned(data_jk_bits, A0_6_bit);
+        	    A0_6= A0_6 * A0_6_LSB;
+        	    std::cout << "A0_6= " << A0_6 << std::endl;
+
+        	    A1_6= (double)read_navigation_unsigned(data_jk_bits, A1_6_bit);
+        	    A1_6= A1_6 * A1_6_LSB;
+        	    std::cout << "A1_6= " << A1_6 << std::endl;
+
+        	    Delta_tLS_6= (double)read_navigation_unsigned(data_jk_bits, Delta_tLS_6_bit);
+        	    std::cout << "Delta_tLS_6= " << Delta_tLS_6 << std::endl;
+
+        	    t0t_6= (double)read_navigation_unsigned(data_jk_bits, t0t_6_bit);
+        	    t0t_6= t0t_6 * t0t_6_LSB;
+        	    std::cout << "t0t_6= " << t0t_6 << std::endl;
+
+        	    WNot_6= (double)read_navigation_unsigned(data_jk_bits, WNot_6_bit);
+        	    std::cout << "WNot_6= " << WNot_6 << std::endl;
+
+        	    WN_LSF_6= (double)read_navigation_unsigned(data_jk_bits, WN_LSF_6_bit);
+        	    std::cout << "WN_LSF_6= " << WN_LSF_6 << std::endl;
+
+        	    DN_6= (double)read_navigation_unsigned(data_jk_bits, DN_6_bit);
+        	    std::cout << "DN_6= " << DN_6 << std::endl;
+
+        	    Delta_tLSF_6= (double)read_navigation_unsigned(data_jk_bits, Delta_tLSF_6_bit);
+        	    std::cout << "Delta_tLSF_6= " << Delta_tLSF_6 << std::endl;
+
+        	    TOW_6= (double)read_navigation_unsigned(data_jk_bits, TOW_6_bit);
+        	    std::cout << "TOW_6= " << TOW_6 << std::endl;
+
+        	    break;
+
+         case 7: /*Word type 7: Almanac for SVID1 (1/2), almanac reference time and almanac reference week number*/
+
+        	    IOD_a_7= (double)read_navigation_unsigned(data_jk_bits, IOD_a_7_bit);
+        	    std::cout << "IOD_a_7= " << IOD_a_7 << std::endl;
+
+        	    WN_a_7= (double)read_navigation_unsigned(data_jk_bits, WN_a_7_bit);
+        	    std::cout << "WN_a_7= " << WN_a_7 << std::endl;
+
+        	    t0a_7= (double)read_navigation_unsigned(data_jk_bits, t0a_7_bit);
+        	    t0a_7= t0a_7 * t0a_7_LSB;
+        	    std::cout << "t0a_7= " << t0a_7 << std::endl;
+
+        	    SVID1_7= (double)read_navigation_unsigned(data_jk_bits, SVID1_7_bit);
+        	    std::cout << "SVID1_7= " << SVID1_7 << std::endl;
+
+        	    Delta_alpha_7= (double)read_navigation_unsigned(data_jk_bits, Delta_alpha_7_bit);
+        	    Delta_alpha_7= Delta_alpha_7 * Delta_alpha_7_LSB;
+        	    std::cout << "Delta_alpha_7= " << Delta_alpha_7 << std::endl;
+
+        	    e_7= (double)read_navigation_unsigned(data_jk_bits, e_7_bit);
+        	    e_7= e_7 * e_7_LSB;
+        	    std::cout << "e_7= " << e_7 << std::endl;
+
+        	    omega_7= (double)read_navigation_unsigned(data_jk_bits, omega_7_bit);
+        	    omega_7= omega_7 * omega_7_LSB;
+        	    std::cout << "omega_7= " << omega_7 << std::endl;
+
+        	    delta_i_7= (double)read_navigation_unsigned(data_jk_bits, delta_i_7_bit);
+        	    delta_i_7= delta_i_7 * delta_i_7_LSB;
+        	    std::cout << "delta_i_7= " << delta_i_7 << std::endl;
+
+        	    Omega0_7= (double)read_navigation_unsigned(data_jk_bits, Omega0_7_bit);
+        	    Omega0_7= Omega0_7 * Omega0_7_LSB;
+        	    std::cout << "Omega0_7= " << Omega0_7 << std::endl;
+
+        	    Omega_dot_7= (double)read_navigation_unsigned(data_jk_bits, Omega_dot_7_bit);
+        	    Omega_dot_7= Omega_dot_7 * Omega_dot_7_LSB;
+        	    std::cout << "Omega_dot_7= " << Omega_dot_7 << std::endl;
+
+        	    M0_7= (double)read_navigation_unsigned(data_jk_bits, M0_7_bit);
+        	    M0_7= M0_7 * M0_7_LSB;
+        	    std::cout << "M0_7= " << M0_7 << std::endl;
+
+        	    break;
+
+        case 8: /*Word type 8: Almanac for SVID1 (2/2) and SVID2 (1/2)*/
+
+        		IOD_a_8= (double)read_navigation_unsigned(data_jk_bits, IOD_a_8_bit);
+        		std::cout << "IOD_a_8= " << IOD_a_8 << std::endl;
+
+        		af0_8= (double)read_navigation_unsigned(data_jk_bits, af0_8_bit);
+        		af0_8= af0_8 * af0_8_LSB;
+        		std::cout << "af0_8= " << af0_8 << std::endl;
+
+        	    af1_8= (double)read_navigation_unsigned(data_jk_bits, af1_8_bit);
+        	    af1_8= af1_8 * af1_8_LSB;
+        	    std::cout << "af1_8= " << af1_8 << std::endl;
+
+        	    E5b_HS_8= (double)read_navigation_unsigned(data_jk_bits, E5b_HS_8_bit);
+        	    std::cout << "E5b_HS_8= " << E5b_HS_8 << std::endl;
+
+        	    E1B_HS_8= (double)read_navigation_unsigned(data_jk_bits, E1B_HS_8_bit);
+        	    std::cout << "E1B_HS_8= " << E1B_HS_8 << std::endl;
+
+        	    SVID2_8= (double)read_navigation_unsigned(data_jk_bits, SVID2_8_bit);
+        	    std::cout << "SVID2_8= " << SVID2_8 << std::endl;
+
+        	    DELTA_A_8= (double)read_navigation_unsigned(data_jk_bits, DELTA_A_8_bit);
+        	    DELTA_A_8= DELTA_A_8 * DELTA_A_8_LSB;
+        	    std::cout << "DELTA_A_8= " << DELTA_A_8 << std::endl;
+
+        	    e_8= (double)read_navigation_unsigned(data_jk_bits, e_8_bit);
+        	    e_8= e_8 * e_8_LSB;
+        	    std::cout << "e_8= " << e_8 << std::endl;
+
+        	    omega_8= (double)read_navigation_unsigned(data_jk_bits, omega_8_bit);
+        	    omega_8= omega_8 * omega_8_LSB;
+        	    std::cout << "omega_8= " << omega_8 << std::endl;
+
+        	    delta_i_8= (double)read_navigation_unsigned(data_jk_bits, delta_i_8_bit);
+        	    delta_i_8= delta_i_8 * delta_i_8_LSB;
+        	    std::cout << "delta_i_8= " << delta_i_8 << std::endl;
+
+        	    Omega0_8= (double)read_navigation_unsigned(data_jk_bits, Omega0_8_bit);
+        	    Omega0_8= Omega0_8 * Omega0_8_LSB;
+        	    std::cout << "Omega0_8= " << Omega0_8 << std::endl;
+
+        	    Omega_dot_8= (double)read_navigation_unsigned(data_jk_bits, Omega_dot_8_bit);
+        	    Omega_dot_8= Omega_dot_8 * Omega_dot_8_LSB;
+        	    std::cout << "Omega_dot_8= " << Omega_dot_8 << std::endl;
+
+        	    break;
+
+        	case 9: /*Word type 9: Almanac for SVID2 (2/2) and SVID3 (1/2)*/
+
+        	    IOD_a_9= (double)read_navigation_unsigned(data_jk_bits, IOD_a_9_bit);
+        	    std::cout << "IOD_a_9= " << IOD_a_9 << std::endl;
+
+        	    WN_a_9= (double)read_navigation_unsigned(data_jk_bits, WN_a_9_bit);
+        	    std::cout << "WN_a_9= " << WN_a_9 << std::endl;
+
+        	    t0a_9= (double)read_navigation_unsigned(data_jk_bits, t0a_9_bit);
+        	    t0a_9= t0a_9 * t0a_9_LSB;
+        	    std::cout << "t0a_9= " << t0a_9 << std::endl;
+
+        	    M0_9= (double)read_navigation_unsigned(data_jk_bits, M0_9_bit);
+        	    M0_9= M0_9 * M0_9_LSB;
+        	    std::cout << "M0_9= " << M0_9 << std::endl;
+
+        	    af0_9= (double)read_navigation_unsigned(data_jk_bits, af0_9_bit);
+        	    af0_9= af0_9 * af0_9_LSB;
+        	    std::cout << "af0_9= " << af0_9 << std::endl;
+
+        	    af1_9= (double)read_navigation_unsigned(data_jk_bits, af1_9_bit);
+        	    af1_9= af1_9 * af1_9_LSB;
+        	    std::cout << "af1_9= " << af1_9 << std::endl;
+
+        	    E1B_HS_9= (double)read_navigation_unsigned(data_jk_bits, E1B_HS_9_bit);
+        	    std::cout << "E1B_HS_9= " << E1B_HS_9 << std::endl;
+
+        	    E1B_HS_9= (double)read_navigation_unsigned(data_jk_bits, E1B_HS_9_bit);
+        	    std::cout << "E1B_HS_9= " << E1B_HS_9 << std::endl;
+
+        	    SVID3_9= (double)read_navigation_unsigned(data_jk_bits,SVID3_9_bit);
+        	    std::cout << "SVID3_9= " << SVID3_9 << std::endl;
+
+
+        	    DELTA_A_9= (double)read_navigation_unsigned(data_jk_bits, DELTA_A_9_bit);
+        	    DELTA_A_9= DELTA_A_9 * DELTA_A_9_LSB;
+        	    std::cout << "DELTA_A_9= " << DELTA_A_9 << std::endl;
+
+        	    e_9= (double)read_navigation_unsigned(data_jk_bits, e_9_bit);
+        	    e_9= e_9 * e_9_LSB;
+        	    std::cout << "e_9= " << e_9 << std::endl;
+
+        	    omega_9= (double)read_navigation_unsigned(data_jk_bits, omega_9_bit);
+        	    omega_9= omega_9 * omega_9_LSB;
+        	    std::cout << "omega_9= " << omega_9 << std::endl;
+
+        	    delta_i_9= (double)read_navigation_unsigned(data_jk_bits, delta_i_9_bit);
+        	    delta_i_9= delta_i_9 * delta_i_9_LSB;
+        	    std::cout << "delta_i_9= " << delta_i_9 << std::endl;
+
+        	    break;
+
+        case 10: /*Word type 10: Almanac for SVID3 (2/2) and GST-GPS conversion parameters*/
+
+        	    IOD_a_10= (double)read_navigation_unsigned(data_jk_bits, IOD_a_10_bit);
+        	    std::cout << "IOD_a_10= " << IOD_a_10 << std::endl;
+
+        	    Omega0_10= (double)read_navigation_unsigned(data_jk_bits, Omega0_10_bit);
+        	    Omega0_10= Omega0_10 * Omega0_10_LSB;
+        	    std::cout << "Omega0_10= " << Omega0_10 << std::endl;
+
+        	    Omega_dot_10= (double)read_navigation_unsigned(data_jk_bits, Omega_dot_10_bit);
+        	    Omega_dot_10= Omega_dot_10 * Omega_dot_10_LSB;
+        	    std::cout << "Omega_dot_10= " << Omega_dot_10 << std::endl;
+
+        	    M0_10= (double)read_navigation_unsigned(data_jk_bits, M0_10_bit);
+        	    M0_10= M0_10 * M0_10_LSB;
+        	    std::cout << "M0_10= " << M0_10 << std::endl;
+
+        	    af0_10= (double)read_navigation_unsigned(data_jk_bits, af0_10_bit);
+        	    af0_10= af0_10 * af0_10_LSB;
+        	    std::cout << "af0_10= " << af0_10 << std::endl;
+
+        	    af1_10= (double)read_navigation_unsigned(data_jk_bits, af1_10_bit);
+        	    af1_10= af1_10 * af1_10_LSB;
+        	    std::cout << "af1_10= " << af1_10 << std::endl;
+
+        	    E5b_HS_10= (double)read_navigation_unsigned(data_jk_bits, E5b_HS_10_bit);
+        	    std::cout << "E5b_HS_10= " << E5b_HS_10 << std::endl;
+
+        	    E1B_HS_10= (double)read_navigation_unsigned(data_jk_bits, E1B_HS_10_bit);
+        	    std::cout << "E1B_HS_10= " << E1B_HS_10 << std::endl;
+
+        	    A_0G_10= (double)read_navigation_unsigned(data_jk_bits, A_0G_10_bit);
+        	    A_0G_10= A_0G_10 * A_0G_10_LSB;
+        	    std::cout << "A_0G_10= " << A_0G_10 << std::endl;
+
+        	    A_1G_10= (double)read_navigation_unsigned(data_jk_bits, A_1G_10_bit);
+        	    A_1G_10= A_1G_10 * A_1G_10_LSB;
+        	    std::cout << "A_1G_10= " << A_1G_10 << std::endl;
+
+        	    t_0G_10= (double)read_navigation_unsigned(data_jk_bits, A_1G_10_bit);
+        	    t_0G_10= t_0G_10 * t_0G_10_LSB;
+        	    std::cout << "t_0G_10= " << t_0G_10 << std::endl;
+
+        	    WN_0G_10= (double)read_navigation_unsigned(data_jk_bits, WN_0G_10_bit);
+        	    std::cout << "WN_0G_10= " << WN_0G_10 << std::endl;
+
+        	   break;
+
+       case 0: /*Word type 0: I/NAV Spare Word*/
+        	    Time_0= (double)read_navigation_unsigned(data_jk_bits, Time_0_bit);
+        	    std::cout << "Time_0= " << Time_0 << std::endl;
+
+         	    WN_0= (double)read_navigation_unsigned(data_jk_bits, WN_0_bit);
+         	    std::cout << "WN_0= " << WN_0 << std::endl;
+
+         	    TOW_0= (double)read_navigation_unsigned(data_jk_bits, TOW_0_bit);
+          	    std::cout << "TOW_0= " << TOW_0 << std::endl;
+
+          	 break;
         }
 
 
-    /*unsigned int gps_word;
-
-    // UNPACK BYTES TO BITS AND REMOVE THE CRC REDUNDANCE
-    std::bitset<GALILEO_SUBFRAME_BITS> subframe_bits;
-    std::bitset<GPS_WORD_BITS+2> word_bits;
-    for (int i=0; i<10; i++)
-        {
-            memcpy(&gps_word, &subframe[i*4], sizeof(char)*4);
-            word_bits = std::bitset<(GPS_WORD_BITS+2)>(gps_word);
-            for (int j=0; j<GPS_WORD_BITS; j++)
-                {
-                    subframe_bits[GPS_WORD_BITS*(9-i) + j] = word_bits[j];
-                }
-        }
-
-    subframe_ID = (int)read_navigation_unsigned(subframe_bits, SUBFRAME_ID);
-
-    // Decode all 5 sub-frames
-    switch (subframe_ID)
-    {
-    //--- Decode the sub-frame id ------------------------------------------
-    // ICD (IS-GPS-200E Appendix II). http://www.losangeles.af.mil/shared/media/document/AFD-100813-045.pdf
-    case 1:
-        //--- It is subframe 1 -------------------------------------
-        // Compute the time of week (TOW) of the first sub-frames in the array ====
-        // Also correct the TOW. The transmitted TOW is actual TOW of the next
-        // subframe and we need the TOW of the first subframe in this data block
-        // (the variable subframe at this point contains bits of the last subframe).
-        //TOW = bin2dec(subframe(31:47)) * 6 - 30;
-        d_TOW_SF1 = (double)read_navigation_unsigned(subframe_bits, TOW);
-        //we are in the first subframe (the transmitted TOW is the start time of the next subframe) !
-        d_TOW_SF1 = d_TOW_SF1*6;
-        d_TOW = d_TOW_SF1 - 6; // Set transmission time
-        b_integrity_status_flag = read_navigation_bool(subframe_bits, INTEGRITY_STATUS_FLAG);
-        b_alert_flag = read_navigation_bool(subframe_bits, ALERT_FLAG);
-        b_antispoofing_flag = read_navigation_bool(subframe_bits, ANTI_SPOOFING_FLAG);
-        i_GPS_week = (int)read_navigation_unsigned(subframe_bits, GPS_WEEK);
-        i_SV_accuracy = (int)read_navigation_unsigned(subframe_bits, SV_ACCURACY);  // (20.3.3.3.1.3)
-        i_SV_health = (int)read_navigation_unsigned(subframe_bits, SV_HEALTH);
-        b_L2_P_data_flag = read_navigation_bool(subframe_bits, L2_P_DATA_FLAG); //
-        i_code_on_L2 = (int)read_navigation_unsigned(subframe_bits, CA_OR_P_ON_L2);
-        d_TGD = (double)read_navigation_signed(subframe_bits, T_GD);
-        d_TGD = d_TGD*T_GD_LSB;
-        d_IODC = (double)read_navigation_unsigned(subframe_bits, IODC);
-        d_Toc = (double)read_navigation_unsigned(subframe_bits, T_OC);
-        d_Toc = d_Toc*T_OC_LSB;
-        d_A_f0 = (double)read_navigation_signed(subframe_bits, A_F0);
-        d_A_f0 = d_A_f0*A_F0_LSB;
-        d_A_f1 = (double)read_navigation_signed(subframe_bits, A_F1);
-        d_A_f1 = d_A_f1*A_F1_LSB;
-        d_A_f2 = (double)read_navigation_signed(subframe_bits, A_F2);
-        d_A_f2 = d_A_f2*A_F2_LSB;
-
-        break;
-
-    case 2:  //--- It is subframe 2 -------------------
-        d_TOW_SF2 = (double)read_navigation_unsigned(subframe_bits, TOW);
-        d_TOW_SF2 = d_TOW_SF2*6;
-        d_TOW = d_TOW_SF2 - 6; // Set transmission time
-        b_integrity_status_flag = read_navigation_bool(subframe_bits, INTEGRITY_STATUS_FLAG);
-        b_alert_flag = read_navigation_bool(subframe_bits, ALERT_FLAG);
-        b_antispoofing_flag = read_navigation_bool(subframe_bits, ANTI_SPOOFING_FLAG);
-        d_IODE_SF2 = (double)read_navigation_unsigned(subframe_bits, IODE_SF2);
-        d_Crs = (double)read_navigation_signed(subframe_bits, C_RS);
-        d_Crs = d_Crs * C_RS_LSB;
-        d_Delta_n = (double)read_navigation_signed(subframe_bits, DELTA_N);
-        d_Delta_n = d_Delta_n * DELTA_N_LSB;
-        d_M_0 = (double)read_navigation_signed(subframe_bits, M_0);
-        d_M_0 = d_M_0 * M_0_LSB;
-        d_Cuc = (double)read_navigation_signed(subframe_bits, C_UC);
-        d_Cuc = d_Cuc * C_UC_LSB;
-        d_e_eccentricity = (double)read_navigation_unsigned(subframe_bits, E);
-        d_e_eccentricity = d_e_eccentricity * E_LSB;
-        d_Cus = (double)read_navigation_signed(subframe_bits, C_US);
-        d_Cus = d_Cus * C_US_LSB;
-        d_sqrt_A = (double)read_navigation_unsigned(subframe_bits, SQRT_A);
-        d_sqrt_A = d_sqrt_A * SQRT_A_LSB;
-        d_Toe = (double)read_navigation_unsigned(subframe_bits, T_OE);
-        d_Toe = d_Toe * T_OE_LSB;
-        b_fit_interval_flag = read_navigation_bool(subframe_bits, FIT_INTERVAL_FLAG);
-        i_AODO = (int)read_navigation_unsigned(subframe_bits, AODO);
-        i_AODO = i_AODO * AODO_LSB;
-
-        break;
-
-    case 3: // --- It is subframe 3 -------------------------------------
-        d_TOW_SF3 = (double)read_navigation_unsigned(subframe_bits, TOW);
-        d_TOW_SF3 = d_TOW_SF3*6;
-        d_TOW = d_TOW_SF3 - 6; // Set transmission time
-        b_integrity_status_flag = read_navigation_bool(subframe_bits, INTEGRITY_STATUS_FLAG);
-        b_alert_flag = read_navigation_bool(subframe_bits, ALERT_FLAG);
-        b_antispoofing_flag = read_navigation_bool(subframe_bits, ANTI_SPOOFING_FLAG);
-        d_Cic = (double)read_navigation_signed(subframe_bits, C_IC);
-        d_Cic = d_Cic * C_IC_LSB;
-        d_OMEGA0 = (double)read_navigation_signed(subframe_bits, OMEGA_0);
-        d_OMEGA0 = d_OMEGA0 * OMEGA_0_LSB;
-        d_Cis = (double)read_navigation_signed(subframe_bits, C_IS);
-        d_Cis = d_Cis * C_IS_LSB;
-        d_i_0 = (double)read_navigation_signed(subframe_bits, I_0);
-        d_i_0 = d_i_0 * I_0_LSB;
-        d_Crc = (double)read_navigation_signed(subframe_bits, C_RC);
-        d_Crc = d_Crc * C_RC_LSB;
-        d_OMEGA = (double)read_navigation_signed(subframe_bits, OMEGA);
-        d_OMEGA = d_OMEGA * OMEGA_LSB;
-        d_OMEGA_DOT = (double)read_navigation_signed(subframe_bits, OMEGA_DOT);
-        d_OMEGA_DOT = d_OMEGA_DOT * OMEGA_DOT_LSB;
-        d_IODE_SF3 = (double)read_navigation_unsigned(subframe_bits, IODE_SF3);
-        d_IDOT = (double)read_navigation_signed(subframe_bits, I_DOT);
-        d_IDOT = d_IDOT*I_DOT_LSB;
-
-        break;
-
-    case 4: // --- It is subframe 4 ---------- Almanac, ionospheric model, UTC parameters, SV health (PRN: 25-32)
-        d_TOW_SF4 = (double)read_navigation_unsigned(subframe_bits, TOW);
-        d_TOW_SF4 = d_TOW_SF4*6;
-        d_TOW = d_TOW_SF4 - 6; // Set transmission time
-        b_integrity_status_flag = read_navigation_bool(subframe_bits, INTEGRITY_STATUS_FLAG);
-        b_alert_flag = read_navigation_bool(subframe_bits, ALERT_FLAG);
-        b_antispoofing_flag = read_navigation_bool(subframe_bits, ANTI_SPOOFING_FLAG);
-        SV_data_ID = (int)read_navigation_unsigned(subframe_bits, SV_DATA_ID);
-        SV_page = (int)read_navigation_unsigned(subframe_bits, SV_PAGE);
-
-        if (SV_page == 13)
-            {
-                //! \TODO read Estimated Range Deviation (ERD) values
-            }
-
-        if (SV_page == 18)
-            {
-                // Page 18 - Ionospheric and UTC data
-                d_alpha0 = (double)read_navigation_signed(subframe_bits, ALPHA_0);
-                d_alpha0 = d_alpha0 * ALPHA_0_LSB;
-                d_alpha1 = (double)read_navigation_signed(subframe_bits, ALPHA_1);
-                d_alpha1 = d_alpha1 * ALPHA_1_LSB;
-                d_alpha2 = (double)read_navigation_signed(subframe_bits, ALPHA_2);
-                d_alpha2 = d_alpha2 * ALPHA_2_LSB;
-                d_alpha3 = (double)read_navigation_signed(subframe_bits, ALPHA_3);
-                d_alpha3 = d_alpha3 * ALPHA_3_LSB;
-                d_beta0 = (double)read_navigation_signed(subframe_bits, BETA_0);
-                d_beta0 = d_beta0 * BETA_0_LSB;
-                d_beta1 = (double)read_navigation_signed(subframe_bits, BETA_1);
-                d_beta1 = d_beta1 * BETA_1_LSB;
-                d_beta2 = (double)read_navigation_signed(subframe_bits, BETA_2);
-                d_beta2 = d_beta2 * BETA_2_LSB;
-                d_beta3 = (double)read_navigation_signed(subframe_bits, BETA_3);
-                d_beta3 = d_beta3 * BETA_3_LSB;
-                d_A1 = (double)read_navigation_signed(subframe_bits, A_1);
-                d_A1 = d_A1 * A_1_LSB;
-                d_A0 = (double)read_navigation_signed(subframe_bits, A_0);
-                d_A0 = d_A0 * A_0_LSB;
-                d_t_OT = (double)read_navigation_unsigned(subframe_bits, T_OT);
-                d_t_OT = d_t_OT * T_OT_LSB;
-                i_WN_T = (int)read_navigation_unsigned(subframe_bits, WN_T);
-                d_DeltaT_LS = (double)read_navigation_signed(subframe_bits, DELTAT_LS);
-                i_WN_LSF = (int)read_navigation_unsigned(subframe_bits, WN_LSF);
-                i_DN = (int)read_navigation_unsigned(subframe_bits, DN);  // Right-justified ?
-                d_DeltaT_LSF = (double)read_navigation_signed(subframe_bits, DELTAT_LSF);
-                flag_iono_valid = true;
-                flag_utc_model_valid = true;
-            }
-
-        if (SV_page == 25)
-            {
-                // Page 25 Anti-Spoofing, SV config and almanac health (PRN: 25-32)
-                //! \TODO Read Anti-Spoofing, SV config
-                almanacHealth[25] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV25);
-                almanacHealth[26] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV26);
-                almanacHealth[27] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV27);
-                almanacHealth[28] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV28);
-                almanacHealth[29] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV29);
-                almanacHealth[30] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV30);
-                almanacHealth[31] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV31);
-                almanacHealth[32] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV32);
-            }
-
-        break;
-
-    case 5://--- It is subframe 5 -----------------almanac health (PRN: 1-24) and Almanac reference week number and time.
-        d_TOW_SF5 = (double)read_navigation_unsigned(subframe_bits, TOW);
-        d_TOW_SF5 = d_TOW_SF5*6;
-        d_TOW = d_TOW_SF5 - 6; // Set transmission time
-        b_integrity_status_flag = read_navigation_bool(subframe_bits, INTEGRITY_STATUS_FLAG);
-        b_alert_flag = read_navigation_bool(subframe_bits, ALERT_FLAG);
-        b_antispoofing_flag = read_navigation_bool(subframe_bits, ANTI_SPOOFING_FLAG);
-        SV_data_ID = (int)read_navigation_unsigned(subframe_bits, SV_DATA_ID);
-        SV_page = (int)read_navigation_unsigned(subframe_bits, SV_PAGE);
-        if (SV_page < 25)
-            {
-                //! \TODO read almanac
-            }
-        if (SV_page == 25)
-            {
-                d_Toa = (double)read_navigation_unsigned(subframe_bits, T_OA);
-                d_Toa = d_Toa * T_OA_LSB;
-                i_WN_A = (int)read_navigation_unsigned(subframe_bits, WN_A);
-                almanacHealth[1] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV1);
-                almanacHealth[2] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV2);
-                almanacHealth[3] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV3);
-                almanacHealth[4] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV4);
-                almanacHealth[5] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV5);
-                almanacHealth[6] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV6);
-                almanacHealth[7] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV7);
-                almanacHealth[8] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV8);
-                almanacHealth[9] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV9);
-                almanacHealth[10] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV10);
-                almanacHealth[11] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV11);
-                almanacHealth[12] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV12);
-                almanacHealth[13] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV13);
-                almanacHealth[14] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV14);
-                almanacHealth[15] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV15);
-                almanacHealth[16] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV16);
-                almanacHealth[17] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV17);
-                almanacHealth[18] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV18);
-                almanacHealth[19] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV19);
-                almanacHealth[20] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV20);
-                almanacHealth[21] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV21);
-                almanacHealth[22] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV22);
-                almanacHealth[23] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV23);
-                almanacHealth[24] = (int)read_navigation_unsigned(subframe_bits, HEALTH_SV24);
-            }
-        break;
-
-    default:
-        break;
-    } // switch subframeID ...
-*/cout<<"--------------------------------------------------------------------------"<<endl;
+   cout<<"--------------------------------------------------------------------------"<<endl;
     return page_number;
 }
diff --git a/src/core/system_parameters/galileo_navigation_message.h b/src/core/system_parameters/galileo_navigation_message.h
index 7a756bf07..7cb3c5e26 100644
--- a/src/core/system_parameters/galileo_navigation_message.h
+++ b/src/core/system_parameters/galileo_navigation_message.h
@@ -51,45 +51,160 @@ class Galileo_Navigation_Message {
 private:
 
 
-	//bool read_navigation_bool(std::bitset<GALILEO_SUBFRAME_BITS> bits, const std::vector<std::pair<int,int> > parameter);
+	bool read_navigation_bool(std::bitset<GALILEO_DATA_JK_BITS> bits, const std::vector<std::pair<int,int> > parameter);
 	//void print_galileo_word_bytes(unsigned int GPS_word);
 	unsigned long int read_navigation_unsigned(std::bitset<GALILEO_DATA_JK_BITS> bits, const std::vector< std::pair<int,int> > parameter);
 	unsigned long int read_page_type_unsigned(std::bitset<GALILEO_PAGE_TYPE_BITS> bits, const std::vector< std::pair<int,int> > parameter);
-	//signed long int read_navigation_signed(std::bitset<GALILEO_SUBFRAME_BITS> bits, const std::vector<std::pair<int,int> > parameter);
+	signed long int read_navigation_signed(std::bitset<GALILEO_DATA_JK_BITS> bits, const std::vector<std::pair<int,int> > parameter);
 
 	int x,y;
 
 public:
+	int flag_even_word;
 
 	/*Word type 1: Ephemeris (1/4)*/
-	int IOD_nav_1;  // IOD_nav page 1
-	double t0e; 	// Ephemeris reference time [s]
-	double M0;		// Mean anomaly at reference time [semi-circles]
-	double e;		// Eccentricity
-	double A;   	// Square root of the semi-major axis [metres^1/2]
+		int IOD_nav_1;  // IOD_nav page 1
+		double t0e_1; 	// Ephemeris reference time [s]
+		double M0_1;		// Mean anomaly at reference time [semi-circles]
+		double e_1;		// Eccentricity
+		double A_1;   	// Square root of the semi-major axis [metres^1/2]
 
-	/*Word type 2: Ephemeris (2/4)*/
+		/*Word type 2: Ephemeris (2/4)*/
+		int IOD_nav_2;  // IOD_nav page 2
+		double OMEGA_0_2; // Longitude of ascending node of orbital plane at weekly epoch [semi-circles]
+		double i_0_2;     // Inclination angle at reference time  [semi-circles]
+		double omega_2;   // Argument of perigee [semi-circles]
+		double iDot_2;    // Rate of inclination angle [semi-circles/sec]
 
-	/*Word type 3: Ephemeris (3/4) and SISA*/
+		/*Word type 3: Ephemeris (3/4) and SISA*/
+		int IOD_nav_3;  		//
+		double OMEGA_dot_3;		// Rate of right ascension [semi-circles/sec]
+		double delta_n_3;		// Mean motion difference from computed value  [semi-circles/sec]
+		double C_uc_3;			// Amplitude of the cosine harmonic correction term to the argument of latitude [radians]
+		double C_us_3;			// Amplitude of the sine harmonic correction term to the argument of latitude [radians]
+		double C_rc_3;			// Amplitude of the cosine harmonic correction term to the orbit radius [meters]
+		double C_rs_3;			// Amplitude of the sine harmonic correction term to the orbit radius [meters]
+		double SISA_3;			//
 
-	/*Word type 4: Ephemeris (4/4) and Clock correction parameters*/
-
-	/*Word type 5: Ionospheric correction, BGD, signal health and data validity status and GST*/
-
-	/*Word type 6: GST-UTC conversion parameters*/
-
-	/*Word type 7: Almanac for SVID1 (1/2), almanac reference time and almanac reference week number*/
-
-	/*Word type 8: Almanac for SVID1 (2/2) and SVID2 (1/2)*/
-
-	/*Word type 9: Almanac for SVID2 (2/2) and SVID3 (1/2)*/
-
-	/*Word type 10: Almanac for SVID3 (2/2) and GST-GPS conversion parameters*/
-
-	/*Word type 0: I/NAV Spare Word*/
+		/*Word type 4: Ephemeris (4/4) and Clock correction parameters*/
+		int IOD_nav_4;		//
+		int SV_ID_PRN_4;		//
+		double C_ic_4;		// Amplitude of the cosine harmonic correction 	term to the angle of inclination [radians]
+		double C_is_4;		// Amplitude of the sine harmonic correction term to the angle of inclination [radians]
+		/*Clock correction parameters*/
+		double t0c_4;			//Clock correction data reference Time of Week [sec]
+		double af0_4;			//SV clock bias correction coefficient [s]
+		double af1_4;			//SV clock drift correction coefficient [s/s]
+		double af2_4;			//SV clock drift rate correction coefficient [s/s^2]
+		double spare_4;
 
 
-	void split_page(char *page); 			/* Takes in input a page (Odd or Even) of 120 bit, split it according ICD 4.3.2.3 and join Data_k with Data_j*/
+		/*Word type 5: Ionospheric correction, BGD, signal health and data validity status and GST*/
+		/*Ionospheric correction*/
+		/*Az*/
+		double ai0_5;		//Effective Ionisation Level 1st order parameter [sfu]
+		double ai1_5;		//Effective Ionisation Level 2st order parameter [sfu/degree]
+		double ai2_5;		//Effective Ionisation Level 3st order parameter [sfu/degree]
+
+		/*Ionospheric disturbance flag*/
+		bool Region1_flag_5;	// Ionospheric Disturbance Flag for region 1
+		bool Region2_flag_5;	// Ionospheric Disturbance Flag for region 2
+		bool Region3_flag_5;	// Ionospheric Disturbance Flag for region 3
+		bool Region4_flag_5;	// Ionospheric Disturbance Flag for region 4
+		bool Region5_flag_5;	// Ionospheric Disturbance Flag for region 5
+		double BGD_E1E5a_5;	//E1-E5a Broadcast Group Delay [s]
+		double BGD_E1E5b_5;	//E1-E5b Broadcast Group Delay [s]
+
+		double E5b_HS_5;		//
+		double E1B_HS_5;		//
+		double E5b_DVS_5;	//
+		double E1B_DVS_5;	//
+		/*GST*/
+		double WN_5;
+		double TOW_5;
+
+		double spare_5;
+		/*Word type 6: GST-UTC conversion parameters*/
+
+			double A0_6;
+			double A1_6;
+			double Delta_tLS_6;
+			double t0t_6;
+			double WNot_6;
+			double WN_LSF_6;
+			double DN_6;
+			double Delta_tLSF_6;
+			double TOW_6;
+
+			/*Word type 7: Almanac for SVID1 (1/2), almanac reference time and almanac reference week number*/
+			int IOD_a_7;
+			double WN_a_7;
+			double t0a_7;
+			int SVID1_7;
+			double Delta_alpha_7;
+			double e_7;
+			double omega_7;
+			double delta_i_7;
+			double Omega0_7;
+			double Omega_dot_7;
+			double M0_7;
+
+			/*Word type 8: Almanac for SVID1 (2/2) and SVID2 (1/2)*/
+			int IOD_a_8;
+			double af0_8;
+			double af1_8;
+			double E5b_HS_8;
+			double E1B_HS_8;
+			int SVID2_8;
+			double DELTA_A_8;
+			double e_8;
+			double omega_8;
+			double delta_i_8;
+			double Omega0_8;
+			double Omega_dot_8;
+
+			/*Word type 9: Almanac for SVID2 (2/2) and SVID3 (1/2)*/
+
+			int IOD_a_9;
+			double WN_a_9;
+			double t0a_9;
+			double M0_9;
+			double af0_9;
+			double af1_9;
+			double E5b_HS_9;
+			double E1B_HS_9;
+			int SVID3_9;
+			double DELTA_A_9;
+			double e_9;
+			double omega_9;
+			double delta_i_9;
+
+
+			/*Word type 10: Almanac for SVID3 (2/2) and GST-GPS conversion parameters*/
+
+			int IOD_a_10;
+			double Omega0_10;
+			double Omega_dot_10;
+			double M0_10;
+			double af0_10;
+			double af1_10;
+			double E5b_HS_10;
+			double E1B_HS_10;
+			double A_0G_10;
+			double A_1G_10;
+			double t_0G_10;
+			double WN_0G_10;
+
+
+
+			/*Word type 0: I/NAV Spare Word*/
+			double Time_0;
+			double WN_0;
+			double TOW_0;
+
+
+
+	void split_page(const char *page, int flag_even_word); 			/* Takes in input a page (Odd or Even) of 120 bit, split it according ICD 4.3.2.3 and join Data_k with Data_j*/
 
 	int page_jk_decoder(char *data_jk);		/* Takes in input Data_jk (128 bit) and split it in ephemeris parameters according ICD 4.3.5*/
 
diff --git a/src/core/system_parameters/gps_navigation_message.h b/src/core/system_parameters/gps_navigation_message.h
index 3213f74a2..d37d084d9 100644
--- a/src/core/system_parameters/gps_navigation_message.h
+++ b/src/core/system_parameters/gps_navigation_message.h
@@ -45,7 +45,7 @@
 #include "gps_iono.h"
 #include "gps_almanac.h"
 #include "gps_utc_model.h"
-
+#include "GPS_L1_CA.h"
 
 
 /*!