Merge branch 'mdev' into mudroom

2023-12-04 10:37:31 +01:00
parent cc8d4e3969 09ea9110c1
commit 9cbb731e3a
9 changed files with 2538 additions and 2403 deletions
--- a/platformio.ini
+++ b/platformio.ini
@@ -922,6 +922,16 @@ board_build.partitions = ${esp32.default_partitions}

 ; shared build flags and lib deps for minimum and maximum environment
 [common_mm]
+
+build_disable_sync_interfaces =
+  -D WLED_DISABLE_LOXONE
+  -D WLED_DISABLE_ALEXA
+  -D WLED_DISABLE_HUESYNC
+  -D WLED_DISABLE_MQTT
+  -D WLED_DISABLE_INFRARED
+  -D WLED_DISABLE_ADALIGHT  ;; WLEDMM this board does not have a serial-to-USB chip. Better to disable serial protocols, to avoid crashes (see upstream #3128)
+  -D WLED_DISABLE_ESPNOW ;; ESP-NOW requires wifi, may crash with ethernet only
+
 build_flags_S = 
  -Wall -Wformat -Woverflow -Wuninitialized -Winit-self -Warray-bounds ; enables more warnings
  -Wno-attributes -Wno-unused-variable -Wno-unused-function -Wno-deprecated-declarations ;disables some stupid warnings
@@ -932,14 +942,9 @@ build_flags_S =
  -D USERMOD_AUDIOREACTIVE
  -D UM_AUDIOREACTIVE_USE_NEW_FFT ; use latest (upstream) FFTLib, instead of older library modified by blazoncek. Slightly faster, more accurate, needs 2KB RAM extra   
  ; -D USERMOD_ARTIFX  ;; WLEDMM usermod - temporarily moved into "_M", due to problems in "_S" when compiling with -O2
-  ; -D WLEDMM_FASTPATH ;; WLEDMM experimental option. Reduces audio lag (latency), and allows for faster LED framerates. May break compatibility with previous versions.
+  -D WLEDMM_FASTPATH ;; WLEDMM experimental option. Reduces audio lag (latency), and allows for faster LED framerates. May break compatibility with previous versions.
  ; -D WLED_DEBUG_HEAP ;; WLEDMM enable heap debugging
-  ; -D WLED_DISABLE_LOXONE
-  ; -D WLED_DISABLE_ALEXA
-  ; -D WLED_DISABLE_HUESYNC
-  ; -D WLED_DISABLE_MQTT
-  ; -D WLED_DISABLE_INFRARED
-  ; -D WLED_ENABLE_DMX
+  ${common_mm.build_disable_sync_interfaces}

 lib_deps_S =
  ;; https://github.com/kosme/arduinoFFT#develop @ 1.9.2+sha.419d7b0 ;; used for USERMOD_AUDIOREACTIVE - using "known working" hash
@@ -1033,12 +1038,14 @@ monitor_filters = esp32_exception_decoder
 [esp32_4MB_M_base]
 extends = esp32_4MB_S_base
 build_flags = ${esp32_4MB_S_base.build_flags} ${common_mm.build_flags_M}
+build_unflags = ${esp32_4MB_S_base.build_unflags} ${common_mm.build_disable_sync_interfaces}
 lib_deps = ${esp32_4MB_S_base.lib_deps} ${common_mm.lib_deps_M}
 ; board_build.partitions = tools/WLED_ESP32-wrover_4MB.csv

 [esp32_4MB_XL_base]
 extends = esp32_4MB_M_base
 build_flags = ${esp32_4MB_M_base.build_flags} ${common_mm.build_flags_XL}
+build_unflags = ${esp32_4MB_M_base.build_unflags} ${common_mm.build_disable_sync_interfaces}
 lib_deps = ${esp32_4MB_M_base.lib_deps} ${common_mm.lib_deps_XL}
 ; board_build.partitions = tools/WLED_ESP32-wrover_4MB.csv

@@ -1167,7 +1174,7 @@ build_flags = ${esp32_4MB_M_base.build_flags}
 extends = esp32_4MB_XL_base
 build_flags = ${esp32_4MB_XL_base.build_flags}
  -D WLED_RELEASE_NAME=esp32_4MB_XL
-build_unflags = 
+build_unflags = ${esp32_4MB_XL_base.build_unflags}
  -D USERMOD_ANIMARTRIX ;; Tips our memory usage over the limit
 ; RAM:   [==        ]  24.4% (used 80060 bytes from 327680 bytes)
 ; Flash: [==========]  95.3% (used 1499037 bytes from 1572864 bytes)
@@ -1972,9 +1979,11 @@ monitor_filters = esp32_exception_decoder
 # custom board environments
 # ------------------------------------------------------------------------------

-[wemos_shield_esp32_4MB_M_base]
-extends = esp32_4MB_M_base
-build_flags = ${esp32_4MB_M_base.build_flags}
+;https://www.tindie.com/products/serg74/wled-shield-board-for-addressable-leds/
+;https://www.tindie.com/products/moonmodules/shield-board-for-esp32-for-wled-addressable-leds/
+[wemos_shield_esp32_4MB_S_base]
+extends = esp32_4MB_S_base
+build_flags = ${esp32_4MB_S_base.build_flags}
  -D ABL_MILLIAMPS_DEFAULT=9500 ; Wemos max 10A
  -D LEDPIN=16
  -D RLYPIN=19
@@ -1990,11 +1999,21 @@ build_flags = ${esp32_4MB_M_base.build_flags}
  -D PWM_PIN=-1
  ; -D WLED_USE_MY_CONFIG

+[wemos_shield_esp32_4MB_M_base]
+extends = wemos_shield_esp32_4MB_S_base
+build_flags = ${wemos_shield_esp32_4MB_S_base.build_flags} ${common_mm.build_flags_M}
+lib_deps = ${wemos_shield_esp32_4MB_S_base.lib_deps} ${common_mm.lib_deps_M}
+
 [wemos_shield_esp32_4MB_XL_base]
 extends = wemos_shield_esp32_4MB_M_base
 build_flags = ${wemos_shield_esp32_4MB_M_base.build_flags} ${common_mm.build_flags_XL}
 lib_deps = ${wemos_shield_esp32_4MB_M_base.lib_deps} ${common_mm.lib_deps_XL}

+[env:wemos_shield_esp32_4MB_S]
+extends = wemos_shield_esp32_4MB_S_base
+build_flags = ${wemos_shield_esp32_4MB_S_base.build_flags}
+  -D WLED_RELEASE_NAME=wemos_shield_esp32_4MB_S
+
 [env:wemos_shield_esp32_4MB_M]
 extends = wemos_shield_esp32_4MB_M_base
 build_flags = ${wemos_shield_esp32_4MB_M_base.build_flags}
@@ -2022,6 +2041,13 @@ build_unflags = ${common.build_unflags} ${Shield_LineIn.build_unflags}
 build_flags = ${wemos_shield_esp32_4MB_M_base.build_flags} ${Shield_LineIn.build_flags}
  -D WLED_RELEASE_NAME=wemos_shield_esp32_4MB_LineIn_M

+[env:wemos_shield_esp32_16MB_S]
+extends = wemos_shield_esp32_4MB_S_base
+build_flags = ${wemos_shield_esp32_4MB_S_base.build_flags}
+  -D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_S
+board = esp32_16MB 
+board_build.partitions = tools/WLED_ESP32_16MB.csv         ;; WLED standard for 16MB flash:   2MB firmware, 12 MB filesystem
+
 [env:wemos_shield_esp32_16MB_M]
 extends = wemos_shield_esp32_4MB_M_base
 build_flags = ${wemos_shield_esp32_4MB_M_base.build_flags}
@@ -2081,6 +2107,7 @@ board = esp32_16MB
 board_build.partitions = tools/WLED_ESP32_16MB.csv         ;; WLED standard for 16MB flash:   2MB firmware, 12 MB filesystem
 ;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware,  9 MB filesystem

+;https://www.athom.tech/blank-1/wled-esp32-music-addressable-led-strip-controller
 [env:athom_music_esp32_4MB_M]
 extends = esp32_4MB_M_base
 build_flags = ${esp32_4MB_M_base.build_flags} ${Athom_PDMmic.build_flags}
@@ -2100,6 +2127,29 @@ build_flags = ${esp32_4MB_M_base.build_flags} ${Athom_PDMmic.build_flags}
  ; -D PWM_PIN=-1
  ; -D WLED_USE_MY_CONFIG

+;https://shop.myhome-control.de/Elektronik/
+[env:abc_wled_controller_v43_S]
+extends = esp32_4MB_S_base
+build_unflags = ${esp32_4MB_S_base.build_unflags} ${common_mm.build_disable_sync_interfaces}
+build_flags = ${esp32_4MB_S_base.build_flags}
+  -D WLED_RELEASE_NAME=abc_wled_controller_v43_M
+
+  -D LEDPIN=16
+  -D ABL_MILLIAMPS_DEFAULT=5000 ; 5A default. Max 13A depending on the wires connected
+
+  -D WLED_USE_ETHERNET
+  -D WLED_ETH_DEFAULT=9 ; ABC! WLED V43 & compatible
+  -D RLYPIN=-1 -D BTNPIN=-1 ;; Prevent clash
+  -D WLED_DISABLE_ESPNOW ;; ESP-NOW requires wifi, may crash with ethernet only
+
+  -D AUDIOPIN=-1 
+  -D FLD_PIN_SCL=-1 -D FLD_PIN_SDA=-1 ; use global!
+
+  ; -D WLED_USE_MY_CONFIG
+  -D SR_DMTYPE=4 -D I2S_SDPIN=32 -D I2S_WSPIN=15 -D I2S_CKPIN=14 -D MCLK_PIN=0 ; generic i2s with mclk 0
+  -D SR_SQUELCH=1 -D SR_GAIN=60    ; increrase squelch if noise, in test 0 is okay, but only slightly
+  -D SR_FREQ_PROF=1                ; Generic line in
+
 ; ESP32 WLED pico board with builtin ICS-43432 microphpone
 [env:esp32_pico_4MB_M]
 extends = esp32_4MB_M_base