Skip to content

Commit 2e6f6ce

Browse files
authored
Merge pull request #110 from mazgch/release_candidate
Release candidate
2 parents b4e251c + a9aa143 commit 2e6f6ce

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

Diff for: examples/ZED-F9P/Example19_LBand_Corrections_with_NEO-D9S/Example19_LBand_Corrections_with_NEO-D9S.ino

+3-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,9 @@ void setup()
146146
if (ok) ok = myGNSS.setDGNSSConfiguration(SFE_UBLOX_DGNSS_MODE_FIXED); // Set the differential mode - ambiguities are fixed whenever possible
147147

148148
if (ok) ok = myGNSS.setNavigationFrequency(1); //Set output in Hz.
149-
149+
150+
if (ok) ok = myGNSS.setVal8(UBLOX_CFG_SPARTN_USE_SOURCE, 1); // use LBAND PMP message
151+
150152
//Configure the SPARTN IP Dynamic Keys
151153
//"When the receiver boots, the host should send 'current' and 'next' keys in one message." - Use setDynamicSPARTNKeys for this.
152154
//"Every time the 'current' key is expired, 'next' takes its place."

Diff for: src/SparkFun_u-blox_GNSS_Arduino_Library.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -1527,6 +1527,8 @@ uint16_t SFE_UBLOX_GNSS::getMaxPayloadSize(uint8_t Class, uint8_t ID)
15271527
// Take a given byte and file it into the proper array
15281528
void SFE_UBLOX_GNSS::process(uint8_t incoming, ubxPacket *incomingUBX, uint8_t requestedClass, uint8_t requestedID)
15291529
{
1530+
if (_outputPort != NULL)
1531+
_outputPort->write(incoming); // Echo this byte to the serial port
15301532
if ((currentSentence == NONE) || (currentSentence == NMEA))
15311533
{
15321534
if (incoming == UBX_SYNCH_1) // UBX binary frames start with 0xB5, aka μ
@@ -6451,6 +6453,11 @@ void SFE_UBLOX_GNSS::setNMEAOutputPort(Stream &nmeaOutputPort)
64516453
_nmeaOutputPort = &nmeaOutputPort; // Store the port from user
64526454
}
64536455

6456+
void SFE_UBLOX_GNSS::setOutputPort(Stream &outputPort)
6457+
{
6458+
_outputPort = &outputPort; // Store the port from user
6459+
}
6460+
64546461
// Reset to defaults
64556462

64566463
void SFE_UBLOX_GNSS::factoryReset()

Diff for: src/SparkFun_u-blox_GNSS_Arduino_Library.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,7 @@ class SFE_UBLOX_GNSS
809809
bool setUSBOutput(uint8_t comSettings, uint16_t maxWait = defaultMaxWait); // Configure USB port to output UBX, NMEA, RTCM3, SPARTN or a combination thereof
810810
bool setSPIOutput(uint8_t comSettings, uint16_t maxWait = defaultMaxWait); // Configure SPI port to output UBX, NMEA, RTCM3, SPARTN or a combination thereof
811811
void setNMEAOutputPort(Stream &nmeaOutputPort); // Sets the internal variable for the port to direct NMEA characters to
812+
void setOutputPort(Stream &outputPort); // Sets the internal variable for the port to direct ALL characters to
812813

813814
// Reset to defaults
814815

@@ -1562,7 +1563,7 @@ class SFE_UBLOX_GNSS
15621563
Stream *_serialPort; // The generic connection to user's chosen Serial hardware
15631564
Stream *_nmeaOutputPort = NULL; // The user can assign an output port to print NMEA sentences if they wish
15641565
Stream *_debugSerial; // The stream to send debug messages to if enabled
1565-
1566+
Stream *_outputPort = NULL;
15661567
SPIClass *_spiPort; // The instance of SPIClass
15671568
uint8_t _csPin; // The chip select pin
15681569
uint32_t _spiSpeed; // The speed to use for SPI (Hz)

0 commit comments

Comments
 (0)