diff --git a/platformio.ini b/platformio.ini index 8c714c6a82..73afce8012 100644 --- a/platformio.ini +++ b/platformio.ini @@ -70,6 +70,7 @@ default_envs = ; wemos_shield_esp32_16MB_SPM1423_XL ; wemos_shield_esp32_16MB_LineIn_M ;; + esp32_4MB_V4_Minimal esp32_4MB_V4_S ;; experimental; HUB75 supported esp32_4MB_V4_HUB75_forum ;; experimental; HUB75 supported (forum pinout) esp32_16MB_V4_S ;; experimental - optimized for speed; HUB75 supported @@ -358,8 +359,8 @@ build_flags = -g ; -D WLEDMM_SLOWPATH ;; don't use I2S for LED bus ; -DARDUINO_USB_CDC_ON_BOOT=0 ;; this flag is mandatory for "classic ESP32" when building with arduino-esp32 >=2.0.3 -default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv ;; WLED standard for 4MB flash: 1.4MB firmware, 1MB filesystem -;default_partitions = tools/WLED_ESP32_4MB_256KB_FS.csv ;; WLEDMM alternative for 4MB flash: 1.8MB firmware, 256KB filesystem (esptool erase_flash needed before changing) +; default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv ;; WLED standard for 4MB flash: 1.4MB firmware, 1MB filesystem +default_partitions = tools/WLED_ESP32_4MB_256KB_FS.csv ;; WLEDMM alternative for 4MB flash: 1.8MB firmware, 256KB filesystem (esptool erase_flash needed before changing) tiny_partitions = tools/WLED_ESP32_2MB_noOTA.csv extended_partitions = tools/WLED_ESP32_4MB_700k_FS.csv @@ -1071,7 +1072,7 @@ AR_build_flags = -D USERMOD_AUDIOREACTIVE -D UM_AUDIOREACTIVE_USE_NEW_FFT ;; WLE AR_lib_deps = https://github.com/softhack007/arduinoFFT.git#develop @ 1.9.2 ;; used for USERMOD_AUDIOREACTIVE - optimized version, 10% faster on -S2/-C3 animartrix_build_flags = -D USERMOD_ANIMARTRIX ;; WLEDMM usermod: CC BY-NC 3.0 licensed effects by Stefan Petrick -animartrix_lib_deps = https://github.com/netmindz/animartrix.git#657f754783268b648e1d56b3cd31c810379d0c89 ;; Dirty state fix +animartrix_lib_deps = https://github.com/netmindz/animartrix.git#bd556cef92a6fee9777c0a7304c9de1a84cba184 ;; init state fix animartrix_lib_ignore = animartrix ;; to remove the animartrix lib dependancy (saves a few bytes) DMXin_build_flags = -D WLED_ENABLE_DMX_INPUT ;; WLEDMM DMX physical input - requires ESP-IDF v4.4.x @@ -1649,6 +1650,19 @@ lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compila ; RAM: [=== ] 25.5% (used 83400 bytes from 327680 bytes) ; Flash: [==========] 97.3% (used 1530013 bytes from 1572864 bytes) +[env:esp32_4MB_V4_Minimal] +extends = env:esp32_4MB_V4_S +board_build.partitions = tools/WLED_ESP32_4MB_1MB_FS.csv ;; WLED-AC compatibility +lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps} +lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation + ${common_mm.HUB75_lib_ignore} ;; over the flash size limit + ${common_mm.animartrix_lib_ignore} +build_unflags = ${esp32_4MB_V4_S_base.build_unflags} + -D USERMOD_ANIMARTRIX ;; Tips our memory usage over the limit + -D USERMOD_ARTIFX + -D USERMOD_AUTO_SAVE + -D WLED_ENABLE_HUB75MATRIX + ;; softhack007: my favourite HUB75 buildenv - fastest possible [env:esp32_4MB_V4_HUB75_forum] extends = esp32_4MB_V4_S_base diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h index a33b982300..6c9de44d88 100644 --- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h +++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h @@ -388,58 +388,58 @@ class AnimartrixUsermod : public Usermod { if(!enabled) return; - strip.addEffect(255, &mode_Module_Experiment10, _data_FX_mode_Module_Experiment10); - strip.addEffect(255, &mode_Module_Experiment9, _data_FX_mode_Module_Experiment9); - strip.addEffect(255, &mode_Module_Experiment8, _data_FX_mode_Module_Experiment8); - strip.addEffect(255, &mode_Module_Experiment7, _data_FX_mode_Module_Experiment7); - strip.addEffect(255, &mode_Module_Experiment6, _data_FX_mode_Module_Experiment6); - strip.addEffect(255, &mode_Module_Experiment5, _data_FX_mode_Module_Experiment5); - strip.addEffect(255, &mode_Module_Experiment4, _data_FX_mode_Module_Experiment4); - strip.addEffect(255, &mode_Zoom2, _data_FX_mode_Zoom2); - strip.addEffect(255, &mode_Module_Experiment3, _data_FX_mode_Module_Experiment3); - strip.addEffect(255, &mode_Module_Experiment2, _data_FX_mode_Module_Experiment2); - strip.addEffect(255, &mode_Module_Experiment1, _data_FX_mode_Module_Experiment1); - strip.addEffect(255, &mode_Parametric_Water, _data_FX_mode_Parametric_Water); - strip.addEffect(255, &mode_Water, _data_FX_mode_Water); - strip.addEffect(255, &mode_Complex_Kaleido_6, _data_FX_mode_Complex_Kaleido_6); - strip.addEffect(255, &mode_Complex_Kaleido_5, _data_FX_mode_Complex_Kaleido_5); - strip.addEffect(255, &mode_Complex_Kaleido_4, _data_FX_mode_Complex_Kaleido_4); - strip.addEffect(255, &mode_Complex_Kaleido_3, _data_FX_mode_Complex_Kaleido_3); - strip.addEffect(255, &mode_Complex_Kaleido_2, _data_FX_mode_Complex_Kaleido_2); - strip.addEffect(255, &mode_Complex_Kaleido, _data_FX_mode_Complex_Kaleido); - strip.addEffect(255, &mode_SM10, _data_FX_mode_SM10); - strip.addEffect(255, &mode_SM9, _data_FX_mode_SM9); - strip.addEffect(255, &mode_SM8, _data_FX_mode_SM8); - // strip.addEffect(255, &mode_SM7, _data_FX_mode_SM7); - strip.addEffect(255, &mode_SM6, _data_FX_mode_SM6); - strip.addEffect(255, &mode_SM5, _data_FX_mode_SM5); - strip.addEffect(255, &mode_SM4, _data_FX_mode_SM4); - strip.addEffect(255, &mode_SM3, _data_FX_mode_SM3); - strip.addEffect(255, &mode_SM2, _data_FX_mode_SM2); - strip.addEffect(255, &mode_SM1, _data_FX_mode_SM1); - strip.addEffect(255, &mode_Big_Caleido, _data_FX_mode_Big_Caleido); - strip.addEffect(255, &mode_RGB_Blobs5, _data_FX_mode_RGB_Blobs5); - strip.addEffect(255, &mode_RGB_Blobs4, _data_FX_mode_RGB_Blobs4); - strip.addEffect(255, &mode_RGB_Blobs3, _data_FX_mode_RGB_Blobs3); - strip.addEffect(255, &mode_RGB_Blobs2, _data_FX_mode_RGB_Blobs2); - strip.addEffect(255, &mode_RGB_Blobs, _data_FX_mode_RGB_Blobs); - strip.addEffect(255, &mode_Polar_Waves, _data_FX_mode_Polar_Waves); - strip.addEffect(255, &mode_Slow_Fade, _data_FX_mode_Slow_Fade); - strip.addEffect(255, &mode_Zoom, _data_FX_mode_Zoom); - strip.addEffect(255, &mode_Hot_Blob, _data_FX_mode_Hot_Blob); - strip.addEffect(255, &mode_Spiralus2, _data_FX_mode_Spiralus2); - strip.addEffect(255, &mode_Spiralus, _data_FX_mode_Spiralus); - strip.addEffect(255, &mode_Yves, _data_FX_mode_Yves); - strip.addEffect(255, &mode_Scaledemo1, _data_FX_mode_Scaledemo1); - strip.addEffect(255, &mode_Lava1, _data_FX_mode_Lava1); - strip.addEffect(255, &mode_Caleido3, _data_FX_mode_Caleido3); - strip.addEffect(255, &mode_Caleido2, _data_FX_mode_Caleido2); - strip.addEffect(255, &mode_Caleido1, _data_FX_mode_Caleido1); - strip.addEffect(255, &mode_Distance_Experiment, _data_FX_mode_Distance_Experiment); - strip.addEffect(255, &mode_Center_Field, _data_FX_mode_Center_Field); - strip.addEffect(255, &mode_Waves, _data_FX_mode_Waves); - strip.addEffect(255, &mode_Chasing_Spirals, _data_FX_mode_Chasing_Spirals); - strip.addEffect(255, &mode_Rotating_Blob, _data_FX_mode_Rotating_Blob); + strip.addEffect(203, &mode_Module_Experiment10, _data_FX_mode_Module_Experiment10); + strip.addEffect(204, &mode_Module_Experiment9, _data_FX_mode_Module_Experiment9); + strip.addEffect(205, &mode_Module_Experiment8, _data_FX_mode_Module_Experiment8); + strip.addEffect(206, &mode_Module_Experiment7, _data_FX_mode_Module_Experiment7); + strip.addEffect(207, &mode_Module_Experiment6, _data_FX_mode_Module_Experiment6); + strip.addEffect(208, &mode_Module_Experiment5, _data_FX_mode_Module_Experiment5); + strip.addEffect(209, &mode_Module_Experiment4, _data_FX_mode_Module_Experiment4); + strip.addEffect(210, &mode_Zoom2, _data_FX_mode_Zoom2); + strip.addEffect(211, &mode_Module_Experiment3, _data_FX_mode_Module_Experiment3); + strip.addEffect(212, &mode_Module_Experiment2, _data_FX_mode_Module_Experiment2); + strip.addEffect(213, &mode_Module_Experiment1, _data_FX_mode_Module_Experiment1); + strip.addEffect(214, &mode_Parametric_Water, _data_FX_mode_Parametric_Water); + strip.addEffect(215, &mode_Water, _data_FX_mode_Water); + strip.addEffect(216, &mode_Complex_Kaleido_6, _data_FX_mode_Complex_Kaleido_6); + strip.addEffect(217, &mode_Complex_Kaleido_5, _data_FX_mode_Complex_Kaleido_5); + strip.addEffect(218, &mode_Complex_Kaleido_4, _data_FX_mode_Complex_Kaleido_4); + strip.addEffect(219, &mode_Complex_Kaleido_3, _data_FX_mode_Complex_Kaleido_3); + strip.addEffect(220, &mode_Complex_Kaleido_2, _data_FX_mode_Complex_Kaleido_2); + strip.addEffect(221, &mode_Complex_Kaleido, _data_FX_mode_Complex_Kaleido); + strip.addEffect(222, &mode_SM10, _data_FX_mode_SM10); + strip.addEffect(223, &mode_SM9, _data_FX_mode_SM9); + strip.addEffect(224, &mode_SM8, _data_FX_mode_SM8); + // strip.addEffect(225, &mode_SM7, _data_FX_mode_SM7); + strip.addEffect(226, &mode_SM6, _data_FX_mode_SM6); + strip.addEffect(227, &mode_SM5, _data_FX_mode_SM5); + strip.addEffect(228, &mode_SM4, _data_FX_mode_SM4); + strip.addEffect(229, &mode_SM3, _data_FX_mode_SM3); + strip.addEffect(230, &mode_SM2, _data_FX_mode_SM2); + strip.addEffect(231, &mode_SM1, _data_FX_mode_SM1); + strip.addEffect(232, &mode_Big_Caleido, _data_FX_mode_Big_Caleido); + strip.addEffect(233, &mode_RGB_Blobs5, _data_FX_mode_RGB_Blobs5); + strip.addEffect(234, &mode_RGB_Blobs4, _data_FX_mode_RGB_Blobs4); + strip.addEffect(235, &mode_RGB_Blobs3, _data_FX_mode_RGB_Blobs3); + strip.addEffect(236, &mode_RGB_Blobs2, _data_FX_mode_RGB_Blobs2); + strip.addEffect(237, &mode_RGB_Blobs, _data_FX_mode_RGB_Blobs); + strip.addEffect(238, &mode_Polar_Waves, _data_FX_mode_Polar_Waves); + strip.addEffect(239, &mode_Slow_Fade, _data_FX_mode_Slow_Fade); + strip.addEffect(240, &mode_Zoom, _data_FX_mode_Zoom); + strip.addEffect(241, &mode_Hot_Blob, _data_FX_mode_Hot_Blob); + strip.addEffect(242, &mode_Spiralus2, _data_FX_mode_Spiralus2); + strip.addEffect(243, &mode_Spiralus, _data_FX_mode_Spiralus); + strip.addEffect(244, &mode_Yves, _data_FX_mode_Yves); + strip.addEffect(245, &mode_Scaledemo1, _data_FX_mode_Scaledemo1); + strip.addEffect(246, &mode_Lava1, _data_FX_mode_Lava1); + strip.addEffect(247, &mode_Caleido3, _data_FX_mode_Caleido3); + strip.addEffect(248, &mode_Caleido2, _data_FX_mode_Caleido2); + strip.addEffect(249, &mode_Caleido1, _data_FX_mode_Caleido1); + strip.addEffect(250, &mode_Distance_Experiment, _data_FX_mode_Distance_Experiment); + strip.addEffect(251, &mode_Center_Field, _data_FX_mode_Center_Field); + strip.addEffect(252, &mode_Waves, _data_FX_mode_Waves); + strip.addEffect(253, &mode_Chasing_Spirals, _data_FX_mode_Chasing_Spirals); + strip.addEffect(254, &mode_Rotating_Blob, _data_FX_mode_Rotating_Blob); initDone = true; }