Changeset 5541 in ntrip for trunk/BNC/src/RTCM3

Timestamp:

Nov 9, 2013, 10:21:32 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/RTCM3

Files:

• ephemeris.cpp (modified) (3 diffs)
• ephemeris.h (modified) (1 diff)

trunk/BNC/src/RTCM3/ephemeris.cpp

@@ -596 +596 @@
   _SISA     = ee->SISA;
   _E5aHS    = ee->E5aHS;
+  _E5bHS    = ee->E5bHS;
   _BGD_1_5A = ee->BGD_1_5A;
   _BGD_1_5B = ee->BGD_1_5B;
@@ -708 +709 @@
   buffer= buffer+3;
 
-  GALILEOADDBITS(12, /*inav ? 1046 :*/ 1045)
+  bool inav = ( (_flags & GALEPHF_INAV) == GALEPHF_INAV );
+
+  GALILEOADDBITS(12, inav ? 1046 : 1045)
   GALILEOADDBITS(6, _prn.right((_prn.length()-1)).toInt())
   GALILEOADDBITS(12, _TOC.gpsw())
@@ -743 +746 @@
   GALILEOADDBITSFLOAT(10, _BGD_1_5A, 1.0/static_cast<double>(1<<30)
   /static_cast<double>(1<<2))
-  /*if(inav)
+  if(inav)
   {
     GALILEOADDBITSFLOAT(10, _BGD_1_5B, 1.0/static_cast<double>(1<<30)
     /static_cast<double>(1<<2))
-    GALILEOADDBITS(2, _E5bHS)
-    GALILEOADDBITS(1, flags & MNFGALEPHF_E5BDINVALID)
-  }
-  else*/
+    GALILEOADDBITS(2, static_cast<int>(_E5bHS))
+    GALILEOADDBITS(1, _flags & GALEPHF_E5BDINVALID)
+  }
+  else
   {
-    GALILEOADDBITS(2, _E5aHS)
-    GALILEOADDBITS(1, /*flags & MNFGALEPHF_E5ADINVALID*/0)
+    GALILEOADDBITS(2, static_cast<int>(_E5aHS))
+    GALILEOADDBITS(1, _flags & GALEPHF_E5ADINVALID)
   }
   _TOEsec = 0.9999E9;
   GALILEOADDBITS(20, _TOEsec)
 
-  GALILEOADDBITS(/*inav ? 1 :*/ 3, 0) /* fill up */
+  GALILEOADDBITS(inav ? 1 : 3, 0)
 
   startbuffer[0]=0xD3;

trunk/BNC/src/RTCM3/ephemeris.h

@@ -225 +225 @@
   double  _SISA;             //  Signal In Space Accuracy
   double  _E5aHS;            //  E5a Health Status
+  double  _E5bHS;            //  E5a Health Status
   double  _BGD_1_5A;         //  group delay [s] 
   double  _BGD_1_5B;         //  group delay [s]