Whitespace and formatting changes
This commit is contained in:
@@ -345,7 +345,7 @@ void SFE_UBLOX_GNSS::end(void)
|
|||||||
{
|
{
|
||||||
if (packetUBXRXMQZSSL6message->callbackData != NULL)
|
if (packetUBXRXMQZSSL6message->callbackData != NULL)
|
||||||
{
|
{
|
||||||
delete [] packetUBXRXMQZSSL6message->callbackData;
|
delete[] packetUBXRXMQZSSL6message->callbackData;
|
||||||
}
|
}
|
||||||
delete packetUBXRXMQZSSL6message;
|
delete packetUBXRXMQZSSL6message;
|
||||||
packetUBXRXMQZSSL6message = NULL; // Redundant?
|
packetUBXRXMQZSSL6message = NULL; // Redundant?
|
||||||
@@ -2876,7 +2876,7 @@ nmeaAutomaticFlags *SFE_UBLOX_GNSS::getNMEAFlagsPtr()
|
|||||||
// Byte 2: 10-bits of length of this packet including the first two-ish header bytes, + 6.
|
// Byte 2: 10-bits of length of this packet including the first two-ish header bytes, + 6.
|
||||||
// byte 3 + 4 bits: Msg type 12 bits
|
// byte 3 + 4 bits: Msg type 12 bits
|
||||||
// Example: D3 00 7C 43 F0 ... / 0x7C = 124+6 = 130 bytes in this packet, 0x43F = Msg type 1087
|
// Example: D3 00 7C 43 F0 ... / 0x7C = 124+6 = 130 bytes in this packet, 0x43F = Msg type 1087
|
||||||
SFE_UBLOX_GNSS::sfe_ublox_sentence_types_e SFE_UBLOX_GNSS::processRTCMframe(uint8_t incoming, uint16_t * rtcmFrameCounter)
|
SFE_UBLOX_GNSS::sfe_ublox_sentence_types_e SFE_UBLOX_GNSS::processRTCMframe(uint8_t incoming, uint16_t *rtcmFrameCounter)
|
||||||
{
|
{
|
||||||
static uint16_t rtcmLen = 0;
|
static uint16_t rtcmLen = 0;
|
||||||
|
|
||||||
@@ -3943,8 +3943,10 @@ void SFE_UBLOX_GNSS::processUBXpacket(ubxPacket *msg)
|
|||||||
// Note: the field positions depend on the version
|
// Note: the field positions depend on the version
|
||||||
{
|
{
|
||||||
// Full QZSSL6 message, including Class, ID and checksum
|
// Full QZSSL6 message, including Class, ID and checksum
|
||||||
for (int ch = 0; ch < UBX_RXM_QZSSL6_NUM_CHANNELS; ch ++) {
|
for (int ch = 0; ch < UBX_RXM_QZSSL6_NUM_CHANNELS; ch++)
|
||||||
if (0 == (packetUBXRXMQZSSL6message->automaticFlags.flags.bits.callbackCopyValid & (1 << ch))) {
|
{
|
||||||
|
if (0 == (packetUBXRXMQZSSL6message->automaticFlags.flags.bits.callbackCopyValid & (1 << ch)))
|
||||||
|
{
|
||||||
|
|
||||||
packetUBXRXMQZSSL6message->callbackData[ch].sync1 = UBX_SYNCH_1;
|
packetUBXRXMQZSSL6message->callbackData[ch].sync1 = UBX_SYNCH_1;
|
||||||
packetUBXRXMQZSSL6message->callbackData[ch].sync2 = UBX_SYNCH_2;
|
packetUBXRXMQZSSL6message->callbackData[ch].sync2 = UBX_SYNCH_2;
|
||||||
@@ -5607,10 +5609,11 @@ void SFE_UBLOX_GNSS::checkCallbacks(void)
|
|||||||
(packetUBXRXMQZSSL6message->callbackData != NULL) && // If RAM has been allocated for the copy of the data
|
(packetUBXRXMQZSSL6message->callbackData != NULL) && // If RAM has been allocated for the copy of the data
|
||||||
(packetUBXRXMQZSSL6message->callbackPointerPtr != NULL)) // If the pointer to the callback has been defined
|
(packetUBXRXMQZSSL6message->callbackPointerPtr != NULL)) // If the pointer to the callback has been defined
|
||||||
{
|
{
|
||||||
for (int ch = 0; ch < UBX_RXM_QZSSL6_NUM_CHANNELS; ch ++) {
|
for (int ch = 0; ch < UBX_RXM_QZSSL6_NUM_CHANNELS; ch++)
|
||||||
|
{
|
||||||
if (packetUBXRXMQZSSL6message->automaticFlags.flags.bits.callbackCopyValid & (1 << ch)) // If the copy of the data is valid
|
if (packetUBXRXMQZSSL6message->automaticFlags.flags.bits.callbackCopyValid & (1 << ch)) // If the copy of the data is valid
|
||||||
{
|
{
|
||||||
packetUBXRXMQZSSL6message->callbackPointerPtr( &packetUBXRXMQZSSL6message->callbackData[ch] ); // Call the callback
|
packetUBXRXMQZSSL6message->callbackPointerPtr(&packetUBXRXMQZSSL6message->callbackData[ch]); // Call the callback
|
||||||
packetUBXRXMQZSSL6message->automaticFlags.flags.bits.callbackCopyValid &= ~(1 << ch); // clear it
|
packetUBXRXMQZSSL6message->automaticFlags.flags.bits.callbackCopyValid &= ~(1 << ch); // clear it
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -13127,7 +13130,6 @@ bool SFE_UBLOX_GNSS::initPacketUBXRXMQZSSL6message()
|
|||||||
return (true);
|
return (true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool SFE_UBLOX_GNSS::setRXMCORcallbackPtr(void (*callbackPointer)(UBX_RXM_COR_data_t *))
|
bool SFE_UBLOX_GNSS::setRXMCORcallbackPtr(void (*callbackPointer)(UBX_RXM_COR_data_t *))
|
||||||
{
|
{
|
||||||
if (packetUBXRXMCOR == NULL)
|
if (packetUBXRXMCOR == NULL)
|
||||||
|
|||||||
@@ -747,7 +747,7 @@ public:
|
|||||||
|
|
||||||
void process(uint8_t incoming, ubxPacket *incomingUBX, uint8_t requestedClass, uint8_t requestedID); // Processes NMEA and UBX binary sentences one byte at a time
|
void process(uint8_t incoming, ubxPacket *incomingUBX, uint8_t requestedClass, uint8_t requestedID); // Processes NMEA and UBX binary sentences one byte at a time
|
||||||
void processNMEA(char incoming) __attribute__((weak)); // Given a NMEA character, do something with it. User can overwrite if desired to use something like tinyGPS or MicroNMEA libraries
|
void processNMEA(char incoming) __attribute__((weak)); // Given a NMEA character, do something with it. User can overwrite if desired to use something like tinyGPS or MicroNMEA libraries
|
||||||
sfe_ublox_sentence_types_e processRTCMframe(uint8_t incoming, uint16_t * rtcmFrameCounter) __attribute__((weak)); // Monitor the incoming bytes for start and length bytes
|
sfe_ublox_sentence_types_e processRTCMframe(uint8_t incoming, uint16_t *rtcmFrameCounter) __attribute__((weak)); // Monitor the incoming bytes for start and length bytes
|
||||||
void processRTCM(uint8_t incoming) __attribute__((weak)); // Given rtcm byte, do something with it. User can overwrite if desired to pipe bytes to radio, internet, etc.
|
void processRTCM(uint8_t incoming) __attribute__((weak)); // Given rtcm byte, do something with it. User can overwrite if desired to pipe bytes to radio, internet, etc.
|
||||||
void processUBX(uint8_t incoming, ubxPacket *incomingUBX, uint8_t requestedClass, uint8_t requestedID); // Given a character, file it away into the uxb packet structure
|
void processUBX(uint8_t incoming, ubxPacket *incomingUBX, uint8_t requestedClass, uint8_t requestedID); // Given a character, file it away into the uxb packet structure
|
||||||
void processUBXpacket(ubxPacket *msg); // Once a packet has been received and validated, identify this packet's class/id and update internal flags
|
void processUBXpacket(ubxPacket *msg); // Once a packet has been received and validated, identify this packet's class/id and update internal flags
|
||||||
|
|||||||
Reference in New Issue
Block a user