Cansat
/
esp32_Adafruit_GPS
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for UNO R4 soft serial

This commit is contained in:
hobobandy 2023-08-19 17:28:30 -04:00
parent 3f0911610e
commit e42a176229
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Adafruit_GPS.cpp
View File

@ -40,7 +40,7 @@ static bool strStartsWith(const char *str, const char *prefix);
*/ */
/**************************************************************************/ /**************************************************************************/
bool Adafruit_GPS::begin(uint32_t baud_or_i2caddr) { bool Adafruit_GPS::begin(uint32_t baud_or_i2caddr) {
#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL) #if (defined(__AVR__) || ((defined(ARDUINO_ARCH_RENESAS_UNO) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
if (gpsSwSerial) { if (gpsSwSerial) {
gpsSwSerial->begin(baud_or_i2caddr); gpsSwSerial->begin(baud_or_i2caddr);
} }
@ -78,7 +78,7 @@ bool Adafruit_GPS::begin(uint32_t baud_or_i2caddr) {
@param ser Pointer to SoftwareSerial device @param ser Pointer to SoftwareSerial device
*/ */
/**************************************************************************/ /**************************************************************************/
#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL) #if (defined(__AVR__) || ((defined(ARDUINO_ARCH_RENESAS_UNO) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
Adafruit_GPS::Adafruit_GPS(SoftwareSerial *ser) { Adafruit_GPS::Adafruit_GPS(SoftwareSerial *ser) {
common_init(); // Set everything to common state, then... common_init(); // Set everything to common state, then...
gpsSwSerial = ser; // ...override gpsSwSerial with value passed. gpsSwSerial = ser; // ...override gpsSwSerial with value passed.
@ -147,7 +147,7 @@ Adafruit_GPS::Adafruit_GPS() {
*/ */
/**************************************************************************/ /**************************************************************************/
void Adafruit_GPS::common_init(void) { void Adafruit_GPS::common_init(void) {
#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL) #if (defined(__AVR__) || ((defined(ARDUINO_ARCH_RENESAS_UNO) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
gpsSwSerial = NULL; // Set both to NULL, then override correct gpsSwSerial = NULL; // Set both to NULL, then override correct
#endif #endif
gpsHwSerial = NULL; // port pointer in corresponding constructor gpsHwSerial = NULL; // port pointer in corresponding constructor
@ -196,7 +196,7 @@ size_t Adafruit_GPS::available(void) {
if (paused) if (paused)
return 0; return 0;
#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL) #if (defined(__AVR__) || ((defined(ARDUINO_ARCH_RENESAS_UNO) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
if (gpsSwSerial) { if (gpsSwSerial) {
return gpsSwSerial->available(); return gpsSwSerial->available();
} }
@ -223,7 +223,7 @@ size_t Adafruit_GPS::available(void) {
*/ */
/**************************************************************************/ /**************************************************************************/
size_t Adafruit_GPS::write(uint8_t c) { size_t Adafruit_GPS::write(uint8_t c) {
#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL) #if (defined(__AVR__) || ((defined(ARDUINO_ARCH_RENESAS_UNO) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
if (gpsSwSerial) { if (gpsSwSerial) {
return gpsSwSerial->write(c); return gpsSwSerial->write(c);
} }
@ -279,7 +279,7 @@ char Adafruit_GPS::read(void) {
if (paused || noComms) if (paused || noComms)
return c; return c;
#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL) #if (defined(__AVR__) || ((defined(ARDUINO_ARCH_RENESAS_UNO) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
if (gpsSwSerial) { if (gpsSwSerial) {
if (!gpsSwSerial->available()) if (!gpsSwSerial->available())
return c; return c;

2
src/Adafruit_GPS.h
View File

@ -39,7 +39,7 @@
#endif #endif
#endif #endif
#if (defined(__AVR__) || defined(ESP8266)) && !defined(NO_SW_SERIAL) #if (defined(__AVR__) || ((defined(ARDUINO_ARCH_RENESAS_UNO) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
#define USE_SW_SERIAL ///< insert line `#define NO_SW_SERIAL` before this header #define USE_SW_SERIAL ///< insert line `#define NO_SW_SERIAL` before this header
///< if you don't want to include software serial in the ///< if you don't want to include software serial in the
#endif ///< library #endif ///< library