Index: /trunk/BNC/src/RTCM/GPSDecoder.cpp
===================================================================
--- /trunk/BNC/src/RTCM/GPSDecoder.cpp	(revision 5354)
+++ /trunk/BNC/src/RTCM/GPSDecoder.cpp	(revision 5355)
@@ -47,5 +47,4 @@
 extern "C" {
 #include "rtcm3torinex.h"
-#include "rtcm3torinexsupport.h"
 }
 
@@ -127,5 +126,22 @@
   }
 
-  return rrinex3codetoentry(rnxStr.toAscii().data());
+  for (int ie = 0; ie <  GNSSENTRY_NUMBER; ie++) {
+    if (rnxStr.mid(1) == QString(_codetype[ie])) {
+      if      (rnxStr[0] == 'C') {
+        return ie + GNSSENTRY_CODE;
+      }
+      else if (rnxStr[0] == 'L') {
+        return ie + GNSSENTRY_PHASE;
+      }
+      else if (rnxStr[0] == 'D') {
+        return ie + GNSSENTRY_DOPPLER;
+      }
+      else if (rnxStr[0] == 'S') {
+        return ie + GNSSENTRY_SNR;
+      }
+    }
+  }
+  return -1;
+  ////  return rrinex3codetoentry(rnxStr.toAscii().data());
 }
 
Index: /trunk/BNC/src/bncgetthread.cpp
===================================================================
--- /trunk/BNC/src/bncgetthread.cpp	(revision 5354)
+++ /trunk/BNC/src/bncgetthread.cpp	(revision 5355)
@@ -696,4 +696,8 @@
               allFound = false;
               rnxTypes << obs.rnxStr(iEntry);
+              //// beg test
+              qDebug() << iEntry << obs.satSys << obs.rnxStr(iEntry) 
+                       << obs.measdata(obs.rnxStr(iEntry), 3.01);
+              //// end test
             }
           }
Index: /trunk/BNC/src/src.pri
===================================================================
--- /trunk/BNC/src/src.pri	(revision 5354)
+++ /trunk/BNC/src/src.pri	(revision 5355)
@@ -55,5 +55,4 @@
           RTCM/RTCM2_2021.h RTCM/rtcm_utils.h                         \
           RTCM3/RTCM3Decoder.h RTCM3/rtcm3torinex/rtcm3torinex.h      \
-          RTCM3/rtcm3torinex/rtcm3torinexsupport.h                    \
           RTCM3/RTCM3coDecoder.h                                      \
           RTCM3/clock_and_orbit/clock_orbit_rtcm.h                    \
@@ -84,5 +83,4 @@
           RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp                     \
           RTCM3/RTCM3Decoder.cpp RTCM3/rtcm3torinex/rtcm3torinex.c    \
-          RTCM3/rtcm3torinex/rtcm3torinexsupport.c                    \
           RTCM3/RTCM3coDecoder.cpp                                    \
           RTCM3/clock_and_orbit/clock_orbit_rtcm.c                    \