Merge remote-tracking branch 'origin/v3.4' into dev

This commit is contained in:
proddy
2022-01-23 17:56:52 +01:00
parent 02e2b51814
commit 77e1898512
538 changed files with 32282 additions and 38655 deletions

View File

@@ -28,6 +28,7 @@ build_flags =
-D ONEWIRE_CRC16=0
-D NO_GLOBAL_ARDUINOOTA
-D ARDUINOJSON_ENABLE_STD_STRING=1
-D ARDUINOJSON_USE_DOUBLE=0
unbuild_flags =
${common.core_unbuild_flags}
@@ -61,6 +62,9 @@ extra_scripts =
scripts/rename_fw.py
board = esp32dev
platform = espressif32
; platform_packages =
; toolchain-xtensa32@~2.80400.0
; framework-arduinoespressif32@https://github.com/espressif/arduino-esp32.git
board_build.partitions = esp32_partition_app1984k_spiffs64k.csv
build_flags = ${common.build_flags}
build_unflags = ${common.unbuild_flags}