diff --git a/platformio.ini b/platformio.ini index 3e2a3ef8..a1937846 100644 --- a/platformio.ini +++ b/platformio.ini @@ -125,6 +125,9 @@ build_flags = -Wno-unused-but-set-variable -Wno-return-type -Wno-sequence-point + -Wno-narrowing + -Wno-reorder + -Wno-unused-local-typedefs -DMQTT_MAX_PACKET_SIZE=1024 -DSECURE_CLIENT=SECURE_CLIENT_BEARSSL -DBEARSSL_SSL_BASIC @@ -322,9 +325,10 @@ lib_ignore = [env:esp32_poe] board = esp32-poe -platform = espressif32@1.12.4 +platform = espressif32@2.0 upload_speed = 921600 -build_flags = ${common.build_flags_esp32} ${common.debug_flags} -D RLYPIN=-1 -D WLED_USE_ETHERNET +build_unflags = ${common.build_unflags} +build_flags = ${common.build_flags_esp32} -D RLYPIN=-1 -D WLED_USE_ETHERNET lib_ignore = ESPAsyncTCP ESPAsyncUDP diff --git a/wled00/FX.h b/wled00/FX.h index 6c893692..75d642cf 100644 --- a/wled00/FX.h +++ b/wled00/FX.h @@ -40,8 +40,12 @@ #define DEFAULT_INTENSITY (uint8_t)128 #define DEFAULT_COLOR (uint32_t)0xFFAA00 +#ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) +#endif +#ifndef MAX #define MAX(a,b) ((a)>(b)?(a):(b)) +#endif /* Not used in all effects yet */ #define WLED_FPS 42 diff --git a/wled00/src/dependencies/espalexa/Espalexa.h b/wled00/src/dependencies/espalexa/Espalexa.h index 341de015..cf42f9ff 100644 --- a/wled00/src/dependencies/espalexa/Espalexa.h +++ b/wled00/src/dependencies/espalexa/Espalexa.h @@ -583,7 +583,7 @@ public: return perc / 255; } - ~Espalexa(){delete devices;} //note: Espalexa is NOT meant to be destructed + ~Espalexa(){} //note: Espalexa is NOT meant to be destructed }; #endif diff --git a/wled00/src/dependencies/espalexa/EspalexaDevice.h b/wled00/src/dependencies/espalexa/EspalexaDevice.h index 0653a418..b7f2f184 100644 --- a/wled00/src/dependencies/espalexa/EspalexaDevice.h +++ b/wled00/src/dependencies/espalexa/EspalexaDevice.h @@ -4,7 +4,7 @@ #include "Arduino.h" #include -typedef class EspalexaDevice; +class EspalexaDevice; typedef std::function BrightnessCallbackFunction; typedef std::function DeviceCallbackFunction;