adafruit-mirror/Adafruit_IO_Arduino
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #166 from adafruit/revert-165-fix-esp-bsp-2-0-8

Browse source 
Revert "Fix connectErrorString return type for ESP-32 BSP 2.0.8"
This commit is contained in:
Brent Rubell 2023-05-04 18:23:35 -04:00 committed by GitHub
commit 28fc13d597
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library.properties
View file

@ -1,5 +1,5 @@
name=Adafruit IO Arduino
version=4.2.4
version=4.2.3
author=Adafruit
maintainer=Adafruit <adafruitio@adafruit.com>
sentence=Arduino library to access Adafruit IO.

13
src/AdafruitIO.cpp
View file

@ -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

6
src/AdafruitIO.h
View file

@ -87,13 +87,7 @@ public:
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();
/********************************************************************/