From 3eed40331fbd76eb99f764fc7ecfc0c6097f0da5 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Thu, 29 Jun 2023 12:04:38 +0100 Subject: [PATCH 01/10] setSpeedFactor in animartrix --- platformio.ini | 2 +- usermods/usermod_v2_animartrix/usermod_v2_animartrix.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 6702b8de2f..ab772ced67 100644 --- a/platformio.ini +++ b/platformio.ini @@ -932,7 +932,7 @@ lib_deps_V4_M = paulstoffregen/OneWire@ ^2.3.7 ; used for USERMOD_DALLASTEMPERATURE -> need newer release with bugfixes for -S3; still requires TEMPERATURE_PIN < 46 olikraus/U8g2@ ^2.34.5 ; used for USERMOD_FOUR_LINE_DISPLAY -> need newer version with bugfixes for arduino-esp32 v2.0.4 (Wire inititialization) ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU - https://github.com/netmindz/animartrix.git#d7c1896166f13fec2917c305222a77e3b504d060 + https://github.com/netmindz/animartrix.git#65bcfc5410464fc9721dd13d11a0e29eaf7a94e5 build_flags_XL = -D USERMOD_BH1750 diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h index 6d368e8f83..2e229c2308 100644 --- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h +++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h @@ -67,6 +67,8 @@ class ANIMartRIXMod:public ANIMartRIX { if (SEGENV.call == 0) { init(SEGMENT.virtualWidth(), SEGMENT.virtualHeight(), false); } + float speedFactor = map(source, 0, 255, 1, 100) / 10; + setSpeedFactor(speedFactor); } void setPixelColor(int x, int y, rgb pixel) { SEGMENT.setPixelColorXY(x, y, CRGB(pixel.red, pixel.green, pixel.blue)); From 417bef002619e0116f68071cd5519a0b8e2056da Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Thu, 29 Jun 2023 12:16:17 +0100 Subject: [PATCH 02/10] setSpeedFactor for animartrix --- platformio.ini | 2 +- usermods/usermod_v2_animartrix/usermod_v2_animartrix.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index ab772ced67..555642101c 100644 --- a/platformio.ini +++ b/platformio.ini @@ -925,7 +925,7 @@ lib_deps_M = OneWire@~2.3.5 ; used for USERMOD_FOUR_LINE_DISPLAY and USERMOD_DALLASTEMPERATURE olikraus/U8g2 @ ^2.28.8 ; used for USERMOD_FOUR_LINE_DISPLAY ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU - https://github.com/netmindz/animartrix.git#d7c1896166f13fec2917c305222a77e3b504d060 + https://github.com/netmindz/animartrix.git#65bcfc5410464fc9721dd13d11a0e29eaf7a94e5 lib_deps_V4_M = ;https://github.com/blazoncek/OneWire.git ; includes bugfixes for inconsistent readings diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h index 2e229c2308..150613a7ac 100644 --- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h +++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h @@ -67,7 +67,7 @@ class ANIMartRIXMod:public ANIMartRIX { if (SEGENV.call == 0) { init(SEGMENT.virtualWidth(), SEGMENT.virtualHeight(), false); } - float speedFactor = map(source, 0, 255, 1, 100) / 10; + float speedFactor = map(SEGMENT.speed, 0, 255, 1, 100) / 10; setSpeedFactor(speedFactor); } void setPixelColor(int x, int y, rgb pixel) { @@ -420,6 +420,7 @@ class AnimartrixUsermod : public Usermod { void addToJsonInfo(JsonObject& root) { + if(!enabled) return; char myStringBuffer[16]; // buffer for snprintf() JsonObject user = root["u"]; if (user.isNull()) user = root.createNestedObject("u"); From d41f24fb15f8c42e2df65fc18e8cf5b7b86eb163 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Thu, 29 Jun 2023 12:16:45 +0100 Subject: [PATCH 03/10] Only add animartrix effects when usermod is enabled --- usermods/usermod_v2_animartrix/usermod_v2_animartrix.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h index 150613a7ac..723acc288f 100644 --- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h +++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h @@ -351,6 +351,8 @@ class AnimartrixUsermod : public Usermod { void setup() { + + 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); From a0b913db2771d2c7dc2f7d670da740fef19844ca Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Thu, 29 Jun 2023 12:17:55 +0100 Subject: [PATCH 04/10] Disable Animartrix by default --- wled00/usermods_list.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wled00/usermods_list.cpp b/wled00/usermods_list.cpp index da3c546297..44b51670a9 100644 --- a/wled00/usermods_list.cpp +++ b/wled00/usermods_list.cpp @@ -403,6 +403,6 @@ void registerUsermods() usermods.add(new GamesUsermod()); #endif #ifdef USERMOD_ANIMARTRIX - usermods.add(new AnimartrixUsermod("Animartrix", true)); + usermods.add(new AnimartrixUsermod("Animartrix", false)); #endif } From 1f0dc486ad17293660900e16d282f3864da5aa47 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Thu, 29 Jun 2023 12:22:54 +0100 Subject: [PATCH 05/10] animartrix update for fix for SM1 --- platformio.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index 555642101c..209e3eb165 100644 --- a/platformio.ini +++ b/platformio.ini @@ -925,14 +925,14 @@ lib_deps_M = OneWire@~2.3.5 ; used for USERMOD_FOUR_LINE_DISPLAY and USERMOD_DALLASTEMPERATURE olikraus/U8g2 @ ^2.28.8 ; used for USERMOD_FOUR_LINE_DISPLAY ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU - https://github.com/netmindz/animartrix.git#65bcfc5410464fc9721dd13d11a0e29eaf7a94e5 + https://github.com/netmindz/animartrix.git#af1e52bc9f5ec844869d5ec9cfa251d4103fe9e3 lib_deps_V4_M = ;https://github.com/blazoncek/OneWire.git ; includes bugfixes for inconsistent readings paulstoffregen/OneWire@ ^2.3.7 ; used for USERMOD_DALLASTEMPERATURE -> need newer release with bugfixes for -S3; still requires TEMPERATURE_PIN < 46 olikraus/U8g2@ ^2.34.5 ; used for USERMOD_FOUR_LINE_DISPLAY -> need newer version with bugfixes for arduino-esp32 v2.0.4 (Wire inititialization) ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU - https://github.com/netmindz/animartrix.git#65bcfc5410464fc9721dd13d11a0e29eaf7a94e5 + https://github.com/netmindz/animartrix.git#af1e52bc9f5ec844869d5ec9cfa251d4103fe9e3 build_flags_XL = -D USERMOD_BH1750 From 850c9beec5bb160b93a8846a252f2b8a5006175e Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Thu, 29 Jun 2023 12:53:55 +0100 Subject: [PATCH 06/10] Add speed slider for animartrix effects --- .../usermod_v2_animartrix.h | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h index 723acc288f..05a8904909 100644 --- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h +++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h @@ -7,58 +7,58 @@ //======================================================================================================================== -static const char _data_FX_mode_Module_Experiment10[] PROGMEM = "Z💡Module_Experiment10 ☾@;;1;2"; -static const char _data_FX_mode_Module_Experiment9[] PROGMEM = "Z💡Module_Experiment9 ☾@;;1;2"; -static const char _data_FX_mode_Module_Experiment8[] PROGMEM = "Z💡Module_Experiment8 ☾@;;1;2"; -static const char _data_FX_mode_Module_Experiment7[] PROGMEM = "Z💡Module_Experiment7 ☾@;;1;2"; -static const char _data_FX_mode_Module_Experiment6[] PROGMEM = "Z💡Module_Experiment6 ☾@;;1;2"; -static const char _data_FX_mode_Module_Experiment5[] PROGMEM = "Z💡Module_Experiment5 ☾@;;1;2"; -static const char _data_FX_mode_Module_Experiment4[] PROGMEM = "Z💡Module_Experiment4 ☾@;;1;2"; -static const char _data_FX_mode_Zoom2[] PROGMEM = "Z💡Zoom2 ☾@;;1;2"; -static const char _data_FX_mode_Module_Experiment3[] PROGMEM = "Z💡Module_Experiment3 ☾@;;1;2"; -static const char _data_FX_mode_Module_Experiment2[] PROGMEM = "Z💡Module_Experiment2 ☾@;;1;2"; -static const char _data_FX_mode_Module_Experiment1[] PROGMEM = "Z💡Module_Experiment1 ☾@;;1;2"; -static const char _data_FX_mode_Parametric_Water[] PROGMEM = "Z💡Parametric_Water ☾@;;1;2"; -static const char _data_FX_mode_Water[] PROGMEM = "Z💡Water ☾@;;1;2"; -static const char _data_FX_mode_Complex_Kaleido_6[] PROGMEM = "Z💡Complex_Kaleido_6 ☾@;;1;2"; -static const char _data_FX_mode_Complex_Kaleido_5[] PROGMEM = "Z💡Complex_Kaleido_5 ☾@;;1;2"; -static const char _data_FX_mode_Complex_Kaleido_4[] PROGMEM = "Z💡Complex_Kaleido_4 ☾@;;1;2"; -static const char _data_FX_mode_Complex_Kaleido_3[] PROGMEM = "Z💡Complex_Kaleido_3 ☾@;;1;2"; -static const char _data_FX_mode_Complex_Kaleido_2[] PROGMEM = "Z💡Complex_Kaleido_2 ☾@;;1;2"; -static const char _data_FX_mode_Complex_Kaleido[] PROGMEM = "Z💡Complex_Kaleido ☾@;;1;2"; -static const char _data_FX_mode_SM10[] PROGMEM = "Z💡SM10 ☾@;;1;2"; -static const char _data_FX_mode_SM9[] PROGMEM = "Z💡SM9 ☾@;;1;2"; -static const char _data_FX_mode_SM8[] PROGMEM = "Z💡SM8 ☾@;;1;2"; -static const char _data_FX_mode_SM7[] PROGMEM = "Z💡SM7 ☾@;;1;2"; -static const char _data_FX_mode_SM6[] PROGMEM = "Z💡SM6 ☾@;;1;2"; -static const char _data_FX_mode_SM5[] PROGMEM = "Z💡SM5 ☾@;;1;2"; -static const char _data_FX_mode_SM4[] PROGMEM = "Z💡SM4 ☾@;;1;2"; -static const char _data_FX_mode_SM3[] PROGMEM = "Z💡SM3 ☾@;;1;2"; -static const char _data_FX_mode_SM2[] PROGMEM = "Z💡SM2 ☾@;;1;2"; -static const char _data_FX_mode_SM1[] PROGMEM = "Z💡SM1 ☾@;;1;2"; -static const char _data_FX_mode_Big_Caleido[] PROGMEM = "Z💡Big_Caleido ☾@;;1;2"; -static const char _data_FX_mode_RGB_Blobs5[] PROGMEM = "Z💡RGB_Blobs5 ☾@;;1;2"; -static const char _data_FX_mode_RGB_Blobs4[] PROGMEM = "Z💡RGB_Blobs4 ☾@;;1;2"; -static const char _data_FX_mode_RGB_Blobs3[] PROGMEM = "Z💡RGB_Blobs3 ☾@;;1;2"; -static const char _data_FX_mode_RGB_Blobs2[] PROGMEM = "Z💡RGB_Blobs2 ☾@;;1;2"; -static const char _data_FX_mode_RGB_Blobs[] PROGMEM = "Z💡RGB_Blobs ☾@;;1;2"; -static const char _data_FX_mode_Polar_Waves[] PROGMEM = "Z💡Polar_Waves ☾@;;1;2"; -static const char _data_FX_mode_Slow_Fade[] PROGMEM = "Z💡Slow_Fade ☾@;;1;2"; -static const char _data_FX_mode_Zoom[] PROGMEM = "Z💡Zoom ☾@;;1;2"; -static const char _data_FX_mode_Hot_Blob[] PROGMEM = "Z💡Hot_Blob ☾@;;1;2"; -static const char _data_FX_mode_Spiralus2[] PROGMEM = "Z💡Spiralus2 ☾@;;1;2"; -static const char _data_FX_mode_Spiralus[] PROGMEM = "Z💡Spiralus ☾@;;1;2"; -static const char _data_FX_mode_Yves[] PROGMEM = "Z💡Yves ☾@;;1;2"; -static const char _data_FX_mode_Scaledemo1[] PROGMEM = "Z💡Scaledemo1 ☾@;;1;2"; -static const char _data_FX_mode_Lava1[] PROGMEM = "Z💡Lava1 ☾@;;1;2"; -static const char _data_FX_mode_Caleido3[] PROGMEM = "Z💡Caleido3 ☾@;;1;2"; -static const char _data_FX_mode_Caleido2[] PROGMEM = "Z💡Caleido2 ☾@;;1;2"; -static const char _data_FX_mode_Caleido1[] PROGMEM = "Z💡Caleido1 ☾@;;1;2"; -static const char _data_FX_mode_Distance_Experiment[] PROGMEM = "Z💡Distance_Experiment ☾@;;1;2"; -static const char _data_FX_mode_Center_Field[] PROGMEM = "Z💡Center_Field ☾@;;1;2"; -static const char _data_FX_mode_Waves[] PROGMEM = "Z💡Waves ☾@;;1;2"; -static const char _data_FX_mode_Chasing_Spirals[] PROGMEM = "Z💡Chasing_Spirals ☾@;;1;2"; -static const char _data_FX_mode_Rotating_Blob[] PROGMEM = "Z💡Rotating_Blob ☾@;;1;2"; +static const char _data_FX_mode_Module_Experiment10[] PROGMEM = "Z💡Module_Experiment10 ☾@Speed;;1;2"; +static const char _data_FX_mode_Module_Experiment9[] PROGMEM = "Z💡Module_Experiment9 ☾@Speed;;1;2"; +static const char _data_FX_mode_Module_Experiment8[] PROGMEM = "Z💡Module_Experiment8 ☾@Speed;;1;2"; +static const char _data_FX_mode_Module_Experiment7[] PROGMEM = "Z💡Module_Experiment7 ☾@Speed;;1;2"; +static const char _data_FX_mode_Module_Experiment6[] PROGMEM = "Z💡Module_Experiment6 ☾@Speed;;1;2"; +static const char _data_FX_mode_Module_Experiment5[] PROGMEM = "Z💡Module_Experiment5 ☾@Speed;;1;2"; +static const char _data_FX_mode_Module_Experiment4[] PROGMEM = "Z💡Module_Experiment4 ☾@Speed;;1;2"; +static const char _data_FX_mode_Zoom2[] PROGMEM = "Z💡Zoom2 ☾@Speed;;1;2"; +static const char _data_FX_mode_Module_Experiment3[] PROGMEM = "Z💡Module_Experiment3 ☾@Speed;;1;2"; +static const char _data_FX_mode_Module_Experiment2[] PROGMEM = "Z💡Module_Experiment2 ☾@Speed;;1;2"; +static const char _data_FX_mode_Module_Experiment1[] PROGMEM = "Z💡Module_Experiment1 ☾@Speed;;1;2"; +static const char _data_FX_mode_Parametric_Water[] PROGMEM = "Z💡Parametric_Water ☾@Speed;;1;2"; +static const char _data_FX_mode_Water[] PROGMEM = "Z💡Water ☾@Speed;;1;2"; +static const char _data_FX_mode_Complex_Kaleido_6[] PROGMEM = "Z💡Complex_Kaleido_6 ☾@Speed;;1;2"; +static const char _data_FX_mode_Complex_Kaleido_5[] PROGMEM = "Z💡Complex_Kaleido_5 ☾@Speed;;1;2"; +static const char _data_FX_mode_Complex_Kaleido_4[] PROGMEM = "Z💡Complex_Kaleido_4 ☾@Speed;;1;2"; +static const char _data_FX_mode_Complex_Kaleido_3[] PROGMEM = "Z💡Complex_Kaleido_3 ☾@Speed;;1;2"; +static const char _data_FX_mode_Complex_Kaleido_2[] PROGMEM = "Z💡Complex_Kaleido_2 ☾@Speed;;1;2"; +static const char _data_FX_mode_Complex_Kaleido[] PROGMEM = "Z💡Complex_Kaleido ☾@Speed;;1;2"; +static const char _data_FX_mode_SM10[] PROGMEM = "Z💡SM10 ☾@Speed;;1;2"; +static const char _data_FX_mode_SM9[] PROGMEM = "Z💡SM9 ☾@Speed;;1;2"; +static const char _data_FX_mode_SM8[] PROGMEM = "Z💡SM8 ☾@Speed;;1;2"; +static const char _data_FX_mode_SM7[] PROGMEM = "Z💡SM7 ☾@Speed;;1;2"; +static const char _data_FX_mode_SM6[] PROGMEM = "Z💡SM6 ☾@Speed;;1;2"; +static const char _data_FX_mode_SM5[] PROGMEM = "Z💡SM5 ☾@Speed;;1;2"; +static const char _data_FX_mode_SM4[] PROGMEM = "Z💡SM4 ☾@Speed;;1;2"; +static const char _data_FX_mode_SM3[] PROGMEM = "Z💡SM3 ☾@Speed;;1;2"; +static const char _data_FX_mode_SM2[] PROGMEM = "Z💡SM2 ☾@Speed;;1;2"; +static const char _data_FX_mode_SM1[] PROGMEM = "Z💡SM1 ☾@Speed;;1;2"; +static const char _data_FX_mode_Big_Caleido[] PROGMEM = "Z💡Big_Caleido ☾@Speed;;1;2"; +static const char _data_FX_mode_RGB_Blobs5[] PROGMEM = "Z💡RGB_Blobs5 ☾@Speed;;1;2"; +static const char _data_FX_mode_RGB_Blobs4[] PROGMEM = "Z💡RGB_Blobs4 ☾@Speed;;1;2"; +static const char _data_FX_mode_RGB_Blobs3[] PROGMEM = "Z💡RGB_Blobs3 ☾@Speed;;1;2"; +static const char _data_FX_mode_RGB_Blobs2[] PROGMEM = "Z💡RGB_Blobs2 ☾@Speed;;1;2"; +static const char _data_FX_mode_RGB_Blobs[] PROGMEM = "Z💡RGB_Blobs ☾@Speed;;1;2"; +static const char _data_FX_mode_Polar_Waves[] PROGMEM = "Z💡Polar_Waves ☾@Speed;;1;2"; +static const char _data_FX_mode_Slow_Fade[] PROGMEM = "Z💡Slow_Fade ☾@Speed;;1;2"; +static const char _data_FX_mode_Zoom[] PROGMEM = "Z💡Zoom ☾@Speed;;1;2"; +static const char _data_FX_mode_Hot_Blob[] PROGMEM = "Z💡Hot_Blob ☾@Speed;;1;2"; +static const char _data_FX_mode_Spiralus2[] PROGMEM = "Z💡Spiralus2 ☾@Speed;;1;2"; +static const char _data_FX_mode_Spiralus[] PROGMEM = "Z💡Spiralus ☾@Speed;;1;2"; +static const char _data_FX_mode_Yves[] PROGMEM = "Z💡Yves ☾@Speed;;1;2"; +static const char _data_FX_mode_Scaledemo1[] PROGMEM = "Z💡Scaledemo1 ☾@Speed;;1;2"; +static const char _data_FX_mode_Lava1[] PROGMEM = "Z💡Lava1 ☾@Speed;;1;2"; +static const char _data_FX_mode_Caleido3[] PROGMEM = "Z💡Caleido3 ☾@Speed;;1;2"; +static const char _data_FX_mode_Caleido2[] PROGMEM = "Z💡Caleido2 ☾@Speed;;1;2"; +static const char _data_FX_mode_Caleido1[] PROGMEM = "Z💡Caleido1 ☾@Speed;;1;2"; +static const char _data_FX_mode_Distance_Experiment[] PROGMEM = "Z💡Distance_Experiment ☾@Speed;;1;2"; +static const char _data_FX_mode_Center_Field[] PROGMEM = "Z💡Center_Field ☾@Speed;;1;2"; +static const char _data_FX_mode_Waves[] PROGMEM = "Z💡Waves ☾@Speed;;1;2"; +static const char _data_FX_mode_Chasing_Spirals[] PROGMEM = "Z💡Chasing_Spirals ☾@Speed;;1;2"; +static const char _data_FX_mode_Rotating_Blob[] PROGMEM = "Z💡Rotating_Blob ☾@Speed;;1;2"; class ANIMartRIXMod:public ANIMartRIX { From 1df0229a179f489653e02fabf9ce6fdef9afe6ab Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Thu, 29 Jun 2023 13:00:34 +0100 Subject: [PATCH 07/10] Dynamic radial_filter_radius --- platformio.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index 209e3eb165..00f4ec514c 100644 --- a/platformio.ini +++ b/platformio.ini @@ -925,14 +925,14 @@ lib_deps_M = OneWire@~2.3.5 ; used for USERMOD_FOUR_LINE_DISPLAY and USERMOD_DALLASTEMPERATURE olikraus/U8g2 @ ^2.28.8 ; used for USERMOD_FOUR_LINE_DISPLAY ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU - https://github.com/netmindz/animartrix.git#af1e52bc9f5ec844869d5ec9cfa251d4103fe9e3 + https://github.com/netmindz/animartrix.git#baa6802fb86aa55be3cca66fa2049c7038009aa7 lib_deps_V4_M = ;https://github.com/blazoncek/OneWire.git ; includes bugfixes for inconsistent readings paulstoffregen/OneWire@ ^2.3.7 ; used for USERMOD_DALLASTEMPERATURE -> need newer release with bugfixes for -S3; still requires TEMPERATURE_PIN < 46 olikraus/U8g2@ ^2.34.5 ; used for USERMOD_FOUR_LINE_DISPLAY -> need newer version with bugfixes for arduino-esp32 v2.0.4 (Wire inititialization) ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU - https://github.com/netmindz/animartrix.git#af1e52bc9f5ec844869d5ec9cfa251d4103fe9e3 + https://github.com/netmindz/animartrix.git#baa6802fb86aa55be3cca66fa2049c7038009aa7 build_flags_XL = -D USERMOD_BH1750 From 258a3e5bfbea58bbcc95176ea2e517d593dd56ba Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Thu, 29 Jun 2023 13:05:04 +0100 Subject: [PATCH 08/10] Dynamic radial_filter_radius --- platformio.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index 00f4ec514c..a627ba18ae 100644 --- a/platformio.ini +++ b/platformio.ini @@ -925,14 +925,14 @@ lib_deps_M = OneWire@~2.3.5 ; used for USERMOD_FOUR_LINE_DISPLAY and USERMOD_DALLASTEMPERATURE olikraus/U8g2 @ ^2.28.8 ; used for USERMOD_FOUR_LINE_DISPLAY ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU - https://github.com/netmindz/animartrix.git#baa6802fb86aa55be3cca66fa2049c7038009aa7 + https://github.com/netmindz/animartrix.git#f070fefc42febe2de3a2ab5d6d39e78bbc539702 lib_deps_V4_M = ;https://github.com/blazoncek/OneWire.git ; includes bugfixes for inconsistent readings paulstoffregen/OneWire@ ^2.3.7 ; used for USERMOD_DALLASTEMPERATURE -> need newer release with bugfixes for -S3; still requires TEMPERATURE_PIN < 46 olikraus/U8g2@ ^2.34.5 ; used for USERMOD_FOUR_LINE_DISPLAY -> need newer version with bugfixes for arduino-esp32 v2.0.4 (Wire inititialization) ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU - https://github.com/netmindz/animartrix.git#baa6802fb86aa55be3cca66fa2049c7038009aa7 + https://github.com/netmindz/animartrix.git#f070fefc42febe2de3a2ab5d6d39e78bbc539702 build_flags_XL = -D USERMOD_BH1750 From 0bd7acadf34871bd2a3c6c53426d507e874f2cfe Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Thu, 29 Jun 2023 13:19:58 +0100 Subject: [PATCH 09/10] call init for RGB_Blobs5 --- usermods/usermod_v2_animartrix/usermod_v2_animartrix.h | 1 + 1 file changed, 1 insertion(+) diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h index 05a8904909..df09e13734 100644 --- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h +++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h @@ -233,6 +233,7 @@ uint16_t mode_Big_Caleido() { return FRAMETIME; } uint16_t mode_RGB_Blobs5() { + anim.initEffect(); anim.RGB_Blobs5(); return FRAMETIME; } From 918ed57f1b11a3644b34ca56328755bc5d51c9ea Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Thu, 29 Jun 2023 21:13:27 +0100 Subject: [PATCH 10/10] Fix speedFactor midpoint --- usermods/usermod_v2_animartrix/usermod_v2_animartrix.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h index df09e13734..f8925c8a75 100644 --- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h +++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h @@ -67,7 +67,13 @@ class ANIMartRIXMod:public ANIMartRIX { if (SEGENV.call == 0) { init(SEGMENT.virtualWidth(), SEGMENT.virtualHeight(), false); } - float speedFactor = map(SEGMENT.speed, 0, 255, 1, 100) / 10; + float speedFactor = 1.0; + if (SEGMENT.speed < 128) { + speedFactor = map(SEGMENT.speed, 0, 127, 1, 10) / 10; + } + else{ + speedFactor = map(SEGMENT.speed, 128, 255, 10, 100) / 10; + } setSpeedFactor(speedFactor); } void setPixelColor(int x, int y, rgb pixel) {