Changeset 6319 in ntrip for trunk/BNC/src

Timestamp:

Nov 12, 2014, 5:15:14 PM (10 years ago)

Author:

stuerze

Message:

frequencies for systems J,S,C added

Location:

trunk/BNC/src

Files:

• bncconst.cpp (modified) (1 diff)
• bncconst.h (modified) (2 diffs)

trunk/BNC/src/bncconst.cpp

@@ -44 +44 @@
   case t_frequency::R1:    return 1602000000.0 + 562500.0 * slotNum;
   case t_frequency::R2:    return 1246000000.0 + 437500.0 * slotNum;
+  case t_frequency::J1:    return 1575420000.0;
+  case t_frequency::J2:    return 1227600000.0;
+  case t_frequency::J5:    return 1176450000.0;
+  case t_frequency::J6:    return 1278750000.0;
+  case t_frequency::S1:    return 1575420000.0;
+  case t_frequency::S5:    return 1176450000.0;
+  case t_frequency::C1:    return 1561098000.0;
+  case t_frequency::C7:    return 1207140000.0;
+  case t_frequency::C6:    return 1268520000.0;
   case t_frequency::dummy:
   case t_frequency::max:   return 0.0;

trunk/BNC/src/bncconst.h

@@ -37 +37 @@
                         E7, // E5b / 1207.140         
                         E8, // E5(E5a+E5b) / 1191.795 
-                        E6, // E6  / 1278.75          
+                        E6, // E6  / 1278.75
+                                                J1, // 1575.42
+                                                J2, // 1227.60
+                                                J5, // 1176.45
+                                                J6, // Lex(6) 1278.75
+                                                S1, // 1575.42
+                                                S5, // 1176.45
+                                                C1, // 1561.098
+                                                C7, // 1207.14
+                                                C6, // 1268.52
              max};
 
@@ -51 +60 @@
     else if (tt == E7) return "E7";
     else if (tt == E8) return "E8";
+    else if (tt == J1) return "J1";
+    else if (tt == J2) return "J2";
+    else if (tt == J5) return "J5";
+    else if (tt == J6) return "J6";
+    else if (tt == S1) return "S1";
+    else if (tt == S5) return "S5";
+    else if (tt == C1) return "C1";
+    else if (tt == C7) return "C7";
+    else if (tt == C6) return "C6";
     return std::string();
   }