[hamradio-commits] [gnss-sdr] 04/06: Adding IODE to ephemeris

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit bacbb1a22e4b8db521380b12876bb31e4478884d
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Feb 18 01:08:19 2015 +0100

    Adding IODE to ephemeris
---
 src/core/system_parameters/gps_ephemeris.cc          | 20 +++++++++++---------
 src/core/system_parameters/gps_ephemeris.h           |  4 ++++
 src/core/system_parameters/gps_navigation_message.cc |  3 ++-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/core/system_parameters/gps_ephemeris.cc b/src/core/system_parameters/gps_ephemeris.cc
index 7a20340..c22715e 100644
--- a/src/core/system_parameters/gps_ephemeris.cc
+++ b/src/core/system_parameters/gps_ephemeris.cc
@@ -58,21 +58,23 @@ Gps_Ephemeris::Gps_Ephemeris()
     b_L2_P_data_flag = false;
     i_SV_accuracy = 0;
     i_SV_health = 0;
-    d_TGD = 0;            //!< Estimated Group Delay Differential: L1-L2 correction term only for the benefit of "L1 P(Y)" or "L2 P(Y)" s users [s]
-    d_IODC = 0;           //!< Issue of Data, Clock
-    i_AODO = 0;           //!< Age of Data Offset (AODO) term for the navigation message correction table (NMCT) contained in subframe 4 (reference paragraph 20.3.3.5.1.9) [s]
+    d_IODE_SF2 = 0;
+    d_IODE_SF3 = 0;
+    d_TGD = 0;            // Estimated Group Delay Differential: L1-L2 correction term only for the benefit of "L1 P(Y)" or "L2 P(Y)" s users [s]
+    d_IODC = 0;           // Issue of Data, Clock
+    i_AODO = 0;           // Age of Data Offset (AODO) term for the navigation message correction table (NMCT) contained in subframe 4 (reference paragraph 20.3.3.5.1.9) [s]
 
-    b_fit_interval_flag = false; //!< indicates the curve-fit interval used by the CS (Block II/IIA/IIR/IIR-M/IIF) and SS (Block IIIA) in determining the ephemeris parameters, as follows: 0  =  4 hours, 1  =  greater than 4 hours.
+    b_fit_interval_flag = false; // indicates the curve-fit interval used by the CS (Block II/IIA/IIR/IIR-M/IIF) and SS (Block IIIA) in determining the ephemeris parameters, as follows: 0  =  4 hours, 1  =  greater than 4 hours.
     d_spare1 = 0;
     d_spare2 = 0;
 
-    d_A_f0 = 0;          //!< Coefficient 0 of code phase offset model [s]
-    d_A_f1 = 0;          //!< Coefficient 1 of code phase offset model [s/s]
-    d_A_f2 = 0;          //!< Coefficient 2 of code phase offset model [s/s^2]
+    d_A_f0 = 0;          // Coefficient 0 of code phase offset model [s]
+    d_A_f1 = 0;          // Coefficient 1 of code phase offset model [s/s]
+    d_A_f2 = 0;          // Coefficient 2 of code phase offset model [s/s^2]
 
     b_integrity_status_flag = false;
-    b_alert_flag = false;         //!< If true, indicates  that the SV URA may be worse than indicated in d_SV_accuracy, use that SV at our own risk.
-    b_antispoofing_flag = false;  //!<  If true, the AntiSpoofing mode is ON in that SV
+    b_alert_flag = false;         // If true, indicates  that the SV URA may be worse than indicated in d_SV_accuracy, use that SV at our own risk.
+    b_antispoofing_flag = false;  //  If true, the AntiSpoofing mode is ON in that SV
 
     //Plane A (info from http://www.navcen.uscg.gov/?Do=constellationStatus)
     satelliteBlock[9] = "IIA";
diff --git a/src/core/system_parameters/gps_ephemeris.h b/src/core/system_parameters/gps_ephemeris.h
index 08ae407..a968af2 100644
--- a/src/core/system_parameters/gps_ephemeris.h
+++ b/src/core/system_parameters/gps_ephemeris.h
@@ -83,6 +83,8 @@ public:
     int i_SV_health;
     double d_TGD;            //!< Estimated Group Delay Differential: L1-L2 correction term only for the benefit of "L1 P(Y)" or "L2 P(Y)" s users [s]
     double d_IODC;           //!< Issue of Data, Clock
+    double d_IODE_SF2;       //!< Issue of Data, Ephemeris (IODE), subframe 2
+    double d_IODE_SF3;       //!< Issue of Data, Ephemeris(IODE), subframe 3
     int i_AODO;              //!< Age of Data Offset (AODO) term for the navigation message correction table (NMCT) contained in subframe 4 (reference paragraph 20.3.3.5.1.9) [s]
 
     bool b_fit_interval_flag;//!< indicates the curve-fit interval used by the CS (Block II/IIA/IIR/IIR-M/IIF) and SS (Block IIIA) in determining the ephemeris parameters, as follows: 0 = 4 hours, 1 = greater than 4 hours.
@@ -136,6 +138,8 @@ public:
 
         archive & make_nvp("i_satellite_PRN", i_satellite_PRN); // SV PRN NUMBER
         archive & make_nvp("d_TOW", d_TOW);          //!< Time of GPS Week of the ephemeris set (taken from subframes TOW) [s]
+        archive & make_nvp("d_IODE_SF2", d_IODE_SF2);
+        archive & make_nvp("d_IODE_SF3", d_IODE_SF3);
         archive & make_nvp("d_Crs", d_Crs);          //!< Amplitude of the Sine Harmonic Correction Term to the Orbit Radius [m]
         archive & make_nvp("d_Delta_n", d_Delta_n);  //!< Mean Motion Difference From Computed Value [semi-circles/s]
         archive & make_nvp("d_M_0", d_M_0);          //!< Mean Anomaly at Reference Time [semi-circles]
diff --git a/src/core/system_parameters/gps_navigation_message.cc b/src/core/system_parameters/gps_navigation_message.cc
index 67af26c..8bf80dc 100644
--- a/src/core/system_parameters/gps_navigation_message.cc
+++ b/src/core/system_parameters/gps_navigation_message.cc
@@ -43,7 +43,6 @@ void Gps_Navigation_Message::reset()
     d_TOW_SF3 = 0;
     d_TOW_SF4 = 0;
     d_TOW_SF5 = 0;
-
     d_IODE_SF2 = 0;
     d_IODE_SF3 = 0;
     d_Crs = 0;
@@ -762,6 +761,8 @@ Gps_Ephemeris Gps_Navigation_Message::get_ephemeris()
     ephemeris.i_SV_health = i_SV_health;
     ephemeris.d_TGD = d_TGD;
     ephemeris.d_IODC = d_IODC;
+    ephemeris.d_IODE_SF2 = d_IODE_SF2;
+    ephemeris.d_IODE_SF3 = d_IODE_SF3;
     ephemeris.i_AODO = i_AODO;
     ephemeris.b_fit_interval_flag = b_fit_interval_flag;
     ephemeris.d_spare1 = d_spare1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git