Index: /trunk/BNC/src/PPP/pppSatObs.cpp =================================================================== --- /trunk/BNC/src/PPP/pppSatObs.cpp (revision 11041) +++ /trunk/BNC/src/PPP/pppSatObs.cpp (revision 11042) @@ -409,7 +409,21 @@ // provider is relied on to keep DF+010 synchronized with DF+069 across all // systems for this to work. -//////////////////////////////////////////////////////////////////////////// -static bool ssrSatAntennaTrusted(const t_satAntenna* satAntenna) { +// +// Separately, providers only guarantee SatelliteAntennaIOD uniqueness within +// a rolling 64-day window (it wraps/repeats after that), so a client that +// has been without a fresh Antenna message for that system for 64 days or +// more must treat any cached data as unverifiable and stop using it, even +// if the IOD/Metadata check above would otherwise pass - the same IOD value +// could by then legitimately mean something else. epoTime is the current +// processing epoch, compared against t_satAntenna::_time (when this data +// was actually decoded, not a wire epoch - the message carries none). +//////////////////////////////////////////////////////////////////////////// +static bool ssrSatAntennaTrusted(const t_satAntenna* satAntenna, const bncTime& epoTime) { + const double MAX_AGE_SEC = 64.0 * 86400.0; if (!satAntenna || satAntenna->_satelliteAntennaIOD == 0) { + return false; + } + if (epoTime.valid() && satAntenna->_time.valid() && + epoTime - satAntenna->_time >= MAX_AGE_SEC) { return false; } @@ -543,5 +557,5 @@ if (PPP_CLIENT->antex()) { const t_satAntenna* satAntenna = PPP_CLIENT->obsPool()->satAntenna(_prn); - if (!ssrSatAntennaTrusted(satAntenna)) { + if (!ssrSatAntennaTrusted(satAntenna, _time)) { satAntenna = 0; // untrusted (IOD zero, or not confirmed via Metadata) - fall back to ANTEX } Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h =================================================================== --- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h (revision 11041) +++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h (revision 11042) @@ -604,5 +604,16 @@ #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 */ +/* ADDBITS' mask "(1<> 48) & 0xFFFFU) \ + ADDBITS(16, (mask64_ >> 32) & 0xFFFFU) \ + ADDBITS(16, (mask64_ >> 16) & 0xFFFFU) \ + ADDBITS(16, mask64_ & 0xFFFFU) \ +} /* 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) */ Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp =================================================================== --- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp (revision 11041) +++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.cpp (revision 11042) @@ -945,2 +945,10 @@ } +// +//////////////////////////////////////////////////////////////////////////// +size_t SsrCorrIgs::MakeAntenna(const struct Antenna*, SatAntennaType, char*, size_t) { + // This format does not encode Satellite Antenna message content; nothing + // to encode. + return 0; +} + Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.h =================================================================== --- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.h (revision 11041) +++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_igs.h (revision 11042) @@ -227,4 +227,5 @@ size_t MakeVTEC(const struct VTEC *v, int moremessagesfollow, char *buffer, size_t size); size_t MakeMetaData(const struct MetaData *md, char *buffer, size_t size); + size_t MakeAntenna(const struct Antenna *a, SatAntennaType type, char *buffer, size_t size); enum GCOB_RETURN GetSSR(struct ClockOrbit *co, struct CodeBias *cb, struct VTEC *v, struct PhaseBias *pb, struct MetaData *md, struct Antenna* a, Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp =================================================================== --- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp (revision 11041) +++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp (revision 11042) @@ -1399,2 +1399,10 @@ } +// +//////////////////////////////////////////////////////////////////////////// +size_t SsrCorrRtcm::MakeAntenna(const struct Antenna*, SatAntennaType, char*, size_t) { + // Satellite Antenna messages are not defined in (old) RTCM-SSR; nothing + // to encode. + return 0; +} + Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h =================================================================== --- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h (revision 11041) +++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.h (revision 11042) @@ -226,4 +226,5 @@ size_t MakeVTEC(const struct VTEC *v, int moremessagesfollow, char *buffer, size_t size); size_t MakeMetaData(const struct MetaData *md, char *buffer, size_t size); + size_t MakeAntenna(const struct Antenna *a, SatAntennaType type, char *buffer, size_t size); enum GCOB_RETURN GetSSR(struct ClockOrbit *co, struct CodeBias *cb, struct VTEC *v, struct PhaseBias *pb, struct MetaData *md, struct Antenna* a, Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp =================================================================== --- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp (revision 11041) +++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp (revision 11042) @@ -495,4 +495,78 @@ } +// +//////////////////////////////////////////////////////////////////////////// +size_t SsrCorrRtcmNew::MakeAntenna(const struct Antenna* a, SatAntennaType type, + char* buffer, size_t size) { + unsigned int s, k, satBlockIdx, freqBlockIdx, deg, f, numSatBlocks, numFreqBlocks; + unsigned int satPositions[64], numSatPositions; + unsigned int freqPositions[ANT_MAXFREQUENCIES], numFreqPositions; + + STARTDATA + + for (s = 0; s < CLOCKORBIT_SATNUM; ++s) { + if (a->SatelliteMask[s] == 0 || + !(type == SATANTTYPE_AUTO || type == corType[s][COBOFS_SATANT])) { + continue; + } + INITBLOCK + E_RTCM_MESSAGE_NUMBER(corType[s][COBOFS_SATANT]) + E_SSR_PROVIDER_ID(a->SSRProviderID[s]) + E_SATELLITE_ANTENNA_IOD(a->SatelliteAntennaIOD[s]) + E_PHASE_CENTER_INFO_INDICATOR(a->PhaseCenterInformationIndicator[s]) + E_GROUP_DELAY_INFO_INDICATOR(a->GroupDelayInformationIndicator[s]) + E_NADIR_ANGLE_DEPENDENT_CORR_INDICATOR(a->NadirAngleDependentCorrectionIndicator[s]) + if (a->NadirAngleDependentCorrectionIndicator[s]) { + E_MAXIMUM_OFF_NADIR_ANGLE(a->maximumOffNadirAngle[s]) + E_NADIR_ANGLE_DEPENDENT_CORR_RANGE_EXTENSION(a->NadirAngleDependentCorrectionRangeExtension[s]) + } + E_SATELLITE_SET_INDICATOR(a->SatelliteSetIndicator[s]) + E_SATELLITE_MASK(a->SatelliteMask[s]) + + /* same MSB-first mask convention as D_SATELLITE_MASK/GetSSR */ + numSatPositions = 0; + for (k = 0; k < 64 && satoffset[s] + k < satoffset[s + 1]; ++k) { + if ((a->SatelliteMask[s] >> (63 - k)) & 1ULL) { + satPositions[numSatPositions++] = satoffset[s] + k; + } + } + numSatBlocks = a->SatelliteSetIndicator[s] ? (numSatPositions ? 1 : 0) : numSatPositions; + + for (satBlockIdx = 0; satBlockIdx < numSatBlocks; ++satBlockIdx) { + /* satellites sharing a block (SatelliteSetIndicator set) must + already carry identical Sat[] content - the caller is + responsible for that, same as the encoder trusts NumberOfSat + elsewhere; only the first masked satellite's data is sent */ + const struct Antenna::SatellitePart& satBlock = a->Sat[satPositions[satBlockIdx]]; + E_FREQUENCY_SET_INDICATOR(satBlock.FrequencySetIndicator) + E_GNSS_FREQUENCY_MASK(satBlock.GnssFrequencyMask) + + numFreqPositions = 0; + for (k = 0; k < ANT_MAXFREQUENCIES; ++k) { + if ((satBlock.GnssFrequencyMask >> (ANT_MAXFREQUENCIES - 1 - k)) & 1U) { + freqPositions[numFreqPositions++] = k; + } + } + numFreqBlocks = satBlock.FrequencySetIndicator ? (numFreqPositions ? 1 : 0) : numFreqPositions; + + for (freqBlockIdx = 0; freqBlockIdx < numFreqBlocks; ++freqBlockIdx) { + f = satBlock.FrequencySetIndicator ? freqPositions[0] : freqPositions[freqBlockIdx]; + E_NADIR_CORR_INDICATOR(satBlock.Freq[f].NadirCorrectionIndicator) + if (satBlock.Freq[f].NadirCorrectionIndicator) { + E_NADIR_CORRECTION(satBlock.Freq[f].NadirCorrection) + } + if (a->NadirAngleDependentCorrectionIndicator[s]) { + for (deg = 0; deg <= a->maximumOffNadirAngle[s] && deg < ANT_MAXNADIRDEGREES; ++deg) { + E_NADIR_ANGLE_DEPENDENT_CORRECTION(satBlock.Freq[f].NadirAngleCorrection[deg], + a->NadirAngleDependentCorrectionRangeExtension[s]) + } + } + } + } + ENDBLOCK + } + return ressize; +} + enum GCOB_RETURN SsrCorrRtcmNew::GetSSR(struct ClockOrbit* co, struct CodeBias* cb, struct VTEC* v, struct PhaseBias* pb, struct MetaData* md, struct Antenna* a, const char* buffer, size_t size, int* bytesused) { @@ -1152,5 +1226,13 @@ for (satBlockIdx = 0; satBlockIdx < numSatBlocks; ++satBlockIdx) { - struct Antenna::SatellitePart satBlock; + /* zero-initialized, not just declared: DF+019/DF+013 unset means the + correction IS zero (not "not present"), per spec - a plain + declaration left NadirCorrection/NadirAngleCorrection as + uninitialized stack garbage for every satellite/frequency whose + indicator was 0, which is nearly all of them in real data. This + went unnoticed because normal call depth happened to leave zero + there; it surfaced via a deeper (nested) call stack during + MakeAntenna round-trip testing. */ + struct Antenna::SatellitePart satBlock = {}; D_FREQUENCY_SET_INDICATOR(satBlock.FrequencySetIndicator) D_GNSS_FREQUENCY_MASK(satBlock.GnssFrequencyMask) Index: /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h =================================================================== --- /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h (revision 11041) +++ /trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h (revision 11042) @@ -280,4 +280,5 @@ size_t MakeVTEC(const struct VTEC *v, int moremessagesfollow, char *buffer, size_t size); size_t MakeMetaData(const struct MetaData *md, char *buffer, size_t size); + size_t MakeAntenna(const struct Antenna *a, SatAntennaType type, char *buffer, size_t size); enum GCOB_RETURN GetSSR(struct ClockOrbit *co, struct CodeBias *cb, struct VTEC *v, struct PhaseBias *pb, struct MetaData *md, struct Antenna* a, Index: /trunk/BNC/src/bnchelp.html =================================================================== --- /trunk/BNC/src/bnchelp.html (revision 11041) +++ /trunk/BNC/src/bnchelp.html (revision 11042) @@ -4615,5 +4615,5 @@
  1. Special character '>' is the first character in each 'Epoch Record' (as we have it in RINEX Version 3)
    2. -
  2. SSR message or topic descriptor, valid descriptors are:
    ORBIT, CLOCK, CODE_BIAS, PHASE_BIAS, or VTEC
    3. +
  3. SSR message or topic descriptor, valid descriptors are:
    ORBIT, CLOCK, CODE_BIAS, PHASE_BIAS, VTEC, META_DATA, or SAT_ANTENNA
  4. Year, GPS time
  5. Month, GPS time
    6. @@ -4652,4 +4652,5 @@ 
    
 > ORBIT 2022 10 01 23 59 45.0 2 110 SSRA00CNE1
+ 2
 G01          93    -0.1588    -0.8664    -0.0600        0.2210    -0.1200    -0.0400
 G02          33     0.0491    -1.7468     0.5608        0.1820     0.0040     0.0200
@@ -4672,4 +4673,17 @@
    +

    + The second record in this block provides one parameter, an SSR source format indicator: +

    + This indicator determines which relativistic correction formula applies when the orbit correction is combined + with the Broadcast Ephemeris: the velocity-based formula of IS-GPS-200D 20.3.3.3.3.1 for the (new) RTCM-SSR + format, or the classic eccentricity-based formula otherwise. +

    Records in this block provide the following satellite specific information: +

    + +

    + Example for block 'META_DATA' carrying model/correction metadata +

    + 
    
+> META_DATA 2026 06 26 09 00 15.0 0 3 SSRA00BKG0
+2 260 3
+ 3 1 0  0 0   0
+ 6 1 0  0 0   0
+ 7 1 0  0 0   0
+
    +

    + The second record in this block provides three parameters: +

    + Following records, one per model/correction entry, provide: + +

    + +

    + Example for block 'SAT_ANTENNA' carrying satellite antenna corrections +

    + 
    
+> SAT_ANTENNA 2026 06 26 09 00 15.0 0 16 SSRA00BKG0
+G08  260 23 1 0 1 16  7    2   G1 0     0.0000    0.0000   -0.0020   -0.0030   -0.0050   -0.0060   -0.0070   -0.0090   -0.0100   -0.0100   -0.0100   -0.0100   -0.0080   -0.0060   -0.0030    0.0000    0.0060    0.0120   G2 0     0.0000    0.0000   -0.0020   -0.0030   -0.0050   -0.0060   -0.0070   -0.0090   -0.0100   -0.0100   -0.0100   -0.0100   -0.0080   -0.0060   -0.0030    0.0000    0.0060    0.0120
+G16  260 23 1 0 1 16  7    2   G1 0     0.0000    0.0000    0.0010    0.0030    0.0050    0.0070    0.0100    0.0110    0.0110    0.0100    0.0090    0.0070    0.0050    0.0040    0.0040    0.0050    0.0050    0.0080   G2 0     0.0000    0.0000    0.0010    0.0030    0.0050    0.0070    0.0100    0.0110    0.0110    0.0100    0.0090    0.0070    0.0050    0.0040    0.0040    0.0050    0.0050    0.0080
+..
+
    +

    + Records in this block provide the following satellite specific information: +

    +

    +

    + Whether a given correction is a Phase Center Variation (PCV, applies to phaserange observations only), a + Group Delay Variation (GDV, applies to pseudorange observations only), or both at once (same values applied to + each observation type independently) is determined by the Phase Center Information and Group Delay Information + indicators, not by the type of value itself. +

    +

    + Before BNC's PPP client applies a satellite's antenna correction, it must be confirmed via a 'META_DATA' block: + the Satellite Antenna IOD must be non-zero and must match the Data IOD of a Metadata entry of type 1 (PCV) or + type 2 (GDV) − either is sufficient, since Metadata carries this IOD once globally while the Satellite + Antenna IOD is GNSS-specific, so the same Metadata entries serve as the trust anchor for every GNSS. In + addition, since a Satellite Antenna IOD is only guaranteed unique within a rolling 64-day period, BNC discards + any Satellite Antenna correction that is 64 days or older, even if its IOD would otherwise still match, and + falls back to using ANTEX-based satellite antenna corrections instead.