Skip to content
This repository was archived by the owner on Jan 28, 2021. It is now read-only.

Commit 5517e69

Browse files
author
Nathan Seidle
committed
Add flash guards around printed strings.
1 parent 440ef4f commit 5517e69

File tree

1 file changed

+45
-45
lines changed

1 file changed

+45
-45
lines changed

‎src/SparkFun_Ublox_Arduino_Library.cpp‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void SFE_UBLOX_GPS::setSerialRate(uint32_t baudrate, uint8_t uartPort, uint16_t
143143

144144
if (_printDebug == true)
145145
{
146-
_debugSerial->print("Current baud rate: ");
146+
_debugSerial->print(F("Current baud rate: "));
147147
_debugSerial->println(((uint32_t)payloadCfg[10] << 16) | ((uint32_t)payloadCfg[9] << 8) | payloadCfg[8]);
148148
}
149149

@@ -160,7 +160,7 @@ void SFE_UBLOX_GPS::setSerialRate(uint32_t baudrate, uint8_t uartPort, uint16_t
160160

161161
if (_printDebug == true)
162162
{
163-
_debugSerial->print("New baud rate:");
163+
_debugSerial->print(F("New baud rate:"));
164164
_debugSerial->println(((uint32_t)payloadCfg[10] << 16) | ((uint32_t)payloadCfg[9] << 8) | payloadCfg[8]);
165165
}
166166

@@ -252,7 +252,7 @@ boolean SFE_UBLOX_GPS::checkUbloxI2C()
252252

253253
if (_printDebug == true)
254254
{
255-
_debugSerial->print("Bytes available error:");
255+
_debugSerial->print(F("Bytes available error:"));
256256
_debugSerial->println(bytesAvailable);
257257
}
258258
}
@@ -261,7 +261,7 @@ boolean SFE_UBLOX_GPS::checkUbloxI2C()
261261
{
262262
if (_printDebug == true)
263263
{
264-
_debugSerial->print("Bytes available:");
264+
_debugSerial->print(F("Bytes available:"));
265265
_debugSerial->println(bytesAvailable);
266266
}
267267
}
@@ -460,9 +460,9 @@ void SFE_UBLOX_GPS::processRTCM(uint8_t incoming)
460460
//_debugSerial->write(incoming); //An example of passing this byte out the serial port
461461

462462
//Debug printing
463-
// _debugSerial->print(" ");
464-
// if(incoming < 0x10) _debugSerial->print("0");
465-
// if(incoming < 0x10) _debugSerial->print("0");
463+
// _debugSerial->print(F(" "));
464+
// if(incoming < 0x10) _debugSerial->print(F("0"));
465+
// if(incoming < 0x10) _debugSerial->print(F("0"));
466466
// _debugSerial->print(incoming, HEX);
467467
// if(rtcmFrameCounter % 16 == 0) _debugSerial->println();
468468
}
@@ -510,9 +510,9 @@ void SFE_UBLOX_GPS::processUBX(uint8_t incoming, ubxPacket *incomingUBX)
510510
{
511511
if (_printDebug == true)
512512
{
513-
_debugSerial->print("Size: ");
513+
_debugSerial->print(F("Size: "));
514514
_debugSerial->print(incomingUBX->len);
515-
_debugSerial->print(" Received: ");
515+
_debugSerial->print(F(" Received: "));
516516
printPacket(incomingUBX);
517517
}
518518
incomingUBX->valid = true;
@@ -529,19 +529,19 @@ void SFE_UBLOX_GPS::processUBX(uint8_t incoming, ubxPacket *incomingUBX)
529529
delay(10);
530530
digitalWrite(2, HIGH);
531531

532-
_debugSerial->print("Size: ");
532+
_debugSerial->print(F("Size: "));
533533
_debugSerial->print(incomingUBX->len);
534-
_debugSerial->print(" Received: ");
534+
_debugSerial->print(F(" Received: "));
535535
printPacket(incomingUBX);
536536

537-
_debugSerial->print(" checksumA: ");
537+
_debugSerial->print(F(" checksumA: "));
538538
_debugSerial->print(incomingUBX->checksumA);
539-
_debugSerial->print(" checksumB: ");
539+
_debugSerial->print(F(" checksumB: "));
540540
_debugSerial->print(incomingUBX->checksumB);
541541

542-
_debugSerial->print(" rollingChecksumA: ");
542+
_debugSerial->print(F(" rollingChecksumA: "));
543543
_debugSerial->print(rollingChecksumA);
544-
_debugSerial->print(" rollingChecksumB: ");
544+
_debugSerial->print(F(" rollingChecksumB: "));
545545
_debugSerial->print(rollingChecksumB);
546546
_debugSerial->println();
547547
}
@@ -652,30 +652,30 @@ void SFE_UBLOX_GPS::processUBXpacket(ubxPacket *msg)
652652

653653
if (_printDebug == true)
654654
{
655-
_debugSerial->print("Sec: ");
655+
_debugSerial->print(F("Sec: "));
656656
_debugSerial->print(((float)extractLong(4)) / 1000.0f);
657-
_debugSerial->print(" ");
658-
_debugSerial->print("LON: ");
657+
_debugSerial->print(F(" "));
658+
_debugSerial->print(F("LON: "));
659659
_debugSerial->print(((float)(int32_t)extractLong(8)) / 10000000.0f);
660-
_debugSerial->print(" ");
661-
_debugSerial->print("LAT: ");
660+
_debugSerial->print(F(" "));
661+
_debugSerial->print(F("LAT: "));
662662
_debugSerial->print(((float)(int32_t)extractLong(12)) / 10000000.0f);
663-
_debugSerial->print(" ");
664-
_debugSerial->print("ELI M: ");
663+
_debugSerial->print(F(" "));
664+
_debugSerial->print(F("ELI M: "));
665665
_debugSerial->print(((float)(int32_t)extractLong(16)) / 1000.0f);
666-
_debugSerial->print(" ");
667-
_debugSerial->print("MSL M: ");
666+
_debugSerial->print(F(" "));
667+
_debugSerial->print(F("MSL M: "));
668668
_debugSerial->print(((float)(int32_t)extractLong(20)) / 1000.0f);
669-
_debugSerial->print(" ");
670-
_debugSerial->print("GEO: ");
669+
_debugSerial->print(F(" "));
670+
_debugSerial->print(F("GEO: "));
671671
_debugSerial->print(((float)(int32_t)extractLong(24)) / 1000.0f);
672-
_debugSerial->print(" ");
673-
_debugSerial->print("HA 2D M: ");
672+
_debugSerial->print(F(" "));
673+
_debugSerial->print(F("HA 2D M: "));
674674
_debugSerial->print(((float)extractLong(28)) / 1000.0f);
675-
_debugSerial->print(" ");
676-
_debugSerial->print("VERT M: ");
675+
_debugSerial->print(F(" "));
676+
_debugSerial->print(F("VERT M: "));
677677
_debugSerial->print(((float)extractLong(32)) / 1000.0f);
678-
_debugSerial->print(" ");
678+
_debugSerial->print(F(" "));
679679
}
680680
}
681681
break;
@@ -690,7 +690,7 @@ boolean SFE_UBLOX_GPS::sendCommand(ubxPacket outgoingUBX, uint16_t maxWait)
690690

691691
if (_printDebug == true)
692692
{
693-
_debugSerial->print("Sending: ");
693+
_debugSerial->print(F("Sending: "));
694694
printPacket(&outgoingUBX);
695695
}
696696
if (commType == COMM_TYPE_I2C)
@@ -852,20 +852,20 @@ void SFE_UBLOX_GPS::printPacket(ubxPacket *packet)
852852
{
853853
if (_printDebug == true)
854854
{
855-
_debugSerial->print("CLS:");
855+
_debugSerial->print(F("CLS:"));
856856
_debugSerial->print(packet->cls, HEX);
857857

858-
_debugSerial->print(" ID:");
858+
_debugSerial->print(F(" ID:"));
859859
_debugSerial->print(packet->id, HEX);
860860

861-
_debugSerial->print(" Len: 0x");
861+
_debugSerial->print(F(" Len: 0x"));
862862
_debugSerial->print(packet->len, HEX);
863863

864-
_debugSerial->print(" Payload:");
864+
_debugSerial->print(F(" Payload:"));
865865

866866
for (int x = 0; x < packet->len; x++)
867867
{
868-
_debugSerial->print(" ");
868+
_debugSerial->print(F(" "));
869869
_debugSerial->print(packet->payload[x], HEX);
870870
}
871871
_debugSerial->println();
@@ -900,7 +900,7 @@ boolean SFE_UBLOX_GPS::waitForResponse(uint8_t requestedClass, uint8_t requested
900900
{
901901
if (_printDebug == true)
902902
{
903-
_debugSerial->print("Packet didn't match CLS/ID");
903+
_debugSerial->print(F("Packet didn't match CLS/ID"));
904904
printPacket(&packetCfg);
905905
}
906906
}
@@ -971,7 +971,7 @@ uint8_t SFE_UBLOX_GPS::getVal8(uint16_t group, uint16_t id, uint8_t size, uint8_
971971

972972
if (_printDebug == true)
973973
{
974-
_debugSerial->print("key: 0x");
974+
_debugSerial->print(F("key: 0x"));
975975
_debugSerial->print(key, HEX);
976976
_debugSerial->println();
977977
}
@@ -1005,7 +1005,7 @@ uint8_t SFE_UBLOX_GPS::getVal8(uint32_t key, uint8_t layer, uint16_t maxWait)
10051005

10061006
if (_printDebug == true)
10071007
{
1008-
_debugSerial->print("key: 0x");
1008+
_debugSerial->print(F("key: 0x"));
10091009
_debugSerial->print(key, HEX);
10101010
_debugSerial->println();
10111011
}
@@ -1840,7 +1840,7 @@ boolean SFE_UBLOX_GPS::powerSaveMode(bool power_save, uint16_t maxWait)
18401840
/*
18411841
if (_printDebug == true)
18421842
{
1843-
_debugSerial->print("Protocol version is ");
1843+
_debugSerial->print(F("Protocol version is "));
18441844
_debugSerial->println(protVer);
18451845
}
18461846
*/
@@ -2290,9 +2290,9 @@ boolean SFE_UBLOX_GPS::getProtocolVersion(uint16_t maxWait)
22902290

22912291
if (_printDebug == true)
22922292
{
2293-
_debugSerial->print("Extension ");
2293+
_debugSerial->print(F("Extension "));
22942294
_debugSerial->print(extensionNumber);
2295-
_debugSerial->print(": ");
2295+
_debugSerial->print(F(": "));
22962296
for (int location = 0; location < MAX_PAYLOAD_SIZE; location++)
22972297
{
22982298
if (payloadCfg[location] == '\0')
@@ -2331,8 +2331,8 @@ boolean SFE_UBLOX_GPS::getRELPOSNED(uint16_t maxWait)
23312331
//We got a response, now parse the bits
23322332

23332333
uint16_t refStationID = extractInt(2);
2334-
//_debugSerial->print("refStationID: ");
2335-
//_debugSerial->println(refStationID);
2334+
//_debugSerial->print(F("refStationID: "));
2335+
//_debugSerial->println(refStationID));
23362336

23372337
int32_t tempRelPos;
23382338

0 commit comments

Comments
 (0)