Skip to content

Commit ad02f6e

Browse files
committed
Replace check with appropriate board constant
ARDUINO_UNOR4_WIFI is used in compiler -D option
1 parent e42a176 commit ad02f6e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/Adafruit_GPS.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static bool strStartsWith(const char *str, const char *prefix);
4040
*/
4141
/**************************************************************************/
4242
bool Adafruit_GPS::begin(uint32_t baud_or_i2caddr) {
43-
#if (defined(__AVR__) || ((defined(ARDUINO_ARCH_RENESAS_UNO) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
43+
#if (defined(__AVR__) || ((defined(ARDUINO_UNOR4_WIFI) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
4444
if (gpsSwSerial) {
4545
gpsSwSerial->begin(baud_or_i2caddr);
4646
}
@@ -78,7 +78,7 @@ bool Adafruit_GPS::begin(uint32_t baud_or_i2caddr) {
7878
@param ser Pointer to SoftwareSerial device
7979
*/
8080
/**************************************************************************/
81-
#if (defined(__AVR__) || ((defined(ARDUINO_ARCH_RENESAS_UNO) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
81+
#if (defined(__AVR__) || ((defined(ARDUINO_UNOR4_WIFI) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
8282
Adafruit_GPS::Adafruit_GPS(SoftwareSerial *ser) {
8383
common_init(); // Set everything to common state, then...
8484
gpsSwSerial = ser; // ...override gpsSwSerial with value passed.
@@ -147,7 +147,7 @@ Adafruit_GPS::Adafruit_GPS() {
147147
*/
148148
/**************************************************************************/
149149
void Adafruit_GPS::common_init(void) {
150-
#if (defined(__AVR__) || ((defined(ARDUINO_ARCH_RENESAS_UNO) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
150+
#if (defined(__AVR__) || ((defined(ARDUINO_UNOR4_WIFI) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
151151
gpsSwSerial = NULL; // Set both to NULL, then override correct
152152
#endif
153153
gpsHwSerial = NULL; // port pointer in corresponding constructor
@@ -196,7 +196,7 @@ size_t Adafruit_GPS::available(void) {
196196
if (paused)
197197
return 0;
198198

199-
#if (defined(__AVR__) || ((defined(ARDUINO_ARCH_RENESAS_UNO) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
199+
#if (defined(__AVR__) || ((defined(ARDUINO_UNOR4_WIFI) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
200200
if (gpsSwSerial) {
201201
return gpsSwSerial->available();
202202
}
@@ -223,7 +223,7 @@ size_t Adafruit_GPS::available(void) {
223223
*/
224224
/**************************************************************************/
225225
size_t Adafruit_GPS::write(uint8_t c) {
226-
#if (defined(__AVR__) || ((defined(ARDUINO_ARCH_RENESAS_UNO) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
226+
#if (defined(__AVR__) || ((defined(ARDUINO_UNOR4_WIFI) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
227227
if (gpsSwSerial) {
228228
return gpsSwSerial->write(c);
229229
}
@@ -279,7 +279,7 @@ char Adafruit_GPS::read(void) {
279279
if (paused || noComms)
280280
return c;
281281

282-
#if (defined(__AVR__) || ((defined(ARDUINO_ARCH_RENESAS_UNO) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
282+
#if (defined(__AVR__) || ((defined(ARDUINO_UNOR4_WIFI) || defined(ESP8266)) && !defined(NO_SW_SERIAL)))
283283
if (gpsSwSerial) {
284284
if (!gpsSwSerial->available())
285285
return c;

src/Adafruit_GPS.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#endif
4040
#endif
4141

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

0 commit comments

Comments
 (0)