Index: trunk/BNC/src/RTCM/GPSDecoder.cpp
===================================================================
--- trunk/BNC/src/RTCM/GPSDecoder.cpp	(revision 4395)
+++ trunk/BNC/src/RTCM/GPSDecoder.cpp	(revision 4396)
@@ -109,28 +109,30 @@
   // ------------------------------------
   if (satSys == 'G') {
-    if      (rnxStr == "C1C") iEntry = GNSSENTRY_C1DATA;
-    else if (rnxStr == "L1C") iEntry = GNSSENTRY_L1CDATA; 
-    else if (rnxStr == "D1C") iEntry = GNSSENTRY_D1CDATA; 
-    else if (rnxStr == "S1C") iEntry = GNSSENTRY_S1CDATA; 
-    else if (rnxStr == "C1W") iEntry = GNSSENTRY_P1DATA;  
-    else if (rnxStr == "L1W") iEntry = GNSSENTRY_L1PDATA; 
-    else if (rnxStr == "D1W") iEntry = GNSSENTRY_D1PDATA; 
-    else if (rnxStr == "S1W") iEntry = GNSSENTRY_S1PDATA; 
-    else if (rnxStr == "C5" ) iEntry = GNSSENTRY_C5DATA;  
-    else if (rnxStr == "L5" ) iEntry = GNSSENTRY_L5DATA;  
-    else if (rnxStr == "D5" ) iEntry = GNSSENTRY_D5DATA;  
-    else if (rnxStr == "S5" ) iEntry = GNSSENTRY_S5DATA;  
-    else if (rnxStr == "C2W") iEntry = GNSSENTRY_P2DATA;  
-    else if (rnxStr == "L2W") iEntry = GNSSENTRY_L2PDATA; 
-    else if (rnxStr == "D2W") iEntry = GNSSENTRY_D2PDATA; 
-    else if (rnxStr == "S2W") iEntry = GNSSENTRY_S2PDATA; 
-    else if (rnxStr == "C2" ) iEntry = GNSSENTRY_C2DATA;  
-    else if (rnxStr == "L2" ) iEntry = GNSSENTRY_L2CDATA; 
-    else if (rnxStr == "D2" ) iEntry = GNSSENTRY_D2CDATA; 
-    else if (rnxStr == "S2" ) iEntry = GNSSENTRY_S2CDATA; 
-    else if (rnxStr == "C1" ) iEntry = GNSSENTRY_C1NDATA; 
-    else if (rnxStr == "L1" ) iEntry = GNSSENTRY_L1NDATA; 
-    else if (rnxStr == "D1" ) iEntry = GNSSENTRY_D1NDATA; 
-    else if (rnxStr == "S1" ) iEntry = GNSSENTRY_S1NDATA; 
+    if      (rnxStr == "C1")                      iEntry = GNSSENTRY_C1NDATA; 
+    else if (rnxStr == "C1C")                     iEntry = GNSSENTRY_C1DATA;  
+    else if (rnxStr == "C1P" || rnxStr == "C1W")  iEntry = GNSSENTRY_P1DATA;  
+    else if (rnxStr == "L1")                      iEntry = GNSSENTRY_L1NDATA; 
+    else if (rnxStr == "L1C")                     iEntry = GNSSENTRY_L1CDATA; 
+    else if (rnxStr == "L1P" || rnxStr == "L1W")  iEntry = GNSSENTRY_L1PDATA; 
+    else if (rnxStr == "D1")                      iEntry = GNSSENTRY_D1NDATA; 
+    else if (rnxStr == "D1C")                     iEntry = GNSSENTRY_D1CDATA; 
+    else if (rnxStr == "D1P" || rnxStr == "D1W")  iEntry = GNSSENTRY_D1PDATA; 
+    else if (rnxStr == "S1")                      iEntry = GNSSENTRY_S1NDATA; 
+    else if (rnxStr == "S1C")                     iEntry = GNSSENTRY_S1CDATA; 
+    else if (rnxStr == "S1P" || rnxStr == "S1W")  iEntry = GNSSENTRY_S1PDATA; 
+
+    else if (rnxStr == "C2"  || rnxStr == "C2X")  iEntry = GNSSENTRY_C2DATA;  
+    else if (rnxStr == "C2P" || rnxStr == "C2W")  iEntry = GNSSENTRY_P2DATA;  
+    else if (rnxStr == "L2"  || rnxStr == "L2X")  iEntry = GNSSENTRY_L2CDATA; 
+    else if (rnxStr == "L2P" || rnxStr == "L2W")  iEntry = GNSSENTRY_L2PDATA; 
+    else if (rnxStr == "D2"  || rnxStr == "D2X")  iEntry = GNSSENTRY_D2CDATA; 
+    else if (rnxStr == "D2P" || rnxStr == "D2W")  iEntry = GNSSENTRY_D2PDATA; 
+    else if (rnxStr == "S2"  || rnxStr == "S2X")  iEntry = GNSSENTRY_S2CDATA; 
+    else if (rnxStr == "S2P" || rnxStr == "S2W")  iEntry = GNSSENTRY_S2PDATA; 
+
+    else if (rnxStr == "C5")                      iEntry = GNSSENTRY_C5DATA;  
+    else if (rnxStr == "D5")                      iEntry = GNSSENTRY_D5DATA;  
+    else if (rnxStr == "L5")                      iEntry = GNSSENTRY_L5DATA;  
+    else if (rnxStr == "S5")                      iEntry = GNSSENTRY_S5DATA;  
   }
 
@@ -150,3 +152,3 @@
   }
 }
-  
+