forked from Aircoookie/WLED
-
-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into merge-upstream
- Loading branch information
Showing
69 changed files
with
10,443 additions
and
7,673 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,6 +39,8 @@ | |
; default_envs = esp32dev_qio80 | ||
; default_envs = esp32_eth_ota1mapp | ||
; default_envs = esp32s2_saola | ||
; default_envs = esp32c3dev | ||
; default_envs = lolin_s2_mini | ||
|
||
; MoonModules entries | ||
; =================== | ||
|
@@ -99,13 +101,14 @@ arduino_core_2_7_4 = [email protected] | |
arduino_core_3_0_0 = [email protected] | ||
arduino_core_3_2_0 = [email protected] | ||
arduino_core_4_1_0 = [email protected] | ||
arduino_core_3_1_2 = [email protected] | ||
|
||
# Development platforms | ||
arduino_core_develop = https://github.com/platformio/platform-espressif8266#develop | ||
arduino_core_git = https://github.com/platformio/platform-espressif8266#feature/stage | ||
|
||
# Platform to use for ESP8266 | ||
platform_wled_default = ${common.arduino_core_4_1_0} | ||
platform_wled_default = ${common.arduino_core_3_1_2} | ||
# We use 2.7.4.7 for all, includes PWM flicker fix and Wstring optimization | ||
#platform_packages = tasmota/framework-arduinoespressif8266 @ 3.20704.7 | ||
platform_packages = platformio/framework-arduinoespressif8266 | ||
|
@@ -547,8 +550,8 @@ board = esp32-c3-devkitm-1 | |
board_build.partitions = tools/WLED_ESP32_4MB_1MB_FS.csv | ||
build_flags = ${common.build_flags} ${esp32c3.build_flags} #-D WLED_RELEASE_NAME=ESP32-C3 | ||
-D WLED_WATCHDOG_TIMEOUT=0 | ||
; -DARDUINO_USB_CDC_ON_BOOT=1 ;; for virtual CDC USB | ||
-DARDUINO_USB_CDC_ON_BOOT=0 ;; for serial-to-USB chip | ||
-DARDUINO_USB_CDC_ON_BOOT=1 ;; for virtual CDC USB | ||
;-DARDUINO_USB_CDC_ON_BOOT=0 ;; for serial-to-USB chip | ||
upload_speed = 460800 | ||
build_unflags = ${common.build_unflags} | ||
lib_deps = ${esp32c3.lib_deps} | ||
|
@@ -660,10 +663,10 @@ platform = ${esp32s2.platform} | |
platform_packages = ${esp32s2.platform_packages} | ||
board = lolin_s2_mini | ||
board_build.partitions = tools/WLED_ESP32_4MB_1MB_FS.csv | ||
build_unflags = ${common.build_unflags} -DARDUINO_USB_CDC_ON_BOOT=1 | ||
build_unflags = ${common.build_unflags} #-DARDUINO_USB_CDC_ON_BOOT=1 | ||
build_flags = ${common.build_flags} ${esp32s2.build_flags} #-D WLED_RELEASE_NAME=LolinS2 | ||
-DBOARD_HAS_PSRAM | ||
-DARDUINO_USB_CDC_ON_BOOT=0 | ||
-DARDUINO_USB_CDC_ON_BOOT=1 # try disabling and enabling unflag above in case of board-specific issues, will disable Serial | ||
-DARDUINO_USB_MSC_ON_BOOT=0 | ||
-DARDUINO_USB_DFU_ON_BOOT=0 | ||
-DLOLIN_WIFI_FIX ; seems to work much better with this | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.