From ec1882be8969e0c686a30444254459c0985eb3e4 Mon Sep 17 00:00:00 2001 From: Bruno Bousquet <21108660+brunob45@users.noreply.github.com> Date: Mon, 31 Jan 2022 23:08:42 -0500 Subject: [PATCH 1/3] add define to disable sw serial --- src/Adafruit_GPS.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Adafruit_GPS.h b/src/Adafruit_GPS.h index bf190b4..f37f396 100644 --- a/src/Adafruit_GPS.h +++ b/src/Adafruit_GPS.h @@ -39,8 +39,6 @@ #endif #endif -#define USE_SW_SERIAL ///< comment this out if you don't want to include - ///< software serial in the library #define GPS_DEFAULT_I2C_ADDR \ 0x10 ///< The default address for I2C transport of GPS data #define GPS_MAX_I2C_TRANSFER \ @@ -54,7 +52,7 @@ 3 ///< maximum length of a source ID name, including terminating 0 #include "Arduino.h" -#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL) +#if (defined(__AVR__) || defined(ESP8266)) && !defined(NO_SW_SERIAL) #include #endif #include @@ -83,7 +81,7 @@ public: // Adafruit_GPS.cpp bool begin(uint32_t baud_or_i2caddr); -#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL) +#if (defined(__AVR__) || defined(ESP8266)) && !defined(NO_SW_SERIAL) Adafruit_GPS(SoftwareSerial *ser); // Constructor when using SoftwareSerial #endif Adafruit_GPS(HardwareSerial *ser); // Constructor when using HardwareSerial @@ -281,7 +279,7 @@ private: bool paused; uint8_t parseResponse(char *response); -#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL) +#if (defined(__AVR__) || defined(ESP8266)) && !defined(NO_SW_SERIAL) SoftwareSerial *gpsSwSerial; #endif bool noComms = false; From 290b1ed835bfa7d3433b223d0f0bee33e4954a85 Mon Sep 17 00:00:00 2001 From: Bruno Bousquet <21108660+brunob45@users.noreply.github.com> Date: Mon, 31 Jan 2022 23:23:06 -0500 Subject: [PATCH 2/3] keep USE_SW_SERIAL define --- src/Adafruit_GPS.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Adafruit_GPS.h b/src/Adafruit_GPS.h index f37f396..e99e90d 100644 --- a/src/Adafruit_GPS.h +++ b/src/Adafruit_GPS.h @@ -39,6 +39,10 @@ #endif #endif +#if (defined(__AVR__) || defined(ESP8266)) && !defined(NO_SW_SERIAL) +#define USE_SW_SERIAL ///< insert line `#define NO_SW_SERIAL` before this header + ///< if you don't want to include software serial in the library +#endif #define GPS_DEFAULT_I2C_ADDR \ 0x10 ///< The default address for I2C transport of GPS data #define GPS_MAX_I2C_TRANSFER \ @@ -52,7 +56,7 @@ 3 ///< maximum length of a source ID name, including terminating 0 #include "Arduino.h" -#if (defined(__AVR__) || defined(ESP8266)) && !defined(NO_SW_SERIAL) +#ifdef USE_SW_SERIAL #include #endif #include @@ -81,7 +85,7 @@ public: // Adafruit_GPS.cpp bool begin(uint32_t baud_or_i2caddr); -#if (defined(__AVR__) || defined(ESP8266)) && !defined(NO_SW_SERIAL) +#ifdef USE_SW_SERIAL Adafruit_GPS(SoftwareSerial *ser); // Constructor when using SoftwareSerial #endif Adafruit_GPS(HardwareSerial *ser); // Constructor when using HardwareSerial @@ -279,7 +283,7 @@ private: bool paused; uint8_t parseResponse(char *response); -#if (defined(__AVR__) || defined(ESP8266)) && !defined(NO_SW_SERIAL) +#ifdef USE_SW_SERIAL SoftwareSerial *gpsSwSerial; #endif bool noComms = false; From 43b28b978e7f017c21108ab9714eadab64bcbf03 Mon Sep 17 00:00:00 2001 From: Bruno Bousquet <21108660+brunob45@users.noreply.github.com> Date: Tue, 1 Feb 2022 16:32:55 -0500 Subject: [PATCH 3/3] Fix formatting --- src/Adafruit_GPS.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Adafruit_GPS.h b/src/Adafruit_GPS.h index e99e90d..a3f4215 100644 --- a/src/Adafruit_GPS.h +++ b/src/Adafruit_GPS.h @@ -41,8 +41,8 @@ #if (defined(__AVR__) || defined(ESP8266)) && !defined(NO_SW_SERIAL) #define USE_SW_SERIAL ///< insert line `#define NO_SW_SERIAL` before this header - ///< if you don't want to include software serial in the library -#endif + ///< if you don't want to include software serial in the +#endif ///< library #define GPS_DEFAULT_I2C_ADDR \ 0x10 ///< The default address for I2C transport of GPS data #define GPS_MAX_I2C_TRANSFER \