Skip to content

Fix connectErrorString return type for ESP-32 BSP 2.0.8 #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 24, 2023
Merged

Fix connectErrorString return type for ESP-32 BSP 2.0.8 #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a770ba9
add preproc for return types
brentru Apr 21, 2023
0e2cdf6
fix ; at end of ifdef?
brentru Apr 21, 2023
88e8569
match https://github.com/adafruit/Adafruit_MQTT_Library/pull/222/comm…
brentru Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Adafruit IO Arduino
version=4.2.3
version=4.2.4
author=Adafruit
maintainer=Adafruit <[email protected]>
sentence=Arduino library to access Adafruit IO.
Expand Down
13 changes: 13 additions & 0 deletions src/AdafruitIO.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,18 @@ 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.
Expand All @@ -251,6 +263,7 @@ AdafruitIO_Dashboard *AdafruitIO::dashboard(const char *name) {
*/
/**************************************************************************/
const __FlashStringHelper *AdafruitIO::statusText() {
#endif
switch (_status) {

// CONNECTING
Expand Down
6 changes: 6 additions & 0 deletions src/AdafruitIO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,13 @@ 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();
/********************************************************************/
Expand Down