Changeset 6817 in ntrip for trunk/BNC

Timestamp:

May 6, 2015, 4:43:36 PM (10 years ago)

Author:

stuerze

Message:

renaming of BDS's first frequency band from '1' in '2'

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (1 diff)
• bncconst.cpp (modified) (1 diff)
• bncconst.h (modified) (3 diffs)
• bncsettings.cpp (modified) (1 diff)
• rinex/reqcanalyze.cpp (modified) (1 diff)
• rinex/rnxobsfile.cpp (modified) (1 diff)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -383 +383 @@
 {
   {0.0,0},
-  {BDS_WAVELENGTH_B1,"1I"},
+  {BDS_WAVELENGTH_B1,"2I"},
   {0.0,0},
   {0.0,0},

trunk/BNC/src/bncconst.cpp

@@ -50 +50 @@
   case t_frequency::S1:    return 1575420000.0;
   case t_frequency::S5:    return 1176450000.0;
-  case t_frequency::C1:    return 1561098000.0;
+  case t_frequency::C2:    return 1561098000.0;
   case t_frequency::C7:    return 1207140000.0;
   case t_frequency::C6:    return 1268520000.0;

trunk/BNC/src/bncconst.h

@@ -44 +44 @@
                         S1, // 1575.42
                         S5, // 1176.45
-                        C1, // 1561.098
+                        C2, // 1561.098
                         C7, // 1207.14
                         C6, // 1268.52
@@ -66 +66 @@
     else if (tt == S1) return "S1";
     else if (tt == S5) return "S5";
-    else if (tt == C1) return "C1";
+    else if (tt == C2) return "C2";
     else if (tt == C7) return "C7";
     else if (tt == C6) return "C6";
@@ -88 +88 @@
     else if (s == "S1") return S1;
     else if (s == "S5") return S5;
-    else if (s == "C1") return C1;
+    else if (s == "C2") return C2;
     else if (s == "C7") return C7;
     else if (s == "C6") return C6;

trunk/BNC/src/bncsettings.cpp

@@ -135 +135 @@
     setValue_p("reqcOutNavFile",      "");
     setValue_p("reqcOutLogFile",      "");
-    setValue_p("reqcSkyPlotSignals",  "C:1&7 E:1&5 G:1&2 J:1&2 R:1&2 S:1&5");
+    setValue_p("reqcSkyPlotSignals",  "C:2&7 E:1&5 G:1&2 J:1&2 R:1&2 S:1&5");
     setValue_p("reqcPlotDir",         "");
     setValue_p("reqcRnxVersion",      "");

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -70 +70 @@
   _navFileNames    = settings.value("reqcNavFile").toString().split(",", QString::SkipEmptyParts);
   _reqcPlotSignals = settings.value("reqcSkyPlotSignals").toString();
-  _defaultSignalTypes << "G:1&2" << "R:1&2" << "J:1&2" << "E:1&5" << "S:1&5" << "C:1&7";
+  _defaultSignalTypes << "G:1&2" << "R:1&2" << "J:1&2" << "E:1&5" << "S:1&5" << "C:2&7";
   if (_reqcPlotSignals.isEmpty()) {
     _reqcPlotSignals = _defaultSignalTypes.join(" ");

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -200 +200 @@
         QString hlp;
         *in >> hlp;
-        if      (sys == 'C' && _version == 3.02) {
-          hlp.replace('2', '1');
-        }
-        else if (sys == 'C' && _version == 3.03) {
+        if (sys == 'C' && _version < 3.03)  {
           hlp.replace('1', '2');
         }