Changeset 10829 in ntrip for trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h

Timestamp:

Apr 10, 2026, 12:11:21 PM (2 months ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h (modified) (8 diffs)

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.h

@@ -23 +23 @@
     COBBASE_GPS     = 1057;
     COBBASE_GLONASS =   41;
-    COBBASE_GALILEO = 1240;
-    COBBASE_QZSS    = 1246;
-    COBBASE_SBAS    = 1252;
-    COBBASE_BDS     = 1258;
-    COBBASE_NUM     =    6;
-    corbase << COBBASE_GPS
+    COBBASE_GALILEO =   62;
+    COBBASE_BDS     =   63;
+    COBBASE_QZSS    =   64;
+    COBBASE_NUM     =    5;
+    corbase
+        << COBBASE_GPS
         << COBBASE_GLONASS
         << COBBASE_GALILEO
-        << COBBASE_QZSS
-        << COBBASE_SBAS
-        << COBBASE_BDS;
-  };
-
-  void setCorOffset() {
-    COBOFS_ORBIT     = 0;
-    COBOFS_CLOCK     = 1;
-    COBOFS_CBIAS     = 2;
-    COBOFS_COMBINED  = 3;
-    COBOFS_URA       = 4;
-    COBOFS_HR        = 5;
-    COBOFS_NUM       = 6;
-  };
+        << COBBASE_BDS
+        << COBBASE_QZSS;
+  };
+
+  void setCorOffset() { };
 
   void setCoType() {
-    COTYPE_GPSORBIT        = COBBASE_GPS + COBOFS_ORBIT;
+    COTYPE_GPSORBIT        = COBBASE_GPS;
     COTYPE_GPSCLOCK        = COTYPE_GPSORBIT + 1;
-    COTYPE_GPSCOMBINED     = COBBASE_GPS + COBOFS_COMBINED;
+    COTYPE_GPSCOMBINED     = COTYPE_GPSCLOCK + 2;
     COTYPE_GPSURA          = COTYPE_GPSCOMBINED + 1;
     COTYPE_GPSHR           = COTYPE_GPSURA + 1;
 
-    COTYPE_GLONASSORBIT    = COBBASE_GLONASS + COBOFS_ORBIT;
+    COTYPE_GLONASSORBIT    = COBBASE_GLONASS;
     COTYPE_GLONASSCLOCK    = COTYPE_GLONASSORBIT + 1;
-    COTYPE_GLONASSCOMBINED = COBBASE_GLONASS + COBOFS_COMBINED;
+    COTYPE_GLONASSCOMBINED = COTYPE_GLONASSCLOCK + 2;
     COTYPE_GLONASSURA      = COTYPE_GLONASSCOMBINED + 1;
     COTYPE_GLONASSHR       = COTYPE_GLONASSURA + 1;
 
-    COTYPE_GALILEOORBIT    = COBBASE_GALILEO + COBOFS_ORBIT,
-    COTYPE_GALILEOCLOCK    = COTYPE_GALILEOORBIT + 1;
-    COTYPE_GALILEOCOMBINED = COBBASE_GALILEO + COBOFS_COMBINED;
-    COTYPE_GALILEOURA      = COTYPE_GALILEOCOMBINED + 1;
-    COTYPE_GALILEOHR       = COTYPE_GALILEOURA + 1;
-
-    COTYPE_QZSSORBIT       = COBBASE_QZSS + COBOFS_ORBIT;
-    COTYPE_QZSSCLOCK       = COTYPE_QZSSORBIT + 1;
-    COTYPE_QZSSCOMBINED    = COBBASE_QZSS + COBOFS_COMBINED,
-    COTYPE_QZSSURA         = COTYPE_QZSSCOMBINED + 1;
-    COTYPE_QZSSHR          = COTYPE_QZSSURA + 1;
-
-    COTYPE_SBASORBIT       = COBBASE_SBAS + COBOFS_ORBIT;
-    COTYPE_SBASCLOCK       = COTYPE_SBASORBIT + 1;
-    COTYPE_SBASCOMBINED    = COBBASE_SBAS + COBOFS_COMBINED;
-    COTYPE_SBASURA         = COTYPE_SBASCOMBINED + 1;
-    COTYPE_SBASHR          = COTYPE_SBASURA + 1;
-
-    COTYPE_BDSORBIT        = COBBASE_BDS + COBOFS_ORBIT;
-    COTYPE_BDSCLOCK        = COTYPE_BDSORBIT + 1;
-    COTYPE_BDSCOMBINED     = COBBASE_BDS + COBOFS_COMBINED,
-    COTYPE_BDSURA          = COTYPE_BDSCOMBINED + 1;
-    COTYPE_BDSHR           = COTYPE_BDSURA + 1;
+    COTYPE_GALILEOORBIT    = COBBASE_GALILEO;
+    COTYPE_GALILEOCLOCK    = COTYPE_GALILEOORBIT + 3;
+    COTYPE_GALILEOCOMBINED = COTYPE_GALILEOCLOCK + 6;
+    COTYPE_GALILEOURA      = COTYPE_GALILEOCOMBINED + 3;
+    COTYPE_GALILEOHR       = COTYPE_GALILEOURA + 3;
+
+    COTYPE_BDSORBIT        = COBBASE_BDS;
+    COTYPE_BDSCLOCK        = COTYPE_BDSORBIT + 3;
+    COTYPE_BDSCOMBINED     = COTYPE_BDSCLOCK + 6;
+    COTYPE_BDSURA          = COTYPE_BDSCOMBINED + 3;
+    COTYPE_BDSHR           = COTYPE_BDSURA + 3;
+
+    COTYPE_QZSSORBIT       = COBBASE_QZSS;
+    COTYPE_QZSSCLOCK       = COTYPE_QZSSORBIT + 3;
+    COTYPE_QZSSCOMBINED    = COTYPE_QZSSCLOCK + 6;
+    COTYPE_QZSSURA         = COTYPE_QZSSCOMBINED + 3;
+    COTYPE_QZSSHR          = COTYPE_QZSSURA + 3;
 
     COTYPE_AUTO = 0;
@@ -87 +72 @@
 
   void setCbType() {
-    CBTYPE_GPS     = COBBASE_GPS     + COBOFS_CBIAS;
-    CBTYPE_GLONASS = COBBASE_GLONASS + COBOFS_CBIAS;
-    CBTYPE_GALILEO = COBBASE_GALILEO + COBOFS_CBIAS;
-    CBTYPE_QZSS    = COBBASE_QZSS    + COBOFS_CBIAS;
-    CBTYPE_SBAS    = COBBASE_SBAS    + COBOFS_CBIAS;
-    CBTYPE_BDS     = COBBASE_BDS     + COBOFS_CBIAS;
+    CBTYPE_GPS     = COBBASE_GPS     + 2;
+    CBTYPE_GLONASS = COBBASE_GLONASS + 2;
+    CBTYPE_GALILEO = COBBASE_GALILEO + 6;
+    CBTYPE_QZSS    = COBBASE_QZSS    + 6;
+    CBTYPE_BDS     = COBBASE_BDS     + 6;
     CBTYPE_AUTO = 0;
   };
@@ -116 +100 @@
   };
 
-
-  void setVtecType() {
-      VTEC_BASE   = 1264;
-  };
+  void setVtecType() {};
+
+  void setSatAntType() {
+    SATANTTYPE_BASE    = 80;
+    SATANTTYPE_GPS     = SATANTTYPE_BASE;
+    SATANTTYPE_GLONASS = SATANTTYPE_GPS++;
+    SATANTTYPE_GALILEO = SATANTTYPE_GLONASS++;
+    SATANTTYPE_BDS     = SATANTTYPE_GALILEO++;
+    SATANTTYPE_QZSS    = SATANTTYPE_BDS++;
+    SATANTTYPE_AUTO    = 0;
+  };
+
+  void setGridDefType() {
+    GRID_BASE = 61;
+  }
+
+  void setTropoType() {
+    TROPOTYPE_BASE = 95;
+  }
+
+  void setRegIonoType() {
+    REGIONOTYPE_BASE    = 96;
+    REGIONOTYPE_GPS     = REGIONOTYPE_BASE;
+    REGIONOTYPE_GLONASS = REGIONOTYPE_GPS++;
+    REGIONOTYPE_GALILEO = REGIONOTYPE_GLONASS++;
+    REGIONOTYPE_BDS     = REGIONOTYPE_GALILEO++;
+    REGIONOTYPE_QZSS    = REGIONOTYPE_BDS++;
+    REGIONOTYPE_AUTO    = 0;
+  }
+
+  void setMetaDataType() {
+    METADATATYPE_BASE = 60;
+  }
 
   void setCodeType() {
-    RESERVED = 99;
-
+    CODETYPE_RESERVED = 99;
+    // GPS
     CODETYPE_GPS_L1_CA          =  0;
     CODETYPE_GPS_L1_P           =  1;
     CODETYPE_GPS_L1_Z           =  2;
-
-
+    // 3 + 4 RESERVED
     CODETYPE_GPS_L2_CA          =  5;
     CODETYPE_GPS_SEMI_CODELESS  =  6;
@@ -136 +148 @@
     CODETYPE_GPS_L2_P           = 10;
     CODETYPE_GPS_L2_Z           = 11;
-
-
+    //12 + 13 RESEVED
     CODETYPE_GPS_L5_I           = 14;
     CODETYPE_GPS_L5_Q           = 15;
@@ -144 +155 @@
     CODETYPE_GPS_L1C_P          = 18;
     CODETYPE_GPS_L1C_DP         = 19;
-
+    // > 19 RESEVED
+
+    // GLONASS
     CODETYPE_GLONASS_L1_CA      =  0;
     CODETYPE_GLONASS_L1_P       =  1;
     CODETYPE_GLONASS_L2_CA      =  2;
     CODETYPE_GLONASS_L2_P       =  3;
-    CODETYPE_GLONASS_L1a_OCd    =  4;
-    CODETYPE_GLONASS_L1a_OCp    =  5;
-    CODETYPE_GLONASS_L1a_OCdp   =  6;
-    CODETYPE_GLONASS_L2a_CSI    =  7;
-    CODETYPE_GLONASS_L2a_OCp    =  8;
-    CODETYPE_GLONASS_L2a_CSIOCp =  9;
-    CODETYPE_GLONASS_L3_I       = 10;
-    CODETYPE_GLONASS_L3_Q       = 11;
-    CODETYPE_GLONASS_L3_IQ      = 12;
-
+    // > 3 RESERVED
+
+    // Galileo
     CODETYPE_GALILEO_E1_A       =  0;
     CODETYPE_GALILEO_E1_B       =  1;
@@ -178 +184 @@
     CODETYPE_GALILEO_E6_BC      = 17;
     CODETYPE_GALILEO_E6_ABC     = 18;
+    // > 18 RESERVED
 
     CODETYPE_QZSS_L1_CA         =  0;
@@ -192 +199 @@
     CODETYPE_QZSS_L6_DP         = 11;
     CODETYPE_QZSS_L1C_DP        = 12;
-    CODETYPE_QZSS_L1_S          = 13;
-    CODETYPE_QZSS_L5_D          = 14;
-    CODETYPE_QZSS_L5_P          = 15;
-    CODETYPE_QZSS_L5_DP         = 16;
-    CODETYPE_QZSS_L6_E          = 17;
-    CODETYPE_QZSS_L6_DE         = 18;
-
-    CODETYPE_SBAS_L1_CA         =  0;
-    CODETYPE_SBAS_L5_I          =  1;
-    CODETYPE_SBAS_L5_Q          =  2;
-    CODETYPE_SBAS_L5_IQ         =  3;
-
+    // > 12 RESERVED
+
+    // BDS
     CODETYPE_BDS_B1_I           =  0;
     CODETYPE_BDS_B1_Q           =  1;
@@ -213 +211 @@
     CODETYPE_BDS_B2_Q           =  7;
     CODETYPE_BDS_B2_IQ          =  8;
-    CODETYPE_BDS_B1a_D          =  9;
-    CODETYPE_BDS_B1a_P          = 10;
-    CODETYPE_BDS_B1a_DP         = 11;
+    CODETYPE_BDS_B1C_D          =  9;
+    CODETYPE_BDS_B1C_P          = 10;
+    CODETYPE_BDS_B1C_DP         = 11;
     CODETYPE_BDS_B2a_D          = 12;
     CODETYPE_BDS_B2a_P          = 13;
     CODETYPE_BDS_B2a_DP         = 14;
-
-
-
-
+    CODETYPE_BDS_B2b_D          = 15;
+    // > 15 RESEVED
   }