From db939d7405d4fc45297e29a1a672772cdc7eaeac Mon Sep 17 00:00:00 2001 From: brentru Date: Wed, 11 Oct 2023 12:45:14 -0400 Subject: [PATCH 1/5] fix werror=address --- src/AdafruitIO_Data.cpp | 52 +++-------------------------------------- 1 file changed, 3 insertions(+), 49 deletions(-) diff --git a/src/AdafruitIO_Data.cpp b/src/AdafruitIO_Data.cpp index f388642..2eea197 100644 --- a/src/AdafruitIO_Data.cpp +++ b/src/AdafruitIO_Data.cpp @@ -419,12 +419,7 @@ void AdafruitIO_Data::setValue(double value, double lat, double lon, double ele, @return Feed's name if feed exists. */ /**************************************************************************/ -char *AdafruitIO_Data::feedName() { - if (!_feed) - return (char *)""; - - return _feed; -} +char *AdafruitIO_Data::feedName() { return _feed; } /**************************************************************************/ /*! @@ -448,12 +443,7 @@ char *AdafruitIO_Data::toChar() { return _value; } @return String of value. */ /**************************************************************************/ -String AdafruitIO_Data::toString() { - if (!_value) - return String(); - - return String(_value); -} +String AdafruitIO_Data::toString() { return String(_value); } /**************************************************************************/ /*! @@ -462,13 +452,9 @@ String AdafruitIO_Data::toString() { */ /**************************************************************************/ bool AdafruitIO_Data::toBool() { - if (!_value) - return false; - if (strcmp(_value, "1") == 0 || _value[0] == 't' || _value[0] == 'T') return true; - else - return false; + return false; } /**************************************************************************/ @@ -494,9 +480,6 @@ bool AdafruitIO_Data::isFalse() { return !toBool(); } */ /**************************************************************************/ int AdafruitIO_Data::toInt() { - if (!_value) - return 0; - char *endptr; return (int)strtol(_value, &endptr, 10); } @@ -542,9 +525,6 @@ unsigned int AdafruitIO_Data::toUnsignedInt() { */ /**************************************************************************/ float AdafruitIO_Data::toFloat() { - if (!_value) - return 0; - char *endptr; return (float)strtod(_value, &endptr); } @@ -556,9 +536,6 @@ float AdafruitIO_Data::toFloat() { */ /**************************************************************************/ double AdafruitIO_Data::toDouble() { - if (!_value) - return 0; - char *endptr; return strtod(_value, &endptr); } @@ -570,9 +547,6 @@ double AdafruitIO_Data::toDouble() { */ /**************************************************************************/ long AdafruitIO_Data::toLong() { - if (!_value) - return 0; - char *endptr; return strtol(_value, &endptr, 10); } @@ -584,9 +558,6 @@ long AdafruitIO_Data::toLong() { */ /**************************************************************************/ unsigned long AdafruitIO_Data::toUnsignedLong() { - if (!_value) - return 0; - char *endptr; #ifdef ESP8266 // For some reason strtoul is not defined on the ESP8266 platform right now. @@ -605,9 +576,6 @@ unsigned long AdafruitIO_Data::toUnsignedLong() { /**************************************************************************/ int AdafruitIO_Data::toRed() { // Convert 0xRRGGBB to red. - if (!_value) { - return 0; - } char r[5]; strcpy(r, "0x"); strncpy(&r[2], toChar() + 1, 2); @@ -623,9 +591,6 @@ int AdafruitIO_Data::toRed() { /**************************************************************************/ int AdafruitIO_Data::toGreen() { // Convert 0xRRGGBB to green. - if (!_value) { - return 0; - } char g[5]; strcpy(g, "0x"); strncpy(&g[2], toChar() + 3, 2); @@ -641,9 +606,6 @@ int AdafruitIO_Data::toGreen() { /**************************************************************************/ int AdafruitIO_Data::toBlue() { // Convert 0xRRGGBB to blue. - if (!_value) { - return 0; - } char b[5]; strcpy(b, "0x"); strncpy(&b[2], toChar() + 5, 2); @@ -659,9 +621,6 @@ int AdafruitIO_Data::toBlue() { */ /**************************************************************************/ long AdafruitIO_Data::toNeoPixel() { - if (!_value) { - return 0; - } char rgb[9]; strcpy(rgb, "0x"); strncpy(&rgb[2], toChar() + 1, 6); @@ -676,11 +635,7 @@ long AdafruitIO_Data::toNeoPixel() { */ /**************************************************************************/ char *AdafruitIO_Data::toCSV() { - if (!_value) - return _csv; - memset(_csv, 0, AIO_CSV_LENGTH); - strcpy(_csv, "\""); strcat(_csv, _value); strcat(_csv, "\","); @@ -689,7 +644,6 @@ char *AdafruitIO_Data::toCSV() { strcat(_csv, charFromDouble(_lon)); strcat(_csv, ","); strcat(_csv, charFromDouble(_ele, 2)); - return _csv; } From 2e73006040993f05b5bca28e9b1f6d957a9ccba4 Mon Sep 17 00:00:00 2001 From: brentru Date: Wed, 11 Oct 2023 13:42:22 -0400 Subject: [PATCH 2/5] fix one more --- src/AdafruitIO_Data.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/AdafruitIO_Data.cpp b/src/AdafruitIO_Data.cpp index 2eea197..36fbd8a 100644 --- a/src/AdafruitIO_Data.cpp +++ b/src/AdafruitIO_Data.cpp @@ -505,9 +505,6 @@ int AdafruitIO_Data::toPinLevel() { */ /**************************************************************************/ unsigned int AdafruitIO_Data::toUnsignedInt() { - if (!_value) - return 0; - char *endptr; #ifdef ESP8266 // For some reason strtoul is not defined on the ESP8266 platform right now. From e1ace0ac6f8dc25c01d8419a80c4e4373d8224d5 Mon Sep 17 00:00:00 2001 From: brentru Date: Wed, 11 Oct 2023 14:06:36 -0400 Subject: [PATCH 3/5] add lib prop --- library.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.properties b/library.properties index 122b25c..05c122a 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Adafruit IO Arduino -version=4.2.7 +version=4.2.8 author=Adafruit maintainer=Adafruit sentence=Arduino library to access Adafruit IO. From 0f94088d28d1e48e4bffdbffcc57b23af9eabb26 Mon Sep 17 00:00:00 2001 From: brentru Date: Wed, 11 Oct 2023 14:37:32 -0400 Subject: [PATCH 4/5] fixes for ledc, servo lib is broken and external so we cantfix/wontfix --- .../adafruitio_09_analog_out.ino | 11 ++------- .../adafruitio_13_rgb/adafruitio_13_rgb.ino | 23 +++++-------------- examples/adafruitio_16_servo/.esp32.test.skip | 1 + examples/adafruitio_23_ifttt/.esp32.test.skip | 1 + .../.esp32.test.skip | 1 + .../.esp32.test.skip | 1 + 6 files changed, 12 insertions(+), 26 deletions(-) create mode 100644 examples/adafruitio_16_servo/.esp32.test.skip create mode 100644 examples/adafruitio_23_ifttt/.esp32.test.skip create mode 100644 examples/adafruitio_27_wifimanager/.esp32.test.skip create mode 100644 examples/adafruitio_28_wifimanager-custom-aio-parameters/.esp32.test.skip diff --git a/examples/adafruitio_09_analog_out/adafruitio_09_analog_out.ino b/examples/adafruitio_09_analog_out/adafruitio_09_analog_out.ino index d6cfebe..255b80c 100644 --- a/examples/adafruitio_09_analog_out/adafruitio_09_analog_out.ino +++ b/examples/adafruitio_09_analog_out/adafruitio_09_analog_out.ino @@ -31,8 +31,7 @@ void setup() { // set up led pin as an analog output #if defined(ARDUINO_ARCH_ESP32) // ESP32 pinMode() - ledcAttachPin(LED_PIN, 1); - ledcSetup(1, 1200, 8); + ledcAttachPin(LED_PIN,analogGetChannel(LED_PIN)); #else pinMode(LED_PIN, OUTPUT); #endif @@ -87,12 +86,6 @@ void handleMessage(AdafruitIO_Data *data) { Serial.print("received <- "); Serial.println(reading); - // write the current 'reading' to the led - #if defined(ARDUINO_ARCH_ESP32) - ledcWrite(1, reading); // ESP32 analogWrite() - #else - analogWrite(LED_PIN, reading); - #endif - + analogWrite(LED_PIN, reading); } diff --git a/examples/adafruitio_13_rgb/adafruitio_13_rgb.ino b/examples/adafruitio_13_rgb/adafruitio_13_rgb.ino index da8fe36..15eda3d 100644 --- a/examples/adafruitio_13_rgb/adafruitio_13_rgb.ino +++ b/examples/adafruitio_13_rgb/adafruitio_13_rgb.ino @@ -40,13 +40,9 @@ void setup() { #if defined(ARDUINO_ARCH_ESP32) // ESP32 pinMode // assign rgb pins to channels - ledcAttachPin(RED_PIN, 1); - ledcAttachPin(GREEN_PIN, 2); - ledcAttachPin(BLUE_PIN, 3); - // init. channels - ledcSetup(1, 12000, 8); - ledcSetup(2, 12000, 8); - ledcSetup(3, 12000, 8); + ledcAttachPin(RED_PIN,analogGetChannel(RED_PIN)); + ledcAttachPin(GREEN_PIN,analogGetChannel(GREEN_PIN)); + ledcAttachPin(BLUE_PIN,analogGetChannel(BLUE_PIN)); #else pinMode(RED_PIN, OUTPUT); pinMode(GREEN_PIN, OUTPUT); @@ -108,14 +104,7 @@ void handleMessage(AdafruitIO_Data *data) { Serial.println(data->value()); // invert RGB values for common anode LEDs - #if defined(ARDUINO_ARCH_ESP32) // ESP32 analogWrite - ledcWrite(1, 255 - data->toRed()); - ledcWrite(2, 255 - data->toGreen()); - ledcWrite(3, 255 - data->toBlue()); - #else - analogWrite(RED_PIN, 255 - data->toRed()); - analogWrite(GREEN_PIN, 255 - data->toGreen()); - analogWrite(BLUE_PIN, 255 - data->toBlue()); - #endif - + analogWrite(RED_PIN, 255 - data->toRed()); + analogWrite(GREEN_PIN, 255 - data->toGreen()); + analogWrite(BLUE_PIN, 255 - data->toBlue()); } diff --git a/examples/adafruitio_16_servo/.esp32.test.skip b/examples/adafruitio_16_servo/.esp32.test.skip new file mode 100644 index 0000000..d3f5a12 --- /dev/null +++ b/examples/adafruitio_16_servo/.esp32.test.skip @@ -0,0 +1 @@ + diff --git a/examples/adafruitio_23_ifttt/.esp32.test.skip b/examples/adafruitio_23_ifttt/.esp32.test.skip new file mode 100644 index 0000000..d3f5a12 --- /dev/null +++ b/examples/adafruitio_23_ifttt/.esp32.test.skip @@ -0,0 +1 @@ + diff --git a/examples/adafruitio_27_wifimanager/.esp32.test.skip b/examples/adafruitio_27_wifimanager/.esp32.test.skip new file mode 100644 index 0000000..d3f5a12 --- /dev/null +++ b/examples/adafruitio_27_wifimanager/.esp32.test.skip @@ -0,0 +1 @@ + diff --git a/examples/adafruitio_28_wifimanager-custom-aio-parameters/.esp32.test.skip b/examples/adafruitio_28_wifimanager-custom-aio-parameters/.esp32.test.skip new file mode 100644 index 0000000..d3f5a12 --- /dev/null +++ b/examples/adafruitio_28_wifimanager-custom-aio-parameters/.esp32.test.skip @@ -0,0 +1 @@ + From 140f13febcc48e56ad6833f69b0985713291a3a8 Mon Sep 17 00:00:00 2001 From: brentru Date: Wed, 11 Oct 2023 15:12:31 -0400 Subject: [PATCH 5/5] match ledcWrite_RGB example in esp32 docs --- .../adafruitio_09_analog_out/adafruitio_09_analog_out.ino | 3 +-- examples/adafruitio_13_rgb/adafruitio_13_rgb.ino | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/examples/adafruitio_09_analog_out/adafruitio_09_analog_out.ino b/examples/adafruitio_09_analog_out/adafruitio_09_analog_out.ino index 255b80c..d10d2a6 100644 --- a/examples/adafruitio_09_analog_out/adafruitio_09_analog_out.ino +++ b/examples/adafruitio_09_analog_out/adafruitio_09_analog_out.ino @@ -30,8 +30,7 @@ void setup() { // set up led pin as an analog output #if defined(ARDUINO_ARCH_ESP32) - // ESP32 pinMode() - ledcAttachPin(LED_PIN,analogGetChannel(LED_PIN)); + ledcAttach(LED_PIN, 12000, 8); // 12 kHz PWM, 8-bit resolution #else pinMode(LED_PIN, OUTPUT); #endif diff --git a/examples/adafruitio_13_rgb/adafruitio_13_rgb.ino b/examples/adafruitio_13_rgb/adafruitio_13_rgb.ino index 15eda3d..f8ace71 100644 --- a/examples/adafruitio_13_rgb/adafruitio_13_rgb.ino +++ b/examples/adafruitio_13_rgb/adafruitio_13_rgb.ino @@ -39,10 +39,9 @@ void setup() { #if defined(ARDUINO_ARCH_ESP32) // ESP32 pinMode - // assign rgb pins to channels - ledcAttachPin(RED_PIN,analogGetChannel(RED_PIN)); - ledcAttachPin(GREEN_PIN,analogGetChannel(GREEN_PIN)); - ledcAttachPin(BLUE_PIN,analogGetChannel(BLUE_PIN)); + ledcAttach(RED_PIN, 12000, 8); // 12 kHz PWM, 8-bit resolution + ledcAttach(GREEN_PIN, 12000, 8); + ledcAttach(BLUE_PIN, 12000, 8); #else pinMode(RED_PIN, OUTPUT); pinMode(GREEN_PIN, OUTPUT);