Changeset 6793 in ntrip for trunk/BNC

Timestamp:

Apr 22, 2015, 4:27:21 PM (10 years ago)

Author:

stuerze

Message:

consider different SISA definitions for Galileo NAV; RTCM: index, RINEX: meters

File:

• trunk/BNC/src/ephemeris.cpp (modified) (4 diffs)

trunk/BNC/src/ephemeris.cpp ¶

@@ -426 +426 @@
 void t_ephGal::set(const galileoephemeris* ee) {
 
+  _SISA     = -1.0; // set RINEX entry to invalid
+
   _receptDateTime = currentDateAndTimeGPS();
 
@@ -458 +460 @@
   _IDOT     = ee->IDOT;
   _TOEweek  = ee->Week;
-
-  _SISA     = ee->SISA;
+  
+  _SISAI    = ee->SISA; // index from RTCM
   _E5aHS    = ee->E5aHS;
   _E5bHS    = ee->E5bHS;
@@ -812 +814 @@
   double datasource = 0.0;
   int pos[4];
+  _SISAI = -1; // set index from RTCM invalid
   pos[0] = (rnxVersion <= 2.12) ?  3 :  4;
   pos[1] = pos[0] + fieldLen;
@@ -1193 +1196 @@
     .arg(0.0,                19, 'e', 12);
 
-  double SISA = -1.0;
-  if ((_SISA >= 0) && (_SISA <= 49)) {
-    SISA = _SISA / 100.0;
-  }
-  if((_SISA >= 50) && (_SISA <= 74)) {
-    SISA = (50 + (_SISA - 50.0) * 2.0) / 100.0;
-  }
-  if((_SISA >= 75) && (_SISA <= 99)) {
-    SISA = 1.0 + (_SISA - 75.0) * 0.04;
-  }
-  if((_SISA >= 100) && (_SISA <= 125)) {
-    SISA = 2.0 + (_SISA - 100.0) * 0.16;
+  // RINEX file input
+  double SISA = _SISA; // [m]
+  // RTCM stream input
+  if ((_SISAI >= 0) && (_SISAI <= 49)) {
+    SISA = _SISAI / 100.0;
+  }
+  if((_SISAI >= 50) && (_SISAI <= 74)) {
+    SISA = (50 + (_SISAI - 50.0) * 2.0) / 100.0;
+  }
+  if((_SISAI >= 75) && (_SISAI <= 99)) {
+    SISA = 1.0 + (_SISAI - 75.0) * 0.04;
+  }
+  if((_SISAI >= 100) && (_SISAI <= 125)) {
+    SISA = 2.0 + (_SISAI - 100.0) * 0.16;
+  }
+  if (_SISAI >= 126 ) {
+    SISA = -1.0;
   }
   out << QString(fmt)