Changeset 6802 in ntrip for trunk/BNC/src

Timestamp:

Apr 29, 2015, 1:47:04 PM (10 years ago)

Author:

stuerze

Message:

some missing bits added

File:

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

trunk/BNC/src/ephemeris.cpp

@@ -923 +923 @@
         }
         // Bit 1-2
-        _E1_bHS = double((int(SVhealth) >> 1) & 0x2);
+        _E1_bHS = double((int(SVhealth) >> 1) & 0x3);
         // Bit 3
         if (int(SVhealth) & (1<<3)) {
@@ -929 +929 @@
         }
         // Bit 4-5
-        _E5aHS = double((int(SVhealth) >> 4) & 0x2);
+        _E5aHS = double((int(SVhealth) >> 4) & 0x3);
         // Bit 6
         if (int(SVhealth) & (1<<6)) {
@@ -935 +935 @@
         }
         // Bit 7-8
-        _E5bHS = double((int(SVhealth) >> 7) & 0x2);
+        _E5bHS = double((int(SVhealth) >> 7) & 0x3);
       }
     }
@@ -1151 +1151 @@
   else if ((_flags & GALEPHF_INAV) == GALEPHF_INAV) {
     dataSource |= (1<<0);
-    dataSource |= (1<<1);// not clear but common practice
+    dataSource |= (1<<1);// not clear but seems to be common in practice
     dataSource |= (1<<2);
     dataSource |= (1<<9);
@@ -1170 +1170 @@
       SVhealth |= (1<<2);
     }
+    //   Bit 3  : E5a DVS
+    if ((_flags & GALEPHF_E5ADINVALID) == GALEPHF_E5ADINVALID) {
+      SVhealth |= (1<<3);
+    }
+    //   Bit 4-5: E5a HS
+    if      (_E5aHS == 1.0) {
+      SVhealth |= (1<<4);
+    }
+    else if (_E5aHS == 2.0) {
+      SVhealth |= (1<<5);
+    }
+    else if (_E5aHS  == 3.0) {
+      SVhealth |= (1<<4);
+      SVhealth |= (1<<5);
+    }
     //   Bit 6  : E5b DVS
-    if ((_flags & GALEPHF_E1DINVALID) == GALEPHF_E1DINVALID) {
+    if ((_flags & GALEPHF_E5BDINVALID) == GALEPHF_E5BDINVALID) {
       SVhealth |= (1<<6);
     }