Changeset 4409 in ntrip


Ignore:
Timestamp:
Jul 8, 2012, 2:59:03 PM (12 years ago)
Author:
mervart
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/RTCM/GPSDecoder.cpp

    r4405 r4409  
    144144  // ---
    145145  if (satSys == 'G') {
    146     if      (rnxStr == "C1")                      retVal = GNSSENTRY_C1NDATA;
    147     else if (rnxStr == "C1C")                     retVal = GNSSENTRY_C1DATA; 
     146    if      (rnxStr == "C1C")                     retVal = GNSSENTRY_C1DATA; 
    148147    else if (rnxStr == "C1P" || rnxStr == "C1W")  retVal = GNSSENTRY_P1DATA; 
    149     else if (rnxStr == "L1")                      retVal = GNSSENTRY_L1NDATA;
     148    else if (rnxStr == "C1N")                     retVal = GNSSENTRY_C1NDATA;
    150149    else if (rnxStr == "L1C")                     retVal = GNSSENTRY_L1CDATA;
    151150    else if (rnxStr == "L1P" || rnxStr == "L1W")  retVal = GNSSENTRY_L1PDATA;
    152     else if (rnxStr == "D1")                      retVal = GNSSENTRY_D1NDATA;
     151    else if (rnxStr == "L1N")                     retVal = GNSSENTRY_L1NDATA;
    153152    else if (rnxStr == "D1C")                     retVal = GNSSENTRY_D1CDATA;
    154153    else if (rnxStr == "D1P" || rnxStr == "D1W")  retVal = GNSSENTRY_D1PDATA;
    155     else if (rnxStr == "S1")                      retVal = GNSSENTRY_S1NDATA;
     154    else if (rnxStr == "D1N")                     retVal = GNSSENTRY_D1NDATA;
    156155    else if (rnxStr == "S1C")                     retVal = GNSSENTRY_S1CDATA;
    157156    else if (rnxStr == "S1P" || rnxStr == "S1W")  retVal = GNSSENTRY_S1PDATA;
    158 
    159     else if (rnxStr == "C2"  || rnxStr == "C2X")  retVal = GNSSENTRY_C2DATA; 
     157    else if (rnxStr == "S1N")                     retVal = GNSSENTRY_S1NDATA;
     158
     159    else if (rnxStr == "C2C" || rnxStr == "C2X")  retVal = GNSSENTRY_C2DATA; 
    160160    else if (rnxStr == "C2P" || rnxStr == "C2W")  retVal = GNSSENTRY_P2DATA; 
    161     else if (rnxStr == "L2" || rnxStr == "L2X")  retVal = GNSSENTRY_L2CDATA;
     161    else if (rnxStr == "L2C" || rnxStr == "L2X")  retVal = GNSSENTRY_L2CDATA;
    162162    else if (rnxStr == "L2P" || rnxStr == "L2W")  retVal = GNSSENTRY_L2PDATA;
    163     else if (rnxStr == "D2" || rnxStr == "D2X")  retVal = GNSSENTRY_D2CDATA;
     163    else if (rnxStr == "D2C" || rnxStr == "D2X")  retVal = GNSSENTRY_D2CDATA;
    164164    else if (rnxStr == "D2P" || rnxStr == "D2W")  retVal = GNSSENTRY_D2PDATA;
    165     else if (rnxStr == "S2" || rnxStr == "S2X")  retVal = GNSSENTRY_S2CDATA;
     165    else if (rnxStr == "S2C" || rnxStr == "S2X")  retVal = GNSSENTRY_S2CDATA;
    166166    else if (rnxStr == "S2P" || rnxStr == "S2W")  retVal = GNSSENTRY_S2PDATA;
    167167
     
    226226  // ----
    227227  else if (satSys == 'J') {
    228     if      (rnxStr == "C1" ) retVal = GNSSENTRY_C1NDATA;   
     228    if      (rnxStr == "C1N") retVal = GNSSENTRY_C1NDATA;   
    229229    else if (rnxStr == "C1C") retVal = GNSSENTRY_C1DATA;   
    230230    else if (rnxStr == "C1Z") retVal = GNSSENTRY_CSAIFDATA;
    231     else if (rnxStr == "L1" ) retVal = GNSSENTRY_L1NDATA;   
     231    else if (rnxStr == "L1N") retVal = GNSSENTRY_L1NDATA;   
    232232    else if (rnxStr == "L1C") retVal = GNSSENTRY_L1CDATA;   
    233233    else if (rnxStr == "L1Z") retVal = GNSSENTRY_LSAIFDATA;
    234     else if (rnxStr == "D1" ) retVal = GNSSENTRY_D1NDATA;   
     234    else if (rnxStr == "D1N") retVal = GNSSENTRY_D1NDATA;   
    235235    else if (rnxStr == "D1C") retVal = GNSSENTRY_D1CDATA;   
    236236    else if (rnxStr == "D1Z") retVal = GNSSENTRY_DSAIFDATA;
    237     else if (rnxStr == "S1" ) retVal = GNSSENTRY_S1NDATA;   
     237    else if (rnxStr == "S1N") retVal = GNSSENTRY_S1NDATA;   
    238238    else if (rnxStr == "S1C") retVal = GNSSENTRY_S1CDATA;   
    239239    else if (rnxStr == "S1Z") retVal = GNSSENTRY_SSAIFDATA;
Note: See TracChangeset for help on using the changeset viewer.