Index: branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp
===================================================================
--- branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp	(revision 8680)
+++ branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp	(revision 8681)
@@ -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},
Index: branches/BNC_2.12/src/RTCM3/gnss.h
===================================================================
--- branches/BNC_2.12/src/RTCM3/gnss.h	(revision 8680)
+++ branches/BNC_2.12/src/RTCM3/gnss.h	(revision 8681)
@@ -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: branches/BNC_2.12/src/rinex/rnxobsfile.cpp
===================================================================
--- branches/BNC_2.12/src/rinex/rnxobsfile.cpp	(revision 8680)
+++ branches/BNC_2.12/src/rinex/rnxobsfile.cpp	(revision 8681)
@@ -357,9 +357,16 @@
     _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"