|
2 | 2 | //And any low frequency tasks that are called by Ticker
|
3 | 3 |
|
4 | 4 | volatile static uint16_t dataHead = 0; //Head advances as data comes in from GNSS's UART
|
5 |
| -int bufferOverruns = 0; //Running count of possible data losses since power-on |
6 |
| - |
7 | 5 | volatile int availableHandlerSpace = 0; //settings.gnssHandlerBufferSize - usedSpace
|
8 | 6 |
|
9 | 7 | //If the phone has any new data (NTRIP RTCM, etc), read it in over Bluetooth and pass along to ZED
|
@@ -298,7 +296,6 @@ void handleGNSSDataTask(void *e)
|
298 | 296 | //Write the data to the file
|
299 | 297 | long startTime = millis();
|
300 | 298 | sdBytesToRecord = ubxFile->write(&rBuffer[sdTail], sliceToRecord);
|
301 |
| - long endTime = millis(); |
302 | 299 |
|
303 | 300 | fileSize = ubxFile->fileSize(); //Get updated filed size
|
304 | 301 |
|
@@ -344,28 +341,28 @@ void handleGNSSDataTask(void *e)
|
344 | 341 | } //End logging
|
345 | 342 |
|
346 | 343 | //Update space available for use in UART task
|
347 |
| -// btBytesToSend = lastDataHead - btTail; |
348 |
| -// if (btBytesToSend < 0) |
349 |
| -// btBytesToSend += settings.gnssHandlerBufferSize; |
350 |
| -// |
351 |
| -// nmeaBytesToSend = lastDataHead - nmeaTail; |
352 |
| -// if (nmeaBytesToSend < 0) |
353 |
| -// nmeaBytesToSend += settings.gnssHandlerBufferSize; |
| 344 | + // btBytesToSend = lastDataHead - btTail; |
| 345 | + // if (btBytesToSend < 0) |
| 346 | + // btBytesToSend += settings.gnssHandlerBufferSize; |
| 347 | + // |
| 348 | + // nmeaBytesToSend = lastDataHead - nmeaTail; |
| 349 | + // if (nmeaBytesToSend < 0) |
| 350 | + // nmeaBytesToSend += settings.gnssHandlerBufferSize; |
354 | 351 |
|
355 | 352 | sdBytesToRecord = lastDataHead - sdTail;
|
356 | 353 | if (sdBytesToRecord < 0)
|
357 | 354 | sdBytesToRecord += settings.gnssHandlerBufferSize;
|
358 | 355 |
|
359 | 356 | //Determine the inteface that is most behind: SD writing, SPP transmission, or TCP transmission
|
360 |
| -// int usedSpace = 0; |
361 |
| -// if (sdBytesToRecord >= btBytesToSend && sdBytesToRecord >= nmeaBytesToSend) |
362 |
| -// usedSpace = sdBytesToRecord; |
363 |
| -// else if (btBytesToSend >= sdBytesToRecord && btBytesToSend >= nmeaBytesToSend) |
364 |
| -// usedSpace = btBytesToSend; |
365 |
| -// else |
366 |
| -// usedSpace = nmeaBytesToSend; |
367 |
| - |
368 |
| -// availableHandlerSpace = settings.gnssHandlerBufferSize - usedSpace; |
| 357 | + // int usedSpace = 0; |
| 358 | + // if (sdBytesToRecord >= btBytesToSend && sdBytesToRecord >= nmeaBytesToSend) |
| 359 | + // usedSpace = sdBytesToRecord; |
| 360 | + // else if (btBytesToSend >= sdBytesToRecord && btBytesToSend >= nmeaBytesToSend) |
| 361 | + // usedSpace = btBytesToSend; |
| 362 | + // else |
| 363 | + // usedSpace = nmeaBytesToSend; |
| 364 | + |
| 365 | + // availableHandlerSpace = settings.gnssHandlerBufferSize - usedSpace; |
369 | 366 | availableHandlerSpace = settings.gnssHandlerBufferSize - sdBytesToRecord;
|
370 | 367 |
|
371 | 368 | //Don't fill the last byte to prevent buffer overflow
|
|
0 commit comments