Changeset 11083 in ntrip for trunk/BNC/src/RTCM3


Ignore:
Timestamp:
Oct 12, 2026, 3:32:43 PM (12 days ago)
Author:
stuerze
Message:

further fixes and improvements

Location:
trunk/BNC/src/RTCM3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

    r11074 r11083  
    12751275    if (bdt) {
    12761276      epoSecBds += 14.0;
    1277       if (epoSecBds > 604800.0) {
     1277      if (epoSecBds >= 604800.0) {
    12781278        epoSecBds -= 7.0*24.0*60.0*60.0;
    12791279      }
    … …  
    12891289  }
    12901290
     1291  // The epoch is given as seconds of week (or of day): move it by whole days
     1292  // to the one closest to the current time. Folding in 12 h steps (as
     1293  // before) stopped at the edge of the +-12 h window, e.g. at the week
     1294  // change a correction of Saturday 23:59:55 received after midnight ended
     1295  // up at Sunday 11:59:55.
    12911296  if (_lastTime.valid()) {
    1292     double maxDiff = 12 * 3600.0;
    1293     while (_lastTime < currentTime - maxDiff) {
    1294       _lastTime = _lastTime + maxDiff;
    1295     }
    1296     while (_lastTime > currentTime + maxDiff) {
    1297       _lastTime = _lastTime - maxDiff;
     1297    const double halfDay = 12 * 3600.0;
     1298    const double day     = 24 * 3600.0;
     1299    while (_lastTime < currentTime - halfDay) {
     1300      _lastTime = _lastTime + day;
     1301    }
     1302    while (_lastTime > currentTime + halfDay) {
     1303      _lastTime = _lastTime - day;
    12981304    }
    12991305  }

  • trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp

    r11042 r11083  
    9797            break;
    9898          case CLOCKORBIT_SATGLONASS:
    99             E_GLONASS_SATELLITE_ID(co->Sat[i].ID)
     99            E_GLONASS_SATELLITE_ID_OLD(co->Sat[i].ID)
    100100            E_GLONASS_IOD(co->Sat[i].IOD)
    101101            break;
    … …  
    161161            break;
    162162          case CLOCKORBIT_SATGLONASS:
    163             E_GLONASS_SATELLITE_ID(co->Sat[i].ID)
     163            E_GLONASS_SATELLITE_ID_OLD(co->Sat[i].ID)
    164164            break;
    165165        }
    … …  
    221221            break;
    222222          case CLOCKORBIT_SATGLONASS:
    223             E_GLONASS_SATELLITE_ID(co->Sat[i].ID)
     223            E_GLONASS_SATELLITE_ID_OLD(co->Sat[i].ID)
    224224            E_GLONASS_IOD(co->Sat[i].IOD)
    225225            break;
    … …  
    294294            break;
    295295          case CLOCKORBIT_SATGLONASS:
    296             E_GLONASS_SATELLITE_ID(co->Sat[i].ID)
     296            E_GLONASS_SATELLITE_ID_OLD(co->Sat[i].ID)
    297297            break;
    298298        }
    … …  
    334334            break;
    335335          case CLOCKORBIT_SATGLONASS:
    336             E_GLONASS_SATELLITE_ID(co->Sat[i].ID)
     336            E_GLONASS_SATELLITE_ID_OLD(co->Sat[i].ID)
    337337            break;
    338338        }
    … …  
    385385            break;
    386386          case CLOCKORBIT_SATGLONASS:
    387             E_GLONASS_SATELLITE_ID(cb->Sat[i].ID)
     387            E_GLONASS_SATELLITE_ID_OLD(cb->Sat[i].ID)
    388388            break;
    389389        }
    … …  
    442442            break;
    443443          case CLOCKORBIT_SATGLONASS:
    444             E_GLONASS_SATELLITE_ID(pb->Sat[i].ID)
     444            E_GLONASS_SATELLITE_ID_OLD(pb->Sat[i].ID)
    445445            break;
    446446        }
Note: See TracChangeset for help on using the changeset viewer.