diff --git a/platformio.ini b/platformio.ini index 4fc93144..1808d1dd 100644 --- a/platformio.ini +++ b/platformio.ini @@ -475,7 +475,7 @@ build_flags = ${common.build_flags} ${esp32c3.build_flags} -D WLED_RELEASE_NAME= -D CONFIG_LITTLEFS_FOR_IDF_3_2 ; WLEDMM -D WLED_USE_MY_CONFIG ; WLEDMM ; -D USERMOD_AUDIOREACTIVE ; WLEDMM - -D USERMOD_CUSTOMEFFECTS ; WLEDMM + -D USERMOD_ARTIFX ; WLEDMM upload_speed = 460800 build_unflags = ${common.build_unflags} lib_deps = ${esp32c3.lib_deps} @@ -494,7 +494,7 @@ build_flags = ${common.build_flags} ${esp32s3.build_flags} -D CONFIG_LITTLEFS_F -D WLED_RELEASE_NAME=ESP32-S3 -D WLED_USE_MY_CONFIG -D USERMOD_AUDIOREACTIVE - -D USERMOD_CUSTOMEFFECTS + -D USERMOD_ARTIFX lib_deps = ${esp32s3.lib_deps} https://github.com/blazoncek/arduinoFFT.git board_build.partitions = tools/WLED_ESP32_8MB.csv @@ -611,7 +611,7 @@ build_flags = ${common.build_flags} ${esp32s2.build_flags} -D WLED_RELEASE_NAME ; -D STATUSLED=15 -D WLED_USE_MY_CONFIG -D USERMOD_AUDIOREACTIVE - -D USERMOD_CUSTOMEFFECTS + -D USERMOD_ARTIFX lib_deps = ${esp32s2.lib_deps} https://github.com/blazoncek/arduinoFFT.git @@ -802,7 +802,7 @@ build_flags_S = ; -D WLED_USE_CIE_BRIGHTNESS_TABLE ;; experimental: use different color / brightness lookup table -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_CUSTOMEFFECTS ; WLEDMM usermod + -D USERMOD_ARTIFX ; WLEDMM usermod ; -D WLED_DISABLE_LOXONE ; -D WLED_DISABLE_ALEXA ; -D WLED_DISABLE_HUESYNC @@ -1063,7 +1063,7 @@ build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_HUESYNC -D WLED_DISABLE_LOXONE ; -D USERMOD_AUDIOREACTIVE - ; -D USERMOD_CUSTOMEFFECTS ; to be done + ; -D USERMOD_ARTIFX ; to be done ; -UWLED_USE_MY_CONFIG -D USERMOD_PIRSWITCH -D USERMOD_DALLASTEMPERATURE ;; disabled because it hangs during usermod setup on -S3 (autodetect broken?) @@ -1128,7 +1128,7 @@ build_flags = ${common.build_flags_esp8266} ; -D WLED_DEBUG ; -D WLED_DISABLE_2D ; -D USERMOD_AUDIOREACTIVE - ; -D USERMOD_CUSTOMEFFECTS ; to be done + ; -D USERMOD_ARTIFX ; to be done ; -UWLED_USE_MY_CONFIG monitor_filters = esp8266_exception_decoder ; RAM: [====== ] 59.3% (used 48616 bytes from 81920 bytes) @@ -1151,7 +1151,7 @@ build_flags = ${common.build_flags_esp8266} -D WLED_DISABLE_HUESYNC -D WLED_DISABLE_LOXONE ; -D USERMOD_AUDIOREACTIVE - ; -D USERMOD_CUSTOMEFFECTS ; to be done + ; -D USERMOD_ARTIFX ; to be done -D USERMOD_PIRSWITCH -D USERMOD_DALLASTEMPERATURE ;; disabled because it hangs during usermod setup on -S3 (autodetect broken?) -D USERMOD_MULTI_RELAY diff --git a/usermods/customeffects/arti.h b/usermods/artifx/arti.h similarity index 100% rename from usermods/customeffects/arti.h rename to usermods/artifx/arti.h diff --git a/usermods/customeffects/arti_wled.h b/usermods/artifx/arti_wled.h similarity index 100% rename from usermods/customeffects/arti_wled.h rename to usermods/artifx/arti_wled.h diff --git a/usermods/customeffects/customeffects.css b/usermods/artifx/artifx.css similarity index 100% rename from usermods/customeffects/customeffects.css rename to usermods/artifx/artifx.css diff --git a/usermods/customeffects/customeffects.js b/usermods/artifx/artifx.js similarity index 94% rename from usermods/customeffects/customeffects.js rename to usermods/artifx/artifx.js index a5198847..a56c84e2 100644 --- a/usermods/customeffects/customeffects.js +++ b/usermods/artifx/artifx.js @@ -93,7 +93,7 @@ function populateCEEditor(name, segID) { fetchAndExecute((loc?`http://${locip}`:'.') + "/", name + ".wled", function(text) { - var cn=`Custom Effects Editor
+ var cn=`ARTI-FX Editor
${name}.wled

@@ -102,8 +102,8 @@ function populateCEEditor(name, segID)

- -
+ +

Compile and Run Log

Run log > 3 seconds is send to Serial Ouput.
@@ -124,7 +124,7 @@ function populateCEEditor(name, segID) } function downloadGHFile(url, name, save=false, warn=false) { //Githubfile - if (url == "CE") url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/CustomEffects/wled/"; + if (url == "CE") url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/ARTIFX/wled/"; if (url == "HBB") url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/Presets/HB_PresetPack210808_32x32_16seg/Base%20pack/"; if (url == "HBE") url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/Presets/HB_PresetPack210808_32x32_16seg/Effects%20pack/"; if (url == "LM") url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/Ledmaps/"; @@ -167,7 +167,7 @@ function downloadGHFile(url, name, save=false, warn=false) { //Githubfile function loadCETemplate(name) { var ceProgramArea = d.getElementById("ceProgramArea"); ceProgramArea.value = `/* - Custom Effects Template + ARTIFX Template */ program ${name} { diff --git a/usermods/customeffects/usermod_v2_customeffects.h b/usermods/artifx/usermod_v2_artifx.h similarity index 91% rename from usermods/customeffects/usermod_v2_customeffects.h rename to usermods/artifx/usermod_v2_artifx.h index a4317808..eb919073 100644 --- a/usermods/customeffects/usermod_v2_customeffects.h +++ b/usermods/artifx/usermod_v2_artifx.h @@ -1,6 +1,6 @@ /* - @title Usermod Custom Effects (CE) - @file usermod_v2_customeffects.h + @title Usermod ARTIFX (AF) + @file usermod_v2_artifx.h @date 20220818 @author Ewoud Wijma @Copyright (c) 2023 Ewoud Wijma @@ -17,7 +17,7 @@ ARTI * arti; //effect function -uint16_t mode_customEffect(void) { +uint16_t mode_ARTIFX(void) { //tbd: move statics to SEGMENT.data static bool succesful; static bool notEnoughHeap; @@ -99,9 +99,9 @@ uint16_t mode_customEffect(void) { return FRAMETIME; } -static const char _data_FX_MODE_CUSTOMEFFECT[] PROGMEM = "⚙️ Custom Effect ☾@Speed,Intensity,Custom 1, Custom 2, Custom 3;!;!;1;mp12=0"; +static const char _data_FX_MODE_ARTIFX[] PROGMEM = "⚙️ ARTI-FX ☾@Speed,Intensity,Custom 1, Custom 2, Custom 3;!;!;1;mp12=0"; -class CustomEffectsUserMod : public Usermod { +class ARTIFXUserMod : public Usermod { private: // strings to reduce flash memory usage (used more than twice) static const char _name[]; //usermod name @@ -115,7 +115,7 @@ class CustomEffectsUserMod : public Usermod { void setup() { if (!initDone) - strip.addEffect(FX_MODE_CUSTOMEFFECT, &mode_customEffect, _data_FX_MODE_CUSTOMEFFECT); + strip.addEffect(FX_MODE_ARTIFX, &mode_ARTIFX, _data_FX_MODE_ARTIFX); initDone = true; enabled = true; } @@ -200,9 +200,9 @@ class CustomEffectsUserMod : public Usermod { */ uint16_t getId() { - return USERMOD_ID_CUSTOMEFFECTS; + return USERMOD_ID_ARTIFX; } }; // strings to reduce flash memory usage (used more than twice) -const char CustomEffectsUserMod::_name[] PROGMEM = "CustomEffects"; +const char ARTIFXUserMod::_name[] PROGMEM = "ARTIFX"; diff --git a/wled00/FX.h b/wled00/FX.h index 7ceb8aa5..f62ce24a 100644 --- a/wled00/FX.h +++ b/wled00/FX.h @@ -316,7 +316,7 @@ #define FX_MODE_WAVESINS 184 #define FX_MODE_ROCKTAVES 185 #define FX_MODE_2DAKEMI 186 -#define FX_MODE_CUSTOMEFFECT 187 //WLEDMM Custom Effects +#define FX_MODE_ARTIFX 187 //WLEDMM ARTIFX #define MODE_COUNT 188 diff --git a/wled00/const.h b/wled00/const.h index 408d80a2..7d2c989b 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -133,7 +133,7 @@ #define USERMOD_ID_SHT 39 //Usermod "usermod_sht.h #define USERMOD_ID_KLIPPER 40 // Usermod Klipper percentage //WLEDMM -#define USERMOD_ID_CUSTOMEFFECTS 90 //Usermod "usermod_v2_customeffects.h" +#define USERMOD_ID_ARTIFX 90 //Usermod "usermod_v2_artifx.h" #define USERMOD_ID_WEATHER 91 //Usermod "usermod_v2_weather.h" #define USERMOD_ID_GAMES 92 //Usermod "usermod_v2_games.h" diff --git a/wled00/data/index.htm b/wled00/data/index.htm index deed043b..ebf0d711 100644 --- a/wled00/data/index.htm +++ b/wled00/data/index.htm @@ -52,7 +52,7 @@ setTimeout(()=>{h.appendChild(l)},100); - + @@ -393,7 +393,7 @@ - + @@ -413,6 +413,6 @@
- + diff --git a/wled00/data/index.js b/wled00/data/index.js index ca8fa23d..0c337ca7 100644 --- a/wled00/data/index.js +++ b/wled00/data/index.js @@ -771,9 +771,9 @@ function populateSegments(s) `; - //WLEDMM Custom Effects + //WLEDMM ARTIFX let fxName = eJson.find((o)=>{return o.id==selectedFx}).name; - let cusEff = `
`; + let cusEff = `
`; cn += `