From ab22beb0c3ca3e479046ef1bf821d97765b416ec Mon Sep 17 00:00:00 2001 From: Ewoud Date: Sat, 7 Jan 2023 15:10:21 +0100 Subject: [PATCH] Minor changes --- .github/workflows/wled-ci.yml | 2 +- usermods/customeffects/arti.h | 1 + usermods/customeffects/arti_wled.h | 1 + .../customeffects/usermod_v2_customeffects.h | 11 +- wled00/FX.cpp | 2 +- wled00/FX_2Dfcn.cpp | 2 +- wled00/data/index.js | 4 +- wled00/data/settings_leds.htm | 6 +- wled00/data/settings_sec.htm | 2 +- wled00/html_settings.h | 950 ++++----- wled00/html_ui.h | 1730 ++++++++--------- wled00/xml.cpp | 2 +- 12 files changed, 1362 insertions(+), 1351 deletions(-) diff --git a/.github/workflows/wled-ci.yml b/.github/workflows/wled-ci.yml index c28446e6..1655f7ec 100644 --- a/.github/workflows/wled-ci.yml +++ b/.github/workflows/wled-ci.yml @@ -28,7 +28,7 @@ jobs: build: - name: Build Enviornments + name: Build Environments runs-on: ubuntu-latest needs: get_default_envs strategy: diff --git a/usermods/customeffects/arti.h b/usermods/customeffects/arti.h index 80a823f5..290a7604 100644 --- a/usermods/customeffects/arti.h +++ b/usermods/customeffects/arti.h @@ -3,6 +3,7 @@ @file arti.h @date 20220818 @author Ewoud Wijma + @Copyright (c) 2023 Ewoud Wijma @repo https://github.com/ewoudwijma/ARTI @remarks - #define ARDUINOJSON_DEFAULT_NESTING_LIMIT 100 //set this in ArduinoJson!!!, currently not necessary... diff --git a/usermods/customeffects/arti_wled.h b/usermods/customeffects/arti_wled.h index aab0de13..1b78af63 100644 --- a/usermods/customeffects/arti_wled.h +++ b/usermods/customeffects/arti_wled.h @@ -3,6 +3,7 @@ @file arti_wled.h @date 20220818 @author Ewoud Wijma + @Copyright (c) 2023 Ewoud Wijma @repo https://github.com/ewoudwijma/ARTI */ diff --git a/usermods/customeffects/usermod_v2_customeffects.h b/usermods/customeffects/usermod_v2_customeffects.h index aa2d3c79..cac6d31f 100644 --- a/usermods/customeffects/usermod_v2_customeffects.h +++ b/usermods/customeffects/usermod_v2_customeffects.h @@ -1,3 +1,12 @@ +/* + @title Usermod Custom Effects (CE) + @file usermod_v2_customeffects.h + @date 20220818 + @author Ewoud Wijma + @Copyright (c) 2023 Ewoud Wijma + @repo https://github.com/ewoudwijma/ARTI + */ + #pragma once #include "wled.h" @@ -16,7 +25,7 @@ uint16_t mode_customEffect(void) { static char previousEffect[charLength]; if (SEGENV.call == 0) { strcpy(previousEffect, ""); //force init - SEGMENT.fill(BLACK); //in case not all leds used e.g. when using expand 1d Circles. Tbd: fill black should never be used to allow for blends/transitions + SEGMENT.fill(BLACK); //in case not all leds used e.g. when using expand 1d Circle. Tbd: fill black should never be used to allow for blends/transitions } char currentEffect[charLength]; diff --git a/wled00/FX.cpp b/wled00/FX.cpp index 3bc526bb..7089f87e 100644 --- a/wled00/FX.cpp +++ b/wled00/FX.cpp @@ -7091,7 +7091,7 @@ uint16_t mode_waterfall(void) { // Waterfall. By: Andrew Tulin return FRAMETIME; } // mode_waterfall() -static const char _data_FX_MODE_WATERFALL[] PROGMEM = "Waterfall@!,Adjust color,Select bin,Volume (min);!,!;!;1f;c2=0,m12=2,si=0"; // Circles, Beatsin +static const char _data_FX_MODE_WATERFALL[] PROGMEM = "Waterfall@!,Adjust color,Select bin,Volume (min);!,!;!;1f;c2=0,m12=2,si=0"; // Circle, Beatsin #ifndef WLED_DISABLE_2D diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp index 985a53a1..042b3d6b 100644 --- a/wled00/FX_2Dfcn.cpp +++ b/wled00/FX_2Dfcn.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - Parts of the code adapted from WLED Sound Reactive + Parts of the code adapted from WLED Sound Reactive: Copyright (c) 2022 Andrew Tuline, Ewoud Wijma, Harm Aldick */ #include "wled.h" #include "FX.h" diff --git a/wled00/data/index.js b/wled00/data/index.js index 8e41b54c..449dee1b 100644 --- a/wled00/data/index.js +++ b/wled00/data/index.js @@ -741,7 +741,7 @@ function populateSegments(s) - + `; @@ -1865,7 +1865,7 @@ ${makePlSel(plJson[i].end?plJson[i].end:0, true)} `; - if (Array.isArray(lastinfo.maps) && lastinfo.maps.length>0) { + if (Array.isArray(lastinfo.maps) && lastinfo.maps.length>0) { //WLEDMM >0 instead of 1 to show also first ledmap content += `
Ledmap: 
"; diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index 4cec25cf..4f92080e 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -12,7 +12,7 @@ function H(){window.open("https://mm.kno.wled.ge/features/settings/#led-settings");} function B(){window.open("/settings","_self");} function gId(n){return d.getElementById(n);} - function hideNoIR(){gId("irOnOff2").style.display="none";} + function hideNoIR(){gId("irOnOff2").style.display="none";} //WLEDMM function off(n){d.getElementsByName(n)[0].value = -1;} // https://www.educative.io/edpresso/how-to-dynamically-load-a-js-file-in-javascript function loadJS(FILE_URL, async = true) { @@ -608,7 +608,7 @@ Length:
Custom bus start indices:
Use global LED buffer:
- Recommended for overlapping segments (0.13 style)
+ WLEDMM: Recommended for overlapping segments (0.13 style)
Color Order Override: @@ -621,7 +621,7 @@ Length:
Disable internal pull-up/down:
Touch threshold:
-
+
This firmware build does not include IR Remote support.
IR GPIO: