From f75cb9d14d1635c5f77604043c389444b59441a0 Mon Sep 17 00:00:00 2001 From: Brent Rubell Date: Thu, 4 May 2023 14:35:24 -0400 Subject: [PATCH 1/2] Revert "Fix connectErrorString return type for ESP-32 BSP 2.0.8" --- library.properties | 2 +- src/AdafruitIO.cpp | 13 ------------- src/AdafruitIO.h | 6 ------ 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/library.properties b/library.properties index cebc1c9..eceaca5 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Adafruit IO Arduino -version=4.2.4 +version=4.2.3 author=Adafruit maintainer=Adafruit sentence=Arduino library to access Adafruit IO. diff --git a/src/AdafruitIO.cpp b/src/AdafruitIO.cpp index f3b4ac5..a470056 100644 --- a/src/AdafruitIO.cpp +++ b/src/AdafruitIO.cpp @@ -243,18 +243,6 @@ AdafruitIO_Dashboard *AdafruitIO::dashboard(const char *name) { return new AdafruitIO_Dashboard(this, name); } -// due to breaking change within Arduino ESP32 BSP v2.0.8 -// see: https://github.com/espressif/arduino-esp32/pull/7941 -#ifdef ARDUINO_ARCH_ESP32 -/**************************************************************************/ -/*! - @brief Provide status explanation strings. - @return A pointer to the status string literal, _status. _status is - the AIO status value -*/ -/**************************************************************************/ -const char *AdafruitIO::statusText() { -#else /**************************************************************************/ /*! @brief Provide status explanation strings. @@ -263,7 +251,6 @@ const char *AdafruitIO::statusText() { */ /**************************************************************************/ const __FlashStringHelper *AdafruitIO::statusText() { -#endif switch (_status) { // CONNECTING diff --git a/src/AdafruitIO.h b/src/AdafruitIO.h index 665810a..6d8bd27 100644 --- a/src/AdafruitIO.h +++ b/src/AdafruitIO.h @@ -87,13 +87,7 @@ class AdafruitIO { AdafruitIO_Dashboard *dashboard(const char *name); AdafruitIO_Time *time(aio_time_format_t format); -// due to breaking change within Arduino ESP32 BSP v2.0.8 -// see: https://github.com/espressif/arduino-esp32/pull/7941 -#ifdef ARDUINO_ARCH_ESP32 - const char *statusText(); -#else const __FlashStringHelper *statusText(); -#endif aio_status_t status(); /********************************************************************/ From a2d84decef64ea738f6de7a84d46c4684218c66e Mon Sep 17 00:00:00 2001 From: Brent Rubell Date: Thu, 4 May 2023 18:24:00 -0400 Subject: [PATCH 2/2] Update library.properties --- library.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.properties b/library.properties index eceaca5..eeaa1e6 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Adafruit IO Arduino -version=4.2.3 +version=4.2.5 author=Adafruit maintainer=Adafruit sentence=Arduino library to access Adafruit IO.