Index: trunk/BNC/test_bnc.cpp
===================================================================
--- trunk/BNC/test_bnc.cpp	(revision 231)
+++ trunk/BNC/test_bnc.cpp	(revision 232)
@@ -8,4 +8,6 @@
 #endif
 
+#include "RTCM/GPSDecoder.h"
+
 using namespace std;
 
@@ -13,20 +15,4 @@
 const char begObs   = 'B';
 const char endEpoch = 'C';
-
-struct Observation {
-  char     StatID[5+1];    // Station ID
-  char     SVPRN;          // Satellite PRN
-  short    GPSWeek;        // Week of GPS-Time
-  int      GPSWeeks;       // Second of Week (GPS-Time)
-  double   sec;            // second 
-  double   C1;             // CA-code validated raw pseudorange (meters)
-  double   P2;             // P2-code validated raw pseudorange (meters)
-  double   L1;             // validated raw carrier phase (meters)
-  double   L2;             // validated raw carrier phase (meters)
-  short    SNR1;           // signal-to noise ration (0.1 dB)
-  short    SNR2;           // signal-to noise ration (0.1 dB)
-  int      pCodeIndicator; // 0 ... CA Code, 1 ... P Code
-  unsigned cumuLossOfCont; // 0 to 31
-} ;
 
 int main(int argc, char* argv[]) {
@@ -83,16 +69,14 @@
         bytesRecv = recv( ConnectSocket, (char*) &obs, sizeof(obs), 0);
         cout << setw(5)                     << obs.StatID         << " "
-             << setw(2)                     << (int) obs.SVPRN    << " "
+             << setw(2)                     << obs.SVPRN          << " "
              << setw(4)                     << obs.GPSWeek        << " "
-             << setw(6)                     << obs.GPSWeeks       << " "
-             << setw(8)  << setprecision(4) << obs.sec            << " "
+             << setw(10) << setprecision(2) << obs.GPSWeeks       << " "
              << setw(14) << setprecision(4) << obs.C1             << " "
+             << setw(14) << setprecision(4) << obs.P1             << " "
              << setw(14) << setprecision(4) << obs.P2             << " "
              << setw(14) << setprecision(4) << obs.L1             << " "
              << setw(14) << setprecision(4) << obs.L2             << " "
              << setw(4)                     << obs.SNR1           << " "
-             << setw(4)                     << obs.SNR2           << " "
-             << setw(4)                     << obs.pCodeIndicator << " "
-             << setw(4)                     << obs.cumuLossOfCont << endl;
+             << setw(4)                     << obs.SNR2           << endl;
       }
     }