Changeset 1831 in ntrip for trunk/BNS


Ignore:
Timestamp:
May 6, 2009, 7:58:35 PM (15 years ago)
Author:
weber
Message:

* empty log message *

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNS/RTCM/clock_orbit_rtcm.c

    r1827 r1831  
    33        Name:           clock_orbit_rtcm.c
    44        Project:        RTCM3
    5         Version:        $Id: clock_orbit_rtcm.c,v 1.6 2009/05/04 12:53:42 stoecker Exp $
     5        Version:        $Id: clock_orbit_rtcm.c,v 1.13 2009/05/06 14:02:39 stoecker Exp $
    66        Authors:        Dirk Stöcker
    77        Description:    state space approach for RTCM3
    … …  
    618618    G_RESERVED5
    619619    G_NO_OF_SATELLITES(co->NumberOfGPSSat)
    620     if(co->OrbitDataSupplied)
    621       return GCOBR_DATAMISMATCH;
    622     co->OrbitDataSupplied = 1;
     620    if(co->OrbitDataSupplied&1)
     621      return GCOBR_DATAMISMATCH;
     622    co->OrbitDataSupplied |= 1;
    623623#ifdef DEBUG
    624624fprintf(stderr, "epochtime %d ui %d mmi %d sats %d\n",co->GPSEpochTime,co->UpdateInterval,mmi,co->NumberOfGPSSat);
    … …  
    663663    G_RESERVED5
    664664    G_NO_OF_SATELLITES(co->NumberOfGPSSat)
    665     if(co->ClockDataSupplied)
    666       return GCOBR_DATAMISMATCH;
    667     co->ClockDataSupplied = 1;
     665    if(co->ClockDataSupplied & 1)
     666      return GCOBR_DATAMISMATCH;
     667    co->ClockDataSupplied |= 1;
    668668    for(i = 0; i < co->NumberOfGPSSat; ++i)
    669669    {
    … …  
    683683    G_RESERVED5
    684684    G_NO_OF_SATELLITES(co->NumberOfGPSSat)
    685     if(co->ClockDataSupplied || co->OrbitDataSupplied)
    686       return GCOBR_DATAMISMATCH;
    687     co->OrbitDataSupplied = 1;
    688     co->ClockDataSupplied = 1;
     685    if((co->ClockDataSupplied&1) || (co->OrbitDataSupplied&1))
     686      return GCOBR_DATAMISMATCH;
     687    co->OrbitDataSupplied |= 1;
     688    co->ClockDataSupplied |= 1;
    689689    for(i = 0; i < co->NumberOfGPSSat; ++i)
    690690    {
    … …  
    715715    G_RESERVED5
    716716    G_NO_OF_SATELLITES(co->NumberOfGPSSat)
    717     if(co->URADataSupplied)
    718       return GCOBR_DATAMISMATCH;
    719     co->URADataSupplied = 1;
     717    if(co->URADataSupplied&1)
     718      return GCOBR_DATAMISMATCH;
     719    co->URADataSupplied |= 1;
    720720    for(i = 0; i < co->NumberOfGPSSat; ++i)
    721721    {
    … …  
    733733    G_RESERVED5
    734734    G_NO_OF_SATELLITES(co->NumberOfGPSSat)
    735     if(co->HRDataSupplied)
    736       return GCOBR_DATAMISMATCH;
    737     co->HRDataSupplied = 1;
     735    if(co->HRDataSupplied&1)
     736      return GCOBR_DATAMISMATCH;
     737    co->HRDataSupplied |= 1;
    738738    for(i = 0; i < co->NumberOfGPSSat; ++i)
    739739    {
    … …  
    749749    G_RESERVED5
    750750    G_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
    751     if(co->OrbitDataSupplied)
    752       return GCOBR_DATAMISMATCH;
    753     co->OrbitDataSupplied = 1;
     751    if(co->OrbitDataSupplied&2)
     752      return GCOBR_DATAMISMATCH;
     753    co->OrbitDataSupplied |= 2;
    754754    for(i = CLOCKORBIT_NUMGPS;
    755755    i < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat; ++i)
    … …  
    777777    G_RESERVED5
    778778    G_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
    779     if(co->ClockDataSupplied)
    780       return GCOBR_DATAMISMATCH;
    781     co->ClockDataSupplied = 1;
     779    if(co->ClockDataSupplied&2)
     780      return GCOBR_DATAMISMATCH;
     781    co->ClockDataSupplied |= 2;
    782782    for(i = CLOCKORBIT_NUMGPS;
    783783    i < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat; ++i)
    … …  
    796796    G_RESERVED5
    797797    G_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
    798     if(co->ClockDataSupplied || co->OrbitDataSupplied)
    799       return GCOBR_DATAMISMATCH;
    800     co->OrbitDataSupplied = 1;
    801     co->ClockDataSupplied = 1;
     798    if((co->ClockDataSupplied&2) || (co->OrbitDataSupplied&2))
     799      return GCOBR_DATAMISMATCH;
     800    co->OrbitDataSupplied |= 2;
     801    co->ClockDataSupplied |= 2;
    802802    for(i = CLOCKORBIT_NUMGPS;
    803803    i < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat; ++i)
    … …  
    827827    G_RESERVED5
    828828    G_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
    829     if(co->URADataSupplied)
    830       return GCOBR_DATAMISMATCH;
    831     co->URADataSupplied = 1;
     829    if(co->URADataSupplied&2)
     830      return GCOBR_DATAMISMATCH;
     831    co->URADataSupplied |= 2;
    832832    for(i = CLOCKORBIT_NUMGPS;
    833833    i < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat; ++i)
    … …  
    844844    G_RESERVED5
    845845    G_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
    846     if(co->HRDataSupplied)
    847       return GCOBR_DATAMISMATCH;
    848     co->HRDataSupplied = 1;
     846    if(co->HRDataSupplied&2)
     847      return GCOBR_DATAMISMATCH;
     848    co->HRDataSupplied |= 2;
    849849    for(i = CLOCKORBIT_NUMGPS;
    850850    i < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat; ++i)
    … …  
    900900    OLD_G_RESERVED6
    901901    OLD_G_NO_OF_SATELLITES(co->NumberOfGPSSat)
    902     if(co->OrbitDataSupplied)
    903       return GCOBR_DATAMISMATCH;
    904     co->OrbitDataSupplied = 1;
     902    if(co->OrbitDataSupplied&1)
     903      return GCOBR_DATAMISMATCH;
     904    co->OrbitDataSupplied |= 1;
    905905    for(i = 0; i < co->NumberOfGPSSat; ++i)
    906906    {
    … …  
    928928    OLD_G_RESERVED6
    929929    OLD_G_NO_OF_SATELLITES(co->NumberOfGPSSat)
    930     if(co->ClockDataSupplied)
    931       return GCOBR_DATAMISMATCH;
    932     co->ClockDataSupplied = 1;
     930    if(co->ClockDataSupplied&1)
     931      return GCOBR_DATAMISMATCH;
     932    co->ClockDataSupplied |= 1;
    933933    for(i = 0; i < co->NumberOfGPSSat; ++i)
    934934    {
    … …  
    948948    OLD_G_RESERVED6
    949949    OLD_G_NO_OF_SATELLITES(co->NumberOfGPSSat)
    950     if(co->ClockDataSupplied || co->OrbitDataSupplied)
    951       return GCOBR_DATAMISMATCH;
    952     co->OrbitDataSupplied = 1;
    953     co->ClockDataSupplied = 1;
     950    if((co->ClockDataSupplied&1) || (co->OrbitDataSupplied&1))
     951      return GCOBR_DATAMISMATCH;
     952    co->OrbitDataSupplied |= 1;
     953    co->ClockDataSupplied |= 1;
    954954    for(i = 0; i < co->NumberOfGPSSat; ++i)
    955955    {
    … …  
    978978    OLD_G_RESERVED6
    979979    OLD_G_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
    980     if(co->OrbitDataSupplied)
    981       return GCOBR_DATAMISMATCH;
    982     co->OrbitDataSupplied = 1;
     980    if(co->OrbitDataSupplied&2)
     981      return GCOBR_DATAMISMATCH;
     982    co->OrbitDataSupplied |= 2;
    983983    for(i = CLOCKORBIT_NUMGPS;
    984984    i < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat; ++i)
    … …  
    10051005    OLD_G_RESERVED6
    10061006    OLD_G_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
    1007     if(co->ClockDataSupplied)
    1008       return GCOBR_DATAMISMATCH;
    1009     co->ClockDataSupplied = 1;
     1007    if(co->ClockDataSupplied&2)
     1008      return GCOBR_DATAMISMATCH;
     1009    co->ClockDataSupplied |= 2;
    10101010    for(i = CLOCKORBIT_NUMGPS;
    10111011    i < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat; ++i)
    … …  
    10241024    OLD_G_RESERVED6
    10251025    OLD_G_NO_OF_SATELLITES(co->NumberOfGLONASSSat)
    1026     if(co->ClockDataSupplied || co->OrbitDataSupplied)
    1027       return GCOBR_DATAMISMATCH;
    1028     co->OrbitDataSupplied = 1;
    1029     co->ClockDataSupplied = 1;
     1026    if((co->ClockDataSupplied&2) || (co->OrbitDataSupplied&2))
     1027      return GCOBR_DATAMISMATCH;
     1028    co->OrbitDataSupplied |= 2;
     1029    co->ClockDataSupplied |= 2;
    10301030    for(i = CLOCKORBIT_NUMGPS;
    10311031    i < CLOCKORBIT_NUMGPS+co->NumberOfGLONASSSat; ++i)
Note: See TracChangeset for help on using the changeset viewer.