Index: trunk/BNC/RTCM3/RTCM3Decoder.cpp
===================================================================
--- trunk/BNC/RTCM3/RTCM3Decoder.cpp	(revision 366)
+++ trunk/BNC/RTCM3/RTCM3Decoder.cpp	(revision 367)
@@ -90,5 +90,5 @@
         if (rr == 2) {
           std::cerr << "No valid RINEX! All values are modulo 299792.458!\n";
-//        exit(1); 
+          exit(1);
         }
 
@@ -148,4 +148,10 @@
               obs->SNR2 = _Parser.Data.snrL2[ii];
             }
+            else if (df & (GNSSDF_S1CDATA|GNSSDF_S1PDATA)) {
+              obs->S1   = _Parser.Data.measdata[ii][pos];
+            }
+            else if (df & (GNSSDF_S2CDATA|GNSSDF_S2PDATA)) {
+              obs->S2   = _Parser.Data.measdata[ii][pos];
+            }
           }
           }
Index: trunk/BNC/RTCM3/rtcm3torinex.cpp
===================================================================
--- trunk/BNC/RTCM3/rtcm3torinex.cpp	(revision 366)
+++ trunk/BNC/RTCM3/rtcm3torinex.cpp	(revision 367)
@@ -1,5 +1,5 @@
 /*
   Converter for RTCM3 data to RINEX.
-  $Id: rtcm3torinex.c,v 1.16 2007/01/11 15:32:26 stoecker Exp $
+  $Id: rtcm3torinex.cpp,v 1.13 2007/01/17 15:17:20 mervart Exp $
   Copyright (C) 2005-2006 by Dirk Stoecker <stoecker@euronik.eu>
 
@@ -51,5 +51,5 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.16 $";
+static char revisionstr[] = "$Revision: 1.13 $";
 
 static uint32_t CRC24(long size, const unsigned char *buf)
@@ -249,5 +249,7 @@
     switch(type)
     {
-    case 1001: case 1002: case 1003: case 1004:
+    // Modification of RTCM3TORINEX for BNC: ignore 1001 and 1003
+    //case 1001: case 1002: case 1003: case 1004:
+    case 1002:  case 1004:
       if(handle->GPSWeek)
       {
@@ -408,5 +410,7 @@
       }
       break;
-    case 1009: case 1010: case 1011: case 1012:
+    // Modification of RTCM3TORINEX for BNC: ignore 1009 and 1010
+    //case 1009: case 1010: case 1011: case 1012:
+    case 1010: case 1012:
       {
         int lastlockl1[64];
@@ -656,7 +660,5 @@
 #define NUMSTARTSKIP 1
 
-////////////////////////////////////////////////////////////////////
-// Aenderung Perlt - kein check auf vorhandene Daten 
-// Abgefragt werden : C1 C2 L1 L2 P1 P2 S1 S2
+// Modification of RTCM3TORINEX for BNC
 
 void HandleHeader(struct RTCM3ParserData *Parser)
@@ -722,5 +724,5 @@
 Parser->datapos2[data[RINEXENTRY_D2DATA]-1] = GNSSENTRY_D2PDATA; 
 }
-// Ende Aenderung Perlt - kein check auf vorhandene Daten 
+// End of RTCM3TORINEX modification for BNC
 
 
@@ -852,5 +854,5 @@
 
 #ifndef NO_RTCM3_MAIN
-static char datestr[]     = "$Date: 2007/01/11 15:32:26 $";
+static char datestr[]     = "$Date: 2007/01/17 15:17:20 $";
 
 /* The string, which is send as agent in HTTP request */