Merge branch 'develop' of github.com:WLANThermo-nano/WLANThermo_ESP32…

…_Software into android-build-test

platformio.ini

@@ -58,17 +58,17 @@ board_build.mcu = esp32
 board_build.f_cpu = 240000000L
 board_build.partitions = partitions.csv
 monitor_speed = 115200
-src_filter = +<*> -<system/> -<display/>
+build_src_filter = +<*> -<system/> -<display/>
 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
+    ArduinoJson@^5.8.4
+    asyncHTTPrequest@^1.2.1
+    thijse/ArduinoLog@~1.0.3
     protohaus/ESPRandom@1.4.1
 lib_ignore =
     ESPAsyncTCP
@@ -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}
   +<system/System.cpp>
   +<system/SystemBase.cpp>
@@ -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}
   +<system/System.cpp>
   +<system/SystemBase.cpp>
@@ -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,<2.5.34
   https://github.com/tuniii/lv_lib_qrcode
   https://github.com/NicoFR75/PCA9533.git
-src_filter = 
+build_src_filter = 
   ${env.src_filter}
   +<system/System.cpp>
   +<system/SystemBase.cpp>
@@ -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}
   +<system/System.cpp>
   +<system/SystemBase.cpp>
@@ -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}
   +<system/System.cpp>
   +<system/SystemBase.cpp>
@@ -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}
   +<system/System.cpp>
   +<system/SystemBase.cpp>
@@ -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}
   +<system/System.cpp>
   +<system/SystemBase.cpp>

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"