Changeset 10551 in ntrip for trunk/BNC

Timestamp:

Sep 25, 2024, 10:31:19 PM (4 weeks ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• RTCM3/bits.h (modified) (1 diff)
• RTCM3/crsEncoder.cpp (modified) (1 diff)
• src.pri (modified) (1 diff)

trunk/BNC/src/RTCM3/bits.h

@@ -152 +152 @@
 
 #define SCALEADDBITS(a, b, c) ADDBITS(a, (int64_t)(c > 0 ? b*c+0.5 : b*c-0.5))
+
+
+// RTCM3 CRS encoding
+//////////////////////////////////////////////////////////
+#define CRSTOINT(type, value) static_cast<type>(round(value))
+
+#define CRSADDBITS(a, b) {bitbuffer = (bitbuffer<<(a)) \
+                       |(CRSTOINT(long long,b)&((1ULL<<a)-1)); \
+                       numbits += (a); \
+                       while(numbits >= 8) { \
+                       buffer[size++] = bitbuffer>>(numbits-8);numbits -= 8;}}
+
+#define CRSADDBITSFLOAT(a,b,c) {long long i = CRSTOINT(long long,(b)/(c)); \
+                             CRSADDBITS(a,i)};
 
 // RTCM3 GPS EPH encoding

trunk/BNC/src/RTCM3/crsEncoder.cpp

@@ -85 +85 @@
   SCALEADDBITS(23, 1000.0, helmertPar._dz)
 
-  SCALEADDBITS(32, 50000.0, helmertPar._ox)
-  SCALEADDBITS(32, 50000.0, helmertPar._oy)
-  SCALEADDBITS(32, 50000.0, helmertPar._oz)
+  CRSADDBITSFLOAT(32, helmertPar._ox, 50000.0)
+  CRSADDBITSFLOAT(32, helmertPar._oy, 50000.0)
+  CRSADDBITSFLOAT(32, helmertPar._oz, 50000.0)
 
   SCALEADDBITS(25, 100000.0, helmertPar._sc)

trunk/BNC/src/src.pri

@@ -25 +25 @@
 #debug:DEFINES   += BNC_DEBUG_SSR
 #debug:DEFINES   += BNC_DEBUG_CMB
-debug:DEFINES    += QT_DISABLE_DEPRECATED_BEFORE=0x050F00
+#debug:DEFINES    += QT_DISABLE_DEPRECATED_BEFORE=0x050F00
 
 !versionAtLeast(QT_VERSION, 5.15.0):error("Use at least Qt version 5.15.0")