Changeset 2432 in ntrip for trunk/clock_and_orbit

Timestamp:

Apr 16, 2010, 8:14:00 AM (14 years ago)

Author:

stoecker

Message:

fixed bug

Location:

trunk/clock_and_orbit

Files:

• clock_orbit_rtcm.c (modified) (5 diffs)
• clock_orbit_rtcm.h (modified) (2 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.9 2010/02/22 13:42:26 stoecker Exp $
+        Version:        $Id: clock_orbit_rtcm.c,v 1.10 2010/04/14 11:09:18 stoecker Exp $
         Authors:        Dirk Stöcker
         Description:    state space approach for RTCM3
@@ -94 +94 @@
 /* standard values */
 #define T_MESSAGE_NUMBER(a)              ADDBITS(12, a) /* DF002 */
-#define T_RESERVED4                      ADDBITS(1, 0)  /* DF001 */
+#define T_RESERVED4                      ADDBITS(4, 0)  /* DF001 */
 #define T_RESERVED5                      ADDBITS(5, 0)  /* DF001 */
 #define T_GPS_SATELLITE_ID(a)            ADDBITS(6, a)  /* DF068 */
@@ -242 +242 @@
   if(gpsco)
   {
-    int nums, left, start = 0;
-    nums = co->NumberOfGPSSat;
+#ifdef SPLITBLOCK
+    int nums = co->NumberOfGPSSat;
+    int left, start = 0;
     if(nums > 28) /* split block when more than 28 sats */
     {
@@ -255 +256 @@
     while(nums)
     {
+#endif
       INITBLOCK
       T_MESSAGE_NUMBER(COTYPE_GPSCOMBINED)
       T_GPS_EPOCH_TIME(co->GPSEpochTime)
       T_SSR_UPDATE_INTERVAL(co->UpdateInterval)
+#ifdef SPLITBLOCK
       T_MULTIPLE_MESSAGE_INDICATOR(/*mmi || */ left ? 1 : 0)
+#else
+      T_MULTIPLE_MESSAGE_INDICATOR(/*mmi || */ 0)
+#endif
       --mmi;
       T_SATELLITE_REFERENCE_DATUM(co->SatRefDatum)
       T_RESERVED4
+#ifdef SPLITBLOCK
       T_NO_OF_SATELLITES(nums)
       for(i = start; i < start+nums; ++i)
+#else
+      T_NO_OF_SATELLITES(co->NumberOfGPSSat)
+      for(i = 0; i < co->NumberOfGPSSat; ++i)
+#endif
       {
         T_GPS_SATELLITE_ID(co->Sat[i].ID)
@@ -279 +290 @@
       }
       ENDBLOCK
+#ifdef SPLITBLOCK
       start += nums;
       nums = left;
       left = 0;
     }
+#endif
   }
   if(gpshr)

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.7 2010/02/22 13:42:26 stoecker Exp $
+        Version:        $Id: clock_orbit_rtcm.h,v 1.8 2010/04/14 11:09:18 stoecker Exp $
         Authors:        Dirk Stöcker
         Description:    state space approach for RTCM3
@@ -35 +35 @@
   CODETYPEGPS_L1_P           = 1,
   CODETYPEGPS_L1_Z           = 2,
-  /* ... */
+  CODETYPEGPS_SEMI_CODELESS  = 6,
+  CODETYPEGPS_L2_CM          = 7,
+  CODETYPEGPS_L2_CL          = 8,
+  CODETYPEGPS_L2_CML         = 9,
+  CODETYPEGPS_L2_P           = 10,
+  CODETYPEGPS_L2_Z           = 11,
+  CODETYPEGPS_L2_Y           = 12,
+  CODETYPEGPS_L2_M           = 13,
+  CODETYPEGPS_L2_I           = 14,
+  CODETYPEGPS_L2_Q           = 15,
+  CODETYPEGPS_L2_IQ          = 16,
 
   CODETYPEGLONASS_L1_CA      = 0,