Changeset 8805 in ntrip for branches/BNC_2.12/src/bncutils.cpp

Timestamp:

Sep 20, 2019, 2:51:58 PM (5 years ago)

Author:

stuerze

Message:

IRNSS support is added in RTCM3 decoder, RTCM signal mapping IDs for GLONASS and BDS are updated/extended

File:

• branches/BNC_2.12/src/bncutils.cpp (modified) (3 diffs)

branches/BNC_2.12/src/bncutils.cpp

@@ -173 +173 @@
     }
   }
-
 }
 
@@ -463 +462 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-int factorial(int n) {
+double factorial(int n) {
   if (n == 0) {
     return 1;
@@ -809 +808 @@
 
 double accuracyFromIndex(int index, t_eph::e_type type) {
-
-  if (type == t_eph::GPS || type == t_eph::BDS || type == t_eph::SBAS
-      || type == t_eph::QZSS) {
-
+double accuracy = -1.0;
+
+  if (type == t_eph::GPS ||
+      type == t_eph::BDS ||
+      type == t_eph::SBAS||
+      type == t_eph::QZSS) {
     if ((index >= 0) && (index <= 6)) {
       if (index == 3) {
-        return ceil(10.0 * pow(2.0, (double(index) / 2.0) + 1.0)) / 10.0;
+        accuracy =  ceil(10.0 * pow(2.0, (double(index) / 2.0) + 1.0)) / 10.0;
       }
       else {
-        return floor(10.0 * pow(2.0, (double(index) / 2.0) + 1.0)) / 10.0;
+        accuracy = floor(10.0 * pow(2.0, (double(index) / 2.0) + 1.0)) / 10.0;
       }
     }
     else if ((index > 6) && (index <= 15)) {
-      return (10.0 * pow(2.0, (double(index) - 2.0))) / 10.0;
+      accuracy = (10.0 * pow(2.0, (double(index) - 2.0))) / 10.0;
     }
     else {
-      return 8192.0;
-    }
-  }
-
-  if (type == t_eph::Galileo) {
-
+      accuracy = 8192.0;
+    }
+  }
+  else if (type == t_eph::Galileo) {
     if ((index >= 0) && (index <= 49)) {
-      return (double(index) / 100.0);
+      accuracy = (double(index) / 100.0);
     }
     else if ((index > 49) && (index <= 74)) {
-      return (50.0 + (double(index) - 50.0) * 2.0) / 100.0;
+      accuracy = (50.0 + (double(index) - 50.0) * 2.0) / 100.0;
     }
     else if ((index > 74) && (index <= 99)) {
-      return 1.0 + (double(index) - 75.0) * 0.04;
+      accuracy = 1.0 + (double(index) - 75.0) * 0.04;
     }
     else if ((index > 99) && (index <= 125)) {
-      return 2.0 + (double(index) - 100.0) * 0.16;
+      accuracy = 2.0 + (double(index) - 100.0) * 0.16;
     }
     else {
-      return -1.0;
-    }
-  }
-
-  return double(index);
-}
+      accuracy = -1.0;
+    }
+  }
+  else if (type == t_eph::IRNSS) {
+    if ((index >= 0) && (index <= 6)) {
+      if      (index == 1) {
+        accuracy = 2.8;
+      }
+      else if (index == 3) {
+        accuracy = 5.7;
+      }
+      else if (index == 5) {
+        accuracy = 11.3;
+      }
+      else {
+        accuracy = pow(2, 1 + index / 2);
+      }
+    }
+    else if ((index > 6) && (index <= 15)) {
+      accuracy = pow(2, index - 2);
+    }
+  }
+  return accuracy;
+}
+
 
 int indexFromAccuracy(double accuracy, t_eph::e_type type) {