Changeset 1237 in ntrip for trunk/rtcm3torinex

Timestamp:

Nov 26, 2008, 11:14:46 AM (15 years ago)

Author:

stoecker

Message:

some BNC related fixes

Location:

trunk/rtcm3torinex

Files:

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

trunk/rtcm3torinex/rtcm3torinex.c

@@ -1 +1 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.32 2008/09/02 07:45:48 stoecker Exp $
+  $Id: rtcm3torinex.c,v 1.19 2008/11/18 08:57:51 weber Exp $
   Copyright (C) 2005-2008 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -51 +51 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.32 $";
+static char revisionstr[] = "$Revision: 1.19 $";
 
 #ifndef COMPILEDATE
@@ -176 +176 @@
 
 #define SKIPBITS(b) { LOADBITS(b) numbits -= (b); }
+
+/* extract byte-aligned byte from data stream,
+   b = variable to store size, s = variable to store string pointer */
+#define GETSTRING(b, s) \
+{ \
+  b = *(data++); \
+  s = (char *) data; \
+  data += b; \
+  size -= b+1; \
+}
 
 struct leapseconds { /* specify the day of leap second */
@@ -273 +283 @@
   int ret=0;
 
+#ifdef NO_RTCM3_MAIN
+  if(GetMessage(handle)) /* don't repeat */
+#else
   while(!ret && GetMessage(handle))
+#endif /* NO_RTCM3_MAIN */
   {
     /* using 64 bit integer types, as it is much easier than handling
@@ -284 +298 @@
     GETBITS(type,12)
 #ifdef NO_RTCM3_MAIN
-    handle->typeList[handle->typeSize] = type;           /* RTCM message types */
-    if(handle->typeSize < 100) {handle->typeSize += 1;}  /* RTCM message types */
+    handle->blocktype = type;
 #endif /* NO_RTCM3_MAIN */
     switch(type)
     {
+#ifdef NO_RTCM3_MAIN
+    default:
+      ret = type;
+      break;
+    case 1005: case 1006:
+      {
+        SKIPBITS(22)
+        GETBITSSIGN(handle->antX, 38)
+        SKIPBITS(2)
+        GETBITSSIGN(handle->antY, 38)
+        SKIPBITS(2)
+        GETBITSSIGN(handle->antZ, 38)
+        if(type == 1006)
+          GETBITS(handle->antH, 16)
+        ret = type;
+      }
+      break;
+    case 1007: case 1008: case 1033:
+      {
+        char *antenna;
+        int antnum;
+
+        SKIPBITS(12)
+        GETSTRING(antnum,antenna)
+        memcpy(handle->antenna, antenna, antnum);
+        handle->antenna[antnum] = 0;
+        ret = type;
+      }
+      break;
+#endif /* NO_RTCM3_MAIN */
     case 1019:
       {
@@ -1622 +1665 @@
 
 #ifndef NO_RTCM3_MAIN
-static char datestr[]     = "$Date: 2008/09/02 07:45:48 $";
+static char datestr[]     = "$Date: 2008/11/18 08:57:51 $";
 
 /* The string, which is send as agent in HTTP request */

trunk/rtcm3torinex/rtcm3torinex.h

@@ -4 +4 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.h,v 1.8 2008/09/02 07:45:48 stoecker Exp $
+  $Id: rtcm3torinex.h,v 1.14 2008/11/10 18:07:35 weber Exp $
   Copyright (C) 2005-2006 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -195 +195 @@
   int    lastlockl2[64];
 #ifdef NO_RTCM3_MAIN
-  int    typeSize;       /* RTCM message types */
-  int    typeList[101];  /* RTCM message types */
+  double antX;
+  double antY;
+  double antZ;
+  double antH;
+  char   antenna[256+1];
+  int    blocktype;
 #endif /* NO_RTCM3_MAIN */
   int    datapos[RINEXENTRY_NUMBER];