Skip to content

Bug fix for parsing UBX-ESF-RAW #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2021
Merged

Bug fix for parsing UBX-ESF-RAW #35

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc09d3f
Initial commit to release_candidate. No significant changes.
nparker2020 May 7, 2021
6f2f433
Fixed byte offsets when parsing the USB-ESF-RAW message.
nparker2020 May 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions src/SparkFun_u-blox_GNSS_Arduino_Library.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVTIMELS;
packetUBXNAVTIMELS = NULL; // Redundant?
}

if (packetUBXNAVPOSECEF != NULL)
{
if (packetUBXNAVPOSECEF->callbackData != NULL)
{
delete[] packetUBXNAVPOSECEF->callbackData;
}
delete[] packetUBXNAVPOSECEF;
packetUBXNAVPOSECEF = NULL; // Redundant?
packetUBXNAVPOSECEF = NULL; // Redundant?
}

if (packetUBXNAVSTATUS != NULL)
Expand All @@ -109,7 +109,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVSTATUS->callbackData;
}
delete[] packetUBXNAVSTATUS;
packetUBXNAVSTATUS = NULL; // Redundant?
packetUBXNAVSTATUS = NULL; // Redundant?
}

if (packetUBXNAVDOP != NULL)
Expand All @@ -119,7 +119,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVDOP->callbackData;
}
delete[] packetUBXNAVDOP;
packetUBXNAVDOP = NULL; // Redundant?
packetUBXNAVDOP = NULL; // Redundant?
}

if (packetUBXNAVATT != NULL)
Expand All @@ -129,7 +129,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVATT->callbackData;
}
delete[] packetUBXNAVATT;
packetUBXNAVATT = NULL; // Redundant?
packetUBXNAVATT = NULL; // Redundant?
}

if (packetUBXNAVPVT != NULL)
Expand All @@ -143,7 +143,7 @@ void SFE_UBLOX_GNSS::end(void)
}
}
delete[] packetUBXNAVPVT;
packetUBXNAVPVT = NULL; // Redundant?
packetUBXNAVPVT = NULL; // Redundant?
if (_printDebug == true)
{
_debugSerial->println(F("end: packetUBXNAVPVT has been deleted"));
Expand All @@ -157,7 +157,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVODO->callbackData;
}
delete[] packetUBXNAVODO;
packetUBXNAVODO = NULL; // Redundant?
packetUBXNAVODO = NULL; // Redundant?
}

if (packetUBXNAVVELECEF != NULL)
Expand All @@ -167,7 +167,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVVELECEF->callbackData;
}
delete[] packetUBXNAVVELECEF;
packetUBXNAVVELECEF = NULL; // Redundant?
packetUBXNAVVELECEF = NULL; // Redundant?
}

if (packetUBXNAVVELNED != NULL)
Expand All @@ -177,7 +177,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVVELNED->callbackData;
}
delete[] packetUBXNAVVELNED;
packetUBXNAVVELNED = NULL; // Redundant?
packetUBXNAVVELNED = NULL; // Redundant?
}

if (packetUBXNAVHPPOSECEF != NULL)
Expand All @@ -187,7 +187,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVHPPOSECEF->callbackData;
}
delete[] packetUBXNAVHPPOSECEF;
packetUBXNAVHPPOSECEF = NULL; // Redundant?
packetUBXNAVHPPOSECEF = NULL; // Redundant?
}

if (packetUBXNAVHPPOSLLH != NULL)
Expand All @@ -197,7 +197,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVHPPOSLLH->callbackData;
}
delete[] packetUBXNAVHPPOSLLH;
packetUBXNAVHPPOSLLH = NULL; // Redundant?
packetUBXNAVHPPOSLLH = NULL; // Redundant?
}

if (packetUBXNAVCLOCK != NULL)
Expand All @@ -207,7 +207,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVCLOCK->callbackData;
}
delete[] packetUBXNAVCLOCK;
packetUBXNAVCLOCK = NULL; // Redundant?
packetUBXNAVCLOCK = NULL; // Redundant?
}

if (packetUBXNAVSVIN != NULL)
Expand All @@ -217,7 +217,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVSVIN->callbackData;
}
delete[] packetUBXNAVSVIN;
packetUBXNAVSVIN = NULL; // Redundant?
packetUBXNAVSVIN = NULL; // Redundant?
}

if (packetUBXNAVRELPOSNED != NULL)
Expand All @@ -227,7 +227,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVRELPOSNED->callbackData;
}
delete[] packetUBXNAVRELPOSNED;
packetUBXNAVRELPOSNED = NULL; // Redundant?
packetUBXNAVRELPOSNED = NULL; // Redundant?
}

if (packetUBXRXMSFRBX != NULL)
Expand All @@ -237,7 +237,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXRXMSFRBX->callbackData;
}
delete[] packetUBXRXMSFRBX;
packetUBXRXMSFRBX = NULL; // Redundant?
packetUBXRXMSFRBX = NULL; // Redundant?
}

if (packetUBXRXMRAWX != NULL)
Expand All @@ -247,7 +247,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXRXMRAWX->callbackData;
}
delete[] packetUBXRXMRAWX;
packetUBXRXMRAWX = NULL; // Redundant?
packetUBXRXMRAWX = NULL; // Redundant?
}

if (packetUBXCFGRATE != NULL)
Expand All @@ -257,7 +257,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXCFGRATE->callbackData;
}
delete[] packetUBXCFGRATE;
packetUBXCFGRATE = NULL; // Redundant?
packetUBXCFGRATE = NULL; // Redundant?
}

if (packetUBXTIMTM2 != NULL)
Expand All @@ -267,7 +267,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXTIMTM2->callbackData;
}
delete[] packetUBXTIMTM2;
packetUBXTIMTM2 = NULL; // Redundant?
packetUBXTIMTM2 = NULL; // Redundant?
}

if (packetUBXESFALG != NULL)
Expand All @@ -277,7 +277,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXESFALG->callbackData;
}
delete[] packetUBXESFALG;
packetUBXESFALG = NULL; // Redundant?
packetUBXESFALG = NULL; // Redundant?
}

if (packetUBXESFSTATUS != NULL)
Expand All @@ -287,7 +287,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXESFSTATUS->callbackData;
}
delete[] packetUBXESFSTATUS;
packetUBXESFSTATUS = NULL; // Redundant?
packetUBXESFSTATUS = NULL; // Redundant?
}

if (packetUBXESFINS != NULL)
Expand All @@ -297,7 +297,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXESFINS->callbackData;
}
delete[] packetUBXESFINS;
packetUBXESFINS = NULL; // Redundant?
packetUBXESFINS = NULL; // Redundant?
}

if (packetUBXESFMEAS != NULL)
Expand All @@ -307,7 +307,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXESFMEAS->callbackData;
}
delete[] packetUBXESFMEAS;
packetUBXESFMEAS = NULL; // Redundant?
packetUBXESFMEAS = NULL; // Redundant?
}

if (packetUBXESFRAW != NULL)
Expand All @@ -317,7 +317,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXESFRAW->callbackData;
}
delete[] packetUBXESFRAW;
packetUBXESFRAW = NULL; // Redundant?
packetUBXESFRAW = NULL; // Redundant?
}

if (packetUBXHNRATT != NULL)
Expand All @@ -327,7 +327,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXHNRATT->callbackData;
}
delete[] packetUBXHNRATT;
packetUBXHNRATT = NULL; // Redundant?
packetUBXHNRATT = NULL; // Redundant?
}

if (packetUBXHNRINS != NULL)
Expand All @@ -337,7 +337,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXHNRINS->callbackData;
}
delete[] packetUBXHNRINS;
packetUBXHNRINS = NULL; // Redundant?
packetUBXHNRINS = NULL; // Redundant?
}

if (packetUBXHNRPVT != NULL)
Expand All @@ -347,7 +347,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXHNRPVT->callbackData;
}
delete[] packetUBXHNRPVT;
packetUBXHNRPVT = NULL; // Redundant?
packetUBXHNRPVT = NULL; // Redundant?
}

}
Expand Down Expand Up @@ -2437,8 +2437,8 @@ void SFE_UBLOX_GNSS::processUBXpacket(ubxPacket *msg)
{
for (int i = 0; (i < DEF_NUM_SENS) && ((i * 8) < (msg->len - 4)); i++)
{
packetUBXESFRAW->data.data[i].data.all = extractLong(msg, 8 + (i * 8));
packetUBXESFRAW->data.data[i].sTag = extractLong(msg, 8 + (i * 8) + 4);
packetUBXESFRAW->data.data[i].data.all = extractLong(msg, 4 + (i * 8));
packetUBXESFRAW->data.data[i].sTag = extractLong(msg, 8 + (i * 8));
}

//Mark all datums as fresh (not read before)
Expand Down Expand Up @@ -9709,7 +9709,7 @@ uint32_t SFE_UBLOX_GNSS::getUnixEpoch(uint16_t maxWait)
packetUBXNAVPVT->moduleQueried.moduleQueried1.bits.sec = false;
packetUBXNAVPVT->moduleQueried.moduleQueried1.bits.all = false;
// assemble time elements into time_t - credits to Thomas Roell @ https://github.com/GrumpyOldPizza
uint32_t t = ((((((((uint32_t)packetUBXNAVPVT->data.year - 1970) * 365) + ((((uint32_t)packetUBXNAVPVT->data.year - 1970) + 3) / 4)) +
uint32_t t = ((((((((uint32_t)packetUBXNAVPVT->data.year - 1970) * 365) + ((((uint32_t)packetUBXNAVPVT->data.year - 1970) + 3) / 4)) +
DAYS_SINCE_MONTH[((uint32_t)packetUBXNAVPVT->data.year - 1970) & 3][(uint32_t)packetUBXNAVPVT->data.month] +
((uint32_t)packetUBXNAVPVT->data.day - 1)) * 24 +
(uint32_t)packetUBXNAVPVT->data.hour) * 60 +
Expand All @@ -9736,7 +9736,7 @@ uint32_t SFE_UBLOX_GNSS::getUnixEpoch(uint32_t& microsecond, uint16_t maxWait)
packetUBXNAVPVT->moduleQueried.moduleQueried1.bits.nano = false;
packetUBXNAVPVT->moduleQueried.moduleQueried1.bits.all = false;
// assemble time elements into time_t - credits to Thomas Roell @ https://github.com/GrumpyOldPizza
uint32_t t = ((((((((uint32_t)packetUBXNAVPVT->data.year - 1970) * 365) + ((((uint32_t)packetUBXNAVPVT->data.year - 1970) + 3) / 4)) +
uint32_t t = ((((((((uint32_t)packetUBXNAVPVT->data.year - 1970) * 365) + ((((uint32_t)packetUBXNAVPVT->data.year - 1970) + 3) / 4)) +
DAYS_SINCE_MONTH[((uint32_t)packetUBXNAVPVT->data.year - 1970) & 3][(uint32_t)packetUBXNAVPVT->data.month] +
((uint32_t)packetUBXNAVPVT->data.day - 1)) * 24 +
(uint32_t)packetUBXNAVPVT->data.hour) * 60 +
Expand Down Expand Up @@ -10395,7 +10395,7 @@ uint8_t SFE_UBLOX_GNSS::getLeapIndicator(int32_t& timeToLsEvent, uint16_t maxWai
getLeapSecondEvent(maxWait);
packetUBXNAVTIMELS->moduleQueried.moduleQueried.bits.validTimeToLsEvent = false; //Since we are about to give this to user, mark this data as stale
packetUBXNAVTIMELS->moduleQueried.moduleQueried.bits.lsChange = false;
packetUBXNAVTIMELS->moduleQueried.moduleQueried.bits.timeToLsEvent = false;
packetUBXNAVTIMELS->moduleQueried.moduleQueried.bits.timeToLsEvent = false;
packetUBXNAVTIMELS->moduleQueried.moduleQueried.bits.all = false;
timeToLsEvent = packetUBXNAVTIMELS->data.timeToLsEvent;
// returns NTP Leap Indicator
Expand Down