Skip to content

Commit 99f261a

Browse files
authored
Merge pull request #56 from sparkfun/release_candidate
v2.0.11
2 parents f1f7a7f + 47288e4 commit 99f261a

File tree

2 files changed

+59
-59
lines changed

2 files changed

+59
-59
lines changed

Diff for: library.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=SparkFun u-blox GNSS Arduino Library
2-
version=2.0.10
2+
version=2.0.11
33
author=SparkFun Electronics <[email protected]>
44
maintainer=SparkFun Electronics <sparkfun.com>
55
sentence=Library for I2C and Serial Communication with u-blox GNSS modules<br/><br/>

Diff for: src/SparkFun_u-blox_GNSS_Arduino_Library.cpp

+58-58
Original file line numberDiff line numberDiff line change
@@ -70,83 +70,83 @@ void SFE_UBLOX_GNSS::end(void)
7070
_debugSerial->println(F("end: the file buffer has been deleted. You will need to call setFileBufferSize before .begin to create a new one."));
7171
}
7272
#endif
73-
delete[] ubxFileBuffer;
73+
delete[] ubxFileBuffer; // Created with new[]
7474
ubxFileBuffer = NULL; // Redundant?
7575
fileBufferSize = 0; // Reset file buffer size. User will have to call setFileBufferSize again
7676
fileBufferMaxAvail = 0;
7777
}
7878

7979
if (moduleSWVersion != NULL)
8080
{
81-
delete[] moduleSWVersion;
81+
delete moduleSWVersion; // Created with new moduleSWVersion_t
8282
moduleSWVersion = NULL; // Redundant?
8383
}
8484

8585
if (currentGeofenceParams != NULL)
8686
{
87-
delete[] currentGeofenceParams;
87+
delete currentGeofenceParams; // Created with new geofenceParams_t
8888
currentGeofenceParams = NULL; // Redundant?
8989
}
9090

9191
if (packetUBXNAVTIMELS != NULL)
9292
{
93-
delete[] packetUBXNAVTIMELS;
93+
delete packetUBXNAVTIMELS; // Created with new UBX_NAV_TIMELS_t
9494
packetUBXNAVTIMELS = NULL; // Redundant?
9595
}
9696

9797
if (packetUBXNAVPOSECEF != NULL)
9898
{
9999
if (packetUBXNAVPOSECEF->callbackData != NULL)
100100
{
101-
delete[] packetUBXNAVPOSECEF->callbackData;
101+
delete packetUBXNAVPOSECEF->callbackData; // Created with new UBX_NAV_POSECEF_data_t
102102
}
103-
delete[] packetUBXNAVPOSECEF;
103+
delete packetUBXNAVPOSECEF; // Created with new UBX_NAV_POSECEF_t
104104
packetUBXNAVPOSECEF = NULL; // Redundant?
105105
}
106106

107107
if (packetUBXNAVSTATUS != NULL)
108108
{
109109
if (packetUBXNAVSTATUS->callbackData != NULL)
110110
{
111-
delete[] packetUBXNAVSTATUS->callbackData;
111+
delete packetUBXNAVSTATUS->callbackData;
112112
}
113-
delete[] packetUBXNAVSTATUS;
113+
delete packetUBXNAVSTATUS;
114114
packetUBXNAVSTATUS = NULL; // Redundant?
115115
}
116116

117117
if (packetUBXNAVDOP != NULL)
118118
{
119119
if (packetUBXNAVDOP->callbackData != NULL)
120120
{
121-
delete[] packetUBXNAVDOP->callbackData;
121+
delete packetUBXNAVDOP->callbackData;
122122
}
123-
delete[] packetUBXNAVDOP;
123+
delete packetUBXNAVDOP;
124124
packetUBXNAVDOP = NULL; // Redundant?
125125
}
126126

127127
if (packetUBXNAVATT != NULL)
128128
{
129129
if (packetUBXNAVATT->callbackData != NULL)
130130
{
131-
delete[] packetUBXNAVATT->callbackData;
131+
delete packetUBXNAVATT->callbackData;
132132
}
133-
delete[] packetUBXNAVATT;
133+
delete packetUBXNAVATT;
134134
packetUBXNAVATT = NULL; // Redundant?
135135
}
136136

137137
if (packetUBXNAVPVT != NULL)
138138
{
139139
if (packetUBXNAVPVT->callbackData != NULL)
140140
{
141-
delete[] packetUBXNAVPVT->callbackData;
141+
delete packetUBXNAVPVT->callbackData;
142142
#ifndef SFE_UBLOX_REDUCED_PROG_MEM
143143
if (_printDebug == true)
144144
{
145145
_debugSerial->println(F("end: packetUBXNAVPVT->callbackData has been deleted"));
146146
}
147147
#endif
148148
}
149-
delete[] packetUBXNAVPVT;
149+
delete packetUBXNAVPVT;
150150
packetUBXNAVPVT = NULL; // Redundant?
151151
#ifndef SFE_UBLOX_REDUCED_PROG_MEM
152152
if (_printDebug == true)
@@ -160,199 +160,199 @@ void SFE_UBLOX_GNSS::end(void)
160160
{
161161
if (packetUBXNAVODO->callbackData != NULL)
162162
{
163-
delete[] packetUBXNAVODO->callbackData;
163+
delete packetUBXNAVODO->callbackData;
164164
}
165-
delete[] packetUBXNAVODO;
165+
delete packetUBXNAVODO;
166166
packetUBXNAVODO = NULL; // Redundant?
167167
}
168168

169169
if (packetUBXNAVVELECEF != NULL)
170170
{
171171
if (packetUBXNAVVELECEF->callbackData != NULL)
172172
{
173-
delete[] packetUBXNAVVELECEF->callbackData;
173+
delete packetUBXNAVVELECEF->callbackData;
174174
}
175-
delete[] packetUBXNAVVELECEF;
175+
delete packetUBXNAVVELECEF;
176176
packetUBXNAVVELECEF = NULL; // Redundant?
177177
}
178178

179179
if (packetUBXNAVVELNED != NULL)
180180
{
181181
if (packetUBXNAVVELNED->callbackData != NULL)
182182
{
183-
delete[] packetUBXNAVVELNED->callbackData;
183+
delete packetUBXNAVVELNED->callbackData;
184184
}
185-
delete[] packetUBXNAVVELNED;
185+
delete packetUBXNAVVELNED;
186186
packetUBXNAVVELNED = NULL; // Redundant?
187187
}
188188

189189
if (packetUBXNAVHPPOSECEF != NULL)
190190
{
191191
if (packetUBXNAVHPPOSECEF->callbackData != NULL)
192192
{
193-
delete[] packetUBXNAVHPPOSECEF->callbackData;
193+
delete packetUBXNAVHPPOSECEF->callbackData;
194194
}
195-
delete[] packetUBXNAVHPPOSECEF;
195+
delete packetUBXNAVHPPOSECEF;
196196
packetUBXNAVHPPOSECEF = NULL; // Redundant?
197197
}
198198

199199
if (packetUBXNAVHPPOSLLH != NULL)
200200
{
201201
if (packetUBXNAVHPPOSLLH->callbackData != NULL)
202202
{
203-
delete[] packetUBXNAVHPPOSLLH->callbackData;
203+
delete packetUBXNAVHPPOSLLH->callbackData;
204204
}
205-
delete[] packetUBXNAVHPPOSLLH;
205+
delete packetUBXNAVHPPOSLLH;
206206
packetUBXNAVHPPOSLLH = NULL; // Redundant?
207207
}
208208

209209
if (packetUBXNAVCLOCK != NULL)
210210
{
211211
if (packetUBXNAVCLOCK->callbackData != NULL)
212212
{
213-
delete[] packetUBXNAVCLOCK->callbackData;
213+
delete packetUBXNAVCLOCK->callbackData;
214214
}
215-
delete[] packetUBXNAVCLOCK;
215+
delete packetUBXNAVCLOCK;
216216
packetUBXNAVCLOCK = NULL; // Redundant?
217217
}
218218

219219
if (packetUBXNAVSVIN != NULL)
220220
{
221221
if (packetUBXNAVSVIN->callbackData != NULL)
222222
{
223-
delete[] packetUBXNAVSVIN->callbackData;
223+
delete packetUBXNAVSVIN->callbackData;
224224
}
225-
delete[] packetUBXNAVSVIN;
225+
delete packetUBXNAVSVIN;
226226
packetUBXNAVSVIN = NULL; // Redundant?
227227
}
228228

229229
if (packetUBXNAVRELPOSNED != NULL)
230230
{
231231
if (packetUBXNAVRELPOSNED->callbackData != NULL)
232232
{
233-
delete[] packetUBXNAVRELPOSNED->callbackData;
233+
delete packetUBXNAVRELPOSNED->callbackData;
234234
}
235-
delete[] packetUBXNAVRELPOSNED;
235+
delete packetUBXNAVRELPOSNED;
236236
packetUBXNAVRELPOSNED = NULL; // Redundant?
237237
}
238238

239239
if (packetUBXRXMSFRBX != NULL)
240240
{
241241
if (packetUBXRXMSFRBX->callbackData != NULL)
242242
{
243-
delete[] packetUBXRXMSFRBX->callbackData;
243+
delete packetUBXRXMSFRBX->callbackData;
244244
}
245-
delete[] packetUBXRXMSFRBX;
245+
delete packetUBXRXMSFRBX;
246246
packetUBXRXMSFRBX = NULL; // Redundant?
247247
}
248248

249249
if (packetUBXRXMRAWX != NULL)
250250
{
251251
if (packetUBXRXMRAWX->callbackData != NULL)
252252
{
253-
delete[] packetUBXRXMRAWX->callbackData;
253+
delete packetUBXRXMRAWX->callbackData;
254254
}
255-
delete[] packetUBXRXMRAWX;
255+
delete packetUBXRXMRAWX;
256256
packetUBXRXMRAWX = NULL; // Redundant?
257257
}
258258

259259
if (packetUBXCFGRATE != NULL)
260260
{
261261
if (packetUBXCFGRATE->callbackData != NULL)
262262
{
263-
delete[] packetUBXCFGRATE->callbackData;
263+
delete packetUBXCFGRATE->callbackData;
264264
}
265-
delete[] packetUBXCFGRATE;
265+
delete packetUBXCFGRATE;
266266
packetUBXCFGRATE = NULL; // Redundant?
267267
}
268268

269269
if (packetUBXTIMTM2 != NULL)
270270
{
271271
if (packetUBXTIMTM2->callbackData != NULL)
272272
{
273-
delete[] packetUBXTIMTM2->callbackData;
273+
delete packetUBXTIMTM2->callbackData;
274274
}
275-
delete[] packetUBXTIMTM2;
275+
delete packetUBXTIMTM2;
276276
packetUBXTIMTM2 = NULL; // Redundant?
277277
}
278278

279279
if (packetUBXESFALG != NULL)
280280
{
281281
if (packetUBXESFALG->callbackData != NULL)
282282
{
283-
delete[] packetUBXESFALG->callbackData;
283+
delete packetUBXESFALG->callbackData;
284284
}
285-
delete[] packetUBXESFALG;
285+
delete packetUBXESFALG;
286286
packetUBXESFALG = NULL; // Redundant?
287287
}
288288

289289
if (packetUBXESFSTATUS != NULL)
290290
{
291291
if (packetUBXESFSTATUS->callbackData != NULL)
292292
{
293-
delete[] packetUBXESFSTATUS->callbackData;
293+
delete packetUBXESFSTATUS->callbackData;
294294
}
295-
delete[] packetUBXESFSTATUS;
295+
delete packetUBXESFSTATUS;
296296
packetUBXESFSTATUS = NULL; // Redundant?
297297
}
298298

299299
if (packetUBXESFINS != NULL)
300300
{
301301
if (packetUBXESFINS->callbackData != NULL)
302302
{
303-
delete[] packetUBXESFINS->callbackData;
303+
delete packetUBXESFINS->callbackData;
304304
}
305-
delete[] packetUBXESFINS;
305+
delete packetUBXESFINS;
306306
packetUBXESFINS = NULL; // Redundant?
307307
}
308308

309309
if (packetUBXESFMEAS != NULL)
310310
{
311311
if (packetUBXESFMEAS->callbackData != NULL)
312312
{
313-
delete[] packetUBXESFMEAS->callbackData;
313+
delete packetUBXESFMEAS->callbackData;
314314
}
315-
delete[] packetUBXESFMEAS;
315+
delete packetUBXESFMEAS;
316316
packetUBXESFMEAS = NULL; // Redundant?
317317
}
318318

319319
if (packetUBXESFRAW != NULL)
320320
{
321321
if (packetUBXESFRAW->callbackData != NULL)
322322
{
323-
delete[] packetUBXESFRAW->callbackData;
323+
delete packetUBXESFRAW->callbackData;
324324
}
325-
delete[] packetUBXESFRAW;
325+
delete packetUBXESFRAW;
326326
packetUBXESFRAW = NULL; // Redundant?
327327
}
328328

329329
if (packetUBXHNRATT != NULL)
330330
{
331331
if (packetUBXHNRATT->callbackData != NULL)
332332
{
333-
delete[] packetUBXHNRATT->callbackData;
333+
delete packetUBXHNRATT->callbackData;
334334
}
335-
delete[] packetUBXHNRATT;
335+
delete packetUBXHNRATT;
336336
packetUBXHNRATT = NULL; // Redundant?
337337
}
338338

339339
if (packetUBXHNRINS != NULL)
340340
{
341341
if (packetUBXHNRINS->callbackData != NULL)
342342
{
343-
delete[] packetUBXHNRINS->callbackData;
343+
delete packetUBXHNRINS->callbackData;
344344
}
345-
delete[] packetUBXHNRINS;
345+
delete packetUBXHNRINS;
346346
packetUBXHNRINS = NULL; // Redundant?
347347
}
348348

349349
if (packetUBXHNRPVT != NULL)
350350
{
351351
if (packetUBXHNRPVT->callbackData != NULL)
352352
{
353-
delete[] packetUBXHNRPVT->callbackData;
353+
delete packetUBXHNRPVT->callbackData;
354354
}
355-
delete[] packetUBXHNRPVT;
355+
delete packetUBXHNRPVT;
356356
packetUBXHNRPVT = NULL; // Redundant?
357357
}
358358

@@ -365,7 +365,7 @@ void SFE_UBLOX_GNSS::setPacketCfgPayloadSize(size_t payloadSize)
365365
if ((payloadSize == 0) && (payloadCfg != NULL))
366366
{
367367
// Zero payloadSize? Dangerous! But we'll free the memory anyway...
368-
delete[] payloadCfg;
368+
delete[] payloadCfg; // Created with new[]
369369
payloadCfg = NULL; // Redundant?
370370
packetCfg.payload = payloadCfg;
371371
if ((_printDebug == true) || (_printLimitedDebug == true)) // This is important. Print this if doing limited debugging
@@ -386,7 +386,7 @@ void SFE_UBLOX_GNSS::setPacketCfgPayloadSize(size_t payloadSize)
386386
uint8_t *newPayload = new uint8_t[payloadSize];
387387
for (size_t i = 0; (i < payloadSize) && (i < packetCfgPayloadSize); i++) // Copy as much existing data as we can
388388
newPayload[i] = payloadCfg[i];
389-
delete[] payloadCfg;
389+
delete[] payloadCfg; // Created with new[]
390390
payloadCfg = newPayload;
391391
packetCfg.payload = payloadCfg;
392392
if (payloadCfg == NULL)
@@ -1260,7 +1260,7 @@ void SFE_UBLOX_GNSS::process(uint8_t incoming, ubxPacket *incomingUBX, uint8_t r
12601260
{
12611261
_debugSerial->println(F("process: memory is already allocated for payloadAuto! Deleting..."));
12621262
}
1263-
delete[] payloadAuto;
1263+
delete[] payloadAuto; // Created with new[]
12641264
payloadAuto = NULL; // Redundant?
12651265
packetAuto.payload = payloadAuto;
12661266
}
@@ -1797,7 +1797,7 @@ void SFE_UBLOX_GNSS::processUBX(uint8_t incoming, ubxPacket *incomingUBX, uint8_
17971797
// allocated for packetAuto
17981798
if (activePacketBuffer == SFE_UBLOX_PACKET_PACKETAUTO)
17991799
{
1800-
delete[] payloadAuto;
1800+
delete[] payloadAuto; // Created with new[]
18011801
payloadAuto = NULL; // Redundant?
18021802
packetAuto.payload = payloadAuto;
18031803
}

0 commit comments

Comments
 (0)