Fix connectErrorString return type for ESP-32 BSP 2.0.8 #222
Conversation
| } | ||
| return statusMsg; | ||
| } | ||
| #else |
There was a problem hiding this comment.
Would it work to just continue returning a F() for all cases? And then only add preproc around the function line to set the specific return type to match what F() ends up being. That would let the function code itself remain unchanged.
There was a problem hiding this comment.
@caternuson I do not think so as F() provides different return types in different architectures. Could you give me a quick example of what you mean? Having trouble visualizing this solution.
There was a problem hiding this comment.
Something like this maybe?
#ifdef ARDUINO_ARCH_ESP32
const char *Adafruit_MQTT::connectErrorString(int8_t code) {
#else
const __FlashStringHelper *Adafruit_MQTT::connectErrorString(int8_t code) {
#endif
switch (code) {
case 1:
return F(
"The Server does not support the level of the MQTT protocol requested");Basically just changing the return type as needed for whatever F() ends up being on a given platform.
There was a problem hiding this comment.
Implemented in a94f4d5, requesting a re-review before I make the same change to the Arduino Adafruit IO Library.
|
@brentru Hi, it's David from arduino-esp32. I'm a volunteer. You shouldn't have to make new cases for ESP32. Just change the return type of function connectErrorString to ESP32 currently defines F as: https://github.com/espressif/arduino-esp32/blob/master/cores/esp32/WString.h You can override it something like this: If you use the undef, you'll probably want it in your .cpp file so it doesn't affect compilation of other libraries. |
Changing the return type to |
This is not true as of espressif/arduino-esp32#7941, it was changed to: We're finding that the compiler does not seem to allow implicit casting to occur in either direction. We could override the current macro to use the older one: But I'm not sure if having divergent #defines between a BSP and library code is the best way to go - I like keeping things in-line. |
Hmmm. That is messy. That PR is one of the breaking changes that will be discussed in our community meeting next week. |
This PR fixes return type of
connectErrorStringdue to a change in espressif/arduino-esp32#7941 by adding a preprocessor for ESP32-arch and returning a const char * rather than a__FlashStringHelpertoSerial.println().Related: adafruit/Adafruit_Learning_System_Guides#2483