Changeset 3734 in ntrip

Timestamp:

Mar 26, 2012, 2:21:59 PM (12 years ago)

Author:

stoecker

Message:

fix crash with Galileo ephemeris available, some other valgrind fixes as well

Location:

trunk/BNC

Files:

• RTCM3/ephemeris.cpp (modified) (4 diffs)
• bncapp.cpp (modified) (1 diff)
• bncgetthread.cpp (modified) (1 diff)

trunk/BNC/RTCM3/ephemeris.cpp

@@ -75 +75 @@
   _TOC  = ee->TOC;
   _TOE  = ee->TOE;
-  _IODE = ee->IODE;             
-  _IODC = ee->IODC;             
-
-  _clock_bias      = ee->clock_bias     ;
-  _clock_drift     = ee->clock_drift    ;
+  _IODE = ee->IODE;
+  _IODC = ee->IODC;
+
+  _clock_bias      = ee->clock_bias;
+  _clock_drift     = ee->clock_drift;
   _clock_driftrate = ee->clock_driftrate;
 
@@ -101 +101 @@
 
   _ok       = true;
+
+  /* FIXME: convert URAindex and flags! */
+  _ura = 0;
+  _L2Codes = 0;
+  _L2PFlag = 0;
+  _health = ee->SVhealth;
 }
 
@@ -596 +602 @@
   _TOC    = ee->TOC;
   _TOE    = ee->TOE;
-  _IODnav = ee->IODnav;             
-
-  _clock_bias      = ee->clock_bias     ;
-  _clock_drift     = ee->clock_drift    ;
+  _IODnav = ee->IODnav;
+
+  _clock_bias      = ee->clock_bias;
+  _clock_drift     = ee->clock_drift;
   _clock_driftrate = ee->clock_driftrate;
 
@@ -617 +623 @@
   _OMEGADOT = ee->OMEGADOT;
   _IDOT     = ee->IDOT;
+  _SISA     = ee->SISA;
+  _BGD_1_5A = ee->BGD_1_5A;
+  _BGD_1_5B = ee->BGD_1_5B;
+  _E5aHS    = ee->E5aHS;
 
   _ok = true;

trunk/BNC/bncapp.cpp

@@ -283 +283 @@
   printEphHeader();
 
-  int galIndex = galileoeph->satellite - 51;
+  int galIndex = galileoeph->satellite;
+  /* GIOVE */
+  if(galIndex == 51) galIndex = 1;
+  else if(galIndex == 52) galIndex = 16;
   if (galIndex < 0 || galIndex > PRN_GALILEO_END - PRN_GALILEO_START) {
     emit( newMessage("Wrong Galileo Satellite Number", true) );

trunk/BNC/bncgetthread.cpp

@@ -108 +108 @@
   if (!settings.value("rawOutFile").toString().isEmpty()) {
     _rawOutput = true;
+  } else {
+    _rawOutput = false;
   }