Merge pull request #165 from brentru/fix-esp-bsp-2-0-8
Fix connectErrorString return type for ESP-32 BSP 2.0.8
This commit is contained in:
commit
e3c27cd196
3 changed files with 20 additions and 1 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
name=Adafruit IO Arduino
|
name=Adafruit IO Arduino
|
||||||
version=4.2.3
|
version=4.2.4
|
||||||
author=Adafruit
|
author=Adafruit
|
||||||
maintainer=Adafruit <adafruitio@adafruit.com>
|
maintainer=Adafruit <adafruitio@adafruit.com>
|
||||||
sentence=Arduino library to access Adafruit IO.
|
sentence=Arduino library to access Adafruit IO.
|
||||||
|
|
|
||||||
|
|
@ -243,6 +243,18 @@ AdafruitIO_Dashboard *AdafruitIO::dashboard(const char *name) {
|
||||||
return new AdafruitIO_Dashboard(this, 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.
|
@brief Provide status explanation strings.
|
||||||
|
|
@ -251,6 +263,7 @@ AdafruitIO_Dashboard *AdafruitIO::dashboard(const char *name) {
|
||||||
*/
|
*/
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
const __FlashStringHelper *AdafruitIO::statusText() {
|
const __FlashStringHelper *AdafruitIO::statusText() {
|
||||||
|
#endif
|
||||||
switch (_status) {
|
switch (_status) {
|
||||||
|
|
||||||
// CONNECTING
|
// CONNECTING
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,13 @@ public:
|
||||||
AdafruitIO_Dashboard *dashboard(const char *name);
|
AdafruitIO_Dashboard *dashboard(const char *name);
|
||||||
AdafruitIO_Time *time(aio_time_format_t format);
|
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();
|
const __FlashStringHelper *statusText();
|
||||||
|
#endif
|
||||||
|
|
||||||
aio_status_t status();
|
aio_status_t status();
|
||||||
/********************************************************************/
|
/********************************************************************/
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue