From 148de6f113d3340ed8c0ddb9ed4f31848ab74e31 Mon Sep 17 00:00:00 2001 From: Phantomias2006 Date: Wed, 27 Sep 2023 15:39:34 +0200 Subject: [PATCH 1/3] Update platformio.ini Buildfix --- platformio.ini | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/platformio.ini b/platformio.ini index 90a55c92..4d29f6b4 100644 --- a/platformio.ini +++ b/platformio.ini @@ -58,7 +58,7 @@ board_build.mcu = esp32 board_build.f_cpu = 240000000L board_build.partitions = partitions.csv monitor_speed = 115200 -src_filter = +<*> - - +build_src_filter = +<*> - - lib_deps = https://github.com/borisneubert/Time.git https://github.com/tuniii/Arduino-MedianFilter.git @@ -86,7 +86,7 @@ board_build.embed_files = lib_deps = ${env.lib_deps} https://github.com/tuniii/ITEADLIB_Arduino_Nextion.git https://github.com/tuniii/ESPNexUpload.git -src_filter = +build_src_filter = ${env.src_filter} + + @@ -105,7 +105,7 @@ board_build.embed_files = lib_deps = ${env.lib_deps} https://github.com/tuniii/ITEADLIB_Arduino_Nextion.git https://github.com/tuniii/ESPNexUpload.git -src_filter = +build_src_filter = ${env.src_filter} + + @@ -125,10 +125,10 @@ board_build.embed_files = lib_deps = ${env.lib_deps} ;lv_arduino@3.0.1 lvgl@~7.11.0 - TFT_eSPI@2.3.89 + TFT_eSPI@2.5.31 https://github.com/tuniii/lv_lib_qrcode https://github.com/NicoFR75/PCA9533.git -src_filter = +build_src_filter = ${env.src_filter} + + @@ -147,10 +147,10 @@ board_build.embed_files = webui/dist/mini/favicon.ico.gz lib_deps = ${env.lib_deps} lvgl@~7.11.0 - TFT_eSPI@2.3.89 + TFT_eSPI@2.5.31 https://github.com/tuniii/lv_lib_qrcode https://github.com/NicoFR75/PCA9533.git -src_filter = +build_src_filter = ${env.src_filter} + + @@ -170,7 +170,7 @@ board_build.embed_files = lib_deps = ${env.lib_deps} https://github.com/ThingPulse/esp8266-oled-ssd1306.git#4.0.0 https://github.com/mathertel/OneButton.git#1.3.0 -src_filter = +build_src_filter = ${env.src_filter} + + @@ -190,7 +190,7 @@ board_build.embed_files = lib_deps = ${env.lib_deps} https://github.com/ThingPulse/esp8266-oled-ssd1306.git#4.0.0 https://github.com/mathertel/OneButton.git#1.3.0 -src_filter = +build_src_filter = ${env.src_filter} + + @@ -208,7 +208,7 @@ board_build.embed_files = webui/dist/bone/index.html.gz webui/dist/bone/favicon.ico.gz lib_deps = ${env.lib_deps} -src_filter = +build_src_filter = ${env.src_filter} + + From 41c613b627a183e564bfb90c989b3d6bd1126369 Mon Sep 17 00:00:00 2001 From: Phantomias2006 Date: Wed, 27 Sep 2023 16:33:28 +0200 Subject: [PATCH 2/3] Update platformio.ini fix build warnings --- platformio.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platformio.ini b/platformio.ini index 4d29f6b4..59446e5f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -63,12 +63,12 @@ lib_deps = https://github.com/borisneubert/Time.git https://github.com/tuniii/Arduino-MedianFilter.git https://github.com/tuniii/BBQduino.git - ESP Async WebServer@1.2.3 - AsyncTCP@1.1.1 + me-no-dev/ESP Async WebServer@1.2.3 + me-no-dev/AsyncTCP@1.1.1 AsyncMqttClient@0.8.2 ArduinoJson@5.8.4 asyncHTTPrequest@1.2.1 - ArduinoLog@1.0.3 + thijse/ArduinoLog@1.0.3 protohaus/ESPRandom@1.4.1 lib_ignore = ESPAsyncTCP From 6a4bb34b7d0b041e2f85794611e2e83fce6acb07 Mon Sep 17 00:00:00 2001 From: sochs Date: Wed, 27 Sep 2023 17:19:00 +0200 Subject: [PATCH 3/3] Update Version.h --- src/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Version.h b/src/Version.h index e5ca9727..be5f7996 100644 --- a/src/Version.h +++ b/src/Version.h @@ -28,7 +28,7 @@ /*REL_VER*/ #ifndef FIRMWAREVERSION -#define FIRMWAREVERSION "v1.2.1" +#define FIRMWAREVERSION "v1.2.2" #endif #define GUIAPIVERSION "1" #define SERVERAPIVERSION "1"