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

Change printf's to prints (ATmega328 does not support printf)

Browse Source
This commit is contained in:
PaulZC
2021-06-28 10:20:38 +01:00
parent f7ac5175a7
commit 6ed769f288
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SparkFun_u-blox_GNSS_Arduino_Library.cpp
+31 -10
View File
@@ -2482,7 +2482,7 @@ void SFE_UBLOX_GNSS::processUBXpacket(ubxPacket *msg)
{ {
packetUBXESFMEAS->data.data[i].data.all = extractLong(msg, 8 + (i * 4)); packetUBXESFMEAS->data.data[i].data.all = extractLong(msg, 8 + (i * 4));
} }
if (msg->len > (8 + (packetUBXESFMEAS->data.flags.bits.numMeas * 4))) if (msg->len > (8 + (packetUBXESFMEAS->data.flags.bits.numMeas * 4))) // IGNORE COMPILER WARNING comparison between signed and unsigned integer expressions
packetUBXESFMEAS->data.calibTtag = extractLong(msg, 8 + (packetUBXESFMEAS->data.flags.bits.numMeas * 4)); packetUBXESFMEAS->data.calibTtag = extractLong(msg, 8 + (packetUBXESFMEAS->data.flags.bits.numMeas * 4));
//Mark all datums as fresh (not read before) //Mark all datums as fresh (not read before)
@@ -2894,33 +2894,54 @@ void SFE_UBLOX_GNSS::sendSpiCommand(ubxPacket *outgoingUBX)
digitalWrite(_csPin, LOW); digitalWrite(_csPin, LOW);
//Write header bytes //Write header bytes
spiTransfer(UBX_SYNCH_1); //μ - oh ublox, you're funny. I will call you micro-blox from now on. spiTransfer(UBX_SYNCH_1); //μ - oh ublox, you're funny. I will call you micro-blox from now on.
if (_printDebug) _debugSerial->printf("%x ", UBX_SYNCH_1);
spiTransfer(UBX_SYNCH_2); //b spiTransfer(UBX_SYNCH_2); //b
if (_printDebug) _debugSerial->printf("%x ", UBX_SYNCH_2);
spiTransfer(outgoingUBX->cls); spiTransfer(outgoingUBX->cls);
if (_printDebug) _debugSerial->printf("%x ", outgoingUBX->cls);
spiTransfer(outgoingUBX->id); spiTransfer(outgoingUBX->id);
if (_printDebug) _debugSerial->printf("%x ", outgoingUBX->id);
spiTransfer(outgoingUBX->len & 0xFF); //LSB spiTransfer(outgoingUBX->len & 0xFF); //LSB
if (_printDebug) _debugSerial->printf("%x ", outgoingUBX->len & 0xFF);
spiTransfer(outgoingUBX->len >> 8); spiTransfer(outgoingUBX->len >> 8);
if (_printDebug) _debugSerial->printf("%x ", outgoingUBX->len >> 8);
if (_printDebug)
{
_debugSerial->print(F("sendSpiCommand: 0x"));
_debugSerial->print(UBX_SYNCH_1, HEX);
_debugSerial->print(F(" "));
_debugSerial->print(UBX_SYNCH_2, HEX);
_debugSerial->print(F(" "));
_debugSerial->print(outgoingUBX->cls, HEX);
_debugSerial->print(F(" "));
_debugSerial->print(outgoingUBX->id, HEX);
_debugSerial->print(F(" "));
_debugSerial->print(outgoingUBX->len & 0xFF, HEX);
_debugSerial->print(F(" "));
_debugSerial->print(outgoingUBX->len >> 8, HEX);
_debugSerial->print(F(" "));
}
//Write payload. //Write payload.
for (uint16_t i = 0; i < outgoingUBX->len; i++) for (uint16_t i = 0; i < outgoingUBX->len; i++)
{ {
spiTransfer(outgoingUBX->payload[i]); spiTransfer(outgoingUBX->payload[i]);
if (_printDebug) _debugSerial->printf("%x ", outgoingUBX->payload[i]); if (_printDebug)
{
_debugSerial->print(F(" "));
_debugSerial->print(outgoingUBX->payload[i], HEX);
}
} }
//Write checksum //Write checksum
spiTransfer(outgoingUBX->checksumA); spiTransfer(outgoingUBX->checksumA);
if (_printDebug) _debugSerial->printf("%x ", outgoingUBX->checksumA);
spiTransfer(outgoingUBX->checksumB); spiTransfer(outgoingUBX->checksumB);
if (_printDebug) _debugSerial->printf("%x \n", outgoingUBX->checksumB);
digitalWrite(_csPin, HIGH); digitalWrite(_csPin, HIGH);
_spiPort->endTransaction(); _spiPort->endTransaction();
if (_printDebug)
{
_debugSerial->print(F(" "));
_debugSerial->print(outgoingUBX->checksumA, HEX);
_debugSerial->print(F(" "));
_debugSerial->println(outgoingUBX->checksumB, HEX);
}
} }
//Pretty prints the current ubxPacket //Pretty prints the current ubxPacket