PlatformIO-Libs/SparkFunGNSS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35 from nparker2020/release_candidate

Browse Source 
Bug fix for parsing UBX-ESF-RAW
This commit is contained in:
Paul
2021-05-07 18:29:56 +01:00
committed by GitHub
parent 36fe93e4e2 6f2f43385d
commit 35d2cb55dd
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SparkFun_u-blox_GNSS_Arduino_Library.cpp
+31 -31
View File
@@ -91,7 +91,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVTIMELS; delete[] packetUBXNAVTIMELS;
packetUBXNAVTIMELS = NULL; // Redundant? packetUBXNAVTIMELS = NULL; // Redundant?
} }
if (packetUBXNAVPOSECEF != NULL) if (packetUBXNAVPOSECEF != NULL)
{ {
if (packetUBXNAVPOSECEF->callbackData != NULL) if (packetUBXNAVPOSECEF->callbackData != NULL)
@@ -99,7 +99,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVPOSECEF->callbackData; delete[] packetUBXNAVPOSECEF->callbackData;
} }
delete[] packetUBXNAVPOSECEF; delete[] packetUBXNAVPOSECEF;
packetUBXNAVPOSECEF = NULL; // Redundant? packetUBXNAVPOSECEF = NULL; // Redundant?
} }
if (packetUBXNAVSTATUS != NULL) if (packetUBXNAVSTATUS != NULL)
@@ -109,7 +109,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVSTATUS->callbackData; delete[] packetUBXNAVSTATUS->callbackData;
} }
delete[] packetUBXNAVSTATUS; delete[] packetUBXNAVSTATUS;
packetUBXNAVSTATUS = NULL; // Redundant? packetUBXNAVSTATUS = NULL; // Redundant?
} }
if (packetUBXNAVDOP != NULL) if (packetUBXNAVDOP != NULL)
@@ -119,7 +119,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVDOP->callbackData; delete[] packetUBXNAVDOP->callbackData;
} }
delete[] packetUBXNAVDOP; delete[] packetUBXNAVDOP;
packetUBXNAVDOP = NULL; // Redundant? packetUBXNAVDOP = NULL; // Redundant?
} }
if (packetUBXNAVATT != NULL) if (packetUBXNAVATT != NULL)
@@ -129,7 +129,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVATT->callbackData; delete[] packetUBXNAVATT->callbackData;
} }
delete[] packetUBXNAVATT; delete[] packetUBXNAVATT;
packetUBXNAVATT = NULL; // Redundant? packetUBXNAVATT = NULL; // Redundant?
} }
if (packetUBXNAVPVT != NULL) if (packetUBXNAVPVT != NULL)
@@ -143,7 +143,7 @@ void SFE_UBLOX_GNSS::end(void)
} }
} }
delete[] packetUBXNAVPVT; delete[] packetUBXNAVPVT;
packetUBXNAVPVT = NULL; // Redundant? packetUBXNAVPVT = NULL; // Redundant?
if (_printDebug == true) if (_printDebug == true)
{ {
_debugSerial->println(F("end: packetUBXNAVPVT has been deleted")); _debugSerial->println(F("end: packetUBXNAVPVT has been deleted"));
@@ -157,7 +157,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVODO->callbackData; delete[] packetUBXNAVODO->callbackData;
} }
delete[] packetUBXNAVODO; delete[] packetUBXNAVODO;
packetUBXNAVODO = NULL; // Redundant? packetUBXNAVODO = NULL; // Redundant?
} }
if (packetUBXNAVVELECEF != NULL) if (packetUBXNAVVELECEF != NULL)
@@ -167,7 +167,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVVELECEF->callbackData; delete[] packetUBXNAVVELECEF->callbackData;
} }
delete[] packetUBXNAVVELECEF; delete[] packetUBXNAVVELECEF;
packetUBXNAVVELECEF = NULL; // Redundant? packetUBXNAVVELECEF = NULL; // Redundant?
} }
if (packetUBXNAVVELNED != NULL) if (packetUBXNAVVELNED != NULL)
@@ -177,7 +177,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVVELNED->callbackData; delete[] packetUBXNAVVELNED->callbackData;
} }
delete[] packetUBXNAVVELNED; delete[] packetUBXNAVVELNED;
packetUBXNAVVELNED = NULL; // Redundant? packetUBXNAVVELNED = NULL; // Redundant?
} }
if (packetUBXNAVHPPOSECEF != NULL) if (packetUBXNAVHPPOSECEF != NULL)
@@ -187,7 +187,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVHPPOSECEF->callbackData; delete[] packetUBXNAVHPPOSECEF->callbackData;
} }
delete[] packetUBXNAVHPPOSECEF; delete[] packetUBXNAVHPPOSECEF;
packetUBXNAVHPPOSECEF = NULL; // Redundant? packetUBXNAVHPPOSECEF = NULL; // Redundant?
} }
if (packetUBXNAVHPPOSLLH != NULL) if (packetUBXNAVHPPOSLLH != NULL)
@@ -197,7 +197,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVHPPOSLLH->callbackData; delete[] packetUBXNAVHPPOSLLH->callbackData;
} }
delete[] packetUBXNAVHPPOSLLH; delete[] packetUBXNAVHPPOSLLH;
packetUBXNAVHPPOSLLH = NULL; // Redundant? packetUBXNAVHPPOSLLH = NULL; // Redundant?
} }
if (packetUBXNAVCLOCK != NULL) if (packetUBXNAVCLOCK != NULL)
@@ -207,7 +207,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVCLOCK->callbackData; delete[] packetUBXNAVCLOCK->callbackData;
} }
delete[] packetUBXNAVCLOCK; delete[] packetUBXNAVCLOCK;
packetUBXNAVCLOCK = NULL; // Redundant? packetUBXNAVCLOCK = NULL; // Redundant?
} }
if (packetUBXNAVSVIN != NULL) if (packetUBXNAVSVIN != NULL)
@@ -217,7 +217,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVSVIN->callbackData; delete[] packetUBXNAVSVIN->callbackData;
} }
delete[] packetUBXNAVSVIN; delete[] packetUBXNAVSVIN;
packetUBXNAVSVIN = NULL; // Redundant? packetUBXNAVSVIN = NULL; // Redundant?
} }
if (packetUBXNAVRELPOSNED != NULL) if (packetUBXNAVRELPOSNED != NULL)
@@ -227,7 +227,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXNAVRELPOSNED->callbackData; delete[] packetUBXNAVRELPOSNED->callbackData;
} }
delete[] packetUBXNAVRELPOSNED; delete[] packetUBXNAVRELPOSNED;
packetUBXNAVRELPOSNED = NULL; // Redundant? packetUBXNAVRELPOSNED = NULL; // Redundant?
} }
if (packetUBXRXMSFRBX != NULL) if (packetUBXRXMSFRBX != NULL)
@@ -237,7 +237,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXRXMSFRBX->callbackData; delete[] packetUBXRXMSFRBX->callbackData;
} }
delete[] packetUBXRXMSFRBX; delete[] packetUBXRXMSFRBX;
packetUBXRXMSFRBX = NULL; // Redundant? packetUBXRXMSFRBX = NULL; // Redundant?
} }
if (packetUBXRXMRAWX != NULL) if (packetUBXRXMRAWX != NULL)
@@ -247,7 +247,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXRXMRAWX->callbackData; delete[] packetUBXRXMRAWX->callbackData;
} }
delete[] packetUBXRXMRAWX; delete[] packetUBXRXMRAWX;
packetUBXRXMRAWX = NULL; // Redundant? packetUBXRXMRAWX = NULL; // Redundant?
} }
if (packetUBXCFGRATE != NULL) if (packetUBXCFGRATE != NULL)
@@ -257,7 +257,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXCFGRATE->callbackData; delete[] packetUBXCFGRATE->callbackData;
} }
delete[] packetUBXCFGRATE; delete[] packetUBXCFGRATE;
packetUBXCFGRATE = NULL; // Redundant? packetUBXCFGRATE = NULL; // Redundant?
} }
if (packetUBXTIMTM2 != NULL) if (packetUBXTIMTM2 != NULL)
@@ -267,7 +267,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXTIMTM2->callbackData; delete[] packetUBXTIMTM2->callbackData;
} }
delete[] packetUBXTIMTM2; delete[] packetUBXTIMTM2;
packetUBXTIMTM2 = NULL; // Redundant? packetUBXTIMTM2 = NULL; // Redundant?
} }
if (packetUBXESFALG != NULL) if (packetUBXESFALG != NULL)
@@ -277,7 +277,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXESFALG->callbackData; delete[] packetUBXESFALG->callbackData;
} }
delete[] packetUBXESFALG; delete[] packetUBXESFALG;
packetUBXESFALG = NULL; // Redundant? packetUBXESFALG = NULL; // Redundant?
} }
if (packetUBXESFSTATUS != NULL) if (packetUBXESFSTATUS != NULL)
@@ -287,7 +287,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXESFSTATUS->callbackData; delete[] packetUBXESFSTATUS->callbackData;
} }
delete[] packetUBXESFSTATUS; delete[] packetUBXESFSTATUS;
packetUBXESFSTATUS = NULL; // Redundant? packetUBXESFSTATUS = NULL; // Redundant?
} }
if (packetUBXESFINS != NULL) if (packetUBXESFINS != NULL)
@@ -297,7 +297,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXESFINS->callbackData; delete[] packetUBXESFINS->callbackData;
} }
delete[] packetUBXESFINS; delete[] packetUBXESFINS;
packetUBXESFINS = NULL; // Redundant? packetUBXESFINS = NULL; // Redundant?
} }
if (packetUBXESFMEAS != NULL) if (packetUBXESFMEAS != NULL)
@@ -307,7 +307,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXESFMEAS->callbackData; delete[] packetUBXESFMEAS->callbackData;
} }
delete[] packetUBXESFMEAS; delete[] packetUBXESFMEAS;
packetUBXESFMEAS = NULL; // Redundant? packetUBXESFMEAS = NULL; // Redundant?
} }
if (packetUBXESFRAW != NULL) if (packetUBXESFRAW != NULL)
@@ -317,7 +317,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXESFRAW->callbackData; delete[] packetUBXESFRAW->callbackData;
} }
delete[] packetUBXESFRAW; delete[] packetUBXESFRAW;
packetUBXESFRAW = NULL; // Redundant? packetUBXESFRAW = NULL; // Redundant?
} }
if (packetUBXHNRATT != NULL) if (packetUBXHNRATT != NULL)
@@ -327,7 +327,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXHNRATT->callbackData; delete[] packetUBXHNRATT->callbackData;
} }
delete[] packetUBXHNRATT; delete[] packetUBXHNRATT;
packetUBXHNRATT = NULL; // Redundant? packetUBXHNRATT = NULL; // Redundant?
} }
if (packetUBXHNRINS != NULL) if (packetUBXHNRINS != NULL)
@@ -337,7 +337,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXHNRINS->callbackData; delete[] packetUBXHNRINS->callbackData;
} }
delete[] packetUBXHNRINS; delete[] packetUBXHNRINS;
packetUBXHNRINS = NULL; // Redundant? packetUBXHNRINS = NULL; // Redundant?
} }
if (packetUBXHNRPVT != NULL) if (packetUBXHNRPVT != NULL)
@@ -347,7 +347,7 @@ void SFE_UBLOX_GNSS::end(void)
delete[] packetUBXHNRPVT->callbackData; delete[] packetUBXHNRPVT->callbackData;
} }
delete[] packetUBXHNRPVT; delete[] packetUBXHNRPVT;
packetUBXHNRPVT = NULL; // Redundant? packetUBXHNRPVT = NULL; // Redundant?
} }
} }
@@ -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++) 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].data.all = extractLong(msg, 4 + (i * 8));
packetUBXESFRAW->data.data[i].sTag = extractLong(msg, 8 + (i * 8) + 4); packetUBXESFRAW->data.data[i].sTag = extractLong(msg, 8 + (i * 8));
} }
//Mark all datums as fresh (not read before) //Mark all datums as fresh (not read before)
@@ -9709,7 +9709,7 @@ uint32_t SFE_UBLOX_GNSS::getUnixEpoch(uint16_t maxWait)
packetUBXNAVPVT->moduleQueried.moduleQueried1.bits.sec = false; packetUBXNAVPVT->moduleQueried.moduleQueried1.bits.sec = false;
packetUBXNAVPVT->moduleQueried.moduleQueried1.bits.all = false; packetUBXNAVPVT->moduleQueried.moduleQueried1.bits.all = false;
// assemble time elements into time_t - credits to Thomas Roell @ https://github.com/GrumpyOldPizza // 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] + 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.day - 1)) * 24 +
(uint32_t)packetUBXNAVPVT->data.hour) * 60 + (uint32_t)packetUBXNAVPVT->data.hour) * 60 +
@@ -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.nano = false;
packetUBXNAVPVT->moduleQueried.moduleQueried1.bits.all = false; packetUBXNAVPVT->moduleQueried.moduleQueried1.bits.all = false;
// assemble time elements into time_t - credits to Thomas Roell @ https://github.com/GrumpyOldPizza // 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] + 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.day - 1)) * 24 +
(uint32_t)packetUBXNAVPVT->data.hour) * 60 + (uint32_t)packetUBXNAVPVT->data.hour) * 60 +
@@ -10395,7 +10395,7 @@ uint8_t SFE_UBLOX_GNSS::getLeapIndicator(int32_t& timeToLsEvent, uint16_t maxWai
getLeapSecondEvent(maxWait); 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.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.lsChange = false;
packetUBXNAVTIMELS->moduleQueried.moduleQueried.bits.timeToLsEvent = false; packetUBXNAVTIMELS->moduleQueried.moduleQueried.bits.timeToLsEvent = false;
packetUBXNAVTIMELS->moduleQueried.moduleQueried.bits.all = false; packetUBXNAVTIMELS->moduleQueried.moduleQueried.bits.all = false;
timeToLsEvent = packetUBXNAVTIMELS->data.timeToLsEvent; timeToLsEvent = packetUBXNAVTIMELS->data.timeToLsEvent;
// returns NTP Leap Indicator // returns NTP Leap Indicator