Merge remote-tracking branch 'origin/mdev_new-FrameWork4' into mdev

This commit is contained in:
Frank
2022-10-04 11:21:39 +02:00

View File

@@ -620,9 +620,10 @@ build_unflags = ${common.build_unflags}
;build_flags = ${common.build_flags} ${esp32.build_flags}
build_flags = ${common.build_flags} ${esp32.build_flagsV4}
-D WLED_RELEASE_NAME=ESP32 -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BLYNK #-D WLED_DISABLE_BROWNOUT_DET
-D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
-D WLED_USE_PSRAM
-D ABL_MILLIAMPS_DEFAULT=1500 ; 850 not enough for 1024 leds
-D UWLED_USE_MY_CONFIG
-D WLED_USE_MY_CONFIG
-D USERMOD_CUSTOMEFFECTS
-D USERMOD_AUDIOREACTIVE
-D UM_AUDIOREACTIVE_USE_NEW_FFT
@@ -646,7 +647,7 @@ platform_packages = ${esp32.platformV4_packages}
upload_speed = 460800 ; or 921600
build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=ESP32S3 #-D WLED_DISABLE_BLYNK #-D WLED_DISABLE_BROWNOUT_DET
-D ARDUINO_USB_MODE=1 -D ARDUINO_USB_CDC_ON_BOOT=0 -D ARDUINO_USB_MSC_ON_BOOT=0
-D ARDUINO_USB_MODE=1 -D ARDUINO_USB_CDC_ON_BOOT=0 -D ARDUINO_USB_MSC_ON_BOOT=0 -D ARDUINO_USB_DFU_ON_BOOT=0
-D WLED_WATCHDOG_TIMEOUT=0
-D ABL_MILLIAMPS_DEFAULT=1500 ; 850 not enough for 1024 leds
-D LEDPIN=4