Index: trunk/BNC/src/bncgetthread.cpp
===================================================================
--- trunk/BNC/src/bncgetthread.cpp	(revision 6579)
+++ trunk/BNC/src/bncgetthread.cpp	(revision 6580)
@@ -665,4 +665,9 @@
             QString rnxStr('C');
             rnxStr.append(obs._obs[iFrq]->_rnxType2ch.c_str());
+            if (_format.indexOf("RTCM_2") != -1 ||
+                _format.indexOf("RTCM2") != -1 ||
+                _format.indexOf("RTCM 2") != -1 ) {
+              rnxStr = t_rnxObsFile::type3to2(obs._prn.system(), rnxStr);
+            }
             if (rnxTypes.indexOf(rnxStr) == -1) {
               rnxTypes.push_back(rnxStr);
@@ -673,4 +678,9 @@
             QString rnxStr('L');
             rnxStr.append(obs._obs[iFrq]->_rnxType2ch.c_str());
+            if (_format.indexOf("RTCM_2") != -1 ||
+                _format.indexOf("RTCM2") != -1 ||
+                _format.indexOf("RTCM 2") != -1 ) {
+              rnxStr = t_rnxObsFile::type3to2(obs._prn.system(), rnxStr);
+            }
             if (rnxTypes.indexOf(rnxStr) == -1) {
               rnxTypes.push_back(rnxStr);
@@ -681,4 +691,9 @@
             QString rnxStr('D');
             rnxStr.append(obs._obs[iFrq]->_rnxType2ch.c_str());
+            if (_format.indexOf("RTCM_2") != -1 ||
+                _format.indexOf("RTCM2") != -1 ||
+                _format.indexOf("RTCM 2") != -1 ) {
+              rnxStr = t_rnxObsFile::type3to2(obs._prn.system(), rnxStr);
+            }
             if (rnxTypes.indexOf(rnxStr) == -1) {
               rnxTypes.push_back(rnxStr);
@@ -689,4 +704,9 @@
             QString rnxStr('S');
             rnxStr.append(obs._obs[iFrq]->_rnxType2ch.c_str());
+            if (_format.indexOf("RTCM_2") != -1 ||
+                _format.indexOf("RTCM2") != -1 ||
+                _format.indexOf("RTCM 2") != -1 ) {
+              rnxStr = t_rnxObsFile::type3to2(obs._prn.system(), rnxStr);
+            }
             if (rnxTypes.indexOf(rnxStr) == -1) {
               rnxTypes.push_back(rnxStr);
Index: trunk/BNC/src/bncgetthread.h
===================================================================
--- trunk/BNC/src/bncgetthread.h	(revision 6579)
+++ trunk/BNC/src/bncgetthread.h	(revision 6580)
@@ -36,4 +36,5 @@
 #include "bncrawfile.h"
 #include "satObs.h"
+#include "rinex/rnxobsfile.h"
 
 class GPSDecoder;