Changeset 11034 in ntrip for trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h

Timestamp:

Sep 21, 2026, 2:06:01 PM (3 days ago)

Author:

stuerze

Message:

updates regarding RTCM-SSR

File:

• trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h (modified) (5 diffs)

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h

@@ -78 +78 @@
   GCOBR_NOPHASEBIASPARAMETER = -12,
   GCOBR_NOVTECPARAMETER = -13,
+  GCOBR_NOANTENNAPARAMETER = -14,
   /* data mismatch - data in storage does not match new data */
   GCOBR_TIMEMISMATCH = -20,
@@ -478 +479 @@
 
   struct Antenna {
-    unsigned int SSRProviderID;
-    unsigned int SatelliteAntennaIOD;
-    unsigned int PhaseCenterInformationIndicator;
-    unsigned int GroupDelayInformationIndicator;
-    unsigned int NadirAngleDependentCorrectionIndicator;
-    unsigned int maximumOffNadirAngle;
-    unsigned int NadirAngleDependentCorrectionRangeExtension;
-    unsigned int SatelliteSetIndicator;
-    unsigned int SatelliteMask;
+    SatAntennaType messageType[CLOCKORBIT_SATNUM];
+    unsigned int SSRProviderID[CLOCKORBIT_SATNUM];
+    unsigned int SatelliteAntennaIOD[CLOCKORBIT_SATNUM];
+    unsigned int PhaseCenterInformationIndicator[CLOCKORBIT_SATNUM];
+    unsigned int GroupDelayInformationIndicator[CLOCKORBIT_SATNUM];
+    unsigned int NadirAngleDependentCorrectionIndicator[CLOCKORBIT_SATNUM];
+    unsigned int maximumOffNadirAngle[CLOCKORBIT_SATNUM];
+    unsigned int NadirAngleDependentCorrectionRangeExtension[CLOCKORBIT_SATNUM];
+    unsigned int SatelliteSetIndicator[CLOCKORBIT_SATNUM];
+    uint64_t SatelliteMask[CLOCKORBIT_SATNUM];
     struct SatellitePart {
       unsigned int FrequencySetIndicator;
@@ -496 +498 @@
       } Freq[ANT_MAXFREQUENCIES];
     } Sat[CLOCKORBIT_COUNTSAT];
-  } GNSS[CLOCKORBIT_SATNUM];
+  };
 
   /* return size of resulting data or 0 in case of an error */
@@ -598 +600 @@
 #define E_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a) ADDBITS(4,  a)                      /* DF+015 (new RTCM) to extend DF+021*/
 #define E_SATELLITE_SET_INDICATOR(a)                    ADDBITS(1,  a)                      /* DF+016 (new RTCM) */
+#define E_SATELLITE_MASK(a)                             ADDBITS(64, a)                      /* DF394 */
 #define E_FREQUENCY_SET_INDICATOR(a)                    ADDBITS(1,  a)                      /* DF+017 (new RTCM) */
 #define E_GNSS_FREQUENCY_MASK(a)                        ADDBITS(6,  a)                      /* DF+018 (new RTCM) */
@@ -843 +846 @@
 /* Antenna Information*/
 #define D_SATELLITE_ANTENNA_IOD(a)                      GETSSRBITS(a,  6)                    /* DF+010 (new RTCM) */
-#define D_PHASE_CENTER_INFO_INDICATORD(a)               GETSSRBITS(a,  1)                    /* DF+011 (new RTCM) */    
+#define D_PHASE_CENTER_INFO_INDICATOR(a)                GETSSRBITS(a,  1)                    /* DF+011 (new RTCM) */    
 #define D_GROUP_DELAY_INFO_INDICATOR(a)                 GETSSRBITS(a,  1)                    /* DF+012 (new RTCM) */    
 #define D_NADIR_ANGLE_DEPENDENT_CORR_INDICATOR(a)       GETSSRBITS(a,  1)                    /* DF+013 (new RTCM) */
+#define D_MAXIMUM_OFF_NADIR_ANGLE(a)                    GETSSRBITS(a,  5)                    /* DF+014 (new RTCM  */
 #define D_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a) GETSSRBITS(a,  4)                    /* DF+015 (new RTCM) required to extend DF+021*/
 #define D_SATELLITE_SET_INDICATOR(a)                    GETSSRBITS(a,  1)                    /* DF+016 (new RTCM) */
-#define D_FREQUENCY_SET_INDICATOR (a)                   GETSSRBITS(a,  1)                    /* DF+017 (new RTCM) */
-#define D_GNSS_FREQUENCY_MASK (a)                       GETSSRBITS(a,  6)                    /* DF+018 (new RTCM) */
+/* GETSSRBITS cannot safely read a full 64 bits in one call: bitbuffer is
+   itself only 64 bits wide, so LOADSSRBITS's loop (which keeps whatever
+   residual (0-7) bits are already buffered from the previous field) can be
+   asked to hold residual+64 bits at once, silently shifting the residual
+   bits out before extraction. Split into two 32-bit reads instead, each of
+   which stays safely within bitbuffer's capacity. */
+#define D_SATELLITE_MASK(a)                             { \
+  unsigned int maskHi32, maskLo32; \
+  GETSSRBITS(maskHi32, 32) \
+  GETSSRBITS(maskLo32, 32) \
+  (a) = ((uint64_t)maskHi32 << 32) | maskLo32; \
+}                                                                             /* DF394 */
+#define D_FREQUENCY_SET_INDICATOR(a)                    GETSSRBITS(a,  1)                    /* DF+017 (new RTCM) */
+#define D_GNSS_FREQUENCY_MASK(a)                        GETSSRBITS(a,  6)                    /* DF+018 (new RTCM) */
 #define D_NADIR_CORR_INDICATOR(a)                       GETSSRBITS(a,  1)                    /* DF+019 (new RTCM) */
 #define D_NADIR_CORRECTION(a)                           GETSSRFLOATSIGN(a, 12, 1/1000.0)     /* DF+020 (new RTCM) in [m] */