Changeset 5318 in ntrip for trunk/rtcm3torinex

Timestamp:

Jul 3, 2013, 11:25:46 AM (11 years ago)

Author:

stoecker

Message:

add type 1046

Location:

trunk/rtcm3torinex/lib

Files:

• rtcm3torinex.c (modified) (4 diffs)
• rtcm3torinex.h (modified) (2 diffs)

trunk/rtcm3torinex/lib/rtcm3torinex.c

@@ -445 +445 @@
       }
       break;
-    case 1045:
+    case 1045: case 1046:
       {
         struct galileoephemeris *ge;
@@ -479 +479 @@
         GETFLOATSIGN(ge->OMEGADOT, 24, R2R_PI/(double)(1<<30)/(double)(1<<13))
         GETFLOATSIGN(ge->BGD_1_5A, 10, 1.0/(double)(1<<30)/(double)(1<<2))
-        GETFLOATSIGN(ge->BGD_1_5B, 10, 1.0/(double)(1<<30)/(double)(1<<2))
-        GETBITS(ge->E5aHS, 2)
-        GETBITS(sv, 1)
-        if(sv)
-          ge->flags |= GALEPHF_E5ADINVALID;
-        ret = 1045;
+        if(type == 1046)
+        {
+          GETFLOATSIGN(ge->BGD_1_5B, 10, 1.0/(double)(1<<30)/(double)(1<<2))
+          GETBITS(ge->E5aHS, 2)
+          GETBITS(sv, 1)
+          if(sv)
+            ge->flags |= GALEPHF_E5ADINVALID;
+          GETFLOATSIGN(ge->BGD_1_5B, 10, 1.0/(double)(1<<30)/(double)(1<<2))
+        }
+        else
+        {
+          GETBITS(ge->E5bHS, 2)
+          GETBITS(sv, 1)
+          if(sv)
+            ge->flags |= GALEPHF_E5BDINVALID;
+        }
+        ret = type;
       }
       break;
@@ -3811 +3822 @@
         int k = 0;
         int chunkymode = 0;
-        int starttime = time(0);
-        int lastout = starttime;
         int totalbytes = 0;
         int chunksize = 0;
@@ -3939 +3948 @@
             {
               totalbytes = 0;
-              starttime = time(0);
-              lastout = starttime;
             }
           }

trunk/rtcm3torinex/lib/rtcm3torinex.h

@@ -362 +362 @@
 
 #define GALEPHF_E5ADINVALID     (1<<0) /* E5aDVS set invalid */
+#define GALEPHF_E5BDINVALID     (1<<0) /* E5bDVS set invalid */
 
 #define GLOEPHF_UNHEALTHY       (1<<0) /* set if unhealty satellite, f2b78 */
@@ -423 +424 @@
   int    SISA;
   int    E5aHS;
+  int    E5bHS;
 };