Index: /branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp
===================================================================
--- /branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp (revision 9285)
+++ /branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp (revision 9286)
@@ -1032,5 +1032,5 @@
eph._receptDateTime = currentDateAndTimeGPS();
- eph._receptStaID = _staID;
+ eph._receptStaID = _staID;
GETBITS(i, 6)
@@ -1111,5 +1111,5 @@
eph._receptDateTime = currentDateAndTimeGPS();
eph._receptStaID = _staID;
-
+
GETBITS(sv, 6)
eph._prn.set('R', sv);
@@ -1236,5 +1236,5 @@
eph._receptDateTime = currentDateAndTimeGPS();
eph._receptStaID = _staID;
-
+
GETBITS(i, 4)
eph._prn.set('J', i);
@@ -1319,5 +1319,5 @@
eph._receptDateTime = currentDateAndTimeGPS();
eph._receptStaID = _staID;
-
+
GETBITS(i, 6)
eph._prn.set('I', i);
@@ -1410,5 +1410,5 @@
eph._receptDateTime = currentDateAndTimeGPS();
eph._receptStaID = _staID;
-
+
GETBITS(i, 6)
eph._prn.set('S', 20 + i);
@@ -1465,5 +1465,5 @@
eph._receptDateTime = currentDateAndTimeGPS();
eph._receptStaID = _staID;
-
+
eph._inav = (i == 1046);
eph._fnav = (i == 1045);
@@ -1571,5 +1571,5 @@
eph._receptDateTime = currentDateAndTimeGPS();
eph._receptStaID = _staID;
-
+
GETBITS(i, 6)
eph._prn.set('C', i);
@@ -1745,5 +1745,5 @@
}
}
- else if (id >= 1070 && id <= 1229) { /* MSM */
+ else if (id >= 1070 && id <= 1237) { /* MSM */
if (DecodeRTCM3MSM(_Message, _BlockSize))
decoded = true;
Index: /branches/BNC_2.12/src/RTCM3/RTCM3Decoder.h
===================================================================
--- /branches/BNC_2.12/src/RTCM3/RTCM3Decoder.h (revision 9285)
+++ /branches/BNC_2.12/src/RTCM3/RTCM3Decoder.h (revision 9286)
@@ -64,5 +64,5 @@
* {@link _MessageSize}: contains to current amount of bytes in the buffer
* {@link _SkipBytes}: amount of bytes to skip at the beginning of the buffer
- *
+ *
* The functions sets following variables:
* {@link _NeedBytes}: Minimum number of bytes needed on next call
@@ -94,6 +94,6 @@
bool DecodeRTCM3GLONASS(unsigned char* buffer, int bufLen);
/**
- * Extract data from MSM 1070-1229 RTCM3 messages.
- * @param buffer the buffer containing an 1070-1229 RTCM block
+ * Extract data from MSM 1070-1237 RTCM3 messages.
+ * @param buffer the buffer containing an 1070-1237 RTCM block
* @param bufLen the length of the buffer (the message length including header+crc)
* @return true
when data block is finished and transfered into
@@ -137,5 +137,5 @@
* @return true
when data block was decodable
*/
- bool DecodeIRNSSEphemeris(unsigned char* buffer, int bufLen);
+ bool DecodeIRNSSEphemeris(unsigned char* buffer, int bufLen);
/**
* Extract ephemeris data from 1045 and 1046 RTCM3 messages.
@@ -174,5 +174,5 @@
/** List of decoders for Clock and Orbit data */
- QMap _coDecoders;
+ QMap _coDecoders;
/** Message buffer for input parsing */
Index: /branches/BNC_2.12/src/bncgetthread.cpp
===================================================================
--- /branches/BNC_2.12/src/bncgetthread.cpp (revision 9285)
+++ /branches/BNC_2.12/src/bncgetthread.cpp (revision 9286)
@@ -558,5 +558,5 @@
if ((rtcmType >= 1001 && rtcmType <= 1004) || // legacy RTCM OBS
(rtcmType >= 1009 && rtcmType <= 1012) || // legacy RTCM OBS
- (rtcmType >= 1071 && rtcmType <= 1137)) { // MSM RTCM OBS
+ (rtcmType >= 1070 && rtcmType <= 1137)) { // MSM RTCM OBS
_rtcmObs = true;
} else if ((rtcmType >= 1057 && rtcmType <= 1068) ||