Changeset 1184 in ntrip for trunk/BNC/RTCM3

Timestamp:

Nov 10, 2008, 7:01:41 PM (16 years ago)

Author:

weber

Message:

* empty log message *

File:

• trunk/BNC/RTCM3/rtcm3torinex.c (modified) (4 diffs)

trunk/BNC/RTCM3/rtcm3torinex.c ¶

@@ -1 +1 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.16 2008/09/02 14:14:33 weber Exp $
+  $Id: rtcm3torinex.c,v 1.17 2008/09/22 09:39:49 weber Exp $
   Copyright (C) 2005-2008 by Dirk Stöcker <stoecker@alberding.eu>
 
@@ -51 +51 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.16 $";
+static char revisionstr[] = "$Revision: 1.17 $";
 
 #ifndef COMPILEDATE
@@ -290 +290 @@
     {
 #ifdef NO_RTCM3_MAIN
-    double antX, antY, antZ, antH; /* Antenna XYZ-H */
+    case 1005:
+      {
+        double antX, antY, antZ; /* Antenna XYZ */
+        SKIPBITS(22)
+        GETBITSSIGN(antX, 38)
+        SKIPBITS(2)
+        GETBITSSIGN(antY, 38)
+        SKIPBITS(2)
+        GETBITSSIGN(antZ, 38)
+        handle->antList5[handle->antSize5 + 0] = antX;
+        handle->antList5[handle->antSize5 + 1] = antY;
+        handle->antList5[handle->antSize5 + 2] = antZ;
+        if(handle->antSize5 < 100 - 5 ) {handle->antSize5 += 3;}
+        ret = 1005;
+      }
+      break;
     case 1006:
       {
-        SKIPBITS(22);
-        GETBITSSIGN(antX, 38); SKIPBITS(2);
-        GETBITSSIGN(antY, 38); SKIPBITS(2);
-        GETBITSSIGN(antZ, 38);
-        GETBITS(    antH, 16);
-        handle->antList[handle->antSize + 0] = antX;
-        handle->antList[handle->antSize + 1] = antY;
-        handle->antList[handle->antSize + 2] = antZ;
-        handle->antList[handle->antSize + 3] = antH;
-        if(handle->antSize < 100 - 6 ) {handle->antSize += 4;}
+        double antX, antY, antZ, antH; /* Antenna XYZ-H */
+        SKIPBITS(22)
+        GETBITSSIGN(antX, 38)
+        SKIPBITS(2)
+        GETBITSSIGN(antY, 38)
+        SKIPBITS(2)
+        GETBITSSIGN(antZ, 38)
+        GETBITS(    antH, 16)
+        handle->antList6[handle->antSize6 + 0] = antX;
+        handle->antList6[handle->antSize6 + 1] = antY;
+        handle->antList6[handle->antSize6 + 2] = antZ;
+        handle->antList6[handle->antSize6 + 3] = antH;
+        if(handle->antSize6 < 100 - 6 ) {handle->antSize6 += 4;}
+        ret = 1006;
+      }
+      break;
+    case 1007:
+      {
+        char *antC = '\0'; /* Antenna Descriptor */
+        char *antS = '\0';
+        antC = (char*) malloc(32);   
+        antS  = (char*) malloc(32);   
+        uint32_t antN;
+        uint32_t antD;
+        uint32_t jj;
+
+        SKIPBITS(12)
+        GETBITS(antN, 8)
+        if ((antN>0) && (antN<32)) {
+          for (jj = 0; jj < antN; jj++) {
+            GETBITS(antD, 8)
+            sprintf(antS,"%c",antD);
+            if (jj<1) {
+              strcpy(antC,antS);
+            } else {
+              strcat(antC,antS);
+            }
+          }
+          handle->antType[handle->antSize] = antC;
+          if(handle->antSize < 100) {handle->antSize += 1;}
+        }
+        ret = 1007;
+      }
+      break;
+    case 1008:
+      {
+        char *antC = '\0'; /* Antenna Descriptor */
+        char *antS = '\0';
+        antC = (char*) malloc(32);   
+        antS  = (char*) malloc(32);   
+        uint32_t antN;
+        uint32_t antD;
+        uint32_t jj;
+
+        SKIPBITS(12)
+        GETBITS(antN, 8)
+        if ((antN>0) && (antN<32)) {
+          for (jj = 0; jj < antN; jj++) {
+            GETBITS(antD, 8)
+            sprintf(antS,"%c",antD);
+            if (jj<1) {
+              strcpy(antC,antS);
+            } else {
+              strcat(antC,antS);
+            }
+          }
+          handle->antType[handle->antSize] = antC;
+          if(handle->antSize < 100) {handle->antSize += 1;}
+        }
+        ret = 1008;
       }
       break;
@@ -1639 +1714 @@
 
 #ifndef NO_RTCM3_MAIN
-static char datestr[]     = "$Date: 2008/09/02 14:14:33 $";
+static char datestr[]     = "$Date: 2008/09/22 09:39:49 $";
 
 /* The string, which is send as agent in HTTP request */