Changeset 4395 in ntrip for trunk/BNC


Ignore:
Timestamp:
Jul 8, 2012, 9:34:56 AM (12 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
2 edited

Legend:

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

    r4394 r4395  
    108108  // TODO: this is a preliminary solution
    109109  // ------------------------------------
    110   if      (rnxStr.indexOf("C1") == 0) {
    111     iEntry = GNSSENTRY_C1DATA;
    112   }
    113   else if (rnxStr.indexOf("P1") == 0) {
    114     iEntry = GNSSENTRY_P1DATA;
    115   }
    116   else if (rnxStr.indexOf("L1") == 0) {
    117     iEntry = GNSSENTRY_L1CDATA;
    118   }
    119   else if (rnxStr.indexOf("D1") == 0) {
    120     iEntry = GNSSENTRY_D1CDATA;
    121   }
    122   else if (rnxStr.indexOf("S1") == 0) {
    123     iEntry = GNSSENTRY_S1CDATA;
    124   }
    125   else if (rnxStr.indexOf("C2") == 0) {
    126     iEntry = GNSSENTRY_C2DATA;
    127   }
    128   else if (rnxStr.indexOf("P2") == 0) {
    129     iEntry = GNSSENTRY_P2DATA;
    130   }
    131   else if (rnxStr.indexOf("L2") == 0) {
    132     iEntry = GNSSENTRY_L2CDATA;
    133   }
    134   else if (rnxStr.indexOf("D2") == 0) {
    135     iEntry = GNSSENTRY_D2CDATA;
    136   }
    137   else if (rnxStr.indexOf("S2") == 0) {
    138     iEntry = GNSSENTRY_S2CDATA;
    139   }
    140   else if (rnxStr.indexOf("C5") == 0) {
    141     iEntry = GNSSENTRY_C5DATA;
    142   }
    143   else if (rnxStr.indexOf("L5") == 0) {
    144     iEntry = GNSSENTRY_L5DATA;
    145   }
    146   else if (rnxStr.indexOf("D5") == 0) {
    147     iEntry = GNSSENTRY_D5DATA;
    148   }
    149   else if (rnxStr.indexOf("S5") == 0) {
    150     iEntry = GNSSENTRY_S5DATA;
     110  if (satSys == 'G') {
     111    if      (rnxStr == "C1C") iEntry = GNSSENTRY_C1DATA;
     112    else if (rnxStr == "L1C") iEntry = GNSSENTRY_L1CDATA;
     113    else if (rnxStr == "D1C") iEntry = GNSSENTRY_D1CDATA;
     114    else if (rnxStr == "S1C") iEntry = GNSSENTRY_S1CDATA;
     115    else if (rnxStr == "C1W") iEntry = GNSSENTRY_P1DATA; 
     116    else if (rnxStr == "L1W") iEntry = GNSSENTRY_L1PDATA;
     117    else if (rnxStr == "D1W") iEntry = GNSSENTRY_D1PDATA;
     118    else if (rnxStr == "S1W") iEntry = GNSSENTRY_S1PDATA;
     119    else if (rnxStr == "C5" ) iEntry = GNSSENTRY_C5DATA; 
     120    else if (rnxStr == "L5" ) iEntry = GNSSENTRY_L5DATA; 
     121    else if (rnxStr == "D5" ) iEntry = GNSSENTRY_D5DATA; 
     122    else if (rnxStr == "S5" ) iEntry = GNSSENTRY_S5DATA; 
     123    else if (rnxStr == "C2W") iEntry = GNSSENTRY_P2DATA; 
     124    else if (rnxStr == "L2W") iEntry = GNSSENTRY_L2PDATA;
     125    else if (rnxStr == "D2W") iEntry = GNSSENTRY_D2PDATA;
     126    else if (rnxStr == "S2W") iEntry = GNSSENTRY_S2PDATA;
     127    else if (rnxStr == "C2" ) iEntry = GNSSENTRY_C2DATA; 
     128    else if (rnxStr == "L2" ) iEntry = GNSSENTRY_L2CDATA;
     129    else if (rnxStr == "D2" ) iEntry = GNSSENTRY_D2CDATA;
     130    else if (rnxStr == "S2" ) iEntry = GNSSENTRY_S2CDATA;
     131    else if (rnxStr == "C1" ) iEntry = GNSSENTRY_C1NDATA;
     132    else if (rnxStr == "L1" ) iEntry = GNSSENTRY_L1NDATA;
     133    else if (rnxStr == "D1" ) iEntry = GNSSENTRY_D1NDATA;
     134    else if (rnxStr == "S1" ) iEntry = GNSSENTRY_S1NDATA;
    151135  }
    152136
  • trunk/BNC/src/bncrinex.cpp

    r4391 r4395  
    108108  _rnxTypes['G'] << "C1C" << "L1C" << "D1C" << "S1C"
    109109                 << "C1W" << "L1W" << "D1W" << "S1W"
    110                  << "C2P" << "L2P" << "D2P" << "S2P"
    111                  << "C2X" << "L2X" << "D2X" << "S2X"
     110                 << "C2W" << "L2W" << "D2W" << "S2W"
    112111                 << "C5"  << "L5"  << "D5"  << "S5";
    113112
Note: See TracChangeset for help on using the changeset viewer.