Index: trunk/BNC/src/RTCM3/RTCM3Decoder.cpp
===================================================================
--- trunk/BNC/src/RTCM3/RTCM3Decoder.cpp	(revision 8679)
+++ trunk/BNC/src/RTCM3/RTCM3Decoder.cpp	(revision 8682)
@@ -196,5 +196,5 @@
       GETBITS(i, 7);
       frqObs->_lockTime = lti2sec(type,i);
-      frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);      
+      frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);
       frqObs->_slipCounter = i;
       if (type == 1004) {
@@ -356,10 +356,10 @@
         {0.0, 0},
         {0.0, 0},
-        {GPS_WAVELENGTH_L1, "1Z"},
-        {0.0, 0},
-        {0.0, 0},
-        {QZSS_WAVELENGTH_LEX, "6S"},
-        {QZSS_WAVELENGTH_LEX, "6L"},
-        {QZSS_WAVELENGTH_LEX, "6X"},
+        {GPS_WAVELENGTH_L1, "1Z"},// not defined in RTCM3.3?
+        {0.0, 0},
+        {0.0, 0},
+        {QZSS_WAVELENGTH_L6, "6S"},
+        {QZSS_WAVELENGTH_L6, "6L"},
+        {QZSS_WAVELENGTH_L6, "6X"},
         {0.0, 0},
         {0.0, 0},
@@ -380,6 +380,6 @@
         {0.0, 0},
         {0.0, 0},
-        {GPS_WAVELENGTH_L1, "1D"},
-        {GPS_WAVELENGTH_L1, "1P"},
+        {GPS_WAVELENGTH_L1, "1S"},
+        {GPS_WAVELENGTH_L1, "1L"},
         {GPS_WAVELENGTH_L1, "1X"}
     };
@@ -389,18 +389,18 @@
         {0.0, 0},
         {BDS_WAVELENGTH_B1, "2I"},
-        {0.0, 0},
-        {0.0, 0},
+        {BDS_WAVELENGTH_B1, "2Q"},
+        {BDS_WAVELENGTH_B1, "2X"},
         {0.0, 0},
         {0.0, 0},
         {0.0, 0},
         {BDS_WAVELENGTH_B3, "6I"},
-        {0.0, 0},
-        {0.0, 0},
+        {BDS_WAVELENGTH_B3, "6Q"},
+        {BDS_WAVELENGTH_B3, "6X"},
         {0.0, 0},
         {0.0, 0},
         {0.0, 0},
         {BDS_WAVELENGTH_B2, "7I"},
-        {0.0, 0},
-        {0.0, 0},
+        {BDS_WAVELENGTH_B2, "7Q"},
+        {BDS_WAVELENGTH_B2, "7X"},
         {0.0, 0},
         {0.0, 0},
@@ -719,5 +719,5 @@
                   frqObs->_phaseValid = true;
                   frqObs->_lockTime = lti2sec(type,ll[count]);
-                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);                  
+                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
                   frqObs->_slipCounter = ll[count];
                 }
@@ -735,5 +735,5 @@
                   frqObs->_phaseValid = true;
                   frqObs->_lockTime = lti2sec(type,ll[count]);
-                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);                  
+                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
                   frqObs->_slipCounter = ll[count];
                 }
@@ -752,5 +752,5 @@
                   frqObs->_phaseValid = true;
                   frqObs->_lockTime = lti2sec(type,ll[count]);
-                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);                  
+                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
                   frqObs->_slipCounter = ll[count];
                 }
@@ -772,5 +772,5 @@
                   frqObs->_phaseValid = true;
                   frqObs->_lockTime = lti2sec(type,ll[count]);
-                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);                  
+                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
                   frqObs->_slipCounter = ll[count];
                 }
@@ -797,5 +797,5 @@
                   frqObs->_phaseValid = true;
                   frqObs->_lockTime = lti2sec(type,ll[count]);
-                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);                  
+                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
                   frqObs->_slipCounter = ll[count];
                 }
@@ -817,5 +817,5 @@
                   frqObs->_phaseValid = true;
                   frqObs->_lockTime = lti2sec(type,ll[count]);
-                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);                  
+                  frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0);
                   frqObs->_slipCounter = ll[count];
                 }
@@ -907,5 +907,5 @@
     GETBITS(i, 7);
     frqObs->_lockTime = lti2sec(type,i);
-    frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);    
+    frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);
     frqObs->_slipCounter = i;
     if (type == 1010 || type == 1012) {
@@ -953,5 +953,5 @@
       GETBITS(i, 7);
       frqObs->_lockTime = lti2sec(type,i);
-      frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);      
+      frqObs->_lockTimeValid = (frqObs->_lockTime >= 0.0 && frqObs->_phaseValid);
       frqObs->_slipCounter = i;
       if (type == 1012) {
Index: trunk/BNC/src/RTCM3/gnss.h
===================================================================
--- trunk/BNC/src/RTCM3/gnss.h	(revision 8679)
+++ trunk/BNC/src/RTCM3/gnss.h	(revision 8682)
@@ -57,9 +57,9 @@
 #define QZSS_FREQU_L2       1227600000.0  /* Hz */
 #define QZSS_FREQU_L5       1176450000.0  /* Hz */
-#define QZSS_FREQU_LEX      1278750000.0 /* Hz */
+#define QZSS_FREQU_L6      1278750000.0 /* Hz */
 #define QZSS_WAVELENGTH_L1  (LIGHTSPEED / QZSS_FREQU_L1) /* m */
 #define QZSS_WAVELENGTH_L2  (LIGHTSPEED / QZSS_FREQU_L2) /* m */
 #define QZSS_WAVELENGTH_L5  (LIGHTSPEED / QZSS_FREQU_L5) /* m */
-#define QZSS_WAVELENGTH_LEX (LIGHTSPEED / QZSS_FREQU_LEX) /* m */
+#define QZSS_WAVELENGTH_L6  (LIGHTSPEED / QZSS_FREQU_L6) /* m */
 
 #define BDS_FREQU_B1       1561098000.0  /* Hz */
Index: trunk/BNC/src/rinex/rnxobsfile.cpp
===================================================================
--- trunk/BNC/src/rinex/rnxobsfile.cpp	(revision 8679)
+++ trunk/BNC/src/rinex/rnxobsfile.cpp	(revision 8682)
@@ -355,11 +355,19 @@
                    << "C8X" << "L8X" << "S8X";
 
+
     _obsTypes['S'] << "C1C" << "L1C" << "S1C"
                    << "C5I" << "L5I" << "S5I"
-                   << "C5Q" << "L5Q" << "S5Q";
+                   << "C5Q" << "L5Q" << "S5Q"
+                   << "C5X" << "L5X" << "S5X";
 
     _obsTypes['C'] << "C2I" << "L2I" << "S2I"
+                   << "C2Q" << "L2Q" << "S2Q"
+                   << "C2X" << "L2X" << "S2X"
                    << "C6I" << "L6I" << "S6I"
-                   << "C7I" << "L7I" << "S7I";
+                   << "C6Q" << "L6Q" << "S6Q"
+                   << "C6X" << "L6X" << "S6X"
+                   << "C7I" << "L7I" << "S7I"
+                   << "C7Q" << "L7Q" << "S7Q"
+                   << "C7X" << "L7X" << "S7X";
 
     _obsTypes['I'] << "C5A" << "L5A" << "S5A"