Revert "Merge remote-tracking branch 'origin/mdev_new-FrameWork-V4' into mdev"

This reverts commit 0fad8ffd85.
2022-09-06 17:53:02 +02:00
parent 0fad8ffd85
commit 01e67b500d
13 changed files with 760 additions and 945 deletions
--- a/platformio.ini
+++ b/platformio.ini
@@ -12,7 +12,7 @@
 ; default_envs = travis_esp8266, travis_esp32

 # Release binaries
-; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32s2_saola, esp32c3dev
+; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32s2_saola, esp32c3

 # Build everything
 ; default_envs = esp32dev, esp8285_4CH_MagicHome, codm-controller-0.6-rev2, codm-controller-0.6, esp32s2_saola, d1_mini_5CH_Shojo_PCB, d1_mini, sp501e, travis_esp8266, travis_esp32, nodemcuv2, esp32_eth, anavi_miracle_controller, esp07, esp01_1m_full, m5atom, h803wf, d1_mini_ota, heltec_wifi_kit_8, esp8285_H801, d1_mini_debug, wemos_shield_esp32, elekstube_ips
@@ -33,8 +33,6 @@
 ; default_envs = esp8285_H801
 ; default_envs = d1_mini_5CH_Shojo_PCB
 default_envs = esp32mdev
-; default_envs = esp32mdev_PSRAM
-; default_envs = esp32s3-mdev
 ; default_envs = esp8266mdev
 ; default_envs = wemos_shield_esp32
 ; default_envs = m5atom
@@ -42,7 +40,6 @@ default_envs = esp32mdev
 ; default_envs = esp32dev_qio80
 ; default_envs = esp32_eth_ota1mapp
 ; default_envs = esp32s2_saola
-; default_envs = esp32c3dev

 src_dir  = ./wled00
 data_dir = ./wled00/data
@@ -118,7 +115,6 @@ build_flags =
  -D DECODE_SONY=true
  -D DECODE_SAMSUNG=true
  -D DECODE_LG=true
-  -D DECODE_RC5=true
  -DWLED_USE_MY_CONFIG
  ; -D USERMOD_SENSORSTOMQTT

@@ -133,9 +129,6 @@ build_flags_all_features =

 build_flags_esp8266 = ${common.build_flags}  ${esp8266.build_flags}
 build_flags_esp32   = ${common.build_flags}  ${esp32.build_flags}
-build_flags_esp32c3 = ${common.build_flags}  ${esp32c3.build_flags}
-build_flags_esp32s2 = ${common.build_flags}  ${esp32s2.build_flags}
-build_flags_esp32s3 = ${common.build_flags}  ${esp32s3.build_flags}

 ldscript_1m128k = eagle.flash.1m128.ld
 ldscript_2m512k = eagle.flash.2m512.ld
@@ -215,30 +208,25 @@ lib_deps =
  makuna/NeoPixelBus @ 2.6.9

 [esp32]
-#platform = espressif32@3.5.0
-#platform_packages = framework-arduinoespressif32 @ https://github.com/Aircoookie/arduino-esp32.git#1.0.6.4
+#platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.3/platform-espressif32-2.0.2.3.zip
+platform = espressif32@3.5.0

-;; use latest tasmota framework, including IDF v4.4.3 and arduino-esp32 v2.0.4
-framework = arduino
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4.1/platform-espressif32-2.0.4.1.zip
-platform_packages =
+platform_packages = framework-arduinoespressif32 @ https://github.com/Aircoookie/arduino-esp32.git#1.0.6.4

 build_flags = -g
  -DARDUINO_ARCH_ESP32
-  ; -DCONFIG_LITTLEFS_FOR_IDF_3_2
-  -D CONFIG_LITTLEFS_FOR_IDF_3_2 -D CONFIG_LITTLEFS_SPIFFS_COMPAT=1 -D CONFIG_LITTLEFS_CACHE_SIZE=512
-  -D WLED_WATCHDOG_TIMEOUT=0
+  #-DCONFIG_LITTLEFS_FOR_IDF_3_2
  -D CONFIG_ASYNC_TCP_USE_WDT=0
 #use LITTLEFS library by lorol in ESP32 core 1.x.x instead of built-in in 2.x.x
-  ; -D LOROL_LITTLEFS
+  -D LOROL_LITTLEFS

 default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv

 lib_deps =
  ${env.lib_deps}
  ; https://github.com/lorol/LITTLEFS.git
-  ; WLEDSR specific: use patched version of lorol LittleFS - unless using IDF v4
-  ; https://github.com/softhack007/LITTLEFS-threadsafe.git#master
+  ; WLEDSR specific: use patched version of lorol LittleFS
+  https://github.com/softhack007/LITTLEFS-threadsafe.git#master
  makuna/NeoPixelBus @ 2.6.9
  https://github.com/pbolduc/AsyncTCP.git @ 1.2.0

@@ -248,9 +236,6 @@ build_flags = -g
  -DARDUINO_ARCH_ESP32S2
  -DCONFIG_IDF_TARGET_ESP32S2
  -D CONFIG_ASYNC_TCP_USE_WDT=0
-  -D CONFIG_LITTLEFS_FOR_IDF_3_2
-  -D WLED_WATCHDOG_TIMEOUT=0
-  -D WLED_NO_I2S1_PIXELBUS
  -DCO

 lib_deps =
@@ -258,38 +243,12 @@ lib_deps =
  makuna/NeoPixelBus @ 2.6.9
  https://github.com/pbolduc/AsyncTCP.git @ 1.2.0

-
-[esp32s3]
-build_flags = -g
-  -DESP32
-  -DARDUINO_ARCH_ESP32
-  -DARDUINO_ARCH_ESP32S3
-  -DCONFIG_IDF_TARGET_ESP32S3
-  -D CONFIG_ASYNC_TCP_USE_WDT=0
-  -D CONFIG_LITTLEFS_FOR_IDF_3_2 -D CONFIG_LITTLEFS_SPIFFS_COMPAT=1 -D CONFIG_LITTLEFS_CACHE_SIZE=512
-  -D WLED_NO_I2S0_PIXELBUS
-  -D WLED_NO_I2S1_PIXELBUS
-  -D WLED_DISABLE_BROWNOUT_DET 
-  -D WLED_WATCHDOG_TIMEOUT=0
-  -D ARDUINO_USB_MODE=1 -D ARDUINO_USB_CDC_ON_BOOT=0 -D ARDUINO_USB_MSC_ON_BOOT=0
-  -DCO
-
-lib_deps =
-  ${env.lib_deps}
-  https://github.com/Makuna/NeoPixelBus.git#master @ 2.7.0
-  https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
-
-
 [esp32c3]
 build_flags = -g
  -DARDUINO_ARCH_ESP32
  -DARDUINO_ARCH_ESP32C3
  -DCONFIG_IDF_TARGET_ESP32C3
  -D CONFIG_ASYNC_TCP_USE_WDT=0
-  -D CONFIG_LITTLEFS_FOR_IDF_3_2
-  -D WLED_WATCHDOG_TIMEOUT=0
-  -D WLED_NO_I2S0_PIXELBUS
-  -D WLED_NO_I2S1_PIXELBUS
  -DCO

 lib_deps =
@@ -401,39 +360,24 @@ board_build.partitions = ${esp32.default_partitions}

 [env:esp32s2_saola]
 board = esp32-s2-saola-1
-;platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.2/platform-tasmota-espressif32-2.0.2.zip
-;platform_packages =
-platform = ${esp32.platform}
-platform_packages = ${esp32.platform_packages}
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.2/platform-tasmota-espressif32-2.0.2.zip
+platform_packages =
 framework = arduino
-build_flags = ${common.build_flags_esp32s2}
-  -D WLED_RELEASE_NAME=ESP32C3 #-D WLED_DISABLE_BLYNK #-D WLED_DISABLE_BROWNOUT_DET
-  ; -D USERMOD_AUDIOREACTIVE -D I2S_USE_16BIT_SAMPLES
-  ; -D UM_AUDIOREACTIVE_USE_NEW_FFT
-  ; -D USERMOD_CUSTOMEFFECTS
 board_build.partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
 board_build.flash_mode = qio
 upload_speed = 460800
 build_unflags = ${common.build_unflags}
 lib_deps = ${esp32s2.lib_deps}
-  ; https://github.com/kosme/arduinoFFT#develop @ 1.9.2

-[env:esp32c3dev]
+[env:esp32c3]
 board = esp32-c3-devkitm-1
-;platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.2/platform-tasmota-espressif32-2.0.2.zip
-platform = ${esp32.platform}
-platform_packages = ${esp32.platform_packages}
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.2/platform-tasmota-espressif32-2.0.2.zip
+platform_packages =
 framework = arduino
-build_flags = ${common.build_flags_esp32c3}
-  -D WLED_RELEASE_NAME=ESP32C3 #-D WLED_DISABLE_BLYNK #-D WLED_DISABLE_BROWNOUT_DET
-  -D USERMOD_AUDIOREACTIVE -D I2S_USE_16BIT_SAMPLES
-  -D UM_AUDIOREACTIVE_USE_NEW_FFT
-  -D USERMOD_CUSTOMEFFECTS
 board_build.partitions = tools/WLED_ESP32_4MB_1MB_FS.csv
 upload_speed = 460800
 build_unflags = ${common.build_unflags}
 lib_deps = ${esp32c3.lib_deps}
-  https://github.com/kosme/arduinoFFT#develop @ 1.9.2

 [env:esp8285_4CH_MagicHome]
 board = esp8285
@@ -500,29 +444,6 @@ lib_deps = ${esp8266.lib_deps}
 # ------------------------------------------------------------------------------
 # custom board configurations
 # ------------------------------------------------------------------------------
-[env:esp32s3-mdev]
-board = esp32-s3-devkitc-1
-platform = ${esp32.platform}
-upload_speed = 460800 ; or 921600
-platform_packages = ${esp32.platform_packages}
-build_unflags = ${common.build_unflags}
-
-build_flags = ${common.build_flags_esp32s3}
-  -D WLED_RELEASE_NAME=ESP32S3 #-D WLED_DISABLE_BLYNK #-D WLED_DISABLE_BROWNOUT_DET
-  ; -D WLED_DEBUG
-  -D USERMOD_AUDIOREACTIVE
-  -D UM_AUDIOREACTIVE_USE_NEW_FFT
-  -D USERMOD_CUSTOMEFFECTS
-
-lib_deps = ${esp32s3.lib_deps}
-  ; https://github.com/blazoncek/arduinoFFT.git ; arduinoFFT @ 1.5.6
-  https://github.com/kosme/arduinoFFT#develop @ 1.9.2
-
-board_build.partitions = tools/WLED_ESP32_8MB.csv
-board_build.f_flash = 80000000L
-;board_build.flash_mode = dio
-;board_build.f_flash = 120000000L
-board_build.flash_mode = qio

 [env:esp32mdev]
 board = esp32dev
@@ -533,32 +454,6 @@ build_unflags = ${common.build_unflags}

 build_flags = ${common.build_flags_esp32}
  -D WLED_RELEASE_NAME=ESP32 #-D WLED_DISABLE_BLYNK #-D WLED_DISABLE_BROWNOUT_DET
-  ; -D WLED_DEBUG
-  -D USERMOD_AUDIOREACTIVE
-  -D UM_AUDIOREACTIVE_USE_NEW_FFT
-  -D USERMOD_CUSTOMEFFECTS
-
-lib_deps = ${esp32.lib_deps}
-  ; https://github.com/blazoncek/arduinoFFT.git ; arduinoFFT @ 1.5.6
-  https://github.com/kosme/arduinoFFT#develop @ 1.9.2
-monitor_filters = esp32_exception_decoder
-board_build.partitions = ${esp32.default_partitions}
-board_build.f_flash = 80000000L
-board_build.flash_mode = dio
-
-[env:esp32mdev_PSRAM]
-;; experiemtal environment for boards with PSRAM. 
-;; Warning: you cannot use PSRAM with the WLED-specific bootloader that was striped down by AC.
-board = esp32cam
-; board = lolin_d32_pro
-platform = ${esp32.platform}
-upload_speed = 460800 ; or 921600
-platform_packages = ${esp32.platform_packages}
-build_unflags = ${common.build_unflags}
-
-build_flags = ${common.build_flags_esp32}
-  -D WLED_RELEASE_NAME=ESP32 -D WLED_USE_PSRAM #-D WLED_DISABLE_BLYNK #-D WLED_DISABLE_BROWNOUT_DET
-;  -D WLED_DEBUG
  -D USERMOD_AUDIOREACTIVE
  -D UM_AUDIOREACTIVE_USE_NEW_FFT
  -D USERMOD_CUSTOMEFFECTS