Changeset 1808 in ntrip

Timestamp:

Apr 24, 2009, 10:36:34 AM (16 years ago)

Author:

stoecker

Message:

fixed

Location:

trunk/clock_and_orbit

Files:

• clock_orbit_rtcm.c (modified) (10 diffs)
• clock_orbit_rtcm.h (modified) (3 diffs)

trunk/clock_and_orbit/clock_orbit_rtcm.c

@@ -3 +3 @@
         Name:           clock_orbit_rtcm.c
         Project:        RTCM3
-        Version:        $Id: clock_orbit_rtcm.c,v 1.2 2008/11/26 12:05:37 stoecker Exp $
+        Version:        $Id: clock_orbit_rtcm.c,v 1.9 2009/02/27 08:59:49 weber Exp $
         Authors:        Dirk Stöcker
         Description:    state space approach for RTCM3
@@ -93 +93 @@
 
 /* defined values */
-#define T_DELTA_RADIAL(a)                SCALEADDBITS(22, 10000.0, a)
-#define T_DELTA_ALONG_TRACK(a)           SCALEADDBITS(22, 10000.0, a)
-#define T_DELTA_CROSS_TRACK(a)           SCALEADDBITS(22, 10000.0, a)
-#define T_DELTA_DOT_RADIAL(a)            SCALEADDBITS(21, 1000000.0, a)
-#define T_DELTA_DOT_ALONG_TRACK(a)       SCALEADDBITS(21, 1000000.0, a)
-#define T_DELTA_DOT_CROSS_TRACK(a)       SCALEADDBITS(21, 1000000.0, a)
+#define T_DELTA_RADIAL(a)                SCALEADDBITS(22,    10000.0, a)
+#define T_DELTA_ALONG_TRACK(a)           SCALEADDBITS(20,     2500.0, a)
+#define T_DELTA_CROSS_TRACK(a)           SCALEADDBITS(20,     2500.0, a)
+#define T_DELTA_DOT_RADIAL(a)            SCALEADDBITS(21,  1000000.0, a)
+#define T_DELTA_DOT_ALONG_TRACK(a)       SCALEADDBITS(19,   250000.0, a)
+#define T_DELTA_DOT_CROSS_TRACK(a)       SCALEADDBITS(19,   250000.0, a)
 #define T_DELTA_DOT_DOT_RADIAL(a)        SCALEADDBITS(27, 50000000.0, a)
-#define T_DELTA_DOT_DOT_ALONG_TRACK(a)   SCALEADDBITS(27, 50000000.0, a)
-#define T_DELTA_DOT_DOT_CROSS_TRACK(a)   SCALEADDBITS(27, 50000000.0, a)
+#define T_DELTA_DOT_DOT_ALONG_TRACK(a)   SCALEADDBITS(25, 12500000.0, a)
+#define T_DELTA_DOT_DOT_CROSS_TRACK(a)   SCALEADDBITS(25, 12500000.0, a)
 #define T_SATELLITE_REFERENCE_POINT(a)   ADDBITS(1, a)
 
 #define T_SATELLITE_REFERENCE_DATUM(a)   ADDBITS(1, a)
-#define T_DELTA_CLOCK_C0(a)              SCALEADDBITS(22, 10000.0, a)
-#define T_DELTA_CLOCK_C1(a)              SCALEADDBITS(21, 1000000.0, a)
+#define T_DELTA_CLOCK_C0(a)              SCALEADDBITS(22,    10000.0, a)
+#define T_DELTA_CLOCK_C1(a)              SCALEADDBITS(21,  1000000.0, a)
 #define T_DELTA_CLOCK_C2(a)              SCALEADDBITS(27, 50000000.0, a)
 #define T_NO_OF_CODE_BIASES(a)           ADDBITS(5, a)
@@ -112 +112 @@
 #define T_GLONASS_SIGNAL_IDENTIFIER(a)   ADDBITS(5, a)
 #define T_GALILEO_SIGNAL_IDENTIFIER(a)   ADDBITS(5, a)
-#define T_CODE_BIAS(a)                   SCALEADDBITS(14, 100.0, a)
+#define T_CODE_BIAS(a)                   SCALEADDBITS(14,      100.0, a)
 #define T_GLONASS_SATELLITE_ID(a)        ADDBITS(5, a)
 
@@ -120 +120 @@
 #define T_MULTIPLE_MESSAGE_INDICATOR(a)  ADDBITS(1, a)
 #define T_SSR_URA(a)                     ADDBITS(4, a)
-#define T_HR_CLOCK_CORRECTION(a)         SCALEADDBITS(22, 10000.0, a)
+#define T_HR_CLOCK_CORRECTION(a)         SCALEADDBITS(22,    10000.0, a)
 #define T_SSR_UPDATE_INTERVAL(a)         ADDBITS(4, a)
 
@@ -475 +475 @@
   while((a) > numbits) \
   { \
-    if(!size--) return GCOBR_SHORTBUFFER; \
+    if(!size--) return GCOBR_SHORTMESSAGE; \
     bitbuffer = (bitbuffer<<8)|((unsigned char)*(buffer++)); \
     numbits += 8; \
@@ -514 +514 @@
 /* defined values */
 #define G_DELTA_RADIAL(a)                GETFLOATSIGN(a, 22, 1/10000.0)
-#define G_DELTA_ALONG_TRACK(a)           GETFLOATSIGN(a, 22, 1/10000.0)
-#define G_DELTA_CROSS_TRACK(a)           GETFLOATSIGN(a, 22, 1/10000.0)
+#define G_DELTA_ALONG_TRACK(a)           GETFLOATSIGN(a, 20, 1/2500.0)
+#define G_DELTA_CROSS_TRACK(a)           GETFLOATSIGN(a, 20, 1/2500.0)
 #define G_DELTA_DOT_RADIAL(a)            GETFLOATSIGN(a, 21, 1/1000000.0)
-#define G_DELTA_DOT_ALONG_TRACK(a)       GETFLOATSIGN(a, 21, 1/1000000.0)
-#define G_DELTA_DOT_CROSS_TRACK(a)       GETFLOATSIGN(a, 21, 1/1000000.0)
+#define G_DELTA_DOT_ALONG_TRACK(a)       GETFLOATSIGN(a, 19, 1/250000.0)
+#define G_DELTA_DOT_CROSS_TRACK(a)       GETFLOATSIGN(a, 19, 1/250000.0)
 #define G_DELTA_DOT_DOT_RADIAL(a)        GETFLOATSIGN(a, 27, 1/50000000.0)
-#define G_DELTA_DOT_DOT_ALONG_TRACK(a)   GETFLOATSIGN(a, 27, 1/50000000.0)
-#define G_DELTA_DOT_DOT_CROSS_TRACK(a)   GETFLOATSIGN(a, 27, 1/50000000.0)
+#define G_DELTA_DOT_DOT_ALONG_TRACK(a)   GETFLOATSIGN(a, 25, 1/12500000.0)
+#define G_DELTA_DOT_DOT_CROSS_TRACK(a)   GETFLOATSIGN(a, 25, 1/12500000.0)
 #define G_SATELLITE_REFERENCE_POINT(a)   GETBITS(a, 1)
 
@@ -595 +595 @@
    (((unsigned char)buffer[sizeofrtcmblock+2]))))
     return GCOBR_CRCMISMATCH;
+  size = sizeofrtcmblock; /* reduce size, so overflows are detected */
 
   G_MESSAGE_NUMBER(type)
+#ifdef DEBUG
+fprintf(stderr, "type %d size %d\n",type,sizeofrtcmblock);
+#endif
   switch(type)
   {
@@ -611 +615 @@
       return GCOBR_DATAMISMATCH;
     co->OrbitDataSupplied = 1;
+#ifdef DEBUG
+fprintf(stderr, "epochtime %d ui %d mmi %d sats %d\n",co->GPSEpochTime,co->UpdateInterval,mmi,co->NumberOfGPSSat);
+#endif
     for(i = 0; i < co->NumberOfGPSSat; ++i)
     {
@@ -626 +633 @@
       G_SATELLITE_REFERENCE_POINT(co->SatRefPoint)
       G_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
+#ifdef DEBUG
+fprintf(stderr, "id %2d iod %3d dr %8.3f da %8.3f dc %8.3f dr %8.3f da %8.3f dc %8.3f dr %8.3f da %8.3f dc %8.3f rp %d rd %d\n",
+co->Sat[i].ID,co->Sat[i].IOD,co->Sat[i].Orbit.DeltaRadial,
+co->Sat[i].Orbit.DeltaAlongTrack,co->Sat[i].Orbit.DeltaCrossTrack,
+co->Sat[i].Orbit.DotDeltaRadial,
+co->Sat[i].Orbit.DotDeltaAlongTrack,
+co->Sat[i].Orbit.DotDeltaCrossTrack,
+co->Sat[i].Orbit.DotDotDeltaRadial,
+co->Sat[i].Orbit.DotDotDeltaAlongTrack,
+co->Sat[i].Orbit.DotDotDeltaCrossTrack,
+co->SatRefPoint,
+co->SatRefDatum);
+#endif
     }
     break;
@@ -1062 +1082 @@
     return GCOBR_UNKNOWNTYPE;
   }
+#ifdef DEBUG
+for(type = 0; type < size && (unsigned char)buffer[type] != 0xD3; ++type)
+  numbits += 8;
+fprintf(stderr, "numbits left %d\n",numbits);
+#endif
   if(bytesused)
     *bytesused = sizeofrtcmblock+6;

trunk/clock_and_orbit/clock_orbit_rtcm.h

@@ -6 +6 @@
         Name:           clock_orbit_rtcm.h
         Project:        RTCM3
-        Version:        $Id: clock_orbit_rtcm.h,v 1.2 2008/11/26 12:05:37 stoecker Exp $
+        Version:        $Id: clock_orbit_rtcm.h,v 1.8 2009/03/06 15:59:53 weber Exp $
         Authors:        Dirk Stöcker
         Description:    state space approach for RTCM3
@@ -16 +16 @@
 enum SatelliteReferencePoint { POINT_IONOFREE=0, POINT_CENTER=1 };
 enum ClockOrbitType {
-     COTYPE_GPSORBIT=4060, COTYPE_GPSCLOCK=4061,
-     COTYPE_GPSCOMBINED=4063, COTYPE_GPSURA=4064, COTYPE_GPSHR=4065,
+     COTYPE_GPSORBIT=3001, COTYPE_GPSCLOCK=3002,
+     COTYPE_GPSCOMBINED=3004, COTYPE_GPSURA=3005, COTYPE_GPSHR=3006,
 
-     COTYPE_GLONASSORBIT=4066, COTYPE_GLONASSCLOCK=4067,
-     COTYPE_GLONASSCOMBINED=4069, COTYPE_GLONASSURA=4070, COTYPE_GLONASSHR=4071,
+     COTYPE_GLONASSORBIT=3007, COTYPE_GLONASSCLOCK=3008,
+     COTYPE_GLONASSCOMBINED=3010, COTYPE_GLONASSURA=3011, COTYPE_GLONASSHR=3012,
 
      COTYPE_AUTO=0 };
-enum BiasType { BTYPE_GPS=4062, BTYPE_GLONASS=4068, BTYPE_AUTO = 0 };
+enum BiasType { BTYPE_GPS=3003, BTYPE_GLONASS=3009, BTYPE_AUTO = 0 };
 
 enum COR_CONSTANTS {
@@ -131 +131 @@
   GCOBR_SHORTBUFFER = -30,
   GCOBR_MISSINGBITS = -31,
-  GCOBR_MESSAGEEXCEEDSBUFFER = -32
+  GCOBR_MESSAGEEXCEEDSBUFFER = -32,
+  GCOBR_SHORTMESSAGE = -33
 };