Merge branch 'development03'

src/platformio.ini

@@ -16,17 +16,6 @@ include_dir = .
 framework = arduino
 board_build.filesystem = littlefs
 upload_speed = 921600
-
-;build_flags =
-; ;;;;; Possible Debug options ;;;;;;
-; https://docs.platformio.org/en/latest/platforms/espressif8266.html#debug-level
-    ;-DDEBUG_ESP_PORT=Serial
-    ;-DDEBUG_ESP_CORE
-    ;-DDEBUG_ESP_WIFI
-    ;-DDEBUG_ESP_HTTP_CLIENT
-    ;-DDEBUG_ESP_HTTP_SERVER
-    ;-DDEBUG_ESP_OOM
-
 monitor_speed = 115200
 
 extra_scripts =
@@ -95,7 +84,13 @@ platform = espressif8266
 board = esp8285
 board_build.ldscript = eagle.flash.1m64.ld
 board_build.f_cpu = 80000000L
-build_flags = -DDEBUG_LEVEL=DBG_DEBUG -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_OOM -DDEBUG_ESP_PORT=Serial
+build_flags = -DDEBUG_LEVEL=DBG_DEBUG
+    -DDEBUG_ESP_CORE
+    -DDEBUG_ESP_WIFI
+    -DDEBUG_ESP_HTTP_CLIENT
+    -DDEBUG_ESP_HTTP_SERVER
+    -DDEBUG_ESP_OOM
+    -DDEBUG_ESP_PORT=Serial
 build_type = debug
 monitor_filters =
     ;default   ; Remove typical terminal control codes from input
@@ -103,7 +98,7 @@ monitor_filters =
     log2file  ; Log data to a file “platformio-device-monitor-*.log” located in the current working directory
 
 [env:esp32-wroom32-release]
-platform = espressif32
+platform = espressif32@>=6.1.0
 board = lolin_d32
 build_flags = -D RELEASE -std=gnu++14
 build_unflags = -std=gnu++11
@@ -114,9 +109,11 @@ monitor_filters =
     esp32_exception_decoder
 
 [env:esp32-wroom32-release-prometheus]
-platform = espressif32
+platform = espressif32@>=6.1.0
 board = lolin_d32
-build_flags = -D RELEASE -std=gnu++14 -DENABLE_PROMETHEUS_EP
+build_flags = -D RELEASE
+    -std=gnu++14
+    -DENABLE_PROMETHEUS_EP
 build_unflags = -std=gnu++11
 monitor_filters =
     ;default   ; Remove typical terminal control codes from input
@@ -125,9 +122,16 @@ monitor_filters =
     esp32_exception_decoder
 
 [env:esp32-wroom32-debug]
-platform = espressif32
+platform = espressif32@>=6.1.0
 board = lolin_d32
-build_flags = -DDEBUG_LEVEL=DBG_DEBUG -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_OOM -DDEBUG_ESP_PORT=Serial -std=gnu++14
+build_flags = -DDEBUG_LEVEL=DBG_DEBUG
+    -DDEBUG_ESP_CORE
+    -DDEBUG_ESP_WIFI
+    -DDEBUG_ESP_HTTP_CLIENT
+    -DDEBUG_ESP_HTTP_SERVER
+    -DDEBUG_ESP_OOM
+    -DDEBUG_ESP_PORT=Serial
+    -std=gnu++14
 build_unflags = -std=gnu++11
 build_type = debug
 monitor_filters =
@@ -136,7 +140,7 @@ monitor_filters =
     log2file  ; Log data to a file “platformio-device-monitor-*.log” located in the current working directory
 
 [env:opendtufusionv1-release]
-platform = espressif32
+platform = espressif32@>=6.1.0
 board = esp32-s3-devkitc-1
 upload_protocol = esp-builtin
 upload_speed = 115200