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

Merge pull request #136 from brunob45/no_sw_serial 

Add #define to disable SW Serial
This commit is contained in:
Limor "Ladyada" Fried 2022-02-05 11:47:52 -05:00 committed by GitHub
parent f5030a2692 43b28b978e
commit d8da9b9757
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Adafruit_GPS.h
View File

@ -39,8 +39,10 @@
#endif #endif
#endif #endif
#define USE_SW_SERIAL ///< comment this out if you don't want to include #if (defined(__AVR__) || defined(ESP8266)) && !defined(NO_SW_SERIAL)
///< software serial in the library #define USE_SW_SERIAL ///< insert line `#define NO_SW_SERIAL` before this header
///< if you don't want to include software serial in the
#endif ///< library
#define GPS_DEFAULT_I2C_ADDR \ #define GPS_DEFAULT_I2C_ADDR \
0x10 ///< The default address for I2C transport of GPS data 0x10 ///< The default address for I2C transport of GPS data
#define GPS_MAX_I2C_TRANSFER \ #define GPS_MAX_I2C_TRANSFER \
@ -54,7 +56,7 @@
3 ///< maximum length of a source ID name, including terminating 0 3 ///< maximum length of a source ID name, including terminating 0
#include "Arduino.h" #include "Arduino.h"
#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL) #ifdef USE_SW_SERIAL
#include <SoftwareSerial.h> #include <SoftwareSerial.h>
#endif #endif
#include <Adafruit_PMTK.h> #include <Adafruit_PMTK.h>
@ -83,7 +85,7 @@ public:
// Adafruit_GPS.cpp // Adafruit_GPS.cpp
bool begin(uint32_t baud_or_i2caddr); bool begin(uint32_t baud_or_i2caddr);
#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL) #ifdef USE_SW_SERIAL
Adafruit_GPS(SoftwareSerial *ser); // Constructor when using SoftwareSerial Adafruit_GPS(SoftwareSerial *ser); // Constructor when using SoftwareSerial
#endif #endif
Adafruit_GPS(HardwareSerial *ser); // Constructor when using HardwareSerial Adafruit_GPS(HardwareSerial *ser); // Constructor when using HardwareSerial
@ -281,7 +283,7 @@ private:
bool paused; bool paused;
uint8_t parseResponse(char *response); uint8_t parseResponse(char *response);
#if (defined(__AVR__) || defined(ESP8266)) && defined(USE_SW_SERIAL) #ifdef USE_SW_SERIAL
SoftwareSerial *gpsSwSerial; SoftwareSerial *gpsSwSerial;
#endif #endif
bool noComms = false; bool noComms = false;