WLED is receiving data from the USB serial port at @2000000 baud:
@@ -70,15 +69,19 @@ Credits [here](https://kno.wled.ge/about/contributors/)!
Join the Discord server to discuss everything about WLED!
-
+
Check out the WLED [Discourse forum](https://wled.discourse.group)!
-You can also send me mails to [dev.aircoookie@gmail.com](mailto:dev.aircoookie@gmail.com), but please only do so if you want to talk to me privately.
-If WLED really brightens up your every day, you can [](https://paypal.me/aircoookie)
+
+You can also send me mails to [dev.aircoookie@gmail.com](mailto:dev.aircoookie@gmail.com), but please, only do so if you want to talk to me privately.
+
+If WLED really brightens up your day, you can [](https://paypal.me/aircoookie)
*Disclaimer:*
-If you are sensitive to photosensitive epilepsy it is not recommended that you use this software.
-In case you still want to try, don't use strobe, lighting or noise modes or high effect speed settings.
+
+If you are prone to photosensitive epilepsy, we recommended you do **not** use this software.
+If you still want to try, don't use strobe, lighting or noise modes or high effect speed settings.
+
As per the MIT license, I assume no liability for any damage to you or any other person or equipment.
diff --git a/requirements.txt b/requirements.txt
index c3ed11fc16..c56efad498 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,54 +1,60 @@
#
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# pip-compile
#
-aiofiles==0.6.0
+aiofiles==22.1.0
# via platformio
-ajsonrpc==1.1.0
+ajsonrpc==1.2.0
# via platformio
-bottle==0.12.19
+anyio==3.6.2
+ # via starlette
+bottle==0.12.25
# via platformio
-certifi==2020.12.5
+certifi==2023.7.22
# via requests
-chardet==4.0.0
+charset-normalizer==3.1.0
# via requests
-click==7.1.2
+click==8.1.3
# via
# platformio
# uvicorn
-colorama==0.4.4
+colorama==0.4.6
# via platformio
-h11==0.12.0
+h11==0.14.0
# via
# uvicorn
# wsproto
-idna==2.10
- # via requests
-ifaddr==0.1.7
- # via zeroconf
-marshmallow==3.11.1
+idna==3.7
+ # via
+ # anyio
+ # requests
+marshmallow==3.19.0
# via platformio
-platformio==5.1.1
+packaging==23.1
+ # via marshmallow
+platformio==6.1.6
# via -r requirements.in
-pyelftools==0.27
+pyelftools==0.29
# via platformio
pyserial==3.5
# via platformio
-requests==2.25.1
+requests==2.31.0
# via platformio
-semantic-version==2.8.5
+semantic-version==2.10.0
# via platformio
-starlette==0.14.2
+sniffio==1.3.0
+ # via anyio
+starlette==0.23.1
# via platformio
-tabulate==0.8.9
+tabulate==0.9.0
# via platformio
-urllib3==1.26.5
+typing-extensions==4.11.0
+ # via starlette
+urllib3==1.26.18
# via requests
-uvicorn==0.13.4
- # via platformio
-wsproto==1.0.0
+uvicorn==0.20.0
# via platformio
-zeroconf==0.28.8
+wsproto==1.2.0
# via platformio
diff --git a/tools/WLED_ESP32-wrover_4MB.csv b/tools/WLED_ESP32-wrover_4MB.csv
new file mode 100644
index 0000000000..a179a89d0e
--- /dev/null
+++ b/tools/WLED_ESP32-wrover_4MB.csv
@@ -0,0 +1,6 @@
+# Name, Type, SubType, Offset, Size, Flags
+nvs, data, nvs, 0x9000, 0x5000,
+otadata, data, ota, 0xe000, 0x2000,
+app0, app, ota_0, 0x10000, 0x180000,
+app1, app, ota_1, 0x190000,0x180000,
+spiffs, data, spiffs, 0x310000,0xF0000,
diff --git a/tools/WLED_ESP32_16MB_9MB_FS.csv b/tools/WLED_ESP32_16MB_9MB_FS.csv
new file mode 100644
index 0000000000..f2f3f7783a
--- /dev/null
+++ b/tools/WLED_ESP32_16MB_9MB_FS.csv
@@ -0,0 +1,8 @@
+# Name, Type, SubType, Offset, Size, Flags
+nvs, data, nvs, 0x9000, 0x5000,
+otadata, data, ota, 0xe000, 0x2000,
+app0, app, ota_0, 0x10000, 0x300000,
+app1, app, ota_1, 0x310000,0x300000,
+spiffs, data, spiffs, 0x610000,0x9E0000,
+coredump, data, coredump,,64K
+# to create/use ffat, see https://github.com/marcmerlin/esp32_fatfsimage
\ No newline at end of file
diff --git a/tools/WLED_ESP32_2MB_noOTA.csv b/tools/WLED_ESP32_2MB_noOTA.csv
new file mode 100644
index 0000000000..7a1cf15f89
--- /dev/null
+++ b/tools/WLED_ESP32_2MB_noOTA.csv
@@ -0,0 +1,5 @@
+# Name, Type, SubType, Offset, Size, Flags
+nvs, data, nvs, 0x9000, 20K,
+otadata, data, ota, 0xe000, 8K,
+app0, app, ota_0, 0x10000, 1536K,
+spiffs, data, spiffs, 0x190000, 384K,
diff --git a/tools/WLED_ESP32_8MB.csv b/tools/WLED_ESP32_8MB.csv
index 5e930b89a2..3cf3afc342 100644
--- a/tools/WLED_ESP32_8MB.csv
+++ b/tools/WLED_ESP32_8MB.csv
@@ -3,4 +3,5 @@ nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
app0, app, ota_0, 0x10000, 0x200000,
app1, app, ota_1, 0x210000,0x200000,
-spiffs, data, spiffs, 0x410000,0x3F0000,
\ No newline at end of file
+spiffs, data, spiffs, 0x410000,0x3E0000,
+coredump, data, coredump,,64K
diff --git a/tools/cdata.js b/tools/cdata.js
index 15455a4284..90619ba678 100644
--- a/tools/cdata.js
+++ b/tools/cdata.js
@@ -16,20 +16,31 @@
*/
const fs = require("fs");
+const inliner = require("inliner");
+const zlib = require("zlib");
+const CleanCSS = require("clean-css");
+const MinifyHTML = require("html-minifier-terser").minify;
const packageJson = require("../package.json");
/**
*
*/
-function hexdump(buffer) {
+function hexdump(buffer,isHex=false) {
let lines = [];
- for (let i = 0; i < buffer.length; i += 16) {
- let block = buffer.slice(i, i + 16); // cut buffer into blocks of 16
+ for (let i = 0; i < buffer.length; i +=(isHex?32:16)) {
+ var block;
let hexArray = [];
-
- for (let value of block) {
- hexArray.push("0x" + value.toString(16).padStart(2, "0"));
+ if (isHex) {
+ block = buffer.slice(i, i + 32)
+ for (let j = 0; j < block.length; j +=2 ) {
+ hexArray.push("0x" + block.slice(j,j+2))
+ }
+ } else {
+ block = buffer.slice(i, i + 16); // cut buffer into blocks of 16
+ for (let value of block) {
+ hexArray.push("0x" + value.toString(16).padStart(2, "0"));
+ }
}
let hexString = hexArray.join(", ");
@@ -40,9 +51,6 @@ function hexdump(buffer) {
return lines.join(",\n");
}
-const inliner = require("inliner");
-const zlib = require("zlib");
-
function strReplace(str, search, replacement) {
return str.split(search).join(replacement);
}
@@ -56,16 +64,52 @@ function adoptVersionAndRepo(html) {
html = strReplace(html, "https://github.com/atuline/WLED", repoUrl);
html = strReplace(html, "https://github.com/Aircoookie/WLED", repoUrl);
}
-
let version = packageJson.version;
if (version) {
html = strReplace(html, "##VERSION##", version);
}
-
return html;
}
-function writeHtmlGzipped(sourceFile, resultFile) {
+function filter(str, type) {
+ str = adoptVersionAndRepo(str);
+ if (type === undefined) {
+ return str;
+ } else if (type == "css-minify") {
+ return new CleanCSS({}).minify(str).styles;
+ } else if (type == "js-minify") {
+ return MinifyHTML('', {
+ collapseWhitespace: true,
+ minifyJS: true,
+ continueOnParseError: false,
+ removeComments: true,
+ }).replace(/<[\/]*script>/g,'');
+ } else if (type == "html-minify") {
+ return MinifyHTML(str, {
+ collapseWhitespace: true,
+ maxLineLength: 80,
+ minifyCSS: true,
+ minifyJS: true,
+ continueOnParseError: false,
+ removeComments: true,
+ });
+ } else if (type == "html-minify-ui") {
+ return MinifyHTML(str, {
+ collapseWhitespace: true,
+ conservativeCollapse: true,
+ maxLineLength: 80,
+ minifyCSS: true,
+ minifyJS: true,
+ continueOnParseError: false,
+ removeComments: true,
+ });
+ } else {
+ console.warn("Unknown filter: " + type);
+ return str;
+ }
+}
+
+function writeHtmlGzipped(sourceFile, resultFile, page) {
console.info("Reading " + sourceFile);
new inliner(sourceFile, function (error, html) {
console.info("Inlined " + html.length + " characters");
@@ -95,8 +139,8 @@ function writeHtmlGzipped(sourceFile, resultFile) {
*/
// Autogenerated from ${sourceFile}, do not edit!!
-const uint16_t PAGE_index_L = ${result.length};
-const uint8_t PAGE_index[] PROGMEM = {
+const uint16_t PAGE_${page}_L = ${result.length};
+const uint8_t PAGE_${page}[] PROGMEM = {
${array}
};
`;
@@ -106,41 +150,6 @@ ${array}
});
}
-const CleanCSS = require("clean-css");
-const MinifyHTML = require("html-minifier-terser").minify;
-
-function filter(str, type) {
- str = adoptVersionAndRepo(str);
-
- if (type === undefined) {
- return str;
- } else if (type == "css-minify") {
- return new CleanCSS({}).minify(str).styles;
- } else if (type == "html-minify") {
- return MinifyHTML(str, {
- collapseWhitespace: true,
- maxLineLength: 80,
- minifyCSS: true,
- minifyJS: true,
- continueOnParseError: false,
- removeComments: true,
- });
- } else if (type == "html-minify-ui") {
- return MinifyHTML(str, {
- collapseWhitespace: true,
- conservativeCollapse: true,
- maxLineLength: 80,
- minifyCSS: true,
- minifyJS: true,
- continueOnParseError: false,
- removeComments: true,
- });
- } else {
- console.warn("Unknown filter: " + type);
- return str;
- }
-}
-
function specToChunk(srcDir, s) {
if (s.method == "plaintext") {
const buf = fs.readFileSync(srcDir + "/" + s.file);
@@ -153,6 +162,21 @@ const char ${s.name}[] PROGMEM = R"${s.prepend || ""}${filter(str, s.filter)}${
`;
return s.mangle ? s.mangle(chunk) : chunk;
+ } else if (s.method == "gzip") {
+ const buf = fs.readFileSync(srcDir + "/" + s.file);
+ var str = buf.toString('utf-8');
+ if (s.mangle) str = s.mangle(str);
+ const zip = zlib.gzipSync(filter(str, s.filter), { level: zlib.constants.Z_BEST_COMPRESSION });
+ const result = hexdump(zip.toString('hex'), true);
+ const chunk = `
+// Autogenerated from ${srcDir}/${s.file}, do not edit!!
+const uint16_t ${s.name}_length = ${zip.length};
+const uint8_t ${s.name}[] PROGMEM = {
+${result}
+};
+
+`;
+ return chunk;
} else if (s.method == "binary") {
const buf = fs.readFileSync(srcDir + "/" + s.file);
const result = hexdump(buf);
@@ -164,7 +188,7 @@ ${result}
};
`;
- return s.mangle ? s.mangle(chunk) : chunk;
+ return chunk;
} else {
console.warn("Unknown method: " + s.method);
return undefined;
@@ -194,160 +218,114 @@ function writeChunks(srcDir, specs, resultFile) {
fs.writeFileSync(resultFile, src);
}
-writeHtmlGzipped("wled00/data/index.htm", "wled00/html_ui.h");
-
+writeHtmlGzipped("wled00/data/index.htm", "wled00/html_ui.h", 'index');
+writeHtmlGzipped("wled00/data/simple.htm", "wled00/html_simple.h", 'simple');
+writeHtmlGzipped("wled00/data/pixart/pixart.htm", "wled00/html_pixart.h", 'pixart');
+writeHtmlGzipped("wled00/data/cpal/cpal.htm", "wled00/html_cpal.h", 'cpal');
+writeHtmlGzipped("wled00/data/pxmagic/pxmagic.htm", "wled00/html_pxmagic.h", 'pxmagic');
+/*
+writeChunks(
+ "wled00/data",
+ [
+ {
+ file: "simple.css",
+ name: "PAGE_simpleCss",
+ method: "gzip",
+ filter: "css-minify",
+ },
+ {
+ file: "simple.js",
+ name: "PAGE_simpleJs",
+ method: "gzip",
+ filter: "js-minify",
+ },
+ {
+ file: "simple.htm",
+ name: "PAGE_simple",
+ method: "gzip",
+ filter: "html-minify-ui",
+ }
+ ],
+ "wled00/html_simplex.h"
+);
+*/
writeChunks(
"wled00/data",
[
{
file: "style.css",
name: "PAGE_settingsCss",
- prepend: "=====()=====",
- method: "plaintext",
+ method: "gzip",
filter: "css-minify",
+ mangle: (str) =>
+ str
+ .replace("%%","%")
},
{
file: "settings.htm",
name: "PAGE_settings",
- prepend: "=====(",
- append: ")=====",
- method: "plaintext",
+ method: "gzip",
filter: "html-minify",
- mangle: (str) =>
- str
- .replace("%", "%%")
- .replace(/Usermods\<\/button\>\<\/form\>/gms, "Usermods\<\/button\>\<\/form\>%DMXMENU%"),
},
{
file: "settings_wifi.htm",
name: "PAGE_settings_wifi",
- prepend: "=====(",
- append: ")=====",
- method: "plaintext",
+ method: "gzip",
filter: "html-minify",
- mangle: (str) =>
- str
- .replace(/\/gms, "")
- .replace(/\
+ 
+
+ 
+
+ 
+
-
-
-
-
-------
/ A / 0 - EDCGFAB
diff --git a/usermods/seven_segment_display/usermod_v2_seven_segment_display.h b/usermods/seven_segment_display/usermod_v2_seven_segment_display.h
index 5c0022e027..20fef15df5 100644
--- a/usermods/seven_segment_display/usermod_v2_seven_segment_display.h
+++ b/usermods/seven_segment_display/usermod_v2_seven_segment_display.h
@@ -1,3 +1,7 @@
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
#pragma once
#include "wled.h"
@@ -405,7 +409,7 @@ class SevenSegmentDisplay : public Usermod
if (mqttGroupTopic[0] != 0)
{
- //subcribe for sevenseg messages on the group topic
+ //subscribe for sevenseg messages on the group topic
sprintf_P(subBuffer, PSTR("%s/%S/+/set"), mqttGroupTopic, _str_sevenSeg);
mqtt->subscribe(subBuffer, 2);
}
@@ -413,7 +417,7 @@ class SevenSegmentDisplay : public Usermod
bool onMqttMessage(char *topic, char *payload)
{
- //If topic beings iwth sevenSeg cut it off, otherwise not our message.
+ //If topic beings with sevenSeg cut it off, otherwise not our message.
size_t topicPrefixLen = strlen_P(PSTR("/sevenSeg/"));
if (strncmp_P(topic, PSTR("/sevenSeg/"), topicPrefixLen) == 0)
topic += topicPrefixLen;
diff --git a/usermods/seven_segment_display_reloaded/readme.md b/usermods/seven_segment_display_reloaded/readme.md
index 09479754c1..a3398c3e59 100644
--- a/usermods/seven_segment_display_reloaded/readme.md
+++ b/usermods/seven_segment_display_reloaded/readme.md
@@ -1,6 +1,6 @@
# Seven Segment Display Reloaded
-Usermod that uses the overlay feature to create a configurable seven segment display.
+Uses the overlay feature to create a configurable seven segment display.
Optimized for maximum configurability and use with seven segment clocks by parallyze (https://www.instructables.com/member/parallyze/instructables/)
Very loosely based on the existing usermod "seven segment display".
@@ -12,26 +12,29 @@ Add the compile-time option `-D USERMOD_SSDR` to your `platformio.ini` (or `plat
For the auto brightness option, the usermod SN_Photoresistor has to be installed as well. See SN_Photoresistor/readme.md for instructions.
## Settings
-All settings can be controlled the usermod setting page.
+All settings can be controlled via the usermod settings page.
Part of the settings can be controlled through MQTT with a raw payload or through a json request to /json/state.
### enabled
-Enables/disables this overlay usermod
+Enables/disables this usermod
### inverted
-Enables the inverted mode in which the background should be enabled and the digits should be black (leds off)
+Enables the inverted mode in which the background should be enabled and the digits should be black (LEDs off)
### Colon-blinking
Enables the blinking colon(s) if they are defined
+### Leading-Zero
+Shows the leading zero of the hour if it exists (i.e. shows `07` instead of `7`)
+
### enable-auto-brightness
-Enables the auto brightness feature. Can be only used with the usermod SN_Photoresistor installed.
+Enables the auto brightness feature. Can be used only when the usermod SN_Photoresistor is installed.
### auto-brightness-min / auto-brightness-max
The lux value calculated from usermod SN_Photoresistor will be mapped to the values defined here.
-The mapping is 0 - 1000 lux will be mapped to auto-brightness-min - auto-brightness-max
+The mapping, 0 - 1000 lux, will be mapped to auto-brightness-min and auto-brightness-max
-The mA current protection of WLED will override the calculated value if it is too high.
+WLED current protection will override the calculated value if it is too high.
### Display-Mask
Defines the type of the time/date display.
@@ -61,7 +64,7 @@ See following example for usage.
## Example
-Example for Leds definition
+Example of an LED definition:
```
< A >
/\ /\
@@ -74,15 +77,15 @@ E C
< D >
```
-Leds or Range of Leds are seperated by a comma ","
+LEDs or Range of LEDs are separated by a comma ","
-Segments are seperated by a semicolon ";" and are read as A;B;C;D;E;F;G
+Segments are separated by a semicolon ";" and are read as A;B;C;D;E;F;G
-Digits are seperated by colon ":" -> A;B;C;D;E;F;G:A;B;C;D;E;F;G
+Digits are separated by colon ":" -> A;B;C;D;E;F;G:A;B;C;D;E;F;G
Ranges are defined as lower to higher (lower first)
-For example, an clock definition for the following clock (https://www.instructables.com/Lazy-7-Quick-Build-Edition/) is
+For example, a clock definition for the following clock (https://www.instructables.com/Lazy-7-Quick-Build-Edition/) is
- hour "59,46;47-48;50-51;52-53;54-55;57-58;49,56:0,13;1-2;4-5;6-7;8-9;11-12;3,10"
@@ -96,18 +99,18 @@ or
depending on the orientation.
-# The example detailed:
+# Example details:
hour "59,46;47-48;50-51;52-53;54-55;57-58;49,56:0,13;1-2;4-5;6-7;8-9;11-12;3,10"
-there are two digits seperated by ":"
+there are two digits separated by ":"
- 59,46;47-48;50-51;52-53;54-55;57-58;49,56
- 0,13;1-2;4-5;6-7;8-9;11-12;3,10
In the first digit,
-the **segment A** consists of the leds number **59 and 46**., **segment B** consists of the leds number **47, 48** and so on
+the **segment A** consists of the LEDs number **59 and 46**., **segment B** consists of the LEDs number **47, 48** and so on
-The second digit starts again with **segment A** and leds **0 and 13**, **segment B** consists of the leds number **1 and 2** and so on
+The second digit starts again with **segment A** and LEDs **0 and 13**, **segment B** consists of the LEDs number **1 and 2** and so on
### first digit of the hour
- Segment A: 59, 46
@@ -126,4 +129,4 @@ The second digit starts again with **segment A** and leds **0 and 13**, **segmen
- Segment D: 6, 7
- Segment E: 8, 9
- Segment F: 11, 12
-- Segment G: 3, 10
\ No newline at end of file
+- Segment G: 3, 10
diff --git a/usermods/seven_segment_display_reloaded/usermod_seven_segment_reloaded.h b/usermods/seven_segment_display_reloaded/usermod_seven_segment_reloaded.h
index 6274abceec..5c2fac0d4d 100644
--- a/usermods/seven_segment_display_reloaded/usermod_seven_segment_reloaded.h
+++ b/usermods/seven_segment_display_reloaded/usermod_seven_segment_reloaded.h
@@ -1,3 +1,7 @@
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
#pragma once
#include "wled.h"
@@ -13,6 +17,7 @@ class UsermodSSDR : public Usermod {
bool umSSDRDisplayTime = false;
bool umSSDRInverted = false;
bool umSSDRColonblink = true;
+ bool umSSDRLeadingZero = false;
bool umSSDREnableLDR = false;
String umSSDRHours = "";
String umSSDRMinutes = "";
@@ -75,6 +80,7 @@ class UsermodSSDR : public Usermod {
static const char _str_timeEnabled[];
static const char _str_inverted[];
static const char _str_colonblink[];
+ static const char _str_leadingZero[];
static const char _str_displayMask[];
static const char _str_hours[];
static const char _str_minutes[];
@@ -101,15 +107,15 @@ class UsermodSSDR : public Usermod {
switch (umSSDRDisplayMask[index]) {
case 'h':
timeVar = hourFormat12(localTime);
- _showElements(&umSSDRHours, timeVar, 0, 1);
+ _showElements(&umSSDRHours, timeVar, 0, !umSSDRLeadingZero);
break;
case 'H':
timeVar = hour(localTime);
- _showElements(&umSSDRHours, timeVar, 0, 1);
+ _showElements(&umSSDRHours, timeVar, 0, !umSSDRLeadingZero);
break;
case 'k':
timeVar = hour(localTime) + 1;
- _showElements(&umSSDRHours, timeVar, 0, 0);
+ _showElements(&umSSDRHours, timeVar, 0, !umSSDRLeadingZero);
break;
case 'm':
timeVar = minute(localTime);
@@ -305,6 +311,9 @@ class UsermodSSDR : public Usermod {
if (_cmpIntSetting_P(topic, payload, _str_colonblink, &umSSDRColonblink)) {
return true;
}
+ if (_cmpIntSetting_P(topic, payload, _str_leadingZero, &umSSDRLeadingZero)) {
+ return true;
+ }
if (strcmp_P(topic, _str_displayMask) == 0) {
umSSDRDisplayMask = String(payload);
_publishMQTTstr_P(_str_displayMask, umSSDRDisplayMask);
@@ -319,6 +328,7 @@ class UsermodSSDR : public Usermod {
_publishMQTTint_P(_str_ldrEnabled, umSSDREnableLDR);
_publishMQTTint_P(_str_inverted, umSSDRInverted);
_publishMQTTint_P(_str_colonblink, umSSDRColonblink);
+ _publishMQTTint_P(_str_leadingZero, umSSDRLeadingZero);
_publishMQTTstr_P(_str_hours, umSSDRHours);
_publishMQTTstr_P(_str_minutes, umSSDRMinutes);
@@ -343,6 +353,7 @@ class UsermodSSDR : public Usermod {
ssdrObj[FPSTR(_str_ldrEnabled)] = umSSDREnableLDR;
ssdrObj[FPSTR(_str_inverted)] = umSSDRInverted;
ssdrObj[FPSTR(_str_colonblink)] = umSSDRColonblink;
+ ssdrObj[FPSTR(_str_leadingZero)] = umSSDRLeadingZero;
ssdrObj[FPSTR(_str_displayMask)] = umSSDRDisplayMask;
ssdrObj[FPSTR(_str_hours)] = umSSDRHours;
ssdrObj[FPSTR(_str_minutes)] = umSSDRMinutes;
@@ -384,7 +395,7 @@ class UsermodSSDR : public Usermod {
if (!umSSDRDisplayTime || strip.isUpdating()) {
return;
}
- #ifdef USERMOD_ID_SN_PHOTORESISTOR
+ #ifdef USERMOD_SN_PHOTORESISTOR
if(bri != 0 && umSSDREnableLDR && (millis() - umSSDRLastRefresh > umSSDRResfreshTime)) {
if (ptr != nullptr) {
uint16_t lux = ptr->getLastLDRValue();
@@ -421,6 +432,8 @@ class UsermodSSDR : public Usermod {
invert.add(umSSDRInverted);
JsonArray blink = user.createNestedArray("Blinking colon");
blink.add(umSSDRColonblink);
+ JsonArray zero = user.createNestedArray("Show the hour leading zero");
+ zero.add(umSSDRLeadingZero);
JsonArray ldrEnable = user.createNestedArray("Auto Brightness enabled");
ldrEnable.add(umSSDREnableLDR);
@@ -450,6 +463,7 @@ class UsermodSSDR : public Usermod {
umSSDREnableLDR = ssdrObj[FPSTR(_str_ldrEnabled)] | umSSDREnableLDR;
umSSDRInverted = ssdrObj[FPSTR(_str_inverted)] | umSSDRInverted;
umSSDRColonblink = ssdrObj[FPSTR(_str_colonblink)] | umSSDRColonblink;
+ umSSDRLeadingZero = ssdrObj[FPSTR(_str_leadingZero)] | umSSDRLeadingZero;
umSSDRDisplayMask = ssdrObj[FPSTR(_str_displayMask)] | umSSDRDisplayMask;
}
}
@@ -466,14 +480,14 @@ class UsermodSSDR : public Usermod {
if (mqttGroupTopic[0] != 0)
{
- //subcribe for sevenseg messages on the group topic
+ //subscribe for sevenseg messages on the group topic
sprintf_P(subBuffer, PSTR("%s/%S/+/set"), mqttGroupTopic, _str_name);
mqtt->subscribe(subBuffer, 2);
}
}
bool onMqttMessage(char *topic, char *payload) {
- //If topic beings iwth sevenSeg cut it off, otherwise not our message.
+ //If topic begins with sevenSeg cut it off, otherwise not our message.
size_t topicPrefixLen = strlen_P(PSTR("/wledSS/"));
if (strncmp_P(topic, PSTR("/wledSS/"), topicPrefixLen) == 0) {
topic += topicPrefixLen;
@@ -512,6 +526,7 @@ class UsermodSSDR : public Usermod {
umSSDREnableLDR = (top[FPSTR(_str_ldrEnabled)] | umSSDREnableLDR);
umSSDRInverted = (top[FPSTR(_str_inverted)] | umSSDRInverted);
umSSDRColonblink = (top[FPSTR(_str_colonblink)] | umSSDRColonblink);
+ umSSDRLeadingZero = (top[FPSTR(_str_leadingZero)] | umSSDRLeadingZero);
umSSDRDisplayMask = top[FPSTR(_str_displayMask)] | umSSDRDisplayMask;
umSSDRHours = top[FPSTR(_str_hours)] | umSSDRHours;
@@ -542,6 +557,7 @@ const char UsermodSSDR::_str_name[] PROGMEM = "UsermodSSDR";
const char UsermodSSDR::_str_timeEnabled[] PROGMEM = "enabled";
const char UsermodSSDR::_str_inverted[] PROGMEM = "inverted";
const char UsermodSSDR::_str_colonblink[] PROGMEM = "Colon-blinking";
+const char UsermodSSDR::_str_leadingZero[] PROGMEM = "Leading-Zero";
const char UsermodSSDR::_str_displayMask[] PROGMEM = "Display-Mask";
const char UsermodSSDR::_str_hours[] PROGMEM = "LED-Numbers-Hours";
const char UsermodSSDR::_str_minutes[] PROGMEM = "LED-Numbers-Minutes";
diff --git a/usermods/sht/readme.md b/usermods/sht/readme.md
new file mode 100644
index 0000000000..0337805b3a
--- /dev/null
+++ b/usermods/sht/readme.md
@@ -0,0 +1,56 @@
+# SHT
+Usermod to support various SHT i2c sensors like the SHT30, SHT31, SHT35 and SHT85
+
+## Requirements
+* "SHT85" by Rob Tillaart, v0.2 or higher: https://github.com/RobTillaart/SHT85
+
+## Usermod installation
+Simply copy the below block (build task) to your `platformio_override.ini` and compile WLED using this new build task. Or use an existing one, add the buildflag `-D USERMOD_SHT` and the below library dependencies.
+
+ESP32:
+```
+[env:custom_esp32dev_usermod_sht]
+extends = env:esp32dev
+build_flags = ${common.build_flags_esp32}
+ -D USERMOD_SHT
+lib_deps = ${esp32.lib_deps}
+ robtillaart/SHT85@~0.3.3
+```
+
+ESP8266:
+```
+[env:custom_d1_mini_usermod_sht]
+extends = env:d1_mini
+build_flags = ${common.build_flags_esp8266}
+ -D USERMOD_SHT
+lib_deps = ${esp8266.lib_deps}
+ robtillaart/SHT85@~0.3.3
+```
+
+## MQTT Discovery for Home Assistant
+If you're using Home Assistant and want to have the temperature and humidity available as entities in HA, you can tick the "Add-To-Home-Assistant-MQTT-Discovery" option in the usermod settings. If you have an MQTT broker configured under "Sync Settings" and it is connected, the mod will publish the auto discovery message to your broker and HA will instantly find it and create an entity each for the temperature and humidity.
+
+### Publishing readings via MQTT
+Regardless of having MQTT discovery ticked or not, the mod will always report temperature and humidity to the WLED MQTT topic of that instance, if you have a broker configured and it's connected.
+
+## Configuration
+Navigate to the "Config" and then to the "Usermods" section. If you compiled WLED with `-D USERMOD_SHT`, you will see the config for it there:
+* SHT-Type:
+ * What it does: Select the SHT sensor type you want to use
+ * Possible values: SHT30, SHT31, SHT35, SHT85
+ * Default: SHT30
+* Unit:
+ * What it does: Select which unit should be used to display the temperature in the info section. Also used when sending via MQTT discovery, see below.
+ * Possible values: Celsius, Fahrenheit
+ * Default: Celsius
+* Add-To-HA-MQTT-Discovery:
+ * What it does: Makes the temperature and humidity available via MQTT discovery, so they're automatically added to Home Assistant, because that way it's typesafe.
+ * Possible values: Enabled/Disabled
+ * Default: Disabled
+
+## Change log
+2022-12
+* First implementation.
+
+## Credits
+ezcGman | Andy: Find me on the Intermit.Tech (QuinLED) Discord server: https://discord.gg/WdbAauG
diff --git a/usermods/sht/usermod_sht.h b/usermods/sht/usermod_sht.h
new file mode 100644
index 0000000000..c6e17221be
--- /dev/null
+++ b/usermods/sht/usermod_sht.h
@@ -0,0 +1,480 @@
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
+#pragma once
+
+#include "SHT85.h"
+
+#define USERMOD_SHT_TYPE_SHT30 0
+#define USERMOD_SHT_TYPE_SHT31 1
+#define USERMOD_SHT_TYPE_SHT35 2
+#define USERMOD_SHT_TYPE_SHT85 3
+
+class ShtUsermod : public Usermod
+{
+ private:
+ bool enabled = false; // Is usermod enabled or not
+ bool firstRunDone = false; // Remembers if the first config load run had been done
+ bool initDone = false; // Remembers if the mod has been completely initialised
+ bool haMqttDiscovery = false; // Is MQTT discovery enabled or not
+ bool haMqttDiscoveryDone = false; // Remembers if we already published the HA discovery topics
+
+ // SHT vars
+ SHT *shtTempHumidSensor = nullptr; // Instance of SHT lib
+ byte shtType = 0; // SHT sensor type to be used. Default: SHT30
+ byte unitOfTemp = 0; // Temperature unit to be used. Default: Celsius (0 = Celsius, 1 = Fahrenheit)
+ bool shtInitDone = false; // Remembers if SHT sensor has been initialised
+ bool shtReadDataSuccess = false; // Did we have a successful data read and is a valid temperature and humidity available?
+ const byte shtI2cAddress = 0x44; // i2c address of the sensor. 0x44 is the default for all SHT sensors. Change this, if needed
+ unsigned long shtLastTimeUpdated = 0; // Remembers when we read data the last time
+ bool shtDataRequested = false; // Reading data is done async. This remembers if we asked the sensor to read data
+ float shtCurrentTempC = 0.0f; // Last read temperature in Celsius
+ float shtCurrentHumidity = 0.0f; // Last read humidity in RH%
+
+
+ void initShtTempHumiditySensor();
+ void cleanupShtTempHumiditySensor();
+ void cleanup();
+ inline bool isShtReady() { return shtInitDone; } // Checks if the SHT sensor has been initialised.
+
+ void publishTemperatureAndHumidityViaMqtt();
+ void publishHomeAssistantAutodiscovery();
+ void appendDeviceToMqttDiscoveryMessage(JsonDocument& root);
+
+ public:
+ // Strings to reduce flash memory usage (used more than twice)
+ static const char _name[];
+ static const char _enabled[];
+ static const char _shtType[];
+ static const char _unitOfTemp[];
+ static const char _haMqttDiscovery[];
+
+ void setup();
+ void loop();
+ void onMqttConnect(bool sessionPresent);
+ void appendConfigData();
+ void addToConfig(JsonObject &root);
+ bool readFromConfig(JsonObject &root);
+ void addToJsonInfo(JsonObject& root);
+
+ bool isEnabled() { return enabled; }
+
+ float getTemperature();
+ float getTemperatureC() { return roundf(shtCurrentTempC * 10.0f) / 10.0f; }
+ float getTemperatureF() { return (getTemperatureC() * 1.8f) + 32.0f; }
+ float getHumidity() { return roundf(shtCurrentHumidity * 10.0f) / 10.0f; }
+ const char* getUnitString();
+
+ uint16_t getId() { return USERMOD_ID_SHT; }
+};
+
+// Strings to reduce flash memory usage (used more than twice)
+const char ShtUsermod::_name[] PROGMEM = "SHT-Sensor";
+const char ShtUsermod::_enabled[] PROGMEM = "Enabled";
+const char ShtUsermod::_shtType[] PROGMEM = "SHT-Type";
+const char ShtUsermod::_unitOfTemp[] PROGMEM = "Unit";
+const char ShtUsermod::_haMqttDiscovery[] PROGMEM = "Add-To-HA-MQTT-Discovery";
+
+/**
+ * Initialise SHT sensor.
+ *
+ * Using the correct constructor according to config and initialises it using the
+ * global i2c pins.
+ *
+ * @return void
+ */
+void ShtUsermod::initShtTempHumiditySensor()
+{
+ switch (shtType) {
+ case USERMOD_SHT_TYPE_SHT30: shtTempHumidSensor = (SHT *) new SHT30(); break;
+ case USERMOD_SHT_TYPE_SHT31: shtTempHumidSensor = (SHT *) new SHT31(); break;
+ case USERMOD_SHT_TYPE_SHT35: shtTempHumidSensor = (SHT *) new SHT35(); break;
+ case USERMOD_SHT_TYPE_SHT85: shtTempHumidSensor = (SHT *) new SHT85(); break;
+ }
+
+ shtTempHumidSensor->begin(shtI2cAddress); // uses &Wire
+ if (shtTempHumidSensor->readStatus() == 0xFFFF) {
+ DEBUG_PRINTF("[%s] SHT init failed!\n", _name);
+ cleanup();
+ return;
+ }
+
+ shtInitDone = true;
+}
+
+/**
+ * Cleanup the SHT sensor.
+ *
+ * Properly calls "reset" for the sensor then releases it from memory.
+ *
+ * @return void
+ */
+void ShtUsermod::cleanupShtTempHumiditySensor()
+{
+ if (isShtReady()) {
+ shtTempHumidSensor->reset();
+ delete shtTempHumidSensor;
+ shtTempHumidSensor = nullptr;
+ }
+ shtInitDone = false;
+}
+
+/**
+ * Cleanup the mod completely.
+ *
+ * Calls ::cleanupShtTempHumiditySensor() to cleanup the SHT sensor and
+ * deallocates pins.
+ *
+ * @return void
+ */
+void ShtUsermod::cleanup()
+{
+ cleanupShtTempHumiditySensor();
+ enabled = false;
+}
+
+/**
+ * Publish temperature and humidity to WLED device topic.
+ *
+ * Will add a "/temperature" and "/humidity" topic to the WLED device topic.
+ * Temperature will be written in configured unit.
+ *
+ * @return void
+ */
+void ShtUsermod::publishTemperatureAndHumidityViaMqtt() {
+ if (!WLED_MQTT_CONNECTED) return;
+ char buf[128];
+
+ snprintf_P(buf, 127, PSTR("%s/temperature"), mqttDeviceTopic);
+ mqtt->publish(buf, 0, false, String(getTemperature()).c_str());
+ snprintf_P(buf, 127, PSTR("%s/humidity"), mqttDeviceTopic);
+ mqtt->publish(buf, 0, false, String(getHumidity()).c_str());
+}
+
+/**
+ * If enabled, publishes HA MQTT device discovery topics.
+ *
+ * Will make Home Assistant add temperature and humidity as entities automatically.
+ *
+ * Note: Whenever usermods are part of the WLED integration in HA, this can be dropped.
+ *
+ * @return void
+ */
+void ShtUsermod::publishHomeAssistantAutodiscovery() {
+ if (!WLED_MQTT_CONNECTED) return;
+
+ char json_str[1024], buf[128];
+ size_t payload_size;
+ StaticJsonDocument<1024> json;
+
+ snprintf_P(buf, 127, PSTR("%s Temperature"), serverDescription);
+ json[F("name")] = buf;
+ snprintf_P(buf, 127, PSTR("%s/temperature"), mqttDeviceTopic);
+ json[F("stat_t")] = buf;
+ json[F("dev_cla")] = F("temperature");
+ json[F("stat_cla")] = F("measurement");
+ snprintf_P(buf, 127, PSTR("%s-temperature"), escapedMac.c_str());
+ json[F("uniq_id")] = buf;
+ json[F("unit_of_meas")] = unitOfTemp ? F("°F") : F("°C");
+ appendDeviceToMqttDiscoveryMessage(json);
+ payload_size = serializeJson(json, json_str);
+ snprintf_P(buf, 127, PSTR("homeassistant/sensor/%s/%s-temperature/config"), escapedMac.c_str(), escapedMac.c_str());
+ mqtt->publish(buf, 0, true, json_str, payload_size);
+
+ json.clear();
+
+ snprintf_P(buf, 127, PSTR("%s Humidity"), serverDescription);
+ json[F("name")] = buf;
+ snprintf_P(buf, 127, PSTR("%s/humidity"), mqttDeviceTopic);
+ json[F("stat_t")] = buf;
+ json[F("dev_cla")] = F("humidity");
+ json[F("stat_cla")] = F("measurement");
+ snprintf_P(buf, 127, PSTR("%s-humidity"), escapedMac.c_str());
+ json[F("uniq_id")] = buf;
+ json[F("unit_of_meas")] = F("%");
+ appendDeviceToMqttDiscoveryMessage(json);
+ payload_size = serializeJson(json, json_str);
+ snprintf_P(buf, 127, PSTR("homeassistant/sensor/%s/%s-humidity/config"), escapedMac.c_str(), escapedMac.c_str());
+ mqtt->publish(buf, 0, true, json_str, payload_size);
+
+ haMqttDiscoveryDone = true;
+}
+
+/**
+ * Helper to add device information to MQTT discovery topic.
+ *
+ * @return void
+ */
+void ShtUsermod::appendDeviceToMqttDiscoveryMessage(JsonDocument& root) {
+ JsonObject device = root.createNestedObject(F("dev"));
+ device[F("ids")] = escapedMac.c_str();
+ device[F("name")] = serverDescription;
+ device[F("sw")] = versionString;
+ device[F("mdl")] = ESP.getChipModel();
+ device[F("mf")] = F("espressif");
+}
+
+/**
+ * Setup the mod.
+ *
+ * Allocates i2c pins as PinOwner::HW_I2C, so they can be allocated multiple times.
+ * And calls ::initShtTempHumiditySensor() to initialise the sensor.
+ *
+ * @see Usermod::setup()
+ * @see UsermodManager::setup()
+ *
+ * @return void
+ */
+void ShtUsermod::setup()
+{
+ if (enabled) {
+ // GPIOs can be set to -1 , so check they're gt zero
+ if (i2c_sda < 0 || i2c_scl < 0) {
+ DEBUG_PRINTF("[%s] I2C bus not initialised!\n", _name);
+ cleanup();
+ return;
+ }
+
+ initShtTempHumiditySensor();
+
+ initDone = true;
+ }
+
+ firstRunDone = true;
+}
+
+/**
+ * Actually reading data (async) from the sensor every 30 seconds.
+ *
+ * If last reading is at least 30 seconds, it will trigger a reading using
+ * SHT::requestData(). We will then continiously check SHT::dataReady() if
+ * data is ready to be read. If so, it's read, stored locally and published
+ * via MQTT.
+ *
+ * @see Usermod::loop()
+ * @see UsermodManager::loop()
+ *
+ * @return void
+ */
+void ShtUsermod::loop()
+{
+ if (!enabled || !initDone || strip.isUpdating()) return;
+
+ if (isShtReady()) {
+ if (millis() - shtLastTimeUpdated > 30000 && !shtDataRequested) {
+ shtTempHumidSensor->requestData();
+ shtDataRequested = true;
+
+ shtLastTimeUpdated = millis();
+ }
+
+ if (shtDataRequested) {
+ if (shtTempHumidSensor->dataReady()) {
+ if (shtTempHumidSensor->readData(false)) {
+ shtCurrentTempC = shtTempHumidSensor->getTemperature();
+ shtCurrentHumidity = shtTempHumidSensor->getHumidity();
+
+ publishTemperatureAndHumidityViaMqtt();
+ shtReadDataSuccess = true;
+ } else {
+ shtReadDataSuccess = false;
+ }
+
+ shtDataRequested = false;
+ }
+ }
+ }
+}
+
+/**
+ * Whenever MQTT is connected, publish HA autodiscovery topics.
+ *
+ * Is only done once.
+ *
+ * @see Usermod::onMqttConnect()
+ * @see UsermodManager::onMqttConnect()
+ *
+ * @return void
+ */
+void ShtUsermod::onMqttConnect(bool sessionPresent) {
+ if (haMqttDiscovery && !haMqttDiscoveryDone) publishHomeAssistantAutodiscovery();
+}
+
+/**
+ * Add dropdown for sensor type and unit to UM config page.
+ *
+ * @see Usermod::appendConfigData()
+ * @see UsermodManager::appendConfigData()
+ *
+ * @return void
+ */
+void ShtUsermod::appendConfigData() {
+ oappend(SET_F("dd=addDropdown('"));
+ oappend(_name);
+ oappend(SET_F("','"));
+ oappend(_shtType);
+ oappend(SET_F("');"));
+ oappend(SET_F("addOption(dd,'SHT30',0);"));
+ oappend(SET_F("addOption(dd,'SHT31',1);"));
+ oappend(SET_F("addOption(dd,'SHT35',2);"));
+ oappend(SET_F("addOption(dd,'SHT85',3);"));
+ oappend(SET_F("dd=addDropdown('"));
+ oappend(_name);
+ oappend(SET_F("','"));
+ oappend(_unitOfTemp);
+ oappend(SET_F("');"));
+ oappend(SET_F("addOption(dd,'Celsius',0);"));
+ oappend(SET_F("addOption(dd,'Fahrenheit',1);"));
+}
+
+/**
+ * Add config data to be stored in cfg.json.
+ *
+ * @see Usermod::addToConfig()
+ * @see UsermodManager::addToConfig()
+ *
+ * @return void
+ */
+void ShtUsermod::addToConfig(JsonObject &root)
+{
+ JsonObject top = root.createNestedObject(FPSTR(_name)); // usermodname
+
+ top[FPSTR(_enabled)] = enabled;
+ top[FPSTR(_shtType)] = shtType;
+ top[FPSTR(_unitOfTemp)] = unitOfTemp;
+ top[FPSTR(_haMqttDiscovery)] = haMqttDiscovery;
+}
+
+/**
+ * Apply config on boot or save of UM config page.
+ *
+ * This is called whenever WLED boots and loads cfg.json, or when the UM config
+ * page is saved. Will properly re-instantiate the SHT class upon type change and
+ * publish HA discovery after enabling.
+ *
+ * @see Usermod::readFromConfig()
+ * @see UsermodManager::readFromConfig()
+ *
+ * @return bool
+ */
+bool ShtUsermod::readFromConfig(JsonObject &root)
+{
+ JsonObject top = root[FPSTR(_name)];
+ if (top.isNull()) {
+ DEBUG_PRINTF("[%s] No config found. (Using defaults.)\n", _name);
+ return false;
+ }
+
+ bool oldEnabled = enabled;
+ byte oldShtType = shtType;
+ byte oldUnitOfTemp = unitOfTemp;
+ bool oldHaMqttDiscovery = haMqttDiscovery;
+
+ getJsonValue(top[FPSTR(_enabled)], enabled);
+ getJsonValue(top[FPSTR(_shtType)], shtType);
+ getJsonValue(top[FPSTR(_unitOfTemp)], unitOfTemp);
+ getJsonValue(top[FPSTR(_haMqttDiscovery)], haMqttDiscovery);
+
+ // First run: reading from cfg.json, nothing to do here, will be all done in setup()
+ if (!firstRunDone) {
+ DEBUG_PRINTF("[%s] First run, nothing to do\n", _name);
+ }
+ // Check if mod has been en-/disabled
+ else if (enabled != oldEnabled) {
+ enabled ? setup() : cleanup();
+ DEBUG_PRINTF("[%s] Usermod has been en-/disabled\n", _name);
+ }
+ // Config has been changed, so adopt to changes
+ else if (enabled) {
+ if (oldShtType != shtType) {
+ cleanupShtTempHumiditySensor();
+ initShtTempHumiditySensor();
+ }
+
+ if (oldUnitOfTemp != unitOfTemp) {
+ publishTemperatureAndHumidityViaMqtt();
+ publishHomeAssistantAutodiscovery();
+ }
+
+ if (oldHaMqttDiscovery != haMqttDiscovery && haMqttDiscovery) {
+ publishHomeAssistantAutodiscovery();
+ }
+
+ DEBUG_PRINTF("[%s] Config (re)loaded\n", _name);
+ }
+
+ return true;
+}
+
+/**
+ * Adds the temperature and humidity actually to the info section and /json info.
+ *
+ * This is called every time the info section is opened ot /json is called.
+ *
+ * @see Usermod::addToJsonInfo()
+ * @see UsermodManager::addToJsonInfo()
+ *
+ * @return void
+ */
+void ShtUsermod::addToJsonInfo(JsonObject& root)
+{
+ if (!enabled && !isShtReady()) {
+ return;
+ }
+
+ JsonObject user = root["u"];
+ if (user.isNull()) user = root.createNestedObject("u");
+
+ JsonArray jsonTemp = user.createNestedArray(F("Temperature"));
+ JsonArray jsonHumidity = user.createNestedArray(F("Humidity"));
+
+ if (shtLastTimeUpdated == 0 || !shtReadDataSuccess) {
+ jsonTemp.add(0);
+ jsonHumidity.add(0);
+ if (shtLastTimeUpdated == 0) {
+ jsonTemp.add(F(" Not read yet"));
+ jsonHumidity.add(F(" Not read yet"));
+ } else {
+ jsonTemp.add(F(" Error"));
+ jsonHumidity.add(F(" Error"));
+ }
+ return;
+ }
+
+ jsonHumidity.add(getHumidity());
+ jsonHumidity.add(F(" RH"));
+
+ jsonTemp.add(getTemperature());
+ jsonTemp.add(getUnitString());
+
+ // sensor object
+ JsonObject sensor = root[F("sensor")];
+ if (sensor.isNull()) sensor = root.createNestedObject(F("sensor"));
+
+ jsonTemp = sensor.createNestedArray(F("temp"));
+ jsonTemp.add(getTemperature());
+ jsonTemp.add(getUnitString());
+
+ jsonHumidity = sensor.createNestedArray(F("humidity"));
+ jsonHumidity.add(getHumidity());
+ jsonHumidity.add(F(" RH"));
+}
+
+/**
+ * Getter for last read temperature for configured unit.
+ *
+ * @return float
+ */
+float ShtUsermod::getTemperature() {
+ return unitOfTemp ? getTemperatureF() : getTemperatureC();
+}
+
+/**
+ * Returns the current configured unit as human readable string.
+ *
+ * @return const char*
+ */
+const char* ShtUsermod::getUnitString() {
+ return unitOfTemp ? "°F" : "°C";
+}
\ No newline at end of file
diff --git a/usermods/smartnest/readme.md b/usermods/smartnest/readme.md
new file mode 100644
index 0000000000..5c3ef8072e
--- /dev/null
+++ b/usermods/smartnest/readme.md
@@ -0,0 +1,61 @@
+# Smartnest
+
+Enables integration with `smartnest.cz` service which provides MQTT integration with voice assistants.
+In order to setup Smartnest follow the [documentation](https://www.docu.smartnest.cz/).
+
+## MQTT API
+
+The API is described in the Smartnest [Github repo](https://github.com/aososam/Smartnest/blob/master/Devices/lightRgb/lightRgb.ino).
+
+
+## Usermod installation
+
+1. Register the usermod by adding `#include "../usermods/smartnest/usermod_smartnest.h"` at the top and `usermods.add(new Smartnest());` at the bottom of `usermods_list.cpp`.
+or
+2. Use `#define USERMOD_SMARTNEST` in wled.h or `-D USERMOD_SMARTNEST` in your platformio.ini
+
+
+Example **usermods_list.cpp**:
+
+```cpp
+#include "wled.h"
+/*
+ * Register your v2 usermods here!
+ * (for v1 usermods using just usermod.cpp, you can ignore this file)
+ */
+
+/*
+ * Add/uncomment your usermod filename here (and once more below)
+ * || || ||
+ * \/ \/ \/
+ */
+//#include "usermod_v2_example.h"
+//#include "usermod_temperature.h"
+#include "../usermods/usermod_smartnest.h"
+
+void registerUsermods()
+{
+ /*
+ * Add your usermod class name here
+ * || || ||
+ * \/ \/ \/
+ */
+ //usermods.add(new MyExampleUsermod());
+ //usermods.add(new UsermodTemperature());
+ usermods.add(new Smartnest());
+
+}
+```
+
+## Configuration
+
+Usermod has no configuration, but it relies on the MQTT configuration.\
+Under Config > Sync Interfaces > MQTT:
+* Enable MQTT check box
+* Set the `Broker` field to: `smartnest.cz`
+* The `Username` and `Password` fields are the login information from the `smartnest.cz` website.
+* `Client ID` field is obtained from the device configuration panel in `smartnest.cz`.
+
+## Change log
+2022-09
+* First implementation.
diff --git a/usermods/smartnest/usermod_smartnest.h b/usermods/smartnest/usermod_smartnest.h
new file mode 100644
index 0000000000..8d2b04ff96
--- /dev/null
+++ b/usermods/smartnest/usermod_smartnest.h
@@ -0,0 +1,171 @@
+#ifndef WLED_ENABLE_MQTT
+#error "This user mod requires MQTT to be enabled."
+#endif
+
+#pragma once
+
+#include "wled.h"
+
+class Smartnest : public Usermod
+{
+private:
+ void sendToBroker(const char *const topic, const char *const message)
+ {
+ if (!WLED_MQTT_CONNECTED)
+ {
+ return;
+ }
+
+ String topic_ = String(mqttClientID) + "/" + String(topic);
+ mqtt->publish(topic_.c_str(), 0, true, message);
+ }
+
+ void turnOff()
+ {
+ setBrightness(0);
+ turnOnAtBoot = false;
+ offMode = true;
+ sendToBroker("report/powerState", "OFF");
+ }
+
+ void turnOn()
+ {
+ setBrightness(briLast);
+ turnOnAtBoot = true;
+ offMode = false;
+ sendToBroker("report/powerState", "ON");
+ }
+
+ void setBrightness(int value)
+ {
+ if (value == 0 && bri > 0) briLast = bri;
+ bri = value;
+ stateUpdated(CALL_MODE_DIRECT_CHANGE);
+ }
+
+ void setColor(int r, int g, int b)
+ {
+ strip.setColor(0, r, g, b);
+ stateUpdated(CALL_MODE_DIRECT_CHANGE);
+ char msg[18] {};
+ sprintf(msg, "rgb(%d,%d,%d)", r, g, b);
+ sendToBroker("report/color", msg);
+ }
+
+ int splitColor(const char *const color, int * const rgb)
+ {
+ char *color_ = NULL;
+ const char delim[] = ",";
+ char *cxt = NULL;
+ char *token = NULL;
+ int position = 0;
+
+ // We need to copy the string in order to keep it read only as strtok_r function requires mutable string
+ color_ = (char *)malloc(strlen(color));
+ if (NULL == color_) {
+ return -1;
+ }
+
+ strcpy(color_, color);
+ token = strtok_r(color_, delim, &cxt);
+
+ while (token != NULL)
+ {
+ rgb[position++] = (int)strtoul(token, NULL, 10);
+ token = strtok_r(NULL, delim, &cxt);
+ }
+ free(color_);
+
+ return position;
+ }
+
+public:
+ // Functions called by WLED
+
+ /**
+ * handling of MQTT message
+ * topic should look like: ///
+ */
+ bool onMqttMessage(char *topic, char *message)
+ {
+ String topic_{topic};
+ String topic_prefix{mqttClientID + String("/directive/")};
+
+ if (!topic_.startsWith(topic_prefix))
+ {
+ return false;
+ }
+
+ String subtopic = topic_.substring(topic_prefix.length());
+ String message_(message);
+
+ if (subtopic == "powerState")
+ {
+ if (strcmp(message, "ON") == 0)
+ {
+ turnOn();
+ }
+ else if (strcmp(message, "OFF") == 0)
+ {
+ turnOff();
+ }
+ return true;
+ }
+
+ if (subtopic == "percentage")
+ {
+ int val = (int)strtoul(message, NULL, 10);
+ if (val >= 0 && val <= 100)
+ {
+ setBrightness(map(val, 0, 100, 0, 255));
+ }
+ return true;
+ }
+
+ if (subtopic == "color")
+ {
+ // Parse the message which is in the format "rgb(<0-255>,<0-255>,<0-255>)"
+ int rgb[3] = {};
+ String colors = message_.substring(String("rgb(").length(), message_.lastIndexOf(')'));
+ if (3 != splitColor(colors.c_str(), rgb))
+ {
+ return false;
+ }
+ setColor(rgb[0], rgb[1], rgb[2]);
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * subscribe to MQTT topic and send publish current status.
+ */
+ void onMqttConnect(bool sessionPresent)
+ {
+ String topic = String(mqttClientID) + "/#";
+
+ mqtt->subscribe(topic.c_str(), 0);
+ sendToBroker("report/online", (bri ? "true" : "false")); // Reports that the device is online
+ delay(100);
+ sendToBroker("report/firmware", versionString); // Reports the firmware version
+ delay(100);
+ sendToBroker("report/ip", (char *)WiFi.localIP().toString().c_str()); // Reports the ip
+ delay(100);
+ sendToBroker("report/network", (char *)WiFi.SSID().c_str()); // Reports the network name
+ delay(100);
+
+ String signal(WiFi.RSSI(), 10);
+ sendToBroker("report/signal", signal.c_str()); // Reports the signal strength
+ delay(100);
+ }
+
+ /**
+ * getId() allows you to optionally give your V2 usermod an unique ID (please define it in const.h!).
+ * This could be used in the future for the system to determine whether your usermod is installed.
+ */
+ uint16_t getId()
+ {
+ return USERMOD_ID_SMARTNEST;
+ }
+};
diff --git a/usermods/stairway_wipe_basic/readme.md b/usermods/stairway_wipe_basic/readme.md
index 632b7d85d8..353856b3c1 100644
--- a/usermods/stairway_wipe_basic/readme.md
+++ b/usermods/stairway_wipe_basic/readme.md
@@ -1,14 +1,22 @@
-### Stairway lighting
+# Stairway lighting
+## Install
+Add the buildflag `-D USERMOD_STAIRCASE_WIPE` to your enviroment to activate it.
+
+### Configuration
+`-D STAIRCASE_WIPE_OFF`
+
Have the LEDs wipe off instead of fading out
+
+## Description
Quick usermod to accomplish something similar to [this video](https://www.youtube.com/watch?v=NHkju5ncC4A).
-This usermod allows you to add a lightstrip alongside or on the steps of a staircase.
+This usermod enables you to add a lightstrip alongside or on the steps of a staircase.
When the `userVar0` variable is set, the LEDs will gradually turn on in a Wipe effect.
Both directions are supported by setting userVar0 to 1 and 2, respectively (HTTP API commands `U0=1` and `U0=2`).
-After the Wipe is complete, the light will either stay on (Solid effect) indefinitely or after `userVar1` seconds have elapsed.
-If userVar0 is updated (e.g. by triggering a second sensor) the light will slowly fade off.
-This could be extended to also run a Wipe effect in reverse order to turn the LEDs back off.
+After the Wipe is complete, the light will either stay on (Solid effect) indefinitely or extinguish after `userVar1` seconds have elapsed.
+If userVar0 is updated (e.g. by triggering a second sensor) the light will fade slowly until it's off.
+This could be extended to also run a Wipe effect in reverse order to turn the LEDs off.
This is just a basic version to accomplish this using HTTP API calls `U0` and `U1` and/or macros.
-It should be easy to adapt this code however to interface with motion sensors or other input devices.
\ No newline at end of file
+It should be easy to adapt this code to interface with motion sensors or other input devices.
diff --git a/usermods/stairway_wipe_basic/stairway-wipe-usermod-v2.h b/usermods/stairway_wipe_basic/stairway-wipe-usermod-v2.h
index 08d551be02..f712316b86 100644
--- a/usermods/stairway_wipe_basic/stairway-wipe-usermod-v2.h
+++ b/usermods/stairway_wipe_basic/stairway-wipe-usermod-v2.h
@@ -19,10 +19,12 @@ class StairwayWipeUsermod : public Usermod {
unsigned long timeStaticStart = 0;
uint16_t previousUserVar0 = 0;
+//moved to buildflag
//comment this out if you want the turn off effect to be just fading out instead of reverse wipe
-#define STAIRCASE_WIPE_OFF
+//#define STAIRCASE_WIPE_OFF
public:
-
+void setup() {
+ }
void loop() {
//userVar0 (U0 in HTTP API):
//has to be set to 1 if movement is detected on the PIR that is the same side of the staircase as the ESP8266
@@ -84,19 +86,20 @@ class StairwayWipeUsermod : public Usermod {
uint16_t getId()
{
- return USERMOD_ID_EXAMPLE;
+ return USERMOD_ID_STAIRWAY_WIPE;
}
void startWipe()
{
bri = briLast; //turn on
- transitionDelayTemp = 0; //no transition
+ jsonTransitionOnce = true;
+ strip.setTransition(0); //no transition
effectCurrent = FX_MODE_COLOR_WIPE;
resetTimebase(); //make sure wipe starts from beginning
//set wipe direction
- WS2812FX::Segment& seg = strip.getSegment(0);
+ Segment& seg = strip.getSegment(0);
bool doReverse = (userVar0 == 2);
seg.setOption(1, doReverse);
@@ -105,10 +108,11 @@ class StairwayWipeUsermod : public Usermod {
void turnOff()
{
+ jsonTransitionOnce = true;
#ifdef STAIRCASE_WIPE_OFF
- transitionDelayTemp = 0; //turn off immediately after wipe completed
+ strip.setTransition(0); //turn off immediately after wipe completed
#else
- transitionDelayTemp = 4000; //fade out slowly
+ strip.setTransition(4000); //fade out slowly
#endif
bri = 0;
stateUpdated(CALL_MODE_NOTIFICATION);
diff --git a/usermods/stairway_wipe_basic/wled06_usermod.ino b/usermods/stairway_wipe_basic/wled06_usermod.ino
index eeece4438a..c1264ebfb2 100644
--- a/usermods/stairway_wipe_basic/wled06_usermod.ino
+++ b/usermods/stairway_wipe_basic/wled06_usermod.ino
@@ -89,7 +89,7 @@ void startWipe()
resetTimebase(); //make sure wipe starts from beginning
//set wipe direction
- WS2812FX::Segment& seg = strip.getSegment(0);
+ Segment& seg = strip.getSegment(0);
bool doReverse = (userVar0 == 2);
seg.setOption(1, doReverse);
diff --git a/usermods/usermod_rotary_brightness_color/README.md b/usermods/usermod_rotary_brightness_color/README.md
index 9d59a0ba9f..06a3a0f82a 100644
--- a/usermods/usermod_rotary_brightness_color/README.md
+++ b/usermods/usermod_rotary_brightness_color/README.md
@@ -1,18 +1,18 @@
# Rotary Encoder (Brightness and Color)
-V2 usermod that allows changing brightness and color using a rotary encoder,
+V2 usermod that enables changing brightness and color using a rotary encoder
change between modes by pressing a button (many encoders have one included)
-but it will wait for AUTOSAVE_SETTLE_MS milliseconds, a "settle"
+it will wait for AUTOSAVE_SETTLE_MS milliseconds. a "settle"
period in case there are other changes (any change will
-extend the "settle" window).
+extend the "settle" period).
It will additionally load preset AUTOSAVE_PRESET_NUM at startup.
during the first `loop()`. Reasoning below.
AutoSaveUsermod is standalone, but if FourLineDisplayUsermod is installed, it will notify the user of the saved changes.
-Note: I don't love that WLED doesn't respect the brightness of the preset being auto loaded, so the AutoSaveUsermod will set the AUTOSAVE_PRESET_NUM preset in the first loop, so brightness IS honored. This means WLED will effectively ignore Default brightness and Apply N preset at boot when the AutoSaveUsermod is installed.
+Note: WLED doesn't respect the brightness of the preset being auto loaded, so the AutoSaveUsermod will set the AUTOSAVE_PRESET_NUM preset in the first loop, so brightness IS honored. This means WLED will effectively ignore Default brightness and Apply N preset at boot when the AutoSaveUsermod is installed.
## Installation
diff --git a/usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.h b/usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.h
index 61b76ba194..85a9a16054 100644
--- a/usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.h
+++ b/usermods/usermod_rotary_brightness_color/usermod_rotary_brightness_color.h
@@ -23,7 +23,7 @@ class RotaryEncoderBrightnessColor : public Usermod
unsigned char Enc_B;
unsigned char Enc_A_prev = 0;
- // private class memebers configurable by Usermod Settings (defaults set inside readFromConfig())
+ // private class members configurable by Usermod Settings (defaults set inside readFromConfig())
int8_t pins[3]; // pins[0] = DT from encoder, pins[1] = CLK from encoder, pins[2] = CLK from encoder (optional)
int fadeAmount; // how many points to fade the Neopixel with each step
@@ -162,7 +162,7 @@ class RotaryEncoderBrightnessColor : public Usermod
* - configComplete is used to return false if any value is missing, not just if the main object is missing
* - The defaults are loaded every time readFromConfig() is run, not just once after boot
*
- * This ensures that missing values are added to the config, with their default values, in the rare but plauible cases of:
+ * This ensures that missing values are added to the config, with their default values, in the rare but plausible cases of:
* - a single value being missing at boot, e.g. if the Usermod was upgraded and a new setting was added
* - a single value being missing after boot (e.g. if the cfg.json was manually edited and a value was removed)
*
diff --git a/usermods/usermod_v2_auto_save/readme.md b/usermods/usermod_v2_auto_save/readme.md
index 7cf81085e7..f54d87a769 100644
--- a/usermods/usermod_v2_auto_save/readme.md
+++ b/usermods/usermod_v2_auto_save/readme.md
@@ -1,24 +1,21 @@
# Auto Save
-v2 Usermod to automatically save settings
-to preset number AUTOSAVE_PRESET_NUM after a change to any of
-
+v2 Usermod to automatically save settings
+to preset number AUTOSAVE_PRESET_NUM after a change to any of:
* brightness
* effect speed
* effect intensity
* mode (effect)
* palette
-but it will wait for AUTOSAVE_SETTLE_MS milliseconds, a "settle"
-period in case there are other changes (any change will
-extend the "settle" window).
+but it will wait for AUTOSAVE_AFTER_SEC seconds,
+a "settle" period in case there are other changes (any change will extend the "settle" period).
-It will additionally load preset AUTOSAVE_PRESET_NUM at startup.
-during the first `loop()`. Reasoning below.
+It will additionally load preset AUTOSAVE_PRESET_NUM at startup during the first `loop()`.
AutoSaveUsermod is standalone, but if FourLineDisplayUsermod is installed, it will notify the user of the saved changes.
-Note: I don't love that WLED doesn't respect the brightness of the preset being auto loaded, so the AutoSaveUsermod will set the AUTOSAVE_PRESET_NUM preset in the first loop, so brightness IS honored. This means WLED will effectively ignore Default brightness and Apply N preset at boot when the AutoSaveUsermod is installed.
+Note: WLED doesn't respect the brightness of the preset being auto loaded, so the AutoSaveUsermod will set the AUTOSAVE_PRESET_NUM preset in the first loop, so brightness IS honored. This means WLED will effectively ignore Default brightness and Apply N preset at boot when the AutoSaveUsermod is installed.
## Installation
@@ -28,10 +25,21 @@ This file should be placed in the same directory as `platformio.ini`.
### Define Your Options
-* `USERMOD_AUTO_SAVE` - define this to have this the Auto Save usermod included wled00\usermods_list.cpp
-* `USERMOD_FOUR_LINE_DISPLAY` - define this to have this the Four Line Display mod included wled00\usermods_list.cpp - also tells this usermod that the display is available (see the Four Line Display usermod `readme.md` for more details)
+* `USERMOD_AUTO_SAVE` - define this to have this usermod included wled00\usermods_list.cpp
+* `AUTOSAVE_AFTER_SEC` - define the delay time after the settings auto-saving routine should be executed
+* `AUTOSAVE_PRESET_NUM` - define the preset number used by autosave usermod
+* `USERMOD_AUTO_SAVE_ON_BOOT` - define if autosave should be enabled on boot
+* `USERMOD_FOUR_LINE_DISPLAY` - define this to have this the Four Line Display mod included wled00\usermods_list.cpp
+ also tells this usermod that the display is available
+ (see the Four Line Display usermod `readme.md` for more details)
+
+Example to add in platformio_override:
+ -D USERMOD_AUTO_SAVE
+ -D AUTOSAVE_AFTER_SEC=10
+ -D AUTOSAVE_PRESET_NUM=100
+ -D USERMOD_AUTO_SAVE_ON_BOOT=true
-You can configure auto-save parameters using Usermods settings page.
+You can also configure auto-save parameters using Usermods settings page.
### PlatformIO requirements
@@ -44,4 +52,4 @@ Note: the Four Line Display usermod requires the libraries `U8g2` and `Wire`.
2021-02
* First public release
2021-04
-* Adaptation for runtime configuration.
\ No newline at end of file
+* Adaptation for runtime configuration.
diff --git a/usermods/usermod_v2_auto_save/usermod_v2_auto_save.h b/usermods/usermod_v2_auto_save/usermod_v2_auto_save.h
index c289cc32ad..2a63dd4d88 100644
--- a/usermods/usermod_v2_auto_save/usermod_v2_auto_save.h
+++ b/usermods/usermod_v2_auto_save/usermod_v2_auto_save.h
@@ -33,9 +33,23 @@ class AutoSaveUsermod : public Usermod {
bool enabled = true;
// configurable parameters
+ #ifdef AUTOSAVE_AFTER_SEC
+ uint16_t autoSaveAfterSec = AUTOSAVE_AFTER_SEC;
+ #else
uint16_t autoSaveAfterSec = 15; // 15s by default
+ #endif
+
+ #ifdef AUTOSAVE_PRESET_NUM
+ uint8_t autoSavePreset = AUTOSAVE_PRESET_NUM;
+ #else
uint8_t autoSavePreset = 250; // last possible preset
+ #endif
+
+ #ifdef USERMOD_AUTO_SAVE_ON_BOOT
+ bool applyAutoSaveOnBoot = USERMOD_AUTO_SAVE_ON_BOOT;
+ #else
bool applyAutoSaveOnBoot = false; // do we load auto-saved preset on boot?
+ #endif
// If we've detected the need to auto save, this will be non zero.
unsigned long autoSaveAfter = 0;
@@ -64,6 +78,7 @@ class AutoSaveUsermod : public Usermod {
PSTR("~ %02d-%02d %02d:%02d:%02d ~"),
month(localTime), day(localTime),
hour(localTime), minute(localTime), second(localTime));
+ cacheInvalidate++; // force reload of presets
savePreset(autoSavePreset, presetNameBuffer);
}
@@ -76,13 +91,17 @@ class AutoSaveUsermod : public Usermod {
#endif
}
+ void enable(bool enable) {
+ enabled = enable;
+ }
+
public:
// gets called once at boot. Do all initialization that doesn't depend on
// network here
void setup() {
#ifdef USERMOD_FOUR_LINE_DISPLAY
- // This Usermod has enhanced funcionality if
+ // This Usermod has enhanced functionality if
// FourLineDisplayUsermod is available.
display = (FourLineDisplayUsermod*) usermods.lookup(USERMOD_ID_FOUR_LINE_DISP);
#endif
@@ -129,7 +148,7 @@ class AutoSaveUsermod : public Usermod {
if (autoSaveAfter && now > autoSaveAfter) {
autoSaveAfter = 0;
- // Time to auto save. You may have some flickry?
+ // Time to auto save. You may have some flickery?
saveSettings();
displayOverlay();
}
@@ -140,12 +159,24 @@ class AutoSaveUsermod : public Usermod {
* Creating an "u" object allows you to add custom key/value pairs to the Info section of the WLED web UI.
* Below it is shown how this could be used for e.g. a light sensor
*/
- //void addToJsonInfo(JsonObject& root) {
- //JsonObject user = root["u"];
- //if (user.isNull()) user = root.createNestedObject("u");
- //JsonArray data = user.createNestedArray(F("Autosave"));
- //data.add(F("Loaded."));
- //}
+ void addToJsonInfo(JsonObject& root) {
+ JsonObject user = root["u"];
+ if (user.isNull()) {
+ user = root.createNestedObject("u");
+ }
+
+ JsonArray infoArr = user.createNestedArray(FPSTR(_name)); // name
+
+ String uiDomString = F("");
+ infoArr.add(uiDomString);
+ }
/*
* addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
@@ -158,9 +189,20 @@ class AutoSaveUsermod : public Usermod {
* readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
* Values in the state object may be modified by connected clients
*/
- //void readFromJsonState(JsonObject& root) {
- // if (!initDone) return; // prevent crash on boot applyPreset()
- //}
+ void readFromJsonState(JsonObject& root) {
+ if (!initDone) return; // prevent crash on boot applyPreset()
+ bool en = enabled;
+ JsonObject um = root[FPSTR(_name)];
+ if (!um.isNull()) {
+ if (um[FPSTR(_autoSaveEnabled)].is()) {
+ en = um[FPSTR(_autoSaveEnabled)].as();
+ } else {
+ String str = um[FPSTR(_autoSaveEnabled)]; // checkbox -> off or on
+ en = (bool)(str!="off"); // off is guaranteed to be present
+ }
+ if (en != enabled) enable(en);
+ }
+ }
/*
* addToConfig() can be used to add custom persistent settings to the cfg.json file in the "um" (usermod) object.
diff --git a/usermods/usermod_v2_four_line_display/readme.md b/usermods/usermod_v2_four_line_display/readme.md
index 47518be905..a0ed44d71f 100644
--- a/usermods/usermod_v2_four_line_display/readme.md
+++ b/usermods/usermod_v2_four_line_display/readme.md
@@ -2,9 +2,9 @@
First, thanks to the authors of the ssd11306_i2c_oled_u8g2 mod.
-This usermod provides a four line display using either
+Provides a four line display using either
128x32 or 128x64 OLED displays.
-It's can operate independently, but starts to provide
+It can operate independently, but starts to provide
a relatively complete on-device UI when paired with the
Rotary Encoder UI usermod. I strongly encourage you to use
them together.
@@ -19,11 +19,11 @@ This file should be placed in the same directory as `platformio.ini`.
### Define Your Options
-* `USERMOD_FOUR_LINE_DISPLAY` - define this to have this the Four Line Display mod included wled00\usermods_list.cpp - also tells Rotary Encoder usermod, if installed, that the display is available
+* `USERMOD_FOUR_LINE_DISPLAY` - define this to have this mod included wled00\usermods_list.cpp - also tells Rotary Encoder usermod, if installed, the display is available
* `FLD_PIN_SCL` - The display SCL pin, defaults to 5
* `FLD_PIN_SDA` - The display SDA pin, defaults to 4
-All of the parameters can be configured using Usermods settings page, inluding GPIO pins.
+All of the parameters can be configured via the Usermods settings page, including GPIO pins.
### PlatformIO requirements
@@ -44,7 +44,7 @@ UI usermod folder for how to include these using `platformio_override.ini`.
* 6 = SPI SSD1306 128x32
* 7 = SPI SSD1306 128x64 (4 double-height lines)
* `contrast` - set display contrast (higher contrast may reduce display lifetime)
-* `refreshRateSec` - time in seconds for display refresh
+* `refreshRateSec` - display refresh time in seconds
* `screenTimeOutSec` - screen saver time-out in seconds
* `flip` - flip/rotate display 180°
* `sleepMode` - enable/disable screen saver
@@ -60,4 +60,4 @@ UI usermod folder for how to include these using `platformio_override.ini`.
* Adaptation for runtime configuration.
2021-11
-* Added configuration option description.
\ No newline at end of file
+* Added configuration option description.
diff --git a/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h b/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h
index a49961dd57..2190c23939 100644
--- a/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h
+++ b/usermods/usermod_v2_four_line_display/usermod_v2_four_line_display.h
@@ -11,7 +11,7 @@
// for WLED.
//
// Dependencies
-// * This usermod REQURES the ModeSortUsermod
+// * This usermod REQUIRES the ModeSortUsermod
// * This Usermod works best, by far, when coupled
// with RotaryEncoderUIUsermod.
//
@@ -24,54 +24,31 @@
//
//The SCL and SDA pins are defined here.
+#ifndef FLD_PIN_SCL
+ #define FLD_PIN_SCL i2c_scl
+#endif
+#ifndef FLD_PIN_SDA
+ #define FLD_PIN_SDA i2c_sda
+#endif
+#ifndef FLD_PIN_CLOCKSPI
+ #define FLD_PIN_CLOCKSPI spi_sclk
+#endif
+ #ifndef FLD_PIN_DATASPI
+ #define FLD_PIN_DATASPI spi_mosi
+#endif
+#ifndef FLD_PIN_CS
+ #define FLD_PIN_CS spi_cs
+#endif
#ifdef ARDUINO_ARCH_ESP32
- #define HW_PIN_SCL 22
- #define HW_PIN_SDA 21
- #define HW_PIN_CLOCKSPI 18
- #define HW_PIN_DATASPI 23
- #ifndef FLD_PIN_SCL
- #define FLD_PIN_SCL 22
- #endif
- #ifndef FLD_PIN_SDA
- #define FLD_PIN_SDA 21
- #endif
- #ifndef FLD_PIN_CLOCKSPI
- #define FLD_PIN_CLOCKSPI 18
- #endif
- #ifndef FLD_PIN_DATASPI
- #define FLD_PIN_DATASPI 23
- #endif
#ifndef FLD_PIN_DC
#define FLD_PIN_DC 19
#endif
- #ifndef FLD_PIN_CS
- #define FLD_PIN_CS 5
- #endif
#ifndef FLD_PIN_RESET
#define FLD_PIN_RESET 26
#endif
#else
- #define HW_PIN_SCL 5
- #define HW_PIN_SDA 4
- #define HW_PIN_CLOCKSPI 14
- #define HW_PIN_DATASPI 13
- #ifndef FLD_PIN_SCL
- #define FLD_PIN_SCL 5
- #endif
- #ifndef FLD_PIN_SDA
- #define FLD_PIN_SDA 4
- #endif
- #ifndef FLD_PIN_CLOCKSPI
- #define FLD_PIN_CLOCKSPI 14
- #endif
- #ifndef FLD_PIN_DATASPI
- #define FLD_PIN_DATASPI 13
- #endif
#ifndef FLD_PIN_DC
#define FLD_PIN_DC 12
- #endif
- #ifndef FLD_PIN_CS
- #define FLD_PIN_CS 15
#endif
#ifndef FLD_PIN_RESET
#define FLD_PIN_RESET 16
@@ -192,13 +169,14 @@ class FourLineDisplayUsermod : public Usermod {
bool isHW;
PinOwner po = PinOwner::UM_FourLineDisplay;
if (type == SSD1306_SPI || type == SSD1306_SPI64) {
- isHW = (ioPin[0]==HW_PIN_CLOCKSPI && ioPin[1]==HW_PIN_DATASPI);
+ isHW = (ioPin[0]==spi_sclk && ioPin[1]==spi_mosi);
+ if (isHW) po = PinOwner::HW_SPI; // allow multiple allocations of HW I2C bus pins
PinManagerPinType pins[5] = { { ioPin[0], true }, { ioPin[1], true }, { ioPin[2], true }, { ioPin[3], true }, { ioPin[4], true }};
if (!pinManager.allocateMultiplePins(pins, 5, po)) { type=NONE; return; }
} else {
- isHW = (ioPin[0]==HW_PIN_SCL && ioPin[1]==HW_PIN_SDA);
+ isHW = (ioPin[0]==i2c_scl && ioPin[1]==i2c_sda);
+ if (isHW) po = PinOwner::HW_I2C; // allow multiple allocations of HW I2C bus pins
PinManagerPinType pins[2] = { { ioPin[0], true }, { ioPin[1], true } };
- if (ioPin[0]==HW_PIN_SCL && ioPin[1]==HW_PIN_SDA) po = PinOwner::HW_I2C; // allow multiple allocations of HW I2C bus pins
if (!pinManager.allocateMultiplePins(pins, 2, po)) { type=NONE; return; }
}
@@ -415,7 +393,7 @@ class FourLineDisplayUsermod : public Usermod {
drawString(getCols() - 1, 0, "~");
}
- // Second row with IP or Psssword
+ // Second row with IP or Password
drawGlyph(0, lineHeight, 68, u8x8_font_open_iconic_embedded_1x1); // wifi icon
// Print password in AP mode and if led is OFF.
if (apActive && bri == 0) {
@@ -718,8 +696,14 @@ class FourLineDisplayUsermod : public Usermod {
if (pinsChanged || type!=newType) {
if (type != NONE) delete u8x8;
PinOwner po = PinOwner::UM_FourLineDisplay;
- if (ioPin[0]==HW_PIN_SCL && ioPin[1]==HW_PIN_SDA) po = PinOwner::HW_I2C; // allow multiple allocations of HW I2C bus pins
- pinManager.deallocateMultiplePins((const uint8_t *)ioPin, (type == SSD1306_SPI || type == SSD1306_SPI64) ? 5 : 2, po);
+ bool isSPI = (type == SSD1306_SPI || type == SSD1306_SPI64);
+ if (isSPI) {
+ if (ioPin[0]==spi_sclk && ioPin[1]==spi_mosi) po = PinOwner::HW_SPI; // allow multiple allocations of HW SPI bus pins
+ pinManager.deallocateMultiplePins((const uint8_t *)ioPin, 5, po);
+ } else {
+ if (ioPin[0]==i2c_scl && ioPin[1]==i2c_sda) po = PinOwner::HW_I2C; // allow multiple allocations of HW I2C bus pins
+ pinManager.deallocateMultiplePins((const uint8_t *)ioPin, 2, po);
+ }
for (byte i=0; i<5; i++) ioPin[i] = newPin[i];
if (ioPin[0]<0 || ioPin[1]<0) { // data & clock must be > -1
type = NONE;
diff --git a/usermods/usermod_v2_four_line_display_ALT/readme.md b/usermods/usermod_v2_four_line_display_ALT/readme.md
index 67cde35326..ea9f436109 100644
--- a/usermods/usermod_v2_four_line_display_ALT/readme.md
+++ b/usermods/usermod_v2_four_line_display_ALT/readme.md
@@ -4,12 +4,12 @@ Thank you to the authors of the original version of these usermods. It would not
"usermod_v2_four_line_display"
"usermod_v2_rotary_encoder_ui"
-The core of these usermods are a copy of the originals. The main changes are done to the FourLineDisplay usermod.
+The core of these usermods are a copy of the originals. The main changes are to the FourLineDisplay usermod.
The display usermod UI has been completely changed.
The changes made to the RotaryEncoder usermod were made to support the new UI in the display usermod.
-Without the display it functions identical to the original.
+Without the display it, functions identical to the original.
The original "usermod_v2_auto_save" will not work with the display just yet.
Press the encoder to cycle through the options:
@@ -22,7 +22,7 @@ Press the encoder to cycle through the options:
*Saturation (only if display is used)
Press and hold the encoder to display Network Info
- if AP is active then it will display AP ssid and Password
+ if AP is active, it will display AP, SSID and password
Also shows if the timer is enabled
@@ -42,4 +42,4 @@ Note: the Four Line Display usermod requires the libraries `U8g2` and `Wire`.
## Change Log
2021-10
-* First public release
\ No newline at end of file
+* First public release
diff --git a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h
index 383accc52c..cd4201fecf 100644
--- a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h
+++ b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h
@@ -1,20 +1,24 @@
#pragma once
#include "wled.h"
+#undef U8X8_NO_HW_I2C // borrowed from WLEDMM: we do want I2C hardware drivers - if possible
#include // from https://github.com/olikraus/u8g2/
#include "4LD_wled_fonts.c"
+#ifndef FLD_ESP32_NO_THREADS
+ #define FLD_ESP32_USE_THREADS // comment out to use 0.13.x behaviour without parallel update task - slower, but more robust. May delay other tasks like LEDs or audioreactive!!
+#endif
+
//
-// Insired by the usermod_v2_four_line_display
+// Inspired by the usermod_v2_four_line_display
//
// v2 usermod for using 128x32 or 128x64 i2c
// OLED displays to provide a four line display
// for WLED.
//
// Dependencies
-// * This usermod REQURES the ModeSortUsermod
// * This Usermod works best, by far, when coupled
-// with RotaryEncoderUIUsermod.
+// with RotaryEncoderUI ALT Usermod.
//
// Make sure to enable NTP and set your time zone in WLED Config | Time.
//
@@ -23,56 +27,26 @@
// REQUIREMENT: * U8g2 (the version already in platformio.ini is fine)
// REQUIREMENT: * Wire
//
+// If display does not work or looks corrupted check the
+// constructor reference:
+// https://github.com/olikraus/u8g2/wiki/u8x8setupcpp
+// or check the gallery:
+// https://github.com/olikraus/u8g2/wiki/gallery
+
+#ifndef FLD_PIN_CS
+ #define FLD_PIN_CS 15
+#endif
-//The SCL and SDA pins are defined here.
#ifdef ARDUINO_ARCH_ESP32
- #define HW_PIN_SCL 22
- #define HW_PIN_SDA 21
- #define HW_PIN_CLOCKSPI 18
- #define HW_PIN_DATASPI 23
- #ifndef FLD_PIN_SCL
- #define FLD_PIN_SCL 22
- #endif
- #ifndef FLD_PIN_SDA
- #define FLD_PIN_SDA 21
- #endif
- #ifndef FLD_PIN_CLOCKSPI
- #define FLD_PIN_CLOCKSPI 18
- #endif
- #ifndef FLD_PIN_DATASPI
- #define FLD_PIN_DATASPI 23
- #endif
#ifndef FLD_PIN_DC
#define FLD_PIN_DC 19
#endif
- #ifndef FLD_PIN_CS
- #define FLD_PIN_CS 5
- #endif
#ifndef FLD_PIN_RESET
#define FLD_PIN_RESET 26
#endif
#else
- #define HW_PIN_SCL 5
- #define HW_PIN_SDA 4
- #define HW_PIN_CLOCKSPI 14
- #define HW_PIN_DATASPI 13
- #ifndef FLD_PIN_SCL
- #define FLD_PIN_SCL 5
- #endif
- #ifndef FLD_PIN_SDA
- #define FLD_PIN_SDA 4
- #endif
- #ifndef FLD_PIN_CLOCKSPI
- #define FLD_PIN_CLOCKSPI 14
- #endif
- #ifndef FLD_PIN_DATASPI
- #define FLD_PIN_DATASPI 13
- #endif
#ifndef FLD_PIN_DC
#define FLD_PIN_DC 12
- #endif
- #ifndef FLD_PIN_CS
- #define FLD_PIN_CS 15
#endif
#ifndef FLD_PIN_RESET
#define FLD_PIN_RESET 16
@@ -92,39 +66,55 @@
#define SCREEN_TIMEOUT_MS 60*1000 // 1 min
// Minimum time between redrawing screen in ms
-#define USER_LOOP_REFRESH_RATE_MS 1000
+#define REFRESH_RATE_MS 1000
// Extra char (+1) for null
#define LINE_BUFFER_SIZE 16+1
#define MAX_JSON_CHARS 19+1
#define MAX_MODE_LINE_SPACE 13+1
+
+#ifdef ARDUINO_ARCH_ESP32
+static TaskHandle_t Display_Task = nullptr;
+void DisplayTaskCode(void * parameter);
+#endif
+
+
typedef enum {
NONE = 0,
- SSD1306, // U8X8_SSD1306_128X32_UNIVISION_HW_I2C
- SH1106, // U8X8_SH1106_128X64_WINSTAR_HW_I2C
- SSD1306_64, // U8X8_SSD1306_128X64_NONAME_HW_I2C
- SSD1305, // U8X8_SSD1305_128X32_ADAFRUIT_HW_I2C
- SSD1305_64, // U8X8_SSD1305_128X64_ADAFRUIT_HW_I2C
- SSD1306_SPI, // U8X8_SSD1306_128X32_NONAME_HW_SPI
- SSD1306_SPI64 // U8X8_SSD1306_128X64_NONAME_HW_SPI
+ SSD1306, // U8X8_SSD1306_128X32_UNIVISION_HW_I2C
+ SH1106, // U8X8_SH1106_128X64_WINSTAR_HW_I2C
+ SSD1306_64, // U8X8_SSD1306_128X64_NONAME_HW_I2C
+ SSD1305, // U8X8_SSD1305_128X32_ADAFRUIT_HW_I2C
+ SSD1305_64, // U8X8_SSD1305_128X64_ADAFRUIT_HW_I2C
+ SSD1306_SPI, // U8X8_SSD1306_128X32_NONAME_HW_SPI
+ SSD1306_SPI64, // U8X8_SSD1306_128X64_NONAME_HW_SPI
+ SSD1309_SPI64 // U8X8_SSD1309_128X64_NONAME0_4W_HW_SPI
} DisplayType;
class FourLineDisplayUsermod : public Usermod {
+#if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+ public:
+ FourLineDisplayUsermod() { if (!instance) instance = this; }
+ static FourLineDisplayUsermod* getInstance(void) { return instance; }
+#endif
private:
+ static FourLineDisplayUsermod *instance;
bool initDone = false;
+ volatile bool drawing = false;
+ volatile bool lockRedraw = false;
// HW interface & configuration
U8X8 *u8x8 = nullptr; // pointer to U8X8 display object
#ifndef FLD_SPI_DEFAULT
- int8_t ioPin[5] = {FLD_PIN_SCL, FLD_PIN_SDA, -1, -1, -1}; // I2C pins: SCL, SDA
+ int8_t ioPin[3] = {-1, -1, -1}; // I2C pins: SCL, SDA
uint32_t ioFrequency = 400000; // in Hz (minimum is 100000, baseline is 400000 and maximum should be 3400000)
#else
- int8_t ioPin[5] = {FLD_PIN_CLOCKSPI, FLD_PIN_DATASPI, FLD_PIN_CS, FLD_PIN_DC, FLD_PIN_RESET}; // SPI pins: CLK, MOSI, CS, DC, RST
+ int8_t ioPin[3] = {FLD_PIN_CS, FLD_PIN_DC, FLD_PIN_RESET}; // custom SPI pins: CS, DC, RST
uint32_t ioFrequency = 1000000; // in Hz (minimum is 500kHz, baseline is 1MHz and maximum should be 20MHz)
#endif
@@ -132,8 +122,8 @@ class FourLineDisplayUsermod : public Usermod {
bool flip = false; // flip display 180°
uint8_t contrast = 10; // screen contrast
uint8_t lineHeight = 1; // 1 row or 2 rows
- uint16_t refreshRate = USER_LOOP_REFRESH_RATE_MS; // in ms
- uint32_t screenTimeout = SCREEN_TIMEOUT_MS; // in ms
+ uint16_t refreshRate = REFRESH_RATE_MS; // in ms
+ uint32_t screenTimeout = SCREEN_TIMEOUT_MS; // in ms
bool sleepMode = true; // allow screen sleep?
bool clockMode = false; // display clock
bool showSeconds = true; // display clock with seconds
@@ -187,444 +177,78 @@ class FourLineDisplayUsermod : public Usermod {
// https://github.com/olikraus/u8g2/wiki/gallery
// some displays need this to properly apply contrast
- void setVcomh(bool highContrast) {
- u8x8_t *u8x8_struct = u8x8->getU8x8();
- u8x8_cad_StartTransfer(u8x8_struct);
- u8x8_cad_SendCmd(u8x8_struct, 0x0db); //address of value
- u8x8_cad_SendArg(u8x8_struct, highContrast ? 0x000 : 0x040); //value 0 for fix, reboot resets default back to 64
- u8x8_cad_EndTransfer(u8x8_struct);
- }
-
- public:
+ void setVcomh(bool highContrast);
+ void startDisplay();
- // gets called once at boot. Do all initialization that doesn't depend on
- // network here
- void setup() {
- if (type == NONE || !enabled) return;
+ /**
+ * Wrappers for screen drawing
+ */
+ void setFlipMode(uint8_t mode);
+ void setContrast(uint8_t contrast);
+ void drawString(uint8_t col, uint8_t row, const char *string, bool ignoreLH=false);
+ void draw2x2String(uint8_t col, uint8_t row, const char *string);
+ void drawGlyph(uint8_t col, uint8_t row, char glyph, const uint8_t *font, bool ignoreLH=false);
+ void draw2x2Glyph(uint8_t col, uint8_t row, char glyph, const uint8_t *font);
+ void draw2x2GlyphIcons();
+ uint8_t getCols();
+ void clear();
+ void setPowerSave(uint8_t save);
+ void center(String &line, uint8_t width);
- bool isHW, isSPI = (type == SSD1306_SPI || type == SSD1306_SPI64);
- PinOwner po = PinOwner::UM_FourLineDisplay;
- if (isSPI) {
- isHW = (ioPin[0]==HW_PIN_CLOCKSPI && ioPin[1]==HW_PIN_DATASPI);
- PinManagerPinType pins[5] = { { ioPin[0], true }, { ioPin[1], true }, { ioPin[2], true }, { ioPin[3], true }, { ioPin[4], true }};
- if (!pinManager.allocateMultiplePins(pins, 5, po)) { type=NONE; return; }
- } else {
- isHW = (ioPin[0]==HW_PIN_SCL && ioPin[1]==HW_PIN_SDA);
- PinManagerPinType pins[2] = { { ioPin[0], true }, { ioPin[1], true } };
- if (ioPin[0]==HW_PIN_SCL && ioPin[1]==HW_PIN_SDA) po = PinOwner::HW_I2C; // allow multiple allocations of HW I2C bus pins
- if (!pinManager.allocateMultiplePins(pins, 2, po)) { type=NONE; return; }
- }
+ /**
+ * Display the current date and time in large characters
+ * on the middle rows. Based 24 or 12 hour depending on
+ * the useAMPM configuration.
+ */
+ void showTime();
- DEBUG_PRINTLN(F("Allocating display."));
-/*
-// At some point it may be good to not new/delete U8X8 object but use this instead
-// (does not currently work)
-//-------------------------------------------------------------------------------
- switch (type) {
- case SSD1306:
- u8x8_Setup(u8x8.getU8x8(), u8x8_d_ssd1306_128x32_univision, u8x8_cad_ssd13xx_fast_i2c, u8x8_byte_arduino_sw_i2c, u8x8_gpio_and_delay_arduino);
- break;
- case SH1106:
- u8x8_Setup(u8x8.getU8x8(), u8x8_d_sh1106_128x64_winstar, u8x8_cad_ssd13xx_i2c, u8x8_byte_arduino_sw_i2c, u8x8_gpio_and_delay_arduino);
- break;
- case SSD1306_64:
- u8x8_Setup(u8x8.getU8x8(), u8x8_d_ssd1306_128x64_noname, u8x8_cad_ssd13xx_fast_i2c, u8x8_byte_arduino_sw_i2c, u8x8_gpio_and_delay_arduino);
- break;
- case SSD1305:
- u8x8_Setup(u8x8.getU8x8(), u8x8_d_ssd1305_128x32_adafruit, u8x8_cad_ssd13xx_i2c, u8x8_byte_arduino_hw_i2c, u8x8_gpio_and_delay_arduino);
- break;
- case SSD1305_64:
- u8x8_Setup(u8x8.getU8x8(), u8x8_d_ssd1305_128x64_adafruit, u8x8_cad_ssd13xx_i2c, u8x8_byte_arduino_sw_i2c, u8x8_gpio_and_delay_arduino);
- break;
- case SSD1306_SPI:
- u8x8_Setup(u8x8.getU8x8(), u8x8_d_ssd1306_128x32_univision, u8x8_cad_001, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino);
- break;
- case SSD1306_SPI64:
- u8x8_Setup(u8x8.getU8x8(), u8x8_d_ssd1306_128x64_noname, u8x8_cad_001, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino);
- break;
- default:
- type = NONE;
- return;
- }
- if (isSPI) {
- if (!isHW) u8x8_SetPin_4Wire_SW_SPI(u8x8.getU8x8(), ioPin[0], ioPin[1], ioPin[2], ioPin[3], ioPin[4]);
- else u8x8_SetPin_4Wire_HW_SPI(u8x8.getU8x8(), ioPin[2], ioPin[3], ioPin[4]); // Pins are cs, dc, reset
- } else {
- if (!isHW) u8x8_SetPin_SW_I2C(u8x8.getU8x8(), ioPin[0], ioPin[1], U8X8_PIN_NONE); // SCL, SDA, reset
- else u8x8_SetPin_HW_I2C(u8x8.getU8x8(), U8X8_PIN_NONE, ioPin[0], ioPin[1]); // Pins are Reset, SCL, SDA
- }
-*/
- switch (type) {
- case SSD1306:
- if (!isHW) u8x8 = (U8X8 *) new U8X8_SSD1306_128X32_UNIVISION_SW_I2C(ioPin[0], ioPin[1]); // SCL, SDA, reset
- else u8x8 = (U8X8 *) new U8X8_SSD1306_128X32_UNIVISION_HW_I2C(U8X8_PIN_NONE, ioPin[0], ioPin[1]); // Pins are Reset, SCL, SDA
- break;
- case SH1106:
- if (!isHW) u8x8 = (U8X8 *) new U8X8_SH1106_128X64_WINSTAR_SW_I2C(ioPin[0], ioPin[1]); // SCL, SDA, reset
- else u8x8 = (U8X8 *) new U8X8_SH1106_128X64_WINSTAR_HW_I2C(U8X8_PIN_NONE, ioPin[0], ioPin[1]); // Pins are Reset, SCL, SDA
- break;
- case SSD1306_64:
- if (!isHW) u8x8 = (U8X8 *) new U8X8_SSD1306_128X64_NONAME_SW_I2C(ioPin[0], ioPin[1]); // SCL, SDA, reset
- else u8x8 = (U8X8 *) new U8X8_SSD1306_128X64_NONAME_HW_I2C(U8X8_PIN_NONE, ioPin[0], ioPin[1]); // Pins are Reset, SCL, SDA
- break;
- case SSD1305:
- if (!isHW) u8x8 = (U8X8 *) new U8X8_SSD1305_128X32_NONAME_SW_I2C(ioPin[0], ioPin[1]); // SCL, SDA, reset
- else u8x8 = (U8X8 *) new U8X8_SSD1305_128X32_ADAFRUIT_HW_I2C(U8X8_PIN_NONE, ioPin[0], ioPin[1]); // Pins are Reset, SCL, SDA
- break;
- case SSD1305_64:
- if (!isHW) u8x8 = (U8X8 *) new U8X8_SSD1305_128X64_ADAFRUIT_SW_I2C(ioPin[0], ioPin[1]); // SCL, SDA, reset
- else u8x8 = (U8X8 *) new U8X8_SSD1305_128X64_ADAFRUIT_HW_I2C(U8X8_PIN_NONE, ioPin[0], ioPin[1]); // Pins are Reset, SCL, SDA
- break;
- case SSD1306_SPI:
- if (!isHW) u8x8 = (U8X8 *) new U8X8_SSD1306_128X32_UNIVISION_4W_SW_SPI(ioPin[0], ioPin[1], ioPin[2], ioPin[3], ioPin[4]);
- else u8x8 = (U8X8 *) new U8X8_SSD1306_128X32_UNIVISION_4W_HW_SPI(ioPin[2], ioPin[3], ioPin[4]); // Pins are cs, dc, reset
- break;
- case SSD1306_SPI64:
- if (!isHW) u8x8 = (U8X8 *) new U8X8_SSD1306_128X64_NONAME_4W_SW_SPI(ioPin[0], ioPin[1], ioPin[2], ioPin[3], ioPin[4]);
- else u8x8 = (U8X8 *) new U8X8_SSD1306_128X64_NONAME_4W_HW_SPI(ioPin[2], ioPin[3], ioPin[4]); // Pins are cs, dc, reset
- break;
- default:
- u8x8 = nullptr;
- }
+ /**
+ * Enable sleep (turn the display off) or clock mode.
+ */
+ void sleepOrClock(bool enabled);
- if (nullptr == u8x8) {
- DEBUG_PRINTLN(F("Display init failed."));
- pinManager.deallocateMultiplePins((const uint8_t*)ioPin, isSPI ? 5 : 2, po);
- type = NONE;
- return;
- }
+ public:
- lineHeight = u8x8->getRows() > 4 ? 2 : 1;
- DEBUG_PRINTLN(F("Starting display."));
- u8x8->setBusClock(ioFrequency); // can be used for SPI too
- u8x8->begin();
- setFlipMode(flip);
- setVcomh(contrastFix);
- setContrast(contrast); //Contrast setup will help to preserve OLED lifetime. In case OLED need to be brighter increase number up to 255
- setPowerSave(0);
- //drawString(0, 0, "Loading...");
- overlayLogo(3500);
- initDone = true;
- }
+ // gets called once at boot. Do all initialization that doesn't depend on
+ // network here
+ void setup();
// gets called every time WiFi is (re-)connected. Initialize own network
// interfaces here
- void connected() {
- knownSsid = WiFi.SSID(); //apActive ? apSSID : WiFi.SSID(); //apActive ? WiFi.softAPSSID() :
- knownIp = Network.localIP(); //apActive ? IPAddress(4, 3, 2, 1) : Network.localIP();
- networkOverlay(PSTR("NETWORK INFO"),7000);
- }
+ void connected();
/**
* Da loop.
*/
- void loop() {
- if (!enabled || strip.isUpdating()) return;
- unsigned long now = millis();
- if (now < nextUpdate) return;
- nextUpdate = now + ((displayTurnedOff && clockMode && showSeconds) ? 1000 : refreshRate);
- redraw(false);
- }
-
- /**
- * Wrappers for screen drawing
- */
- void setFlipMode(uint8_t mode) {
- if (type == NONE || !enabled) return;
- u8x8->setFlipMode(mode);
- }
- void setContrast(uint8_t contrast) {
- if (type == NONE || !enabled) return;
- u8x8->setContrast(contrast);
- }
- void drawString(uint8_t col, uint8_t row, const char *string, bool ignoreLH=false) {
- if (type == NONE || !enabled) return;
- u8x8->setFont(u8x8_font_chroma48medium8_r);
- if (!ignoreLH && lineHeight==2) u8x8->draw1x2String(col, row, string);
- else u8x8->drawString(col, row, string);
- }
- void draw2x2String(uint8_t col, uint8_t row, const char *string) {
- if (type == NONE || !enabled) return;
- u8x8->setFont(u8x8_font_chroma48medium8_r);
- u8x8->draw2x2String(col, row, string);
- }
- void drawGlyph(uint8_t col, uint8_t row, char glyph, const uint8_t *font, bool ignoreLH=false) {
- if (type == NONE || !enabled) return;
- u8x8->setFont(font);
- if (!ignoreLH && lineHeight==2) u8x8->draw1x2Glyph(col, row, glyph);
- else u8x8->drawGlyph(col, row, glyph);
- }
- void draw2x2Glyph(uint8_t col, uint8_t row, char glyph, const uint8_t *font) {
- if (type == NONE || !enabled) return;
- u8x8->setFont(font);
- u8x8->draw2x2Glyph(col, row, glyph);
- }
- uint8_t getCols() {
- if (type==NONE || !enabled) return 0;
- return u8x8->getCols();
- }
- void clear() {
- if (type == NONE || !enabled) return;
- u8x8->clear();
- }
- void setPowerSave(uint8_t save) {
- if (type == NONE || !enabled) return;
- u8x8->setPowerSave(save);
- }
-
- void center(String &line, uint8_t width) {
- int len = line.length();
- if (len0; i--) line = ' ' + line;
- for (byte i=line.length(); i 0) {
- if (now >= overlayUntil) {
- // Time to display the overlay has elapsed.
- overlayUntil = 0;
- forceRedraw = true;
- } else {
- // We are still displaying the overlay
- // Don't redraw.
- return;
- }
- }
+ void redraw(bool forceRedraw);
- if (apActive && WLED_WIFI_CONFIGURED && now<15000) {
- knownSsid = apSSID;
- networkOverlay(PSTR("NETWORK INFO"),30000);
- return;
- }
-
- // Check if values which are shown on display changed from the last time.
- if (forceRedraw) {
- needRedraw = true;
- clear();
- } else if ((bri == 0 && powerON) || (bri > 0 && !powerON)) { //trigger power icon
- powerON = !powerON;
- drawStatusIcons();
- return;
- } else if (knownnightlight != nightlightActive) { //trigger moon icon
- knownnightlight = nightlightActive;
- drawStatusIcons();
- if (knownnightlight) {
- String timer = PSTR("Timer On");
- center(timer,LINE_BUFFER_SIZE-1);
- overlay(timer.c_str(), 2500, 6);
- }
- return;
- } else if (wificonnected != interfacesInited) { //trigger wifi icon
- wificonnected = interfacesInited;
- drawStatusIcons();
- return;
- } else if (knownMode != effectCurrent || knownPalette != effectPalette) {
- if (displayTurnedOff) needRedraw = true;
- else {
- if (knownPalette != effectPalette) { showCurrentEffectOrPalette(effectPalette, JSON_palette_names, 2); knownPalette = effectPalette; }
- if (knownMode != effectCurrent) { showCurrentEffectOrPalette(effectCurrent, JSON_mode_names, 3); knownMode = effectCurrent; }
- lastRedraw = now;
- return;
- }
- } else if (knownBrightness != bri) {
- if (displayTurnedOff && nightlightActive) { knownBrightness = bri; }
- else if (!displayTurnedOff) { updateBrightness(); lastRedraw = now; return; }
- } else if (knownEffectSpeed != effectSpeed) {
- if (displayTurnedOff) needRedraw = true;
- else { updateSpeed(); lastRedraw = now; return; }
- } else if (knownEffectIntensity != effectIntensity) {
- if (displayTurnedOff) needRedraw = true;
- else { updateIntensity(); lastRedraw = now; return; }
- }
-
- if (!needRedraw) {
- // Nothing to change.
- // Turn off display after 1 minutes with no change.
- if (sleepMode && !displayTurnedOff && (millis() - lastRedraw > screenTimeout)) {
- // We will still check if there is a change in redraw()
- // and turn it back on if it changed.
- clear();
- sleepOrClock(true);
- } else if (displayTurnedOff && ntpEnabled) {
- showTime();
- }
- return;
- }
-
- lastRedraw = now;
-
- // Turn the display back on
- wakeDisplay();
-
- // Update last known values.
- knownBrightness = bri;
- knownMode = effectCurrent;
- knownPalette = effectPalette;
- knownEffectSpeed = effectSpeed;
- knownEffectIntensity = effectIntensity;
- knownnightlight = nightlightActive;
- wificonnected = interfacesInited;
-
- // Do the actual drawing
- // First row: Icons
- draw2x2GlyphIcons();
- drawArrow();
- drawStatusIcons();
-
- // Second row
- updateBrightness();
- updateSpeed();
- updateIntensity();
-
- // Third row
- showCurrentEffectOrPalette(knownPalette, JSON_palette_names, 2); //Palette info
-
- // Fourth row
- showCurrentEffectOrPalette(knownMode, JSON_mode_names, 3); //Effect Mode info
- }
-
- void updateBrightness() {
- knownBrightness = bri;
- if (overlayUntil == 0) {
- brightness100 = ((uint16_t)bri*100)/255;
- char lineBuffer[4];
- sprintf_P(lineBuffer, PSTR("%-3d"), brightness100);
- drawString(1, lineHeight, lineBuffer);
- //lastRedraw = millis();
- }
- }
-
- void updateSpeed() {
- knownEffectSpeed = effectSpeed;
- if (overlayUntil == 0) {
- fxspeed100 = ((uint16_t)effectSpeed*100)/255;
- char lineBuffer[4];
- sprintf_P(lineBuffer, PSTR("%-3d"), fxspeed100);
- drawString(5, lineHeight, lineBuffer);
- //lastRedraw = millis();
- }
- }
-
- void updateIntensity() {
- knownEffectIntensity = effectIntensity;
- if (overlayUntil == 0) {
- fxintensity100 = ((uint16_t)effectIntensity*100)/255;
- char lineBuffer[4];
- sprintf_P(lineBuffer, PSTR("%-3d"), fxintensity100);
- drawString(9, lineHeight, lineBuffer);
- //lastRedraw = millis();
- }
- }
-
- void draw2x2GlyphIcons() {
- if (lineHeight == 2) {
- drawGlyph( 1, 0, 1, u8x8_4LineDisplay_WLED_icons_2x2, true); //brightness icon
- drawGlyph( 5, 0, 2, u8x8_4LineDisplay_WLED_icons_2x2, true); //speed icon
- drawGlyph( 9, 0, 3, u8x8_4LineDisplay_WLED_icons_2x2, true); //intensity icon
- drawGlyph(14, 2*lineHeight, 4, u8x8_4LineDisplay_WLED_icons_2x2, true); //palette icon
- drawGlyph(14, 3*lineHeight, 5, u8x8_4LineDisplay_WLED_icons_2x2, true); //effect icon
- } else {
- drawGlyph( 1, 0, 1, u8x8_4LineDisplay_WLED_icons_2x1); //brightness icon
- drawGlyph( 5, 0, 2, u8x8_4LineDisplay_WLED_icons_2x1); //speed icon
- drawGlyph( 9, 0, 3, u8x8_4LineDisplay_WLED_icons_2x1); //intensity icon
- drawGlyph(15, 2, 4, u8x8_4LineDisplay_WLED_icons_1x1); //palette icon
- drawGlyph(15, 3, 5, u8x8_4LineDisplay_WLED_icons_1x1); //effect icon
- }
- }
-
- void drawStatusIcons() {
- uint8_t col = 15;
- uint8_t row = 0;
- drawGlyph(col, row, (wificonnected ? 20 : 0), u8x8_4LineDisplay_WLED_icons_1x1, true); // wifi icon
- if (lineHeight==2) { col--; } else { row++; }
- drawGlyph(col, row, (bri > 0 ? 9 : 0), u8x8_4LineDisplay_WLED_icons_1x1, true); // power icon
- if (lineHeight==2) { col--; } else { col = row = 0; }
- drawGlyph(col, row, (nightlightActive ? 6 : 0), u8x8_4LineDisplay_WLED_icons_1x1, true); // moon icon for nighlight mode
- }
+ void updateBrightness();
+ void updateSpeed();
+ void updateIntensity();
+ void drawStatusIcons();
/**
* marks the position of the arrow showing
* the current setting being changed
* pass line and colum info
*/
- void setMarkLine(byte newMarkLineNum, byte newMarkColNum) {
- markLineNum = newMarkLineNum;
- markColNum = newMarkColNum;
- }
+ void setMarkLine(byte newMarkLineNum, byte newMarkColNum);
- //Draw the arrow for the current setting beiong changed
- void drawArrow() {
- if (markColNum != 255 && markLineNum !=255) drawGlyph(markColNum, markLineNum*lineHeight, 21, u8x8_4LineDisplay_WLED_icons_1x1);
- }
+ //Draw the arrow for the current setting being changed
+ void drawArrow();
- //Display the current effect or palette (desiredEntry)
- // on the appropriate line (row).
- void showCurrentEffectOrPalette(int inputEffPal, const char *qstring, uint8_t row) {
- char lineBuffer[MAX_JSON_CHARS];
- if (overlayUntil == 0) {
- // Find the mode name in JSON
- uint8_t printedChars = extractModeName(inputEffPal, qstring, lineBuffer, MAX_JSON_CHARS-1);
- if (lineBuffer[0]=='*' && lineBuffer[1]==' ') {
- // remove "* " from dynamic palettes
- for (byte i=2; i<=printedChars; i++) lineBuffer[i-2] = lineBuffer[i]; //include '\0'
- printedChars -= 2;
- }
- if (lineHeight == 2) { // use this code for 8 line display
- char smallBuffer1[MAX_MODE_LINE_SPACE];
- char smallBuffer2[MAX_MODE_LINE_SPACE];
- uint8_t smallChars1 = 0;
- uint8_t smallChars2 = 0;
- if (printedChars < MAX_MODE_LINE_SPACE) { // use big font if the text fits
- while (printedChars < (MAX_MODE_LINE_SPACE-1)) lineBuffer[printedChars++]=' ';
- lineBuffer[printedChars] = 0;
- drawString(1, row*lineHeight, lineBuffer);
- } else { // for long names divide the text into 2 lines and print them small
- bool spaceHit = false;
- for (uint8_t i = 0; i < printedChars; i++) {
- switch (lineBuffer[i]) {
- case ' ':
- if (i > 4 && !spaceHit) {
- spaceHit = true;
- break;
- }
- if (spaceHit) smallBuffer2[smallChars2++] = lineBuffer[i];
- else smallBuffer1[smallChars1++] = lineBuffer[i];
- break;
- default:
- if (spaceHit) smallBuffer2[smallChars2++] = lineBuffer[i];
- else smallBuffer1[smallChars1++] = lineBuffer[i];
- break;
- }
- }
- while (smallChars1 < (MAX_MODE_LINE_SPACE-1)) smallBuffer1[smallChars1++]=' ';
- smallBuffer1[smallChars1] = 0;
- drawString(1, row*lineHeight, smallBuffer1, true);
- while (smallChars2 < (MAX_MODE_LINE_SPACE-1)) smallBuffer2[smallChars2++]=' ';
- smallBuffer2[smallChars2] = 0;
- drawString(1, row*lineHeight+1, smallBuffer2, true);
- }
- } else { // use this code for 4 ling displays
- char smallBuffer3[MAX_MODE_LINE_SPACE+1]; // uses 1x1 icon for mode/palette
- uint8_t smallChars3 = 0;
- for (uint8_t i = 0; i < MAX_MODE_LINE_SPACE; i++) smallBuffer3[smallChars3++] = (i >= printedChars) ? ' ' : lineBuffer[i];
- smallBuffer3[smallChars3] = 0;
- drawString(1, row*lineHeight, smallBuffer3, true);
- }
- }
- }
+ //Display the current effect or palette (desiredEntry)
+ // on the appropriate line (row).
+ void showCurrentEffectOrPalette(int inputEffPal, const char *qstring, uint8_t row);
/**
* If there screen is off or in clock is displayed,
@@ -632,314 +256,59 @@ class FourLineDisplayUsermod : public Usermod {
* the first input from the rotary encoder but
* to wake up the screen.
*/
- bool wakeDisplay() {
- if (type == NONE || !enabled) return false;
- if (displayTurnedOff) {
- clear();
- // Turn the display back on
- sleepOrClock(false);
- //lastRedraw = millis();
- return true;
- }
- return false;
- }
+ bool wakeDisplay();
/**
* Allows you to show one line and a glyph as overlay for a period of time.
* Clears the screen and prints.
* Used in Rotary Encoder usermod.
*/
- void overlay(const char* line1, long showHowLong, byte glyphType) {
- // Turn the display back on
- if (!wakeDisplay()) clear();
- // Print the overlay
- if (glyphType>0 && glyphType<255) {
- if (lineHeight == 2) drawGlyph(5, 0, glyphType, u8x8_4LineDisplay_WLED_icons_6x6, true); // use 3x3 font with draw2x2Glyph() if flash runs short and comment out 6x6 font
- else drawGlyph(6, 0, glyphType, u8x8_4LineDisplay_WLED_icons_3x3, true);
- }
- if (line1) {
- String buf = line1;
- center(buf, getCols());
- drawString(0, (glyphType<255?3:0)*lineHeight, buf.c_str());
- }
- overlayUntil = millis() + showHowLong;
- }
+ void overlay(const char* line1, long showHowLong, byte glyphType);
/**
* Allows you to show Akemi WLED logo overlay for a period of time.
* Clears the screen and prints.
*/
- void overlayLogo(long showHowLong) {
- // Turn the display back on
- if (!wakeDisplay()) clear();
- // Print the overlay
- if (lineHeight == 2) {
- //add a bit of randomness
- switch (millis()%3) {
- case 0:
- //WLED
- draw2x2Glyph( 0, 2, 1, u8x8_wled_logo_2x2);
- draw2x2Glyph( 4, 2, 2, u8x8_wled_logo_2x2);
- draw2x2Glyph( 8, 2, 3, u8x8_wled_logo_2x2);
- draw2x2Glyph(12, 2, 4, u8x8_wled_logo_2x2);
- break;
- case 1:
- //WLED Akemi
- drawGlyph( 2, 2, 1, u8x8_wled_logo_akemi_4x4, true);
- drawGlyph( 6, 2, 2, u8x8_wled_logo_akemi_4x4, true);
- drawGlyph(10, 2, 3, u8x8_wled_logo_akemi_4x4, true);
- break;
- case 2:
- //Akemi
- //draw2x2Glyph( 5, 0, 12, u8x8_4LineDisplay_WLED_icons_3x3); // use this if flash runs short and comment out 6x6 font
- drawGlyph( 5, 0, 12, u8x8_4LineDisplay_WLED_icons_6x6, true);
- drawString(6, 6, "WLED");
- break;
- }
- } else {
- switch (millis()%3) {
- case 0:
- //WLED
- draw2x2Glyph( 0, 0, 1, u8x8_wled_logo_2x2);
- draw2x2Glyph( 4, 0, 2, u8x8_wled_logo_2x2);
- draw2x2Glyph( 8, 0, 3, u8x8_wled_logo_2x2);
- draw2x2Glyph(12, 0, 4, u8x8_wled_logo_2x2);
- break;
- case 1:
- //WLED Akemi
- drawGlyph( 2, 0, 1, u8x8_wled_logo_akemi_4x4);
- drawGlyph( 6, 0, 2, u8x8_wled_logo_akemi_4x4);
- drawGlyph(10, 0, 3, u8x8_wled_logo_akemi_4x4);
- break;
- case 2:
- //Akemi
- //drawGlyph( 6, 0, 12, u8x8_4LineDisplay_WLED_icons_4x4); // a bit nicer, but uses extra 1.5k flash
- draw2x2Glyph( 6, 0, 12, u8x8_4LineDisplay_WLED_icons_2x2);
- break;
- }
- }
- overlayUntil = millis() + showHowLong;
- }
+ void overlayLogo(long showHowLong);
/**
* Allows you to show two lines as overlay for a period of time.
* Clears the screen and prints.
* Used in Auto Save usermod
*/
- void overlay(const char* line1, const char* line2, long showHowLong) {
- // Turn the display back on
- if (!wakeDisplay()) clear();
- // Print the overlay
- if (line1) {
- String buf = line1;
- center(buf, getCols());
- drawString(0, 1*lineHeight, buf.c_str());
- }
- if (line2) {
- String buf = line2;
- center(buf, getCols());
- drawString(0, 2*lineHeight, buf.c_str());
- }
- overlayUntil = millis() + showHowLong;
- }
-
- void networkOverlay(const char* line1, long showHowLong) {
- String line;
- // Turn the display back on
- if (!wakeDisplay()) clear();
- // Print the overlay
- if (line1) {
- line = line1;
- center(line, getCols());
- drawString(0, 0, line.c_str());
- }
- // Second row with Wifi name
- line = knownSsid.substring(0, getCols() > 1 ? getCols() - 2 : 0);
- if (line.length() < getCols()) center(line, getCols());
- drawString(0, lineHeight, line.c_str());
- // Print `~` char to indicate that SSID is longer, than our display
- if (knownSsid.length() > getCols()) {
- drawString(getCols() - 1, 0, "~");
- }
- // Third row with IP and Password in AP Mode
- line = knownIp.toString();
- center(line, getCols());
- drawString(0, lineHeight*2, line.c_str());
- line = "";
- if (apActive) {
- line = apPass;
- } else if (strcmp(serverDescription, "WLED") != 0) {
- line = serverDescription;
- }
- center(line, getCols());
- drawString(0, lineHeight*3, line.c_str());
- overlayUntil = millis() + showHowLong;
- }
+ void overlay(const char* line1, const char* line2, long showHowLong);
-
- /**
- * Enable sleep (turn the display off) or clock mode.
- */
- void sleepOrClock(bool enabled) {
- if (enabled) {
- displayTurnedOff = true;
- if (clockMode && ntpEnabled) {
- knownMinute = knownHour = 99;
- showTime();
- } else
- setPowerSave(1);
- } else {
- displayTurnedOff = false;
- setPowerSave(0);
- }
- }
-
- /**
- * Display the current date and time in large characters
- * on the middle rows. Based 24 or 12 hour depending on
- * the useAMPM configuration.
- */
- void showTime() {
- if (type == NONE || !enabled || !displayTurnedOff) return;
-
- char lineBuffer[LINE_BUFFER_SIZE];
- static byte lastSecond;
- byte secondCurrent = second(localTime);
- byte minuteCurrent = minute(localTime);
- byte hourCurrent = hour(localTime);
-
- if (knownMinute != minuteCurrent) { //only redraw clock if it has changed
- //updateLocalTime();
- byte AmPmHour = hourCurrent;
- boolean isitAM = true;
- if (useAMPM) {
- if (AmPmHour > 11) { AmPmHour -= 12; isitAM = false; }
- if (AmPmHour == 0) { AmPmHour = 12; }
- }
- if (knownHour != hourCurrent) {
- // only update date when hour changes
- sprintf_P(lineBuffer, PSTR("%s %2d "), monthShortStr(month(localTime)), day(localTime));
- draw2x2String(2, lineHeight==1 ? 0 : lineHeight, lineBuffer); // adjust for 8 line displays, draw month and day
- }
- sprintf_P(lineBuffer,PSTR("%2d:%02d"), (useAMPM ? AmPmHour : hourCurrent), minuteCurrent);
- draw2x2String(2, lineHeight*2, lineBuffer); //draw hour, min. blink ":" depending on odd/even seconds
- if (useAMPM) drawString(12, lineHeight*2, (isitAM ? "AM" : "PM"), true); //draw am/pm if using 12 time
-
- drawStatusIcons(); //icons power, wifi, timer, etc
-
- knownMinute = minuteCurrent;
- knownHour = hourCurrent;
- } else {
- if (secondCurrent == lastSecond) return;
- }
- if (showSeconds) {
- lastSecond = secondCurrent;
- draw2x2String(6, lineHeight*2, secondCurrent%2 ? " " : ":");
- sprintf_P(lineBuffer, PSTR("%02d"), secondCurrent);
- drawString(12, lineHeight*2+1, lineBuffer, true); // even with double sized rows print seconds in 1 line
- }
- }
+ void networkOverlay(const char* line1, long showHowLong);
/**
* handleButton() can be used to override default button behaviour. Returning true
* will prevent button working in a default way.
* Replicating button.cpp
*/
- bool handleButton(uint8_t b) {
- yield();
- if (!enabled
- || b // butto 0 only
- || buttonType[b] == BTN_TYPE_SWITCH
- || buttonType[b] == BTN_TYPE_NONE
- || buttonType[b] == BTN_TYPE_RESERVED
- || buttonType[b] == BTN_TYPE_PIR_SENSOR
- || buttonType[b] == BTN_TYPE_ANALOG
- || buttonType[b] == BTN_TYPE_ANALOG_INVERTED) {
- return false;
- }
+ bool handleButton(uint8_t b);
- unsigned long now = millis();
- static bool buttonPressedBefore = false;
- static bool buttonLongPressed = false;
- static unsigned long buttonPressedTime = 0;
- static unsigned long buttonWaitTime = 0;
- bool handled = true;
-
- //momentary button logic
- if (isButtonPressed(b)) { //pressed
-
- if (!buttonPressedBefore) buttonPressedTime = now;
- buttonPressedBefore = true;
-
- if (now - buttonPressedTime > 600) { //long press
- buttonLongPressed = true;
- //TODO: handleButton() handles button 0 without preset in a different way for double click
- //so we need to override with same behaviour
- longPressAction(0);
- //handled = false;
- }
+ void onUpdateBegin(bool init);
- } else if (!isButtonPressed(b) && buttonPressedBefore) { //released
-
- long dur = now - buttonPressedTime;
- if (dur < 50) {
- buttonPressedBefore = false;
- return true;
- } //too short "press", debounce
-
- bool doublePress = buttonWaitTime; //did we have short press before?
- buttonWaitTime = 0;
-
- if (!buttonLongPressed) { //short press
- // if this is second release within 350ms it is a double press (buttonWaitTime!=0)
- //TODO: handleButton() handles button 0 without preset in a different way for double click
- if (doublePress) {
- networkOverlay(PSTR("NETWORK INFO"),7000);
- handled = true;
- } else {
- buttonWaitTime = now;
- }
- }
- buttonPressedBefore = false;
- buttonLongPressed = false;
- }
- // if 350ms elapsed since last press/release it is a short press
- if (buttonWaitTime && now - buttonWaitTime > 350 && !buttonPressedBefore) {
- buttonWaitTime = 0;
- //TODO: handleButton() handles button 0 without preset in a different way for double click
- //so we need to override with same behaviour
- shortPressAction(0);
- //handled = false;
- }
- return handled;
- }
-
/*
* addToJsonInfo() can be used to add custom entries to the /json/info part of the JSON API.
* Creating an "u" object allows you to add custom key/value pairs to the Info section of the WLED web UI.
* Below it is shown how this could be used for e.g. a light sensor
*/
- //void addToJsonInfo(JsonObject& root) {
- //JsonObject user = root["u"];
- //if (user.isNull()) user = root.createNestedObject("u");
- //JsonArray data = user.createNestedArray(F("4LineDisplay"));
- //data.add(F("Loaded."));
- //}
+ //void addToJsonInfo(JsonObject& root);
/*
* addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
* Values in the state object may be modified by connected clients
*/
- //void addToJsonState(JsonObject& root) {
- //}
+ //void addToJsonState(JsonObject& root);
/*
* readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
* Values in the state object may be modified by connected clients
*/
- //void readFromJsonState(JsonObject& root) {
- // if (!initDone) return; // prevent crash on boot applyPreset()
- //}
+ //void readFromJsonState(JsonObject& root);
+
+ void appendConfigData();
/*
* addToConfig() can be used to add custom persistent settings to the cfg.json file in the "um" (usermod) object.
@@ -955,25 +324,7 @@ class FourLineDisplayUsermod : public Usermod {
*
* I highly recommend checking out the basics of ArduinoJson serialization and deserialization in order to use custom settings!
*/
- void addToConfig(JsonObject& root) {
- JsonObject top = root.createNestedObject(FPSTR(_name));
- top[FPSTR(_enabled)] = enabled;
- JsonArray io_pin = top.createNestedArray("pin");
- for (byte i=0; i<5; i++) io_pin.add(ioPin[i]);
- top["help4Pins"] = F("Clk,Data,CS,DC,RST"); // help for Settings page
- top["type"] = type;
- top["help4Type"] = F("1=SSD1306,2=SH1106,3=SSD1306_128x64,4=SSD1305,5=SSD1305_128x64,6=SSD1306_SPI,7=SSD1306_SPI_128x64"); // help for Settings page
- top[FPSTR(_flip)] = (bool) flip;
- top[FPSTR(_contrast)] = contrast;
- top[FPSTR(_contrastFix)] = (bool) contrastFix;
- top[FPSTR(_refreshRate)] = refreshRate;
- top[FPSTR(_screenTimeOut)] = screenTimeout/1000;
- top[FPSTR(_sleepMode)] = (bool) sleepMode;
- top[FPSTR(_clockMode)] = (bool) clockMode;
- top[FPSTR(_showSeconds)] = (bool) showSeconds;
- top[FPSTR(_busClkFrequency)] = ioFrequency/1000;
- DEBUG_PRINTLN(F("4 Line Display config saved."));
- }
+ void addToConfig(JsonObject& root);
/*
* readFromConfig() can be used to read back the custom settings you added with addToConfig().
@@ -983,71 +334,7 @@ class FourLineDisplayUsermod : public Usermod {
* but also that if you want to write persistent values to a dynamic buffer, you'd need to allocate it here instead of in setup.
* If you don't know what that is, don't fret. It most likely doesn't affect your use case :)
*/
- bool readFromConfig(JsonObject& root) {
- bool needsRedraw = false;
- DisplayType newType = type;
- int8_t newPin[5]; for (byte i=0; i<5; i++) newPin[i] = ioPin[i];
-
- JsonObject top = root[FPSTR(_name)];
- if (top.isNull()) {
- DEBUG_PRINT(FPSTR(_name));
- DEBUG_PRINTLN(F(": No config found. (Using defaults.)"));
- return false;
- }
-
- enabled = top[FPSTR(_enabled)] | enabled;
- newType = top["type"] | newType;
- for (byte i=0; i<5; i++) newPin[i] = top["pin"][i] | ioPin[i];
- flip = top[FPSTR(_flip)] | flip;
- contrast = top[FPSTR(_contrast)] | contrast;
- refreshRate = top[FPSTR(_refreshRate)] | refreshRate;
- refreshRate = min(5000, max(250, (int)refreshRate));
- screenTimeout = (top[FPSTR(_screenTimeOut)] | screenTimeout/1000) * 1000;
- sleepMode = top[FPSTR(_sleepMode)] | sleepMode;
- clockMode = top[FPSTR(_clockMode)] | clockMode;
- showSeconds = top[FPSTR(_showSeconds)] | showSeconds;
- contrastFix = top[FPSTR(_contrastFix)] | contrastFix;
- if (newType == SSD1306_SPI || newType == SSD1306_SPI64)
- ioFrequency = min(20000, max(500, (int)(top[FPSTR(_busClkFrequency)] | ioFrequency/1000))) * 1000; // limit frequency
- else
- ioFrequency = min(3400, max(100, (int)(top[FPSTR(_busClkFrequency)] | ioFrequency/1000))) * 1000; // limit frequency
-
- DEBUG_PRINT(FPSTR(_name));
- if (!initDone) {
- // first run: reading from cfg.json
- for (byte i=0; i<5; i++) ioPin[i] = newPin[i];
- type = newType;
- DEBUG_PRINTLN(F(" config loaded."));
- } else {
- DEBUG_PRINTLN(F(" config (re)loaded."));
- // changing parameters from settings page
- bool pinsChanged = false;
- for (byte i=0; i<5; i++) if (ioPin[i] != newPin[i]) { pinsChanged = true; break; }
- if (pinsChanged || type!=newType) {
- if (type != NONE) delete u8x8;
- PinOwner po = PinOwner::UM_FourLineDisplay;
- if (ioPin[0]==HW_PIN_SCL && ioPin[1]==HW_PIN_SDA) po = PinOwner::HW_I2C; // allow multiple allocations of HW I2C bus pins
- pinManager.deallocateMultiplePins((const uint8_t *)ioPin, (type == SSD1306_SPI || type == SSD1306_SPI64) ? 5 : 2, po);
- for (byte i=0; i<5; i++) ioPin[i] = newPin[i];
- if (ioPin[0]<0 || ioPin[1]<0) { // data & clock must be > -1
- type = NONE;
- return true;
- } else type = newType;
- setup();
- needsRedraw |= true;
- } else {
- u8x8->setBusClock(ioFrequency); // can be used for SPI too
- setVcomh(contrastFix);
- setContrast(contrast);
- setFlipMode(flip);
- }
- knownHour = 99;
- if (needsRedraw && !wakeDisplay()) redraw(true);
- else overlayLogo(3500);
- }
- // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
- return !top[FPSTR(_contrastFix)].isNull();
- }
+ bool readFromConfig(JsonObject& root);
/*
* getId() allows you to optionally give your V2 usermod an unique ID (please define it in const.h!).
@@ -1070,3 +357,1023 @@ const char FourLineDisplayUsermod::_clockMode[] PROGMEM = "clockMode";
const char FourLineDisplayUsermod::_showSeconds[] PROGMEM = "showSeconds";
const char FourLineDisplayUsermod::_busClkFrequency[] PROGMEM = "i2c-freq-kHz";
const char FourLineDisplayUsermod::_contrastFix[] PROGMEM = "contrastFix";
+
+#if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+FourLineDisplayUsermod *FourLineDisplayUsermod::instance = nullptr;
+#endif
+
+// some displays need this to properly apply contrast
+void FourLineDisplayUsermod::setVcomh(bool highContrast) {
+ if (type == NONE || !enabled) return;
+ u8x8_t *u8x8_struct = u8x8->getU8x8();
+ u8x8_cad_StartTransfer(u8x8_struct);
+ u8x8_cad_SendCmd(u8x8_struct, 0x0db); //address of value
+ u8x8_cad_SendArg(u8x8_struct, highContrast ? 0x000 : 0x040); //value 0 for fix, reboot resets default back to 64
+ u8x8_cad_EndTransfer(u8x8_struct);
+}
+
+void FourLineDisplayUsermod::startDisplay() {
+ if (type == NONE || !enabled) return;
+ lineHeight = u8x8->getRows() > 4 ? 2 : 1;
+ DEBUG_PRINTLN(F("Starting display."));
+ u8x8->setBusClock(ioFrequency); // can be used for SPI too
+ u8x8->begin();
+ setFlipMode(flip);
+ setVcomh(contrastFix);
+ setContrast(contrast); //Contrast setup will help to preserve OLED lifetime. In case OLED need to be brighter increase number up to 255
+ setPowerSave(0);
+ //drawString(0, 0, "Loading...");
+ overlayLogo(3500);
+}
+
+/**
+ * Wrappers for screen drawing
+ */
+void FourLineDisplayUsermod::setFlipMode(uint8_t mode) {
+ if (type == NONE || !enabled) return;
+ u8x8->setFlipMode(mode);
+}
+void FourLineDisplayUsermod::setContrast(uint8_t contrast) {
+ if (type == NONE || !enabled) return;
+ u8x8->setContrast(contrast);
+}
+void FourLineDisplayUsermod::drawString(uint8_t col, uint8_t row, const char *string, bool ignoreLH) {
+ if (type == NONE || !enabled) return;
+ drawing = true;
+ u8x8->setFont(u8x8_font_chroma48medium8_r);
+ if (!ignoreLH && lineHeight==2) u8x8->draw1x2String(col, row, string);
+ else u8x8->drawString(col, row, string);
+ drawing = false;
+}
+void FourLineDisplayUsermod::draw2x2String(uint8_t col, uint8_t row, const char *string) {
+ if (type == NONE || !enabled) return;
+ drawing = true;
+ u8x8->setFont(u8x8_font_chroma48medium8_r);
+ u8x8->draw2x2String(col, row, string);
+ drawing = false;
+}
+void FourLineDisplayUsermod::drawGlyph(uint8_t col, uint8_t row, char glyph, const uint8_t *font, bool ignoreLH) {
+ if (type == NONE || !enabled) return;
+ drawing = true;
+ u8x8->setFont(font);
+ if (!ignoreLH && lineHeight==2) u8x8->draw1x2Glyph(col, row, glyph);
+ else u8x8->drawGlyph(col, row, glyph);
+ drawing = false;
+}
+void FourLineDisplayUsermod::draw2x2Glyph(uint8_t col, uint8_t row, char glyph, const uint8_t *font) {
+ if (type == NONE || !enabled) return;
+ drawing = true;
+ u8x8->setFont(font);
+ u8x8->draw2x2Glyph(col, row, glyph);
+ drawing = false;
+}
+uint8_t FourLineDisplayUsermod::getCols() {
+ if (type==NONE || !enabled) return 0;
+ return u8x8->getCols();
+}
+void FourLineDisplayUsermod::clear() {
+ if (type == NONE || !enabled) return;
+ drawing = true;
+ u8x8->clear();
+ drawing = false;
+}
+void FourLineDisplayUsermod::setPowerSave(uint8_t save) {
+ if (type == NONE || !enabled) return;
+ u8x8->setPowerSave(save);
+}
+
+void FourLineDisplayUsermod::center(String &line, uint8_t width) {
+ int len = line.length();
+ if (len0; i--) line = ' ' + line;
+ for (byte i=line.length(); i 11) { AmPmHour -= 12; isitAM = false; }
+ if (AmPmHour == 0) { AmPmHour = 12; }
+ }
+ if (knownHour != hourCurrent) {
+ // only update date when hour changes
+ sprintf_P(lineBuffer, PSTR("%s %2d "), monthShortStr(month(localTime)), day(localTime));
+ draw2x2String(2, lineHeight==1 ? 0 : lineHeight, lineBuffer); // adjust for 8 line displays, draw month and day
+ }
+ sprintf_P(lineBuffer,PSTR("%2d:%02d"), (useAMPM ? AmPmHour : hourCurrent), minuteCurrent);
+ draw2x2String(2, lineHeight*2, lineBuffer); //draw hour, min. blink ":" depending on odd/even seconds
+ if (useAMPM) drawString(12, lineHeight*2, (isitAM ? "AM" : "PM"), true); //draw am/pm if using 12 time
+
+ drawStatusIcons(); //icons power, wifi, timer, etc
+
+ knownMinute = minuteCurrent;
+ knownHour = hourCurrent;
+ }
+ if (showSeconds && secondCurrent != lastSecond) {
+ lastSecond = secondCurrent;
+ draw2x2String(6, lineHeight*2, secondCurrent%2 ? " " : ":");
+ sprintf_P(lineBuffer, PSTR("%02d"), secondCurrent);
+ drawString(12, lineHeight*2+1, lineBuffer, true); // even with double sized rows print seconds in 1 line
+ }
+}
+
+/**
+ * Enable sleep (turn the display off) or clock mode.
+ */
+void FourLineDisplayUsermod::sleepOrClock(bool enabled) {
+ if (enabled) {
+ displayTurnedOff = true;
+ if (clockMode && ntpEnabled) {
+ knownMinute = knownHour = 99;
+ showTime();
+ } else
+ setPowerSave(1);
+ } else {
+ displayTurnedOff = false;
+ setPowerSave(0);
+ }
+}
+
+// gets called once at boot. Do all initialization that doesn't depend on
+// network here
+void FourLineDisplayUsermod::setup() {
+ bool isSPI = (type == SSD1306_SPI || type == SSD1306_SPI64 || type == SSD1309_SPI64);
+
+ // check if pins are -1 and disable usermod as PinManager::allocateMultiplePins() will accept -1 as a valid pin
+ if (isSPI) {
+ if (spi_sclk<0 || spi_mosi<0 || ioPin[0]<0 || ioPin[1]<0 || ioPin[1]<0) {
+ type = NONE;
+ } else {
+ PinManagerPinType cspins[3] = { { ioPin[0], true }, { ioPin[1], true }, { ioPin[2], true } };
+ if (!pinManager.allocateMultiplePins(cspins, 3, PinOwner::UM_FourLineDisplay)) { type = NONE; }
+ }
+ } else {
+ if (i2c_scl<0 || i2c_sda<0) { type=NONE; }
+ }
+
+ DEBUG_PRINTLN(F("Allocating display."));
+ switch (type) {
+ // U8X8 uses Wire (or Wire1 with 2ND constructor) and will use existing Wire properties (calls Wire.begin() though)
+ case SSD1306: u8x8 = (U8X8 *) new U8X8_SSD1306_128X32_UNIVISION_HW_I2C(); break;
+ case SH1106: u8x8 = (U8X8 *) new U8X8_SH1106_128X64_WINSTAR_HW_I2C(); break;
+ case SSD1306_64: u8x8 = (U8X8 *) new U8X8_SSD1306_128X64_NONAME_HW_I2C(); break;
+ case SSD1305: u8x8 = (U8X8 *) new U8X8_SSD1305_128X32_ADAFRUIT_HW_I2C(); break;
+ case SSD1305_64: u8x8 = (U8X8 *) new U8X8_SSD1305_128X64_ADAFRUIT_HW_I2C(); break;
+ // U8X8 uses global SPI variable that is attached to VSPI bus on ESP32
+ case SSD1306_SPI: u8x8 = (U8X8 *) new U8X8_SSD1306_128X32_UNIVISION_4W_HW_SPI(ioPin[0], ioPin[1], ioPin[2]); break; // Pins are cs, dc, reset
+ case SSD1306_SPI64: u8x8 = (U8X8 *) new U8X8_SSD1306_128X64_NONAME_4W_HW_SPI(ioPin[0], ioPin[1], ioPin[2]); break; // Pins are cs, dc, reset
+ case SSD1309_SPI64: u8x8 = (U8X8 *) new U8X8_SSD1309_128X64_NONAME0_4W_HW_SPI(ioPin[0], ioPin[1], ioPin[2]); break; // Pins are cs, dc, reset
+ // catchall
+ default: u8x8 = (U8X8 *) new U8X8_NULL(); enabled = false; break; // catchall to create U8x8 instance
+ }
+
+ if (nullptr == u8x8) {
+ DEBUG_PRINTLN(F("Display init failed."));
+ if (isSPI) {
+ pinManager.deallocateMultiplePins((const uint8_t*)ioPin, 3, PinOwner::UM_FourLineDisplay);
+ }
+ type = NONE;
+ return;
+ }
+
+ startDisplay();
+ onUpdateBegin(false); // create Display task
+ initDone = true;
+}
+
+// gets called every time WiFi is (re-)connected. Initialize own network
+// interfaces here
+void FourLineDisplayUsermod::connected() {
+ knownSsid = WiFi.SSID(); //apActive ? apSSID : WiFi.SSID(); //apActive ? WiFi.softAPSSID() :
+ knownIp = Network.localIP(); //apActive ? IPAddress(4, 3, 2, 1) : Network.localIP();
+ networkOverlay(PSTR("NETWORK INFO"),7000);
+}
+
+/**
+ * Da loop.
+ */
+void FourLineDisplayUsermod::loop() {
+#if !(defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS))
+ if (!enabled || strip.isUpdating()) return;
+ unsigned long now = millis();
+ if (now < nextUpdate) return;
+ nextUpdate = now + ((displayTurnedOff && clockMode && showSeconds) ? 1000 : refreshRate);
+ redraw(false);
+#endif
+}
+
+/**
+ * Redraw the screen (but only if things have changed
+ * or if forceRedraw).
+ */
+void FourLineDisplayUsermod::redraw(bool forceRedraw) {
+ bool needRedraw = false;
+ unsigned long now = millis();
+
+ if (type == NONE || !enabled) return;
+ if (overlayUntil > 0) {
+ if (now >= overlayUntil) {
+ // Time to display the overlay has elapsed.
+ overlayUntil = 0;
+ forceRedraw = true;
+ } else {
+ // We are still displaying the overlay
+ // Don't redraw.
+ return;
+ }
+ }
+
+ while (drawing && millis()-now < 25) delay(1); // wait if someone else is drawing
+ if (drawing || lockRedraw) return;
+
+ if (apActive && WLED_WIFI_CONFIGURED && now<15000) {
+ knownSsid = apSSID;
+ networkOverlay(PSTR("NETWORK INFO"),30000);
+ return;
+ }
+
+ // Check if values which are shown on display changed from the last time.
+ if (forceRedraw) {
+ needRedraw = true;
+ clear();
+ } else if ((bri == 0 && powerON) || (bri > 0 && !powerON)) { //trigger power icon
+ powerON = !powerON;
+ drawStatusIcons();
+ return;
+ } else if (knownnightlight != nightlightActive) { //trigger moon icon
+ knownnightlight = nightlightActive;
+ drawStatusIcons();
+ if (knownnightlight) {
+ String timer = PSTR("Timer On");
+ center(timer,LINE_BUFFER_SIZE-1);
+ overlay(timer.c_str(), 2500, 6);
+ }
+ return;
+ } else if (wificonnected != interfacesInited) { //trigger wifi icon
+ wificonnected = interfacesInited;
+ drawStatusIcons();
+ return;
+ } else if (knownMode != effectCurrent || knownPalette != effectPalette) {
+ if (displayTurnedOff) needRedraw = true;
+ else {
+ if (knownPalette != effectPalette) { showCurrentEffectOrPalette(effectPalette, JSON_palette_names, 2); knownPalette = effectPalette; }
+ if (knownMode != effectCurrent) { showCurrentEffectOrPalette(effectCurrent, JSON_mode_names, 3); knownMode = effectCurrent; }
+ lastRedraw = now;
+ return;
+ }
+ } else if (knownBrightness != bri) {
+ if (displayTurnedOff && nightlightActive) { knownBrightness = bri; }
+ else if (!displayTurnedOff) { updateBrightness(); lastRedraw = now; return; }
+ } else if (knownEffectSpeed != effectSpeed) {
+ if (displayTurnedOff) needRedraw = true;
+ else { updateSpeed(); lastRedraw = now; return; }
+ } else if (knownEffectIntensity != effectIntensity) {
+ if (displayTurnedOff) needRedraw = true;
+ else { updateIntensity(); lastRedraw = now; return; }
+ }
+
+ if (!needRedraw) {
+ // Nothing to change.
+ // Turn off display after 1 minutes with no change.
+ if (sleepMode && !displayTurnedOff && (millis() - lastRedraw > screenTimeout)) {
+ // We will still check if there is a change in redraw()
+ // and turn it back on if it changed.
+ clear();
+ sleepOrClock(true);
+ } else if (displayTurnedOff && ntpEnabled) {
+ showTime();
+ }
+ return;
+ }
+
+ lastRedraw = now;
+
+ // Turn the display back on
+ wakeDisplay();
+
+ // Update last known values.
+ knownBrightness = bri;
+ knownMode = effectCurrent;
+ knownPalette = effectPalette;
+ knownEffectSpeed = effectSpeed;
+ knownEffectIntensity = effectIntensity;
+ knownnightlight = nightlightActive;
+ wificonnected = interfacesInited;
+
+ // Do the actual drawing
+ // First row: Icons
+ draw2x2GlyphIcons();
+ drawArrow();
+ drawStatusIcons();
+
+ // Second row
+ updateBrightness();
+ updateSpeed();
+ updateIntensity();
+
+ // Third row
+ showCurrentEffectOrPalette(knownPalette, JSON_palette_names, 2); //Palette info
+
+ // Fourth row
+ showCurrentEffectOrPalette(knownMode, JSON_mode_names, 3); //Effect Mode info
+}
+
+void FourLineDisplayUsermod::updateBrightness() {
+#if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+ unsigned long now = millis();
+ while (drawing && millis()-now < 125) delay(1); // wait if someone else is drawing
+ if (drawing || lockRedraw) return;
+#endif
+ knownBrightness = bri;
+ if (overlayUntil == 0) {
+ lockRedraw = true;
+ brightness100 = ((uint16_t)bri*100)/255;
+ char lineBuffer[4];
+ sprintf_P(lineBuffer, PSTR("%-3d"), brightness100);
+ drawString(1, lineHeight, lineBuffer);
+ lockRedraw = false;
+ }
+}
+
+void FourLineDisplayUsermod::updateSpeed() {
+#if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+ unsigned long now = millis();
+ while (drawing && millis()-now < 125) delay(1); // wait if someone else is drawing
+ if (drawing || lockRedraw) return;
+#endif
+ knownEffectSpeed = effectSpeed;
+ if (overlayUntil == 0) {
+ lockRedraw = true;
+ fxspeed100 = ((uint16_t)effectSpeed*100)/255;
+ char lineBuffer[4];
+ sprintf_P(lineBuffer, PSTR("%-3d"), fxspeed100);
+ drawString(5, lineHeight, lineBuffer);
+ lockRedraw = false;
+ }
+}
+
+void FourLineDisplayUsermod::updateIntensity() {
+#if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+ unsigned long now = millis();
+ while (drawing && millis()-now < 125) delay(1); // wait if someone else is drawing
+ if (drawing || lockRedraw) return;
+#endif
+ knownEffectIntensity = effectIntensity;
+ if (overlayUntil == 0) {
+ lockRedraw = true;
+ fxintensity100 = ((uint16_t)effectIntensity*100)/255;
+ char lineBuffer[4];
+ sprintf_P(lineBuffer, PSTR("%-3d"), fxintensity100);
+ drawString(9, lineHeight, lineBuffer);
+ lockRedraw = false;
+ }
+}
+
+void FourLineDisplayUsermod::drawStatusIcons() {
+#if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+ unsigned long now = millis();
+ while (drawing && millis()-now < 125) delay(1); // wait if someone else is drawing
+ if (drawing || lockRedraw) return;
+#endif
+ uint8_t col = 15;
+ uint8_t row = 0;
+ lockRedraw = true;
+ drawGlyph(col, row, (wificonnected ? 20 : 0), u8x8_4LineDisplay_WLED_icons_1x1, true); // wifi icon
+ if (lineHeight==2) { col--; } else { row++; }
+ drawGlyph(col, row, (bri > 0 ? 9 : 0), u8x8_4LineDisplay_WLED_icons_1x1, true); // power icon
+ if (lineHeight==2) { col--; } else { col = row = 0; }
+ drawGlyph(col, row, (nightlightActive ? 6 : 0), u8x8_4LineDisplay_WLED_icons_1x1, true); // moon icon for nighlight mode
+ lockRedraw = false;
+}
+
+/**
+ * marks the position of the arrow showing
+ * the current setting being changed
+ * pass line and colum info
+ */
+void FourLineDisplayUsermod::setMarkLine(byte newMarkLineNum, byte newMarkColNum) {
+ markLineNum = newMarkLineNum;
+ markColNum = newMarkColNum;
+}
+
+//Draw the arrow for the current setting being changed
+void FourLineDisplayUsermod::drawArrow() {
+#if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+ unsigned long now = millis();
+ while (drawing && millis()-now < 125) delay(1); // wait if someone else is drawing
+ if (drawing || lockRedraw) return;
+#endif
+ lockRedraw = true;
+ if (markColNum != 255 && markLineNum !=255) drawGlyph(markColNum, markLineNum*lineHeight, 21, u8x8_4LineDisplay_WLED_icons_1x1);
+ lockRedraw = false;
+}
+
+//Display the current effect or palette (desiredEntry)
+// on the appropriate line (row).
+void FourLineDisplayUsermod::showCurrentEffectOrPalette(int inputEffPal, const char *qstring, uint8_t row) {
+#if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+ unsigned long now = millis();
+ while (drawing && millis()-now < 125) delay(1); // wait if someone else is drawing
+ if (drawing || lockRedraw) return;
+#endif
+ char lineBuffer[MAX_JSON_CHARS];
+ if (overlayUntil == 0) {
+ lockRedraw = true;
+ // Find the mode name in JSON
+ uint8_t printedChars = extractModeName(inputEffPal, qstring, lineBuffer, MAX_JSON_CHARS-1);
+ if (lineBuffer[0]=='*' && lineBuffer[1]==' ') {
+ // remove "* " from dynamic palettes
+ for (byte i=2; i<=printedChars; i++) lineBuffer[i-2] = lineBuffer[i]; //include '\0'
+ printedChars -= 2;
+ } else if ((lineBuffer[0]==' ' && lineBuffer[1]>127)) {
+ // remove note symbol from effect names
+ for (byte i=5; i<=printedChars; i++) lineBuffer[i-5] = lineBuffer[i]; //include '\0'
+ printedChars -= 5;
+ }
+ if (lineHeight == 2) { // use this code for 8 line display
+ char smallBuffer1[MAX_MODE_LINE_SPACE];
+ char smallBuffer2[MAX_MODE_LINE_SPACE];
+ uint8_t smallChars1 = 0;
+ uint8_t smallChars2 = 0;
+ if (printedChars < MAX_MODE_LINE_SPACE) { // use big font if the text fits
+ while (printedChars < (MAX_MODE_LINE_SPACE-1)) lineBuffer[printedChars++]=' ';
+ lineBuffer[printedChars] = 0;
+ drawString(1, row*lineHeight, lineBuffer);
+ } else { // for long names divide the text into 2 lines and print them small
+ bool spaceHit = false;
+ for (uint8_t i = 0; i < printedChars; i++) {
+ switch (lineBuffer[i]) {
+ case ' ':
+ if (i > 4 && !spaceHit) {
+ spaceHit = true;
+ break;
+ }
+ if (spaceHit) smallBuffer2[smallChars2++] = lineBuffer[i];
+ else smallBuffer1[smallChars1++] = lineBuffer[i];
+ break;
+ default:
+ if (spaceHit) smallBuffer2[smallChars2++] = lineBuffer[i];
+ else smallBuffer1[smallChars1++] = lineBuffer[i];
+ break;
+ }
+ }
+ while (smallChars1 < (MAX_MODE_LINE_SPACE-1)) smallBuffer1[smallChars1++]=' ';
+ smallBuffer1[smallChars1] = 0;
+ drawString(1, row*lineHeight, smallBuffer1, true);
+ while (smallChars2 < (MAX_MODE_LINE_SPACE-1)) smallBuffer2[smallChars2++]=' ';
+ smallBuffer2[smallChars2] = 0;
+ drawString(1, row*lineHeight+1, smallBuffer2, true);
+ }
+ } else { // use this code for 4 ling displays
+ char smallBuffer3[MAX_MODE_LINE_SPACE+1]; // uses 1x1 icon for mode/palette
+ uint8_t smallChars3 = 0;
+ for (uint8_t i = 0; i < MAX_MODE_LINE_SPACE; i++) smallBuffer3[smallChars3++] = (i >= printedChars) ? ' ' : lineBuffer[i];
+ smallBuffer3[smallChars3] = 0;
+ drawString(1, row*lineHeight, smallBuffer3, true);
+ }
+ lockRedraw = false;
+ }
+}
+
+/**
+ * If there screen is off or in clock is displayed,
+ * this will return true. This allows us to throw away
+ * the first input from the rotary encoder but
+ * to wake up the screen.
+ */
+bool FourLineDisplayUsermod::wakeDisplay() {
+ if (type == NONE || !enabled) return false;
+ if (displayTurnedOff) {
+ #if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+ unsigned long now = millis();
+ while (drawing && millis()-now < 125) delay(1); // wait if someone else is drawing
+ if (drawing || lockRedraw) return false;
+ #endif
+ lockRedraw = true;
+ clear();
+ // Turn the display back on
+ sleepOrClock(false);
+ lockRedraw = false;
+ return true;
+ }
+ return false;
+}
+
+/**
+ * Allows you to show one line and a glyph as overlay for a period of time.
+ * Clears the screen and prints.
+ * Used in Rotary Encoder usermod.
+ */
+void FourLineDisplayUsermod::overlay(const char* line1, long showHowLong, byte glyphType) {
+#if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+ unsigned long now = millis();
+ while (drawing && millis()-now < 125) delay(1); // wait if someone else is drawing
+ if (drawing || lockRedraw) return;
+#endif
+ lockRedraw = true;
+ // Turn the display back on
+ if (!wakeDisplay()) clear();
+ // Print the overlay
+ if (glyphType>0 && glyphType<255) {
+ if (lineHeight == 2) drawGlyph(5, 0, glyphType, u8x8_4LineDisplay_WLED_icons_6x6, true); // use 3x3 font with draw2x2Glyph() if flash runs short and comment out 6x6 font
+ else drawGlyph(6, 0, glyphType, u8x8_4LineDisplay_WLED_icons_3x3, true);
+ }
+ if (line1) {
+ String buf = line1;
+ center(buf, getCols());
+ drawString(0, (glyphType<255?3:0)*lineHeight, buf.c_str());
+ }
+ overlayUntil = millis() + showHowLong;
+ lockRedraw = false;
+}
+
+/**
+ * Allows you to show Akemi WLED logo overlay for a period of time.
+ * Clears the screen and prints.
+ */
+void FourLineDisplayUsermod::overlayLogo(long showHowLong) {
+#if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+ unsigned long now = millis();
+ while (drawing && millis()-now < 125) delay(1); // wait if someone else is drawing
+ if (drawing || lockRedraw) return;
+#endif
+ lockRedraw = true;
+ // Turn the display back on
+ if (!wakeDisplay()) clear();
+ // Print the overlay
+ if (lineHeight == 2) {
+ //add a bit of randomness
+ switch (millis()%3) {
+ case 0:
+ //WLED
+ draw2x2Glyph( 0, 2, 1, u8x8_wled_logo_2x2);
+ draw2x2Glyph( 4, 2, 2, u8x8_wled_logo_2x2);
+ draw2x2Glyph( 8, 2, 3, u8x8_wled_logo_2x2);
+ draw2x2Glyph(12, 2, 4, u8x8_wled_logo_2x2);
+ break;
+ case 1:
+ //WLED Akemi
+ drawGlyph( 2, 2, 1, u8x8_wled_logo_akemi_4x4, true);
+ drawGlyph( 6, 2, 2, u8x8_wled_logo_akemi_4x4, true);
+ drawGlyph(10, 2, 3, u8x8_wled_logo_akemi_4x4, true);
+ break;
+ case 2:
+ //Akemi
+ //draw2x2Glyph( 5, 0, 12, u8x8_4LineDisplay_WLED_icons_3x3); // use this if flash runs short and comment out 6x6 font
+ drawGlyph( 5, 0, 12, u8x8_4LineDisplay_WLED_icons_6x6, true);
+ drawString(6, 6, "WLED");
+ break;
+ }
+ } else {
+ switch (millis()%3) {
+ case 0:
+ //WLED
+ draw2x2Glyph( 0, 0, 1, u8x8_wled_logo_2x2);
+ draw2x2Glyph( 4, 0, 2, u8x8_wled_logo_2x2);
+ draw2x2Glyph( 8, 0, 3, u8x8_wled_logo_2x2);
+ draw2x2Glyph(12, 0, 4, u8x8_wled_logo_2x2);
+ break;
+ case 1:
+ //WLED Akemi
+ drawGlyph( 2, 0, 1, u8x8_wled_logo_akemi_4x4);
+ drawGlyph( 6, 0, 2, u8x8_wled_logo_akemi_4x4);
+ drawGlyph(10, 0, 3, u8x8_wled_logo_akemi_4x4);
+ break;
+ case 2:
+ //Akemi
+ //drawGlyph( 6, 0, 12, u8x8_4LineDisplay_WLED_icons_4x4); // a bit nicer, but uses extra 1.5k flash
+ draw2x2Glyph( 6, 0, 12, u8x8_4LineDisplay_WLED_icons_2x2);
+ break;
+ }
+ }
+ overlayUntil = millis() + showHowLong;
+ lockRedraw = false;
+}
+
+/**
+ * Allows you to show two lines as overlay for a period of time.
+ * Clears the screen and prints.
+ * Used in Auto Save usermod
+ */
+void FourLineDisplayUsermod::overlay(const char* line1, const char* line2, long showHowLong) {
+#if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+ unsigned long now = millis();
+ while (drawing && millis()-now < 125) delay(1); // wait if someone else is drawing
+ if (drawing || lockRedraw) return;
+#endif
+ lockRedraw = true;
+ // Turn the display back on
+ if (!wakeDisplay()) clear();
+ // Print the overlay
+ if (line1) {
+ String buf = line1;
+ center(buf, getCols());
+ drawString(0, 1*lineHeight, buf.c_str());
+ }
+ if (line2) {
+ String buf = line2;
+ center(buf, getCols());
+ drawString(0, 2*lineHeight, buf.c_str());
+ }
+ overlayUntil = millis() + showHowLong;
+ lockRedraw = false;
+}
+
+void FourLineDisplayUsermod::networkOverlay(const char* line1, long showHowLong) {
+#if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+ unsigned long now = millis();
+ while (drawing && millis()-now < 125) delay(1); // wait if someone else is drawing
+ if (drawing || lockRedraw) return;
+#endif
+ lockRedraw = true;
+
+ String line;
+ // Turn the display back on
+ if (!wakeDisplay()) clear();
+ // Print the overlay
+ if (line1) {
+ line = line1;
+ center(line, getCols());
+ drawString(0, 0, line.c_str());
+ }
+ // Second row with Wifi name
+ line = knownSsid.substring(0, getCols() > 1 ? getCols() - 2 : 0);
+ if (line.length() < getCols()) center(line, getCols());
+ drawString(0, lineHeight, line.c_str());
+ // Print `~` char to indicate that SSID is longer, than our display
+ if (knownSsid.length() > getCols()) {
+ drawString(getCols() - 1, 0, "~");
+ }
+ // Third row with IP and Password in AP Mode
+ line = knownIp.toString();
+ center(line, getCols());
+ drawString(0, lineHeight*2, line.c_str());
+ line = "";
+ if (apActive) {
+ line = apPass;
+ } else if (strcmp(serverDescription, "WLED") != 0) {
+ line = serverDescription;
+ }
+ center(line, getCols());
+ drawString(0, lineHeight*3, line.c_str());
+ overlayUntil = millis() + showHowLong;
+ lockRedraw = false;
+}
+
+
+/**
+ * handleButton() can be used to override default button behaviour. Returning true
+ * will prevent button working in a default way.
+ * Replicating button.cpp
+ */
+bool FourLineDisplayUsermod::handleButton(uint8_t b) {
+ yield();
+ if (!enabled
+ || b // button 0 only
+ || buttonType[b] == BTN_TYPE_SWITCH
+ || buttonType[b] == BTN_TYPE_NONE
+ || buttonType[b] == BTN_TYPE_RESERVED
+ || buttonType[b] == BTN_TYPE_PIR_SENSOR
+ || buttonType[b] == BTN_TYPE_ANALOG
+ || buttonType[b] == BTN_TYPE_ANALOG_INVERTED) {
+ return false;
+ }
+
+ unsigned long now = millis();
+ static bool buttonPressedBefore = false;
+ static bool buttonLongPressed = false;
+ static unsigned long buttonPressedTime = 0;
+ static unsigned long buttonWaitTime = 0;
+ bool handled = false;
+
+ //momentary button logic
+ if (isButtonPressed(b)) { //pressed
+
+ if (!buttonPressedBefore) buttonPressedTime = now;
+ buttonPressedBefore = true;
+
+ if (now - buttonPressedTime > 600) { //long press
+ //TODO: handleButton() handles button 0 without preset in a different way for double click
+ //so we need to override with same behaviour
+ //DEBUG_PRINTLN(F("4LD action."));
+ //if (!buttonLongPressed) longPressAction(0);
+ buttonLongPressed = true;
+ return false;
+ }
+
+ } else if (!isButtonPressed(b) && buttonPressedBefore) { //released
+
+ long dur = now - buttonPressedTime;
+ if (dur < 50) {
+ buttonPressedBefore = false;
+ return true;
+ } //too short "press", debounce
+
+ bool doublePress = buttonWaitTime; //did we have short press before?
+ buttonWaitTime = 0;
+
+ if (!buttonLongPressed) { //short press
+ // if this is second release within 350ms it is a double press (buttonWaitTime!=0)
+ //TODO: handleButton() handles button 0 without preset in a different way for double click
+ if (doublePress) {
+ networkOverlay(PSTR("NETWORK INFO"),7000);
+ handled = true;
+ } else {
+ buttonWaitTime = now;
+ }
+ }
+ buttonPressedBefore = false;
+ buttonLongPressed = false;
+ }
+ // if 350ms elapsed since last press/release it is a short press
+ if (buttonWaitTime && now - buttonWaitTime > 350 && !buttonPressedBefore) {
+ buttonWaitTime = 0;
+ //TODO: handleButton() handles button 0 without preset in a different way for double click
+ //so we need to override with same behaviour
+ //shortPressAction(0);
+ //handled = false;
+ }
+ return handled;
+}
+
+#if CONFIG_FREERTOS_UNICORE
+#define ARDUINO_RUNNING_CORE 0
+#else
+#define ARDUINO_RUNNING_CORE 1
+#endif
+void FourLineDisplayUsermod::onUpdateBegin(bool init) {
+#if defined(ARDUINO_ARCH_ESP32) && defined(FLD_ESP32_USE_THREADS)
+ if (init && Display_Task) {
+ vTaskSuspend(Display_Task); // update is about to begin, disable task to prevent crash
+ } else {
+ // update has failed or create task requested
+ if (Display_Task)
+ vTaskResume(Display_Task);
+ else
+ xTaskCreatePinnedToCore(
+ [](void * par) { // Function to implement the task
+ // see https://www.freertos.org/vtaskdelayuntil.html
+ const TickType_t xFrequency = REFRESH_RATE_MS * portTICK_PERIOD_MS / 2;
+ TickType_t xLastWakeTime = xTaskGetTickCount();
+ for(;;) {
+ delay(1); // DO NOT DELETE THIS LINE! It is needed to give the IDLE(0) task enough time and to keep the watchdog happy.
+ // taskYIELD(), yield(), vTaskDelay() and esp_task_wdt_feed() didn't seem to work.
+ vTaskDelayUntil(&xLastWakeTime, xFrequency); // release CPU, by doing nothing for REFRESH_RATE_MS millis
+ FourLineDisplayUsermod::getInstance()->redraw(false);
+ }
+ },
+ "4LD", // Name of the task
+ 3072, // Stack size in words
+ NULL, // Task input parameter
+ 1, // Priority of the task (not idle)
+ &Display_Task, // Task handle
+ ARDUINO_RUNNING_CORE
+ );
+ }
+#endif
+}
+
+/*
+ * addToJsonInfo() can be used to add custom entries to the /json/info part of the JSON API.
+ * Creating an "u" object allows you to add custom key/value pairs to the Info section of the WLED web UI.
+ * Below it is shown how this could be used for e.g. a light sensor
+ */
+//void FourLineDisplayUsermod::addToJsonInfo(JsonObject& root) {
+ //JsonObject user = root["u"];
+ //if (user.isNull()) user = root.createNestedObject("u");
+ //JsonArray data = user.createNestedArray(F("4LineDisplay"));
+ //data.add(F("Loaded."));
+//}
+
+/*
+ * addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
+ * Values in the state object may be modified by connected clients
+ */
+//void FourLineDisplayUsermod::addToJsonState(JsonObject& root) {
+//}
+
+/*
+ * readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
+ * Values in the state object may be modified by connected clients
+ */
+//void FourLineDisplayUsermod::readFromJsonState(JsonObject& root) {
+// if (!initDone) return; // prevent crash on boot applyPreset()
+//}
+
+void FourLineDisplayUsermod::appendConfigData() {
+ oappend(SET_F("dd=addDropdown('4LineDisplay','type');"));
+ oappend(SET_F("addOption(dd,'None',0);"));
+ oappend(SET_F("addOption(dd,'SSD1306',1);"));
+ oappend(SET_F("addOption(dd,'SH1106',2);"));
+ oappend(SET_F("addOption(dd,'SSD1306 128x64',3);"));
+ oappend(SET_F("addOption(dd,'SSD1305',4);"));
+ oappend(SET_F("addOption(dd,'SSD1305 128x64',5);"));
+ oappend(SET_F("addOption(dd,'SSD1306 SPI',6);"));
+ oappend(SET_F("addOption(dd,'SSD1306 SPI 128x64',7);"));
+ oappend(SET_F("addOption(dd,'SSD1309 SPI 128x64',8);"));
+ oappend(SET_F("addInfo('4LineDisplay:type',1,'
Change may require reboot','');"));
+ oappend(SET_F("addInfo('4LineDisplay:pin[]',0,'','SPI CS');"));
+ oappend(SET_F("addInfo('4LineDisplay:pin[]',1,'','SPI DC');"));
+ oappend(SET_F("addInfo('4LineDisplay:pin[]',2,'','SPI RST');"));
+}
+
+/*
+ * addToConfig() can be used to add custom persistent settings to the cfg.json file in the "um" (usermod) object.
+ * It will be called by WLED when settings are actually saved (for example, LED settings are saved)
+ * If you want to force saving the current state, use serializeConfig() in your loop().
+ *
+ * CAUTION: serializeConfig() will initiate a filesystem write operation.
+ * It might cause the LEDs to stutter and will cause flash wear if called too often.
+ * Use it sparingly and always in the loop, never in network callbacks!
+ *
+ * addToConfig() will also not yet add your setting to one of the settings pages automatically.
+ * To make that work you still have to add the setting to the HTML, xml.cpp and set.cpp manually.
+ *
+ * I highly recommend checking out the basics of ArduinoJson serialization and deserialization in order to use custom settings!
+ */
+void FourLineDisplayUsermod::addToConfig(JsonObject& root) {
+ JsonObject top = root.createNestedObject(FPSTR(_name));
+ top[FPSTR(_enabled)] = enabled;
+
+ top["type"] = type;
+ JsonArray io_pin = top.createNestedArray("pin");
+ for (int i=0; i<3; i++) io_pin.add(ioPin[i]);
+ top[FPSTR(_flip)] = (bool) flip;
+ top[FPSTR(_contrast)] = contrast;
+ top[FPSTR(_contrastFix)] = (bool) contrastFix;
+ #ifndef ARDUINO_ARCH_ESP32
+ top[FPSTR(_refreshRate)] = refreshRate;
+ #endif
+ top[FPSTR(_screenTimeOut)] = screenTimeout/1000;
+ top[FPSTR(_sleepMode)] = (bool) sleepMode;
+ top[FPSTR(_clockMode)] = (bool) clockMode;
+ top[FPSTR(_showSeconds)] = (bool) showSeconds;
+ top[FPSTR(_busClkFrequency)] = ioFrequency/1000;
+ DEBUG_PRINTLN(F("4 Line Display config saved."));
+}
+
+/*
+ * readFromConfig() can be used to read back the custom settings you added with addToConfig().
+ * This is called by WLED when settings are loaded (currently this only happens once immediately after boot)
+ *
+ * readFromConfig() is called BEFORE setup(). This means you can use your persistent values in setup() (e.g. pin assignments, buffer sizes),
+ * but also that if you want to write persistent values to a dynamic buffer, you'd need to allocate it here instead of in setup.
+ * If you don't know what that is, don't fret. It most likely doesn't affect your use case :)
+ */
+bool FourLineDisplayUsermod::readFromConfig(JsonObject& root) {
+ bool needsRedraw = false;
+ DisplayType newType = type;
+ int8_t oldPin[3]; for (byte i=0; i<3; i++) oldPin[i] = ioPin[i];
+
+ JsonObject top = root[FPSTR(_name)];
+ if (top.isNull()) {
+ DEBUG_PRINT(FPSTR(_name));
+ DEBUG_PRINTLN(F(": No config found. (Using defaults.)"));
+ return false;
+ }
+
+ enabled = top[FPSTR(_enabled)] | enabled;
+ newType = top["type"] | newType;
+ for (byte i=0; i<3; i++) ioPin[i] = top["pin"][i] | ioPin[i];
+ flip = top[FPSTR(_flip)] | flip;
+ contrast = top[FPSTR(_contrast)] | contrast;
+ #ifndef ARDUINO_ARCH_ESP32
+ refreshRate = top[FPSTR(_refreshRate)] | refreshRate;
+ refreshRate = min(5000, max(250, (int)refreshRate));
+ #endif
+ screenTimeout = (top[FPSTR(_screenTimeOut)] | screenTimeout/1000) * 1000;
+ sleepMode = top[FPSTR(_sleepMode)] | sleepMode;
+ clockMode = top[FPSTR(_clockMode)] | clockMode;
+ showSeconds = top[FPSTR(_showSeconds)] | showSeconds;
+ contrastFix = top[FPSTR(_contrastFix)] | contrastFix;
+ if (newType == SSD1306_SPI || newType == SSD1306_SPI64)
+ ioFrequency = min(20000, max(500, (int)(top[FPSTR(_busClkFrequency)] | ioFrequency/1000))) * 1000; // limit frequency
+ else
+ ioFrequency = min(3400, max(100, (int)(top[FPSTR(_busClkFrequency)] | ioFrequency/1000))) * 1000; // limit frequency
+
+ DEBUG_PRINT(FPSTR(_name));
+ if (!initDone) {
+ // first run: reading from cfg.json
+ type = newType;
+ DEBUG_PRINTLN(F(" config loaded."));
+ } else {
+ DEBUG_PRINTLN(F(" config (re)loaded."));
+ // changing parameters from settings page
+ bool pinsChanged = false;
+ for (byte i=0; i<3; i++) if (ioPin[i] != oldPin[i]) { pinsChanged = true; break; }
+ if (pinsChanged || type!=newType) {
+ bool isSPI = (type == SSD1306_SPI || type == SSD1306_SPI64 || type == SSD1309_SPI64);
+ bool newSPI = (newType == SSD1306_SPI || newType == SSD1306_SPI64 || newType == SSD1309_SPI64);
+ if (isSPI) {
+ if (pinsChanged || !newSPI) pinManager.deallocateMultiplePins((const uint8_t*)oldPin, 3, PinOwner::UM_FourLineDisplay);
+ if (!newSPI) {
+ // was SPI but is no longer SPI
+ if (i2c_scl<0 || i2c_sda<0) { newType=NONE; }
+ } else {
+ // still SPI but pins changed
+ PinManagerPinType cspins[3] = { { ioPin[0], true }, { ioPin[1], true }, { ioPin[2], true } };
+ if (ioPin[0]<0 || ioPin[1]<0 || ioPin[1]<0) { newType=NONE; }
+ else if (!pinManager.allocateMultiplePins(cspins, 3, PinOwner::UM_FourLineDisplay)) { newType=NONE; }
+ }
+ } else if (newSPI) {
+ // was I2C but is now SPI
+ if (spi_sclk<0 || spi_mosi<0) {
+ newType=NONE;
+ } else {
+ PinManagerPinType pins[3] = { { ioPin[0], true }, { ioPin[1], true }, { ioPin[2], true } };
+ if (ioPin[0]<0 || ioPin[1]<0 || ioPin[1]<0) { newType=NONE; }
+ else if (!pinManager.allocateMultiplePins(pins, 3, PinOwner::UM_FourLineDisplay)) { newType=NONE; }
+ }
+ } else {
+ // just I2C type changed
+ }
+ type = newType;
+ switch (type) {
+ case SSD1306:
+ u8x8_Setup(u8x8->getU8x8(), u8x8_d_ssd1306_128x32_univision, u8x8_cad_ssd13xx_fast_i2c, u8x8_byte_arduino_hw_i2c, u8x8_gpio_and_delay_arduino);
+ u8x8_SetPin_HW_I2C(u8x8->getU8x8(), U8X8_PIN_NONE, U8X8_PIN_NONE, U8X8_PIN_NONE);
+ break;
+ case SH1106:
+ u8x8_Setup(u8x8->getU8x8(), u8x8_d_sh1106_128x64_winstar, u8x8_cad_ssd13xx_fast_i2c, u8x8_byte_arduino_hw_i2c, u8x8_gpio_and_delay_arduino);
+ u8x8_SetPin_HW_I2C(u8x8->getU8x8(), U8X8_PIN_NONE, U8X8_PIN_NONE, U8X8_PIN_NONE);
+ break;
+ case SSD1306_64:
+ u8x8_Setup(u8x8->getU8x8(), u8x8_d_ssd1306_128x64_noname, u8x8_cad_ssd13xx_fast_i2c, u8x8_byte_arduino_hw_i2c, u8x8_gpio_and_delay_arduino);
+ u8x8_SetPin_HW_I2C(u8x8->getU8x8(), U8X8_PIN_NONE, U8X8_PIN_NONE, U8X8_PIN_NONE);
+ break;
+ case SSD1305:
+ u8x8_Setup(u8x8->getU8x8(), u8x8_d_ssd1305_128x32_adafruit, u8x8_cad_ssd13xx_fast_i2c, u8x8_byte_arduino_hw_i2c, u8x8_gpio_and_delay_arduino);
+ u8x8_SetPin_HW_I2C(u8x8->getU8x8(), U8X8_PIN_NONE, U8X8_PIN_NONE, U8X8_PIN_NONE);
+ break;
+ case SSD1305_64:
+ u8x8_Setup(u8x8->getU8x8(), u8x8_d_ssd1305_128x64_adafruit, u8x8_cad_ssd13xx_fast_i2c, u8x8_byte_arduino_hw_i2c, u8x8_gpio_and_delay_arduino);
+ u8x8_SetPin_HW_I2C(u8x8->getU8x8(), U8X8_PIN_NONE, U8X8_PIN_NONE, U8X8_PIN_NONE);
+ break;
+ case SSD1306_SPI:
+ u8x8_Setup(u8x8->getU8x8(), u8x8_d_ssd1306_128x32_univision, u8x8_cad_001, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino);
+ u8x8_SetPin_4Wire_HW_SPI(u8x8->getU8x8(), ioPin[0], ioPin[1], ioPin[2]); // Pins are cs, dc, reset
+ break;
+ case SSD1306_SPI64:
+ u8x8_Setup(u8x8->getU8x8(), u8x8_d_ssd1306_128x64_noname, u8x8_cad_001, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino);
+ u8x8_SetPin_4Wire_HW_SPI(u8x8->getU8x8(), ioPin[0], ioPin[1], ioPin[2]); // Pins are cs, dc, reset
+ break;
+ case SSD1309_SPI64:
+ u8x8_Setup(u8x8->getU8x8(), u8x8_d_ssd1309_128x64_noname0, u8x8_cad_001, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino);
+ u8x8_SetPin_4Wire_HW_SPI(u8x8->getU8x8(), ioPin[0], ioPin[1], ioPin[2]); // Pins are cs, dc, reset
+ default:
+ u8x8_Setup(u8x8->getU8x8(), u8x8_d_null_cb, u8x8_cad_empty, u8x8_byte_empty, u8x8_dummy_cb);
+ enabled = false;
+ break;
+ }
+ startDisplay();
+ needsRedraw |= true;
+ } else {
+ u8x8->setBusClock(ioFrequency); // can be used for SPI too
+ setVcomh(contrastFix);
+ setContrast(contrast);
+ setFlipMode(flip);
+ }
+ knownHour = 99;
+ if (needsRedraw && !wakeDisplay()) redraw(true);
+ else overlayLogo(3500);
+ }
+ // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
+ return !top[FPSTR(_contrastFix)].isNull();
+}
diff --git a/usermods/usermod_v2_klipper_percentage/readme.md b/usermods/usermod_v2_klipper_percentage/readme.md
new file mode 100644
index 0000000000..e967d6b217
--- /dev/null
+++ b/usermods/usermod_v2_klipper_percentage/readme.md
@@ -0,0 +1,40 @@
+# Klipper Percentage Usermod
+This usermod polls the Klipper API every 10s for the progressvalue.
+The leds are then filled with a solid color according to that progress percentage.
+the solid color is the secondary color of the segment.
+
+A corresponding curl command would be:
+```
+curl --location --request GET 'http://[]/printer/objects/query?virtual_sdcard=progress'
+```
+## Usage
+Compile the source with the buildflag `-D USERMOD_KLIPPER_PERCENTAGE` added.
+
+You can also use the WLBD bot in the Discord by simply extending an existing build environment:
+```
+[env:esp32klipper]
+extends = env:esp32dev
+build_flags = ${common.build_flags_esp32} -D USERMOD_KLIPPER_PERCENTAGE
+```
+
+## Settings
+
+### Enabled:
+Checkbox to enable or disable the overlay
+
+### Klipper IP:
+IP address of your Klipper instance you want to poll. ESP has to be restarted after change
+
+### Direction :
+0 = normal
+
+1 = reversed
+
+2 = center
+
+-----
+Author:
+
+Sören Willrodt
+
+Discord: Sören#5281
\ No newline at end of file
diff --git a/usermods/usermod_v2_klipper_percentage/usermod_v2_klipper_percentage.h b/usermods/usermod_v2_klipper_percentage/usermod_v2_klipper_percentage.h
new file mode 100644
index 0000000000..2f591b1547
--- /dev/null
+++ b/usermods/usermod_v2_klipper_percentage/usermod_v2_klipper_percentage.h
@@ -0,0 +1,222 @@
+#pragma once
+
+#include "wled.h"
+
+class klipper_percentage : public Usermod
+{
+private:
+ unsigned long lastTime = 0;
+ String ip = "192.168.25.207";
+ WiFiClient wifiClient;
+ char errorMessage[100] = "";
+ int printPercent = 0;
+ int direction = 0; // 0 for along the strip, 1 for reversed direction
+
+ static const char _name[];
+ static const char _enabled[];
+ bool enabled = false;
+
+ void httpGet(WiFiClient &client, char *errorMessage)
+ {
+ // https://arduinojson.org/v6/example/http-client/
+ // is this the most compact way to do http get and put it in arduinojson object???
+ // would like async response ... ???
+ client.setTimeout(10000);
+ if (!client.connect(ip.c_str(), 80))
+ {
+ strcat(errorMessage, PSTR("Connection failed"));
+ }
+ else
+ {
+ // Send HTTP request
+ client.println(F("GET /printer/objects/query?virtual_sdcard=progress HTTP/1.0"));
+ client.println("Host: " + ip);
+ client.println(F("Connection: close"));
+ if (client.println() == 0)
+ {
+ strcat(errorMessage, PSTR("Failed to send request"));
+ }
+ else
+ {
+ // Check HTTP status
+ char status[32] = {0};
+ client.readBytesUntil('\r', status, sizeof(status));
+ if (strcmp(status, "HTTP/1.1 200 OK") != 0)
+ {
+ strcat(errorMessage, PSTR("Unexpected response: "));
+ strcat(errorMessage, status);
+ }
+ else
+ {
+ // Skip HTTP headers
+ char endOfHeaders[] = "\r\n\r\n";
+ if (!client.find(endOfHeaders))
+ {
+ strcat(errorMessage, PSTR("Invalid response"));
+ }
+ }
+ }
+ }
+ }
+
+public:
+ void setup()
+ {
+ }
+
+ void connected()
+ {
+ }
+
+ void loop()
+ {
+ if (enabled)
+ {
+ if (WLED_CONNECTED)
+ {
+ if (millis() - lastTime > 10000)
+ {
+ httpGet(wifiClient, errorMessage);
+ if (strcmp(errorMessage, "") == 0)
+ {
+ PSRAMDynamicJsonDocument klipperDoc(4096); // in practice about 2673
+ DeserializationError error = deserializeJson(klipperDoc, wifiClient);
+ if (error)
+ {
+ strcat(errorMessage, PSTR("deserializeJson() failed: "));
+ strcat(errorMessage, error.c_str());
+ }
+ printPercent = (int)(klipperDoc["result"]["status"]["virtual_sdcard"]["progress"].as() * 100);
+
+ DEBUG_PRINT("Percent: ");
+ DEBUG_PRINTLN((int)(klipperDoc["result"]["status"]["virtual_sdcard"]["progress"].as() * 100));
+ DEBUG_PRINT("LEDs: ");
+ DEBUG_PRINTLN(direction == 2 ? (strip.getLengthTotal() / 2) * printPercent / 100 : strip.getLengthTotal() * printPercent / 100);
+ }
+ else
+ {
+ DEBUG_PRINTLN(errorMessage);
+ DEBUG_PRINTLN(ip);
+ }
+ lastTime = millis();
+ }
+ }
+ }
+ }
+
+ void addToConfig(JsonObject &root)
+ {
+ JsonObject top = root.createNestedObject("Klipper Printing Percentage");
+ top["Enabled"] = enabled;
+ top["Klipper IP"] = ip;
+ top["Direction"] = direction;
+ }
+
+ bool readFromConfig(JsonObject &root)
+ {
+ // default settings values could be set here (or below using the 3-argument getJsonValue()) instead of in the class definition or constructor
+ // setting them inside readFromConfig() is slightly more robust, handling the rare but plausible use case of single value being missing after boot (e.g. if the cfg.json was manually edited and a value was removed)
+
+ JsonObject top = root["Klipper Printing Percentage"];
+
+ bool configComplete = !top.isNull();
+ configComplete &= getJsonValue(top["Klipper IP"], ip);
+ configComplete &= getJsonValue(top["Enabled"], enabled);
+ configComplete &= getJsonValue(top["Direction"], direction);
+ return configComplete;
+ }
+
+ /*
+ * addToJsonInfo() can be used to add custom entries to the /json/info part of the JSON API.
+ * Creating an "u" object allows you to add custom key/value pairs to the Info section of the WLED web UI.
+ * Below it is shown how this could be used for e.g. a light sensor
+ */
+ void addToJsonInfo(JsonObject &root)
+ {
+ JsonObject user = root["u"];
+ if (user.isNull())
+ user = root.createNestedObject("u");
+
+ JsonArray infoArr = user.createNestedArray(FPSTR(_name));
+ String uiDomString = F("");
+ infoArr.add(uiDomString);
+ }
+
+ void addToJsonState(JsonObject &root)
+ {
+ JsonObject usermod = root[FPSTR(_name)];
+ if (usermod.isNull())
+ {
+ usermod = root.createNestedObject(FPSTR(_name));
+ }
+ usermod["on"] = enabled;
+ }
+ void readFromJsonState(JsonObject &root)
+ {
+ JsonObject usermod = root[FPSTR(_name)];
+ if (!usermod.isNull())
+ {
+ if (usermod[FPSTR(_enabled)].is())
+ {
+ enabled = usermod[FPSTR(_enabled)].as();
+ }
+ }
+ }
+
+ /*
+ * handleOverlayDraw() is called just before every show() (LED strip update frame) after effects have set the colors.
+ * Use this to blank out some LEDs or set them to a different color regardless of the set effect mode.
+ * Commonly used for custom clocks (Cronixie, 7 segment)
+ */
+ void handleOverlayDraw()
+ {
+ if (enabled)
+ {
+ if (direction == 0) // normal
+ {
+ for (int i = 0; i < strip.getLengthTotal() * printPercent / 100; i++)
+ {
+ strip.setPixelColor(i, strip.getSegment(0).colors[1]);
+ }
+ }
+ else if (direction == 1) // reversed
+ {
+ for (int i = 0; i < strip.getLengthTotal() * printPercent / 100; i++)
+ {
+ strip.setPixelColor(strip.getLengthTotal() - i, strip.getSegment(0).colors[1]);
+ }
+ }
+ else if (direction == 2) // center
+ {
+ for (int i = 0; i < (strip.getLengthTotal() / 2) * printPercent / 100; i++)
+ {
+ strip.setPixelColor((strip.getLengthTotal() / 2) + i, strip.getSegment(0).colors[1]);
+ strip.setPixelColor((strip.getLengthTotal() / 2) - i, strip.getSegment(0).colors[1]);
+ }
+ }
+ else
+ {
+ direction = 0;
+ }
+ }
+ }
+
+ /*
+ * getId() allows you to optionally give your V2 usermod an unique ID (please define it in const.h!).
+ * This could be used in the future for the system to determine whether your usermod is installed.
+ */
+ uint16_t getId()
+ {
+ return USERMOD_ID_KLIPPER;
+ }
+};
+const char klipper_percentage::_name[] PROGMEM = "Klipper_Percentage";
+const char klipper_percentage::_enabled[] PROGMEM = "enabled";
\ No newline at end of file
diff --git a/usermods/usermod_v2_mode_sort/readme.md b/usermods/usermod_v2_mode_sort/readme.md
index b4fe90e73e..c24322f32e 100644
--- a/usermods/usermod_v2_mode_sort/readme.md
+++ b/usermods/usermod_v2_mode_sort/readme.md
@@ -8,26 +8,26 @@ palettes to other usermods. Notably it provides:
```char **getModesQStrings()```
-Provides an array of char* (pointers) to the names of the
-palettes within JSON_mode_names, in the same order as
+Provides a char* array (pointers) to the names of the
+palettes contained in JSON_mode_names, in the same order as
JSON_mode_names. These strings end in double quote (")
(or \0 if there is a problem).
```byte *getModesAlphaIndexes()```
-An array of byte designating the indexes of names of the
+A byte array designating the indexes of names of the
modes in alphabetical order. "Solid" will always remain
-at the front of the list.
+at the top of the list.
```char **getPalettesQStrings()```
-Provides an array of char* (pointers) to the names of the
-palettes within JSON_palette_names, in the same order as
+Provides a char* array (pointers) to the names of the
+palettes contained in JSON_palette_names, in the same order as
JSON_palette_names. These strings end in double quote (")
(or \0 if there is a problem).
```byte *getPalettesAlphaIndexes()```
-An array of byte designating the indexes of names of the
+A byte array designating the indexes of names of the
palettes in alphabetical order. "Default" and those
-starting with "(" will always remain at the front of the list.
+starting with "(" will always remain at the top of the list.
diff --git a/usermods/usermod_v2_mode_sort/usermod_v2_mode_sort.h b/usermods/usermod_v2_mode_sort/usermod_v2_mode_sort.h
index 2be7ce84c0..092206bb6d 100644
--- a/usermods/usermod_v2_mode_sort/usermod_v2_mode_sort.h
+++ b/usermods/usermod_v2_mode_sort/usermod_v2_mode_sort.h
@@ -162,7 +162,6 @@ class ModeSortUsermod : public Usermod {
break;
}
}
-
re_sortModes(palettes_qstrings, palettes_alpha_indexes, strip.getPaletteCount(), skipPaletteCount);
}
@@ -189,6 +188,7 @@ class ModeSortUsermod : public Usermod {
bool complete = false;
for (size_t i = 0; i < strlen_P(json); i++) {
singleJsonSymbol = pgm_read_byte_near(json + i);
+ if (singleJsonSymbol == '\0') break;
switch (singleJsonSymbol) {
case '"':
insideQuotes = !insideQuotes;
@@ -200,18 +200,14 @@ class ModeSortUsermod : public Usermod {
case '[':
break;
case ']':
- complete = true;
+ if (!insideQuotes) complete = true;
break;
case ',':
- modeIndex++;
+ if (!insideQuotes) modeIndex++;
default:
- if (!insideQuotes) {
- break;
- }
- }
- if (complete) {
- break;
+ if (!insideQuotes) break;
}
+ if (complete) break;
}
return modeStrings;
}
diff --git a/usermods/usermod_v2_ping_pong_clock/readme.md b/usermods/usermod_v2_ping_pong_clock/readme.md
new file mode 100644
index 0000000000..f8219489d1
--- /dev/null
+++ b/usermods/usermod_v2_ping_pong_clock/readme.md
@@ -0,0 +1,10 @@
+# Ping Pong LED Clock
+
+Contains a modification to use WLED in combination with the Ping Pong Ball LED Clock as built in [Instructables](https://www.instructables.com/Ping-Pong-Ball-LED-Clock/).
+
+## Installation
+
+To install this Usermod, you instruct PlatformIO to compile the Project with the USERMOD_PING_PONG_CLOCK flag.
+WLED then automatically provides you with various settings on the Usermod Page.
+
+Note: Depending on the size of your clock, you may have to update the led indices for the individual numbers and the base indices.
diff --git a/usermods/usermod_v2_ping_pong_clock/usermod_v2_ping_pong_clock.h b/usermods/usermod_v2_ping_pong_clock/usermod_v2_ping_pong_clock.h
new file mode 100644
index 0000000000..40ff675c08
--- /dev/null
+++ b/usermods/usermod_v2_ping_pong_clock/usermod_v2_ping_pong_clock.h
@@ -0,0 +1,119 @@
+#pragma once
+
+#include "wled.h"
+
+class PingPongClockUsermod : public Usermod
+{
+private:
+ // Private class members. You can declare variables and functions only accessible to your usermod here
+ unsigned long lastTime = 0;
+ bool colonOn = true;
+
+ // ---- Variables modified by settings below -----
+ // set your config variables to their boot default value (this can also be done in readFromConfig() or a constructor if you prefer)
+ bool pingPongClockEnabled = true;
+ int colorR = 0xFF;
+ int colorG = 0xFF;
+ int colorB = 0xFF;
+
+ // ---- Variables for correct LED numbering below, edit only if your clock is built different ----
+
+ int baseH = 43; // Address for the one place of the hours
+ int baseHH = 7; // Address for the tens place of the hours
+ int baseM = 133; // Address for the one place of the minutes
+ int baseMM = 97; // Address for the tens place of the minutes
+ int colon1 = 79; // Address for the first colon led
+ int colon2 = 80; // Address for the second colon led
+
+ // Matrix for the illumination of the numbers
+ // Note: These only define the increments of the base address. e.g. to define the second Minute you have to add the baseMM to every led position
+ const int numbers[10][10] =
+ {
+ { 0, 1, 4, 6, 13, 15, 18, 19, -1, -1 }, // 0: null
+ { 13, 14, 15, 18, 19, -1, -1, -1, -1, -1 }, // 1: eins
+ { 0, 4, 5, 6, 13, 14, 15, 19, -1, -1 }, // 2: zwei
+ { 4, 5, 6, 13, 14, 15, 18, 19, -1, -1 }, // 3: drei
+ { 1, 4, 5, 14, 15, 18, 19, -1, -1, -1 }, // 4: vier
+ { 1, 4, 5, 6, 13, 14, 15, 18, -1, -1 }, // 5: fünf
+ { 0, 5, 6, 10, 13, 14, 15, 18, -1, -1 }, // 6: sechs
+ { 4, 6, 9, 13, 14, 19, -1, -1, -1, -1 }, // 7: sieben
+ { 0, 1, 4, 5, 6, 13, 14, 15, 18, 19 }, // 8: acht
+ { 1, 4, 5, 6, 9, 13, 14, 19, -1, -1 } // 9: neun
+ };
+
+public:
+ void setup()
+ { }
+
+ void loop()
+ {
+ if (millis() - lastTime > 1000)
+ {
+ lastTime = millis();
+ colonOn = !colonOn;
+ }
+ }
+
+ void addToJsonInfo(JsonObject& root)
+ {
+ JsonObject user = root["u"];
+ if (user.isNull()) user = root.createNestedObject("u");
+
+ JsonArray lightArr = user.createNestedArray("Uhrzeit-Anzeige"); //name
+ lightArr.add(pingPongClockEnabled ? "aktiv" : "inaktiv"); //value
+ lightArr.add(""); //unit
+ }
+
+ void addToConfig(JsonObject &root)
+ {
+ JsonObject top = root.createNestedObject("Ping Pong Clock");
+ top["enabled"] = pingPongClockEnabled;
+ top["colorR"] = colorR;
+ top["colorG"] = colorG;
+ top["colorB"] = colorB;
+ }
+
+ bool readFromConfig(JsonObject &root)
+ {
+ JsonObject top = root["Ping Pong Clock"];
+
+ bool configComplete = !top.isNull();
+
+ configComplete &= getJsonValue(top["enabled"], pingPongClockEnabled);
+ configComplete &= getJsonValue(top["colorR"], colorR);
+ configComplete &= getJsonValue(top["colorG"], colorG);
+ configComplete &= getJsonValue(top["colorB"], colorB);
+
+ return configComplete;
+ }
+
+ void drawNumber(int base, int number)
+ {
+ for(int i = 0; i < 10; i++)
+ {
+ if(numbers[number][i] > -1)
+ strip.setPixelColor(numbers[number][i] + base, RGBW32(colorR, colorG, colorB, 0));
+ }
+ }
+
+ void handleOverlayDraw()
+ {
+ if(pingPongClockEnabled){
+ if(colonOn)
+ {
+ strip.setPixelColor(colon1, RGBW32(colorR, colorG, colorB, 0));
+ strip.setPixelColor(colon2, RGBW32(colorR, colorG, colorB, 0));
+ }
+ drawNumber(baseHH, (hour(localTime) / 10) % 10);
+ drawNumber(baseH, hour(localTime) % 10);
+ drawNumber(baseM, (minute(localTime) / 10) % 10);
+ drawNumber(baseMM, minute(localTime) % 10);
+ }
+ }
+
+ uint16_t getId()
+ {
+ return USERMOD_ID_PING_PONG_CLOCK;
+ }
+
+};
diff --git a/usermods/usermod_v2_rotary_encoder_ui/readme.md b/usermods/usermod_v2_rotary_encoder_ui/readme.md
index 9bbcd6a6ca..5e4f3cff63 100644
--- a/usermods/usermod_v2_rotary_encoder_ui/readme.md
+++ b/usermods/usermod_v2_rotary_encoder_ui/readme.md
@@ -15,11 +15,17 @@ This file should be placed in the same directory as `platformio.ini`.
### Define Your Options
-* `USERMOD_ROTARY_ENCODER_UI` - define this to have this user mod included wled00\usermods_list.cpp
-* `USERMOD_FOUR_LINE_DISPLAY` - define this to have this the Four Line Display mod included wled00\usermods_list.cpp - also tells this usermod that the display is available (see the Four Line Display usermod `readme.md` for more details)
-* `ENCODER_DT_PIN` - The encoders DT pin, defaults to 12
-* `ENCODER_CLK_PIN` - The encoders CLK pin, defaults to 14
-* `ENCODER_SW_PIN` - The encoders SW pin, defaults to 13
+* `USERMOD_ROTARY_ENCODER_UI` - define this to have this user mod included wled00\usermods_list.cpp
+* `USERMOD_ROTARY_ENCODER_GPIO` - define the GPIO function (INPUT, INPUT_PULLUP, etc...)
+* `USERMOD_FOUR_LINE_DISPLAY` - define this to have this the Four Line Display mod included wled00\usermods_list.cpp
+ also tells this usermod that the display is available
+ (see the Four Line Display usermod `readme.md` for more details)
+* `ENCODER_DT_PIN` - defaults to 12
+* `ENCODER_CLK_PIN` - defaults to 14
+* `ENCODER_SW_PIN` - defaults to 13
+* `USERMOD_ROTARY_ENCODER_GPIO` - GPIO functionality:
+ `INPUT_PULLUP` to use internal pull-up
+ `INPUT` to use pull-up on the PCB
### PlatformIO requirements
diff --git a/usermods/usermod_v2_rotary_encoder_ui/usermod_v2_rotary_encoder_ui.h b/usermods/usermod_v2_rotary_encoder_ui/usermod_v2_rotary_encoder_ui.h
index 0ea77e8442..9e207339f1 100644
--- a/usermods/usermod_v2_rotary_encoder_ui/usermod_v2_rotary_encoder_ui.h
+++ b/usermods/usermod_v2_rotary_encoder_ui/usermod_v2_rotary_encoder_ui.h
@@ -20,7 +20,7 @@
// Change between modes by pressing a button.
//
// Dependencies
-// * This usermod REQURES the ModeSortUsermod
+// * This usermod REQUIRES the ModeSortUsermod
// * This Usermod works best coupled with
// FourLineDisplayUsermod.
//
@@ -97,6 +97,7 @@ class RotaryEncoderUIUsermod : public Usermod {
*/
void setup()
{
+ DEBUG_PRINTLN(F("Usermod Rotary Encoder init."));
PinManagerPinType pins[3] = { { pinA, false }, { pinB, false }, { pinC, false } };
if (!pinManager.allocateMultiplePins(pins, 3, PinOwner::UM_RotaryEncoderUI)) {
// BUG: configuring this usermod with conflicting pins
@@ -109,9 +110,13 @@ class RotaryEncoderUIUsermod : public Usermod {
return;
}
- pinMode(pinA, INPUT_PULLUP);
- pinMode(pinB, INPUT_PULLUP);
- pinMode(pinC, INPUT_PULLUP);
+ #ifndef USERMOD_ROTARY_ENCODER_GPIO
+ #define USERMOD_ROTARY_ENCODER_GPIO INPUT_PULLUP
+ #endif
+ pinMode(pinA, USERMOD_ROTARY_ENCODER_GPIO);
+ pinMode(pinB, USERMOD_ROTARY_ENCODER_GPIO);
+ pinMode(pinC, USERMOD_ROTARY_ENCODER_GPIO);
+
currentTime = millis();
loopTime = currentTime;
@@ -439,14 +444,11 @@ class RotaryEncoderUIUsermod : public Usermod {
DEBUG_PRINTLN(F(": No config found. (Using defaults.)"));
return false;
}
- int8_t newDTpin = pinA;
- int8_t newCLKpin = pinB;
- int8_t newSWpin = pinC;
+ int8_t newDTpin = top[FPSTR(_DT_pin)] | pinA;
+ int8_t newCLKpin = top[FPSTR(_CLK_pin)] | pinB;
+ int8_t newSWpin = top[FPSTR(_SW_pin)] | pinC;
enabled = top[FPSTR(_enabled)] | enabled;
- newDTpin = top[FPSTR(_DT_pin)] | newDTpin;
- newCLKpin = top[FPSTR(_CLK_pin)] | newCLKpin;
- newSWpin = top[FPSTR(_SW_pin)] | newSWpin;
DEBUG_PRINT(FPSTR(_name));
if (!initDone) {
diff --git a/usermods/usermod_v2_rotary_encoder_ui_ALT/readme.md b/usermods/usermod_v2_rotary_encoder_ui_ALT/readme.md
index a140f25b91..516362380d 100644
--- a/usermods/usermod_v2_rotary_encoder_ui_ALT/readme.md
+++ b/usermods/usermod_v2_rotary_encoder_ui_ALT/readme.md
@@ -4,12 +4,12 @@ Thank you to the authors of the original version of these usermods. It would not
"usermod_v2_four_line_display"
"usermod_v2_rotary_encoder_ui"
-The core of these usermods are a copy of the originals. The main changes are done to the FourLineDisplay usermod.
+The core of these usermods are a copy of the originals. The main changes are to the FourLineDisplay usermod.
The display usermod UI has been completely changed.
The changes made to the RotaryEncoder usermod were made to support the new UI in the display usermod.
-Without the display it functions identical to the original.
+Without the display, it functions identical to the original.
The original "usermod_v2_auto_save" will not work with the display just yet.
Press the encoder to cycle through the options:
@@ -22,17 +22,17 @@ Press the encoder to cycle through the options:
*Saturation (only if display is used)
Press and hold the encoder to display Network Info
- if AP is active then it will display AP ssid and Password
+ if AP is active, it will display the AP, SSID and Password
-Also shows if the timer is enabled
+Also shows if the timer is enabled.
[See the pair of usermods in action](https://www.youtube.com/watch?v=ulZnBt9z3TI)
## Installation
-Please refer to the original `usermod_v2_rotary_encoder_ui` readme for the main instructions
-Then to activate this alternative usermod add `#define USE_ALT_DISPlAY` to the `usermods_list.cpp` file,
- or add `-D USE_ALT_DISPlAY` to the original `platformio_override.ini.sample` file
+Please refer to the original `usermod_v2_rotary_encoder_ui` readme for the main instructions.
+To activate this alternative usermod, add `#define USE_ALT_DISPlAY` to the `usermods_list.cpp` file,
+or add `-D USE_ALT_DISPlAY` to the original `platformio_override.ini.sample` file.
### PlatformIO requirements
@@ -42,4 +42,4 @@ Note: the Four Line Display usermod requires the libraries `U8g2` and `Wire`.
## Change Log
2021-10
-* First public release
\ No newline at end of file
+* First public release
diff --git a/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h b/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h
index 4629f547a7..20af680000 100644
--- a/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h
+++ b/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h
@@ -4,7 +4,7 @@
//
// Inspired by the original v2 usermods
-// * usermod_v2_rotaty_encoder_ui
+// * usermod_v2_rotary_encoder_ui
//
// v2 usermod that provides a rotary encoder-based UI.
//
@@ -45,9 +45,29 @@
#define ENCODER_SW_PIN 19
#endif
-// The last UI state, remove color and saturation option if diplay not active(too many options)
+#ifndef ENCODER_MAX_DELAY_MS // max delay between polling encoder pins
+#define ENCODER_MAX_DELAY_MS 8 // 8 milliseconds => max 120 change impulses in 1 second, for full turn of a 30/30 encoder (4 changes per segment, 30 segments for one turn)
+#endif
+
+#ifndef USERMOD_USE_PCF8574
+ #undef USE_PCF8574
+ #define USE_PCF8574 false
+#else
+ #undef USE_PCF8574
+ #define USE_PCF8574 true
+#endif
+
+#ifndef PCF8574_ADDRESS
+ #define PCF8574_ADDRESS 0x20 // some may start at 0x38
+#endif
+
+#ifndef PCF8574_INT_PIN
+ #define PCF8574_INT_PIN -1 // GPIO connected to INT pin on PCF8574
+#endif
+
+// The last UI state, remove color and saturation option if display not active (too many options)
#ifdef USERMOD_FOUR_LINE_DISPLAY
- #define LAST_UI_STATE 8
+ #define LAST_UI_STATE 11
#else
#define LAST_UI_STATE 4
#endif
@@ -56,7 +76,7 @@
#define MODE_SORT_SKIP_COUNT 1
// Which list is being sorted
-static char **listBeingSorted;
+static const char **listBeingSorted;
/**
* Modes and palettes are stored as strings that
@@ -65,8 +85,8 @@ static char **listBeingSorted;
* JSON_mode_names or JSON_palette_names.
*/
static int re_qstringCmp(const void *ap, const void *bp) {
- char *a = listBeingSorted[*((byte *)ap)];
- char *b = listBeingSorted[*((byte *)bp)];
+ const char *a = listBeingSorted[*((byte *)ap)];
+ const char *b = listBeingSorted[*((byte *)bp)];
int i = 0;
do {
char aVal = pgm_read_byte_near(a + i);
@@ -79,7 +99,7 @@ static int re_qstringCmp(const void *ap, const void *bp) {
// Lowercase
bVal -= 32;
}
- // Relly we shouldn't ever get to '\0'
+ // Really we shouldn't ever get to '\0'
if (aVal == '"' || bVal == '"' || aVal == '\0' || bVal == '\0') {
// We're done. one is a substring of the other
// or something happenend and the quote didn't stop us.
@@ -113,709 +133,1035 @@ static int re_qstringCmp(const void *ap, const void *bp) {
}
+static volatile uint8_t pcfPortData = 0; // port expander port state
+static volatile uint8_t addrPcf8574 = PCF8574_ADDRESS; // has to be accessible in ISR
+
+// Interrupt routine to read I2C rotary state
+// if we are to use PCF8574 port expander we will need to rely on interrupts as polling I2C every 2ms
+// is a waste of resources and causes 4LD to fail.
+// in such case rely on ISR to read pin values and store them into static variable
+static void IRAM_ATTR i2cReadingISR() {
+ Wire.requestFrom(addrPcf8574, 1U);
+ if (Wire.available()) {
+ pcfPortData = Wire.read();
+ }
+}
+
+
class RotaryEncoderUIUsermod : public Usermod {
-private:
- int8_t fadeAmount = 5; // Amount to change every step (brightness)
- unsigned long loopTime;
- unsigned long buttonPressedTime = 0;
- unsigned long buttonWaitTime = 0;
- bool buttonPressedBefore = false;
- bool buttonLongPressed = false;
+ private:
- int8_t pinA = ENCODER_DT_PIN; // DT from encoder
- int8_t pinB = ENCODER_CLK_PIN; // CLK from encoder
- int8_t pinC = ENCODER_SW_PIN; // SW from encoder
+ const int8_t fadeAmount; // Amount to change every step (brightness)
+ unsigned long loopTime;
- unsigned char select_state = 0; // 0: brightness, 1: effect, 2: effect speed, ...
+ unsigned long buttonPressedTime;
+ unsigned long buttonWaitTime;
+ bool buttonPressedBefore;
+ bool buttonLongPressed;
- uint16_t currentHue1 = 16; // default boot color
- byte currentSat1 = 255;
-
-#ifdef USERMOD_FOUR_LINE_DISPLAY
- FourLineDisplayUsermod *display;
-#else
- void* display = nullptr;
-#endif
+ int8_t pinA; // DT from encoder
+ int8_t pinB; // CLK from encoder
+ int8_t pinC; // SW from encoder
- // Pointers the start of the mode names within JSON_mode_names
- char **modes_qstrings = nullptr;
+ unsigned char select_state; // 0: brightness, 1: effect, 2: effect speed, ...
- // Array of mode indexes in alphabetical order.
- byte *modes_alpha_indexes = nullptr;
+ uint16_t currentHue1; // default boot color
+ byte currentSat1;
+ uint8_t currentCCT;
+
+ #ifdef USERMOD_FOUR_LINE_DISPLAY
+ FourLineDisplayUsermod *display;
+ #else
+ void* display;
+ #endif
- // Pointers the start of the palette names within JSON_palette_names
- char **palettes_qstrings = nullptr;
+ // Pointers the start of the mode names within JSON_mode_names
+ const char **modes_qstrings;
- // Array of palette indexes in alphabetical order.
- byte *palettes_alpha_indexes = nullptr;
+ // Array of mode indexes in alphabetical order.
+ byte *modes_alpha_indexes;
- unsigned char Enc_A;
- unsigned char Enc_B;
- unsigned char Enc_A_prev = 0;
+ // Pointers the start of the palette names within JSON_palette_names
+ const char **palettes_qstrings;
- bool currentEffectAndPaletteInitialized = false;
- uint8_t effectCurrentIndex = 0;
- uint8_t effectPaletteIndex = 0;
- uint8_t knownMode = 0;
- uint8_t knownPalette = 0;
+ // Array of palette indexes in alphabetical order.
+ byte *palettes_alpha_indexes;
- uint8_t currentCCT = 128;
- bool isRgbw = false;
+ struct { // reduce memory footprint
+ bool Enc_A : 1;
+ bool Enc_B : 1;
+ bool Enc_A_prev : 1;
+ };
- byte presetHigh = 0;
- byte presetLow = 0;
+ bool currentEffectAndPaletteInitialized;
+ uint8_t effectCurrentIndex;
+ uint8_t effectPaletteIndex;
+ uint8_t knownMode;
+ uint8_t knownPalette;
- bool applyToAll = true;
+ byte presetHigh;
+ byte presetLow;
- bool initDone = false;
- bool enabled = true;
+ bool applyToAll;
- // strings to reduce flash memory usage (used more than twice)
- static const char _name[];
- static const char _enabled[];
- static const char _DT_pin[];
- static const char _CLK_pin[];
- static const char _SW_pin[];
- static const char _presetHigh[];
- static const char _presetLow[];
- static const char _applyToAll[];
+ bool initDone;
+ bool enabled;
- /**
- * Sort the modes and palettes to the index arrays
- * modes_alpha_indexes and palettes_alpha_indexes.
- */
- void sortModesAndPalettes() {
- modes_qstrings = re_findModeStrings(JSON_mode_names, strip.getModeCount());
- modes_alpha_indexes = re_initIndexArray(strip.getModeCount());
- re_sortModes(modes_qstrings, modes_alpha_indexes, strip.getModeCount(), MODE_SORT_SKIP_COUNT);
+ bool usePcf8574;
+ int8_t pinIRQ;
- palettes_qstrings = re_findModeStrings(JSON_palette_names, strip.getPaletteCount());
- palettes_alpha_indexes = re_initIndexArray(strip.getPaletteCount());
+ // strings to reduce flash memory usage (used more than twice)
+ static const char _name[];
+ static const char _enabled[];
+ static const char _DT_pin[];
+ static const char _CLK_pin[];
+ static const char _SW_pin[];
+ static const char _presetHigh[];
+ static const char _presetLow[];
+ static const char _applyToAll[];
+ static const char _pcf8574[];
+ static const char _pcfAddress[];
+ static const char _pcfINTpin[];
+
+ /**
+ * readPin() - read rotary encoder pin value
+ */
+ byte readPin(uint8_t pin);
+
+ /**
+ * Sort the modes and palettes to the index arrays
+ * modes_alpha_indexes and palettes_alpha_indexes.
+ */
+ void sortModesAndPalettes();
+ byte *re_initIndexArray(int numModes);
+
+ /**
+ * Return an array of mode or palette names from the JSON string.
+ * They don't end in '\0', they end in '"'.
+ */
+ const char **re_findModeStrings(const char json[], int numModes);
+
+ /**
+ * Sort either the modes or the palettes using quicksort.
+ */
+ void re_sortModes(const char **modeNames, byte *indexes, int count, int numSkip);
+
+ public:
+
+ RotaryEncoderUIUsermod()
+ : fadeAmount(5)
+ , buttonPressedTime(0)
+ , buttonWaitTime(0)
+ , buttonPressedBefore(false)
+ , buttonLongPressed(false)
+ , pinA(ENCODER_DT_PIN)
+ , pinB(ENCODER_CLK_PIN)
+ , pinC(ENCODER_SW_PIN)
+ , select_state(0)
+ , currentHue1(16)
+ , currentSat1(255)
+ , currentCCT(128)
+ , display(nullptr)
+ , modes_qstrings(nullptr)
+ , modes_alpha_indexes(nullptr)
+ , palettes_qstrings(nullptr)
+ , palettes_alpha_indexes(nullptr)
+ , currentEffectAndPaletteInitialized(false)
+ , effectCurrentIndex(0)
+ , effectPaletteIndex(0)
+ , knownMode(0)
+ , knownPalette(0)
+ , presetHigh(0)
+ , presetLow(0)
+ , applyToAll(true)
+ , initDone(false)
+ , enabled(true)
+ , usePcf8574(USE_PCF8574)
+ , pinIRQ(PCF8574_INT_PIN)
+ {}
+
+ /*
+ * getId() allows you to optionally give your V2 usermod an unique ID (please define it in const.h!).
+ * This could be used in the future for the system to determine whether your usermod is installed.
+ */
+ uint16_t getId() { return USERMOD_ID_ROTARY_ENC_UI; }
+ /**
+ * Enable/Disable the usermod
+ */
+ inline void enable(bool enable) { if (!(pinA<0 || pinB<0 || pinC<0)) enabled = enable; }
+
+ /**
+ * Get usermod enabled/disabled state
+ */
+ inline bool isEnabled() { return enabled; }
+
+ /**
+ * setup() is called once at boot. WiFi is not yet connected at this point.
+ * You can use it to initialize variables, sensors or similar.
+ */
+ void setup();
+
+ /**
+ * connected() is called every time the WiFi is (re)connected
+ * Use it to initialize network interfaces
+ */
+ //void connected();
+
+ /**
+ * loop() is called continuously. Here you can check for events, read sensors, etc.
+ */
+ void loop();
- // How many palette names start with '*' and should not be sorted?
- // (Also skipping the first one, 'Default').
- int skipPaletteCount = 1;
- while (pgm_read_byte_near(palettes_qstrings[skipPaletteCount++]) == '*') ;
- re_sortModes(palettes_qstrings, palettes_alpha_indexes, strip.getPaletteCount(), skipPaletteCount);
+#ifndef WLED_DISABLE_MQTT
+ //bool onMqttMessage(char* topic, char* payload);
+ //void onMqttConnect(bool sessionPresent);
+#endif
+
+ /**
+ * handleButton() can be used to override default button behaviour. Returning true
+ * will prevent button working in a default way.
+ * Replicating button.cpp
+ */
+ //bool handleButton(uint8_t b);
+
+ /**
+ * addToJsonInfo() can be used to add custom entries to the /json/info part of the JSON API.
+ */
+ //void addToJsonInfo(JsonObject &root);
+
+ /**
+ * addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
+ * Values in the state object may be modified by connected clients
+ */
+ //void addToJsonState(JsonObject &root);
+
+ /**
+ * readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
+ * Values in the state object may be modified by connected clients
+ */
+ //void readFromJsonState(JsonObject &root);
+
+ /**
+ * provide the changeable values
+ */
+ void addToConfig(JsonObject &root);
+
+ void appendConfigData();
+
+ /**
+ * restore the changeable values
+ * readFromConfig() is called before setup() to populate properties from values stored in cfg.json
+ *
+ * The function should return true if configuration was successfully loaded or false if there was no configuration.
+ */
+ bool readFromConfig(JsonObject &root);
+
+ // custom methods
+ void displayNetworkInfo();
+ void findCurrentEffectAndPalette();
+ bool changeState(const char *stateName, byte markedLine, byte markedCol, byte glyph);
+ void lampUdated();
+ void changeBrightness(bool increase);
+ void changeEffect(bool increase);
+ void changeEffectSpeed(bool increase);
+ void changeEffectIntensity(bool increase);
+ void changeCustom(uint8_t par, bool increase);
+ void changePalette(bool increase);
+ void changeHue(bool increase);
+ void changeSat(bool increase);
+ void changePreset(bool increase);
+ void changeCCT(bool increase);
+};
+
+
+/**
+ * readPin() - read rotary encoder pin value
+ */
+byte RotaryEncoderUIUsermod::readPin(uint8_t pin) {
+ if (usePcf8574) {
+ if (pin >= 100) pin -= 100; // PCF I/O ports
+ return (pcfPortData>>pin) & 1;
+ } else {
+ return digitalRead(pin);
}
+}
- byte *re_initIndexArray(int numModes) {
- byte *indexes = (byte *)malloc(sizeof(byte) * numModes);
- for (byte i = 0; i < numModes; i++) {
- indexes[i] = i;
- }
- return indexes;
- }
-
- /**
- * Return an array of mode or palette names from the JSON string.
- * They don't end in '\0', they end in '"'.
- */
- char **re_findModeStrings(const char json[], int numModes) {
- char **modeStrings = (char **)malloc(sizeof(char *) * numModes);
- uint8_t modeIndex = 0;
- bool insideQuotes = false;
- // advance past the mark for markLineNum that may exist.
- char singleJsonSymbol;
-
- // Find the mode name in JSON
- bool complete = false;
- for (size_t i = 0; i < strlen_P(json); i++) {
- singleJsonSymbol = pgm_read_byte_near(json + i);
- if (singleJsonSymbol == '\0') break;
- switch (singleJsonSymbol) {
- case '"':
- insideQuotes = !insideQuotes;
- if (insideQuotes) {
- // We have a new mode or palette
- modeStrings[modeIndex] = (char *)(json + i + 1);
- }
- break;
- case '[':
- break;
- case ']':
- if (!insideQuotes) complete = true;
- break;
- case ',':
- if (!insideQuotes) modeIndex++;
- default:
- if (!insideQuotes) break;
- }
- if (complete) break;
+/**
+ * Sort the modes and palettes to the index arrays
+ * modes_alpha_indexes and palettes_alpha_indexes.
+ */
+void RotaryEncoderUIUsermod::sortModesAndPalettes() {
+ DEBUG_PRINTLN(F("Sorting modes and palettes."));
+ //modes_qstrings = re_findModeStrings(JSON_mode_names, strip.getModeCount());
+ modes_qstrings = strip.getModeDataSrc();
+ modes_alpha_indexes = re_initIndexArray(strip.getModeCount());
+ re_sortModes(modes_qstrings, modes_alpha_indexes, strip.getModeCount(), MODE_SORT_SKIP_COUNT);
+
+ palettes_qstrings = re_findModeStrings(JSON_palette_names, strip.getPaletteCount()+strip.customPalettes.size());
+ palettes_alpha_indexes = re_initIndexArray(strip.getPaletteCount()+strip.customPalettes.size());
+ if (strip.customPalettes.size()) {
+ for (int i=0; i= 0 && pinManager.allocatePin(pinIRQ, false, PinOwner::UM_RotaryEncoderUI)) {
+ pinMode(pinIRQ, INPUT_PULLUP);
+ attachInterrupt(pinIRQ, i2cReadingISR, FALLING); // RISING, FALLING, CHANGE, ONLOW, ONHIGH
+ DEBUG_PRINTLN(F("Interrupt attached."));
+ } else {
+ DEBUG_PRINTLN(F("Unable to allocate interrupt pin, disabling."));
+ pinIRQ = -1;
+ enabled = false;
+ return;
+ }
+ }
+ } else {
PinManagerPinType pins[3] = { { pinA, false }, { pinB, false }, { pinC, false } };
- if (!pinManager.allocateMultiplePins(pins, 3, PinOwner::UM_RotaryEncoderUI)) {
- // BUG: configuring this usermod with conflicting pins
- // will cause it to de-allocate pins it does not own
- // (at second config)
- // This is the exact type of bug solved by pinManager
- // tracking the owner tags....
+ if (pinA<0 || pinB<0 || !pinManager.allocateMultiplePins(pins, 3, PinOwner::UM_RotaryEncoderUI)) {
pinA = pinB = pinC = -1;
enabled = false;
return;
}
- pinMode(pinA, INPUT_PULLUP);
- pinMode(pinB, INPUT_PULLUP);
- pinMode(pinC, INPUT_PULLUP);
- loopTime = millis();
-
- for (uint8_t s = 0; s < busses.getNumBusses(); s++) {
- Bus *bus = busses.getBus(s);
- if (!bus || bus->getLength()==0) break;
- isRgbw |= bus->isRgbw();
- }
+ #ifndef USERMOD_ROTARY_ENCODER_GPIO
+ #define USERMOD_ROTARY_ENCODER_GPIO INPUT_PULLUP
+ #endif
+ pinMode(pinA, USERMOD_ROTARY_ENCODER_GPIO);
+ pinMode(pinB, USERMOD_ROTARY_ENCODER_GPIO);
+ if (pinC>=0) pinMode(pinC, USERMOD_ROTARY_ENCODER_GPIO);
+ }
- currentCCT = (approximateKelvinFromRGB(RGBW32(col[0], col[1], col[2], col[3])) - 1900) >> 5;
+ loopTime = millis();
- if (!initDone) sortModesAndPalettes();
+ currentCCT = (approximateKelvinFromRGB(RGBW32(col[0], col[1], col[2], col[3])) - 1900) >> 5;
-#ifdef USERMOD_FOUR_LINE_DISPLAY
- // This Usermod uses FourLineDisplayUsermod for the best experience.
- // But it's optional. But you want it.
- display = (FourLineDisplayUsermod*) usermods.lookup(USERMOD_ID_FOUR_LINE_DISP);
- if (display != nullptr) {
- display->setMarkLine(1, 0);
- }
-#endif
+ if (!initDone) sortModesAndPalettes();
- initDone = true;
- Enc_A = digitalRead(pinA); // Read encoder pins
- Enc_B = digitalRead(pinB);
- Enc_A_prev = Enc_A;
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ // This Usermod uses FourLineDisplayUsermod for the best experience.
+ // But it's optional. But you want it.
+ display = (FourLineDisplayUsermod*) usermods.lookup(USERMOD_ID_FOUR_LINE_DISP);
+ if (display != nullptr) {
+ display->setMarkLine(1, 0);
}
+#endif
- /*
- * connected() is called every time the WiFi is (re)connected
- * Use it to initialize network interfaces
- */
- void connected()
- {
- //Serial.println("Connected to WiFi!");
- }
-
- /*
- * loop() is called continuously. Here you can check for events, read sensors, etc.
- *
- * Tips:
- * 1. You can use "if (WLED_CONNECTED)" to check for a successful network connection.
- * Additionally, "if (WLED_MQTT_CONNECTED)" is available to check for a connection to an MQTT broker.
- *
- * 2. Try to avoid using the delay() function. NEVER use delays longer than 10 milliseconds.
- * Instead, use a timer check as shown here.
- */
- void loop()
- {
- if (!enabled || strip.isUpdating()) return;
- unsigned long currentTime = millis(); // get the current elapsed time
+ initDone = true;
+ Enc_A = readPin(pinA); // Read encoder pins
+ Enc_B = readPin(pinB);
+ Enc_A_prev = Enc_A;
+}
- // Initialize effectCurrentIndex and effectPaletteIndex to
- // current state. We do it here as (at least) effectCurrent
- // is not yet initialized when setup is called.
-
- if (!currentEffectAndPaletteInitialized) {
- findCurrentEffectAndPalette();
- }
+/*
+ * loop() is called continuously. Here you can check for events, read sensors, etc.
+ *
+ * Tips:
+ * 1. You can use "if (WLED_CONNECTED)" to check for a successful network connection.
+ * Additionally, "if (WLED_MQTT_CONNECTED)" is available to check for a connection to an MQTT broker.
+ *
+ * 2. Try to avoid using the delay() function. NEVER use delays longer than 10 milliseconds.
+ * Instead, use a timer check as shown here.
+ */
+void RotaryEncoderUIUsermod::loop()
+{
+ if (!enabled) return;
+ unsigned long currentTime = millis(); // get the current elapsed time
+ if (strip.isUpdating() && ((currentTime - loopTime) < ENCODER_MAX_DELAY_MS)) return; // be nice, but not too nice
+
+ // Initialize effectCurrentIndex and effectPaletteIndex to
+ // current state. We do it here as (at least) effectCurrent
+ // is not yet initialized when setup is called.
+
+ if (!currentEffectAndPaletteInitialized) {
+ findCurrentEffectAndPalette();
+ }
- if (modes_alpha_indexes[effectCurrentIndex] != effectCurrent || palettes_alpha_indexes[effectPaletteIndex] != effectPalette) {
- currentEffectAndPaletteInitialized = false;
- }
+ if (modes_alpha_indexes[effectCurrentIndex] != effectCurrent || palettes_alpha_indexes[effectPaletteIndex] != effectPalette) {
+ DEBUG_PRINTLN(F("Current mode or palette changed."));
+ currentEffectAndPaletteInitialized = false;
+ }
- if (currentTime >= (loopTime + 2)) // 2ms since last check of encoder = 500Hz
- {
- loopTime = currentTime; // Updates loopTime
-
- bool buttonPressed = !digitalRead(pinC); //0=pressed, 1=released
- if (buttonPressed) {
- if (!buttonPressedBefore) buttonPressedTime = currentTime;
- buttonPressedBefore = true;
- if (currentTime-buttonPressedTime > 3000) {
- if (!buttonLongPressed) displayNetworkInfo(); //long press for network info
- buttonLongPressed = true;
- }
- } else if (!buttonPressed && buttonPressedBefore) {
- bool doublePress = buttonWaitTime;
- buttonWaitTime = 0;
- if (!buttonLongPressed) {
- if (doublePress) {
- toggleOnOff();
- lampUdated();
- } else {
- buttonWaitTime = currentTime;
- }
- }
- buttonLongPressed = false;
- buttonPressedBefore = false;
+ if (currentTime >= (loopTime + 2)) // 2ms since last check of encoder = 500Hz
+ {
+ bool buttonPressed = !readPin(pinC); //0=pressed, 1=released
+ if (buttonPressed) {
+ if (!buttonPressedBefore) buttonPressedTime = currentTime;
+ buttonPressedBefore = true;
+ if (currentTime-buttonPressedTime > 3000) {
+ if (!buttonLongPressed) displayNetworkInfo(); //long press for network info
+ buttonLongPressed = true;
}
- if (buttonWaitTime && currentTime-buttonWaitTime>350 && !buttonPressedBefore) { //same speed as in button.cpp
- buttonWaitTime = 0;
- char newState = select_state + 1;
- bool changedState = true;
- if (newState > LAST_UI_STATE || (newState == 8 && presetHigh==0 && presetLow == 0)) newState = 0;
- if (display != nullptr) {
- switch (newState) {
- case 0: changedState = changeState(PSTR("Brightness"), 1, 0, 1); break; //1 = sun
- case 1: changedState = changeState(PSTR("Speed"), 1, 4, 2); break; //2 = skip forward
- case 2: changedState = changeState(PSTR("Intensity"), 1, 8, 3); break; //3 = fire
- case 3: changedState = changeState(PSTR("Color Palette"), 2, 0, 4); break; //4 = custom palette
- case 4: changedState = changeState(PSTR("Effect"), 3, 0, 5); break; //5 = puzzle piece
- case 5: changedState = changeState(PSTR("Main Color"), 255, 255, 7); break; //7 = brush
- case 6: changedState = changeState(PSTR("Saturation"), 255, 255, 8); break; //8 = contrast
- case 7: changedState = changeState(PSTR("CCT"), 255, 255, 10); break; //10 = star
- case 8: changedState = changeState(PSTR("Preset"), 255, 255, 11); break; //11 = heart
- }
+ } else if (!buttonPressed && buttonPressedBefore) {
+ bool doublePress = buttonWaitTime;
+ buttonWaitTime = 0;
+ if (!buttonLongPressed) {
+ if (doublePress) {
+ toggleOnOff();
+ lampUdated();
+ } else {
+ buttonWaitTime = currentTime;
}
- if (changedState) select_state = newState;
}
-
- Enc_A = digitalRead(pinA); // Read encoder pins
- Enc_B = digitalRead(pinB);
- if ((Enc_A) && (!Enc_A_prev))
- { // A has gone from high to low
- if (Enc_B == LOW) //changes to LOW so that then encoder registers a change at the very end of a pulse
- { // B is high so clockwise
- switch(select_state) {
- case 0: changeBrightness(true); break;
- case 1: changeEffectSpeed(true); break;
- case 2: changeEffectIntensity(true); break;
- case 3: changePalette(true); break;
- case 4: changeEffect(true); break;
- case 5: changeHue(true); break;
- case 6: changeSat(true); break;
- case 7: changeCCT(true); break;
- case 8: changePreset(true); break;
- }
+ buttonLongPressed = false;
+ buttonPressedBefore = false;
+ }
+ if (buttonWaitTime && currentTime-buttonWaitTime>350 && !buttonPressedBefore) { //same speed as in button.cpp
+ buttonWaitTime = 0;
+ char newState = select_state + 1;
+ bool changedState = false;
+ char lineBuffer[64];
+ do {
+ // find new state
+ switch (newState) {
+ case 0: strcpy_P(lineBuffer, PSTR("Brightness")); changedState = true; break;
+ case 1: if (!extractModeSlider(effectCurrent, 0, lineBuffer, 63)) newState++; else changedState = true; break; // speed
+ case 2: if (!extractModeSlider(effectCurrent, 1, lineBuffer, 63)) newState++; else changedState = true; break; // intensity
+ case 3: strcpy_P(lineBuffer, PSTR("Color Palette")); changedState = true; break;
+ case 4: strcpy_P(lineBuffer, PSTR("Effect")); changedState = true; break;
+ case 5: strcpy_P(lineBuffer, PSTR("Main Color")); changedState = true; break;
+ case 6: strcpy_P(lineBuffer, PSTR("Saturation")); changedState = true; break;
+ case 7:
+ if (!(strip.getSegment(applyToAll ? strip.getFirstSelectedSegId() : strip.getMainSegmentId()).getLightCapabilities() & 0x04)) newState++;
+ else { strcpy_P(lineBuffer, PSTR("CCT")); changedState = true; }
+ break;
+ case 8: if (presetHigh==0 || presetLow == 0) newState++; else { strcpy_P(lineBuffer, PSTR("Preset")); changedState = true; } break;
+ case 9:
+ case 10:
+ case 11: if (!extractModeSlider(effectCurrent, newState-7, lineBuffer, 63)) newState++; else changedState = true; break; // custom
}
- else if (Enc_B == HIGH)
- { // B is low so counter-clockwise
- switch(select_state) {
- case 0: changeBrightness(false); break;
- case 1: changeEffectSpeed(false); break;
- case 2: changeEffectIntensity(false); break;
- case 3: changePalette(false); break;
- case 4: changeEffect(false); break;
- case 5: changeHue(false); break;
- case 6: changeSat(false); break;
- case 7: changeCCT(false); break;
- case 8: changePreset(false); break;
- }
+ if (newState > LAST_UI_STATE) newState = 0;
+ } while (!changedState);
+ if (display != nullptr) {
+ switch (newState) {
+ case 0: changedState = changeState(lineBuffer, 1, 0, 1); break; //1 = sun
+ case 1: changedState = changeState(lineBuffer, 1, 4, 2); break; //2 = skip forward
+ case 2: changedState = changeState(lineBuffer, 1, 8, 3); break; //3 = fire
+ case 3: changedState = changeState(lineBuffer, 2, 0, 4); break; //4 = custom palette
+ case 4: changedState = changeState(lineBuffer, 3, 0, 5); break; //5 = puzzle piece
+ case 5: changedState = changeState(lineBuffer, 255, 255, 7); break; //7 = brush
+ case 6: changedState = changeState(lineBuffer, 255, 255, 8); break; //8 = contrast
+ case 7: changedState = changeState(lineBuffer, 255, 255, 10); break; //10 = star
+ case 8: changedState = changeState(lineBuffer, 255, 255, 11); break; //11 = heart
+ case 9: changedState = changeState(lineBuffer, 255, 255, 10); break; //10 = star
+ case 10: changedState = changeState(lineBuffer, 255, 255, 10); break; //10 = star
+ case 11: changedState = changeState(lineBuffer, 255, 255, 10); break; //10 = star
}
}
- Enc_A_prev = Enc_A; // Store value of A for next time
+ if (changedState) select_state = newState;
}
- }
- void displayNetworkInfo() {
- #ifdef USERMOD_FOUR_LINE_DISPLAY
- display->networkOverlay(PSTR("NETWORK INFO"), 10000);
- #endif
- }
-
- void findCurrentEffectAndPalette() {
- currentEffectAndPaletteInitialized = true;
- for (uint8_t i = 0; i < strip.getModeCount(); i++) {
- if (modes_alpha_indexes[i] == effectCurrent) {
- effectCurrentIndex = i;
- break;
+ Enc_A = readPin(pinA); // Read encoder pins
+ Enc_B = readPin(pinB);
+ if ((Enc_A) && (!Enc_A_prev))
+ { // A has gone from high to low
+ if (Enc_B == LOW) //changes to LOW so that then encoder registers a change at the very end of a pulse
+ { // B is high so clockwise
+ switch(select_state) {
+ case 0: changeBrightness(true); break;
+ case 1: changeEffectSpeed(true); break;
+ case 2: changeEffectIntensity(true); break;
+ case 3: changePalette(true); break;
+ case 4: changeEffect(true); break;
+ case 5: changeHue(true); break;
+ case 6: changeSat(true); break;
+ case 7: changeCCT(true); break;
+ case 8: changePreset(true); break;
+ case 9: changeCustom(1,true); break;
+ case 10: changeCustom(2,true); break;
+ case 11: changeCustom(3,true); break;
+ }
}
- }
-
- for (uint8_t i = 0; i < strip.getPaletteCount(); i++) {
- if (palettes_alpha_indexes[i] == effectPalette) {
- effectPaletteIndex = i;
- break;
+ else if (Enc_B == HIGH)
+ { // B is low so counter-clockwise
+ switch(select_state) {
+ case 0: changeBrightness(false); break;
+ case 1: changeEffectSpeed(false); break;
+ case 2: changeEffectIntensity(false); break;
+ case 3: changePalette(false); break;
+ case 4: changeEffect(false); break;
+ case 5: changeHue(false); break;
+ case 6: changeSat(false); break;
+ case 7: changeCCT(false); break;
+ case 8: changePreset(false); break;
+ case 9: changeCustom(1,false); break;
+ case 10: changeCustom(2,false); break;
+ case 11: changeCustom(3,false); break;
+ }
}
}
+ Enc_A_prev = Enc_A; // Store value of A for next time
+ loopTime = currentTime; // Updates loopTime
}
+}
- boolean changeState(const char *stateName, byte markedLine, byte markedCol, byte glyph) {
+void RotaryEncoderUIUsermod::displayNetworkInfo() {
#ifdef USERMOD_FOUR_LINE_DISPLAY
- if (display != nullptr) {
- if (display->wakeDisplay()) {
- // Throw away wake up input
- display->redraw(true);
- return false;
- }
- display->overlay(stateName, 750, glyph);
- display->setMarkLine(markedLine, markedCol);
- }
+ display->networkOverlay(PSTR("NETWORK INFO"), 10000);
#endif
- return true;
+}
+
+void RotaryEncoderUIUsermod::findCurrentEffectAndPalette() {
+ DEBUG_PRINTLN(F("Finding current mode and palette."));
+ currentEffectAndPaletteInitialized = true;
+
+ effectCurrentIndex = 0;
+ for (int i = 0; i < strip.getModeCount(); i++) {
+ if (modes_alpha_indexes[i] == effectCurrent) {
+ effectCurrentIndex = i;
+ DEBUG_PRINTLN(F("Found current mode."));
+ break;
+ }
}
- void lampUdated() {
- //call for notifier -> 0: init 1: direct change 2: button 3: notification 4: nightlight 5: other (No notification)
- // 6: fx changed 7: hue 8: preset cycle 9: blynk 10: alexa
- //setValuesFromFirstSelectedSeg(); //to make transition work on main segment (should no longer be required)
- stateUpdated(CALL_MODE_BUTTON);
- updateInterfaces(CALL_MODE_BUTTON);
+ effectPaletteIndex = 0;
+ DEBUG_PRINTLN(effectPalette);
+ for (uint8_t i = 0; i < strip.getPaletteCount()+strip.customPalettes.size(); i++) {
+ if (palettes_alpha_indexes[i] == effectPalette) {
+ effectPaletteIndex = i;
+ DEBUG_PRINTLN(F("Found palette."));
+ break;
+ }
}
+}
- void changeBrightness(bool increase) {
- #ifdef USERMOD_FOUR_LINE_DISPLAY
- if (display && display->wakeDisplay()) {
- display->redraw(true);
+bool RotaryEncoderUIUsermod::changeState(const char *stateName, byte markedLine, byte markedCol, byte glyph) {
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ if (display != nullptr) {
+ if (display->wakeDisplay()) {
// Throw away wake up input
- return;
+ display->redraw(true);
+ return false;
}
- display->updateRedrawTime();
- #endif
- bri = max(min((increase ? bri+fadeAmount : bri-fadeAmount), 255), 0);
- lampUdated();
- #ifdef USERMOD_FOUR_LINE_DISPLAY
- display->updateBrightness();
- #endif
+ display->overlay(stateName, 750, glyph);
+ display->setMarkLine(markedLine, markedCol);
}
+#endif
+ return true;
+}
+void RotaryEncoderUIUsermod::lampUdated() {
+ //call for notifier -> 0: init 1: direct change 2: button 3: notification 4: nightlight 5: other (No notification)
+ // 6: fx changed 7: hue 8: preset cycle 9: blynk 10: alexa
+ //setValuesFromFirstSelectedSeg(); //to make transition work on main segment (should no longer be required)
+ stateUpdated(CALL_MODE_BUTTON);
+ updateInterfaces(CALL_MODE_BUTTON);
+}
- void changeEffect(bool increase) {
- #ifdef USERMOD_FOUR_LINE_DISPLAY
- if (display && display->wakeDisplay()) {
- display->redraw(true);
- // Throw away wake up input
- return;
- }
- display->updateRedrawTime();
- #endif
- effectCurrentIndex = max(min((increase ? effectCurrentIndex+1 : effectCurrentIndex-1), strip.getModeCount()-1), 0);
- effectCurrent = modes_alpha_indexes[effectCurrentIndex];
- stateChanged = true;
- if (applyToAll) {
- for (byte i=0; ishowCurrentEffectOrPalette(effectCurrent, JSON_mode_names, 3);
- #endif
+void RotaryEncoderUIUsermod::changeBrightness(bool increase) {
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ if (display && display->wakeDisplay()) {
+ display->redraw(true);
+ // Throw away wake up input
+ return;
}
+ display->updateRedrawTime();
+#endif
+ //bri = max(min((increase ? bri+fadeAmount : bri-fadeAmount), 255), 0);
+ if (bri < 40) bri = max(min((increase ? bri+fadeAmount/2 : bri-fadeAmount/2), 255), 0); // slower steps when brightness < 16%
+ else bri = max(min((increase ? bri+fadeAmount : bri-fadeAmount), 255), 0);
+ lampUdated();
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ display->updateBrightness();
+#endif
+}
- void changeEffectSpeed(bool increase) {
- #ifdef USERMOD_FOUR_LINE_DISPLAY
- if (display && display->wakeDisplay()) {
- display->redraw(true);
- // Throw away wake up input
- return;
+void RotaryEncoderUIUsermod::changeEffect(bool increase) {
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ if (display && display->wakeDisplay()) {
+ display->redraw(true);
+ // Throw away wake up input
+ return;
+ }
+ display->updateRedrawTime();
+#endif
+ effectCurrentIndex = max(min((increase ? effectCurrentIndex+1 : effectCurrentIndex-1), strip.getModeCount()-1), 0);
+ effectCurrent = modes_alpha_indexes[effectCurrentIndex];
+ stateChanged = true;
+ if (applyToAll) {
+ for (byte i=0; iupdateRedrawTime();
- #endif
- effectSpeed = max(min((increase ? effectSpeed+fadeAmount : effectSpeed-fadeAmount), 255), 0);
- stateChanged = true;
- if (applyToAll) {
- for (byte i=0; ishowCurrentEffectOrPalette(effectCurrent, JSON_mode_names, 3);
+#endif
+}
+
+
+void RotaryEncoderUIUsermod::changeEffectSpeed(bool increase) {
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ if (display && display->wakeDisplay()) {
+ display->redraw(true);
+ // Throw away wake up input
+ return;
+ }
+ display->updateRedrawTime();
+#endif
+ effectSpeed = max(min((increase ? effectSpeed+fadeAmount : effectSpeed-fadeAmount), 255), 0);
+ stateChanged = true;
+ if (applyToAll) {
+ for (byte i=0; iupdateSpeed();
- #endif
+ } else {
+ Segment& seg = strip.getSegment(strip.getMainSegmentId());
+ seg.speed = effectSpeed;
}
+ lampUdated();
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ display->updateSpeed();
+#endif
+}
- void changeEffectIntensity(bool increase) {
- #ifdef USERMOD_FOUR_LINE_DISPLAY
- if (display && display->wakeDisplay()) {
- display->redraw(true);
- // Throw away wake up input
- return;
- }
- display->updateRedrawTime();
- #endif
- effectIntensity = max(min((increase ? effectIntensity+fadeAmount : effectIntensity-fadeAmount), 255), 0);
- stateChanged = true;
- if (applyToAll) {
- for (byte i=0; iwakeDisplay()) {
+ display->redraw(true);
+ // Throw away wake up input
+ return;
+ }
+ display->updateRedrawTime();
+#endif
+ effectIntensity = max(min((increase ? effectIntensity+fadeAmount : effectIntensity-fadeAmount), 255), 0);
+ stateChanged = true;
+ if (applyToAll) {
+ for (byte i=0; iupdateIntensity();
- #endif
+ } else {
+ Segment& seg = strip.getSegment(strip.getMainSegmentId());
+ seg.intensity = effectIntensity;
}
+ lampUdated();
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ display->updateIntensity();
+#endif
+}
- void changePalette(bool increase) {
- #ifdef USERMOD_FOUR_LINE_DISPLAY
- if (display && display->wakeDisplay()) {
- display->redraw(true);
- // Throw away wake up input
- return;
+void RotaryEncoderUIUsermod::changeCustom(uint8_t par, bool increase) {
+ uint8_t val = 0;
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ if (display && display->wakeDisplay()) {
+ display->redraw(true);
+ // Throw away wake up input
+ return;
+ }
+ display->updateRedrawTime();
+#endif
+ stateChanged = true;
+ if (applyToAll) {
+ uint8_t id = strip.getFirstSelectedSegId();
+ Segment& sid = strip.getSegment(id);
+ switch (par) {
+ case 3: val = sid.custom3 = max(min((increase ? sid.custom3+fadeAmount : sid.custom3-fadeAmount), 255), 0); break;
+ case 2: val = sid.custom2 = max(min((increase ? sid.custom2+fadeAmount : sid.custom2-fadeAmount), 255), 0); break;
+ default: val = sid.custom1 = max(min((increase ? sid.custom1+fadeAmount : sid.custom1-fadeAmount), 255), 0); break;
}
- display->updateRedrawTime();
- #endif
- effectPaletteIndex = max(min((increase ? effectPaletteIndex+1 : effectPaletteIndex-1), strip.getPaletteCount()-1), 0);
- effectPalette = palettes_alpha_indexes[effectPaletteIndex];
- stateChanged = true;
- if (applyToAll) {
- for (byte i=0; ishowCurrentEffectOrPalette(effectPalette, JSON_palette_names, 2);
- #endif
+ } else {
+ Segment& seg = strip.getMainSegment();
+ switch (par) {
+ case 3: val = seg.custom3 = max(min((increase ? seg.custom3+fadeAmount : seg.custom3-fadeAmount), 255), 0); break;
+ case 2: val = seg.custom2 = max(min((increase ? seg.custom2+fadeAmount : seg.custom2-fadeAmount), 255), 0); break;
+ default: val = seg.custom1 = max(min((increase ? seg.custom1+fadeAmount : seg.custom1-fadeAmount), 255), 0); break;
+ }
}
+ lampUdated();
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ char lineBuffer[64];
+ sprintf(lineBuffer, "%d", val);
+ display->overlay(lineBuffer, 500, 10); // use star
+#endif
+}
- void changeHue(bool increase){
- #ifdef USERMOD_FOUR_LINE_DISPLAY
- if (display && display->wakeDisplay()) {
- display->redraw(true);
- // Throw away wake up input
- return;
+void RotaryEncoderUIUsermod::changePalette(bool increase) {
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ if (display && display->wakeDisplay()) {
+ display->redraw(true);
+ // Throw away wake up input
+ return;
+ }
+ display->updateRedrawTime();
+#endif
+ effectPaletteIndex = max(min((unsigned)(increase ? effectPaletteIndex+1 : effectPaletteIndex-1), strip.getPaletteCount()+strip.customPalettes.size()-1), 0U);
+ effectPalette = palettes_alpha_indexes[effectPaletteIndex];
+ stateChanged = true;
+ if (applyToAll) {
+ for (byte i=0; iupdateRedrawTime();
- #endif
- currentHue1 = max(min((increase ? currentHue1+fadeAmount : currentHue1-fadeAmount), 255), 0);
- colorHStoRGB(currentHue1*256, currentSat1, col);
- stateChanged = true;
- if (applyToAll) {
- for (byte i=0; ishowCurrentEffectOrPalette(effectPalette, JSON_palette_names, 2);
+#endif
+}
+
+
+void RotaryEncoderUIUsermod::changeHue(bool increase){
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ if (display && display->wakeDisplay()) {
+ display->redraw(true);
+ // Throw away wake up input
+ return;
+ }
+ display->updateRedrawTime();
+#endif
+ currentHue1 = max(min((increase ? currentHue1+fadeAmount : currentHue1-fadeAmount), 255), 0);
+ colorHStoRGB(currentHue1*256, currentSat1, col);
+ stateChanged = true;
+ if (applyToAll) {
+ for (byte i=0; ioverlay(lineBuffer, 500, 7); // use brush
+#endif
+}
- void changeSat(bool increase){
- #ifdef USERMOD_FOUR_LINE_DISPLAY
- if (display && display->wakeDisplay()) {
- display->redraw(true);
- // Throw away wake up input
- return;
- }
- display->updateRedrawTime();
- #endif
- currentSat1 = max(min((increase ? currentSat1+fadeAmount : currentSat1-fadeAmount), 255), 0);
- colorHStoRGB(currentHue1*256, currentSat1, col);
- if (applyToAll) {
- for (byte i=0; iwakeDisplay()) {
+ display->redraw(true);
+ // Throw away wake up input
+ return;
+ }
+ display->updateRedrawTime();
+#endif
+ currentSat1 = max(min((increase ? currentSat1+fadeAmount : currentSat1-fadeAmount), 255), 0);
+ colorHStoRGB(currentHue1*256, currentSat1, col);
+ if (applyToAll) {
+ for (byte i=0; ioverlay(lineBuffer, 500, 8); // use contrast
+#endif
+}
- void changePreset(bool increase) {
+void RotaryEncoderUIUsermod::changePreset(bool increase) {
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ if (display && display->wakeDisplay()) {
+ display->redraw(true);
+ // Throw away wake up input
+ return;
+ }
+ display->updateRedrawTime();
+#endif
+ if (presetHigh && presetLow && presetHigh > presetLow) {
+ StaticJsonDocument<64> root;
+ char str[64];
+ sprintf_P(str, PSTR("%d~%d~%s"), presetLow, presetHigh, increase?"":"-");
+ root["ps"] = str;
+ deserializeState(root.as(), CALL_MODE_BUTTON_PRESET);
+/*
+ String apireq = F("win&PL=~");
+ if (!increase) apireq += '-';
+ apireq += F("&P1=");
+ apireq += presetLow;
+ apireq += F("&P2=");
+ apireq += presetHigh;
+ handleSet(nullptr, apireq, false);
+*/
+ lampUdated();
#ifdef USERMOD_FOUR_LINE_DISPLAY
- if (display && display->wakeDisplay()) {
- display->redraw(true);
- // Throw away wake up input
- return;
- }
- display->updateRedrawTime();
+ sprintf(str, "%d", currentPreset);
+ display->overlay(str, 500, 11); // use heart
#endif
- if (presetHigh && presetLow && presetHigh > presetLow) {
- String apireq = F("win&PL=~");
- if (!increase) apireq += '-';
- apireq += F("&P1=");
- apireq += presetLow;
- apireq += F("&P2=");
- apireq += presetHigh;
- handleSet(nullptr, apireq, false);
- lampUdated();
- }
}
+}
- void changeCCT(bool increase){
- #ifdef USERMOD_FOUR_LINE_DISPLAY
- if (display && display->wakeDisplay()) {
- display->redraw(true);
- // Throw away wake up input
- return;
- }
- display->updateRedrawTime();
- #endif
- currentCCT = max(min((increase ? currentCCT+fadeAmount : currentCCT-fadeAmount), 255), 0);
+void RotaryEncoderUIUsermod::changeCCT(bool increase){
+#ifdef USERMOD_FOUR_LINE_DISPLAY
+ if (display && display->wakeDisplay()) {
+ display->redraw(true);
+ // Throw away wake up input
+ return;
+ }
+ display->updateRedrawTime();
+#endif
+ currentCCT = max(min((increase ? currentCCT+fadeAmount : currentCCT-fadeAmount), 255), 0);
// if (applyToAll) {
- for (byte i=0; ioverlay(lineBuffer, 500, 10); // use star
+#endif
+}
- /*
- * addToJsonInfo() can be used to add custom entries to the /json/info part of the JSON API.
- * Creating an "u" object allows you to add custom key/value pairs to the Info section of the WLED web UI.
- * Below it is shown how this could be used for e.g. a light sensor
- */
- /*
- void addToJsonInfo(JsonObject& root)
- {
- int reading = 20;
- //this code adds "u":{"Light":[20," lux"]} to the info object
- JsonObject user = root["u"];
- if (user.isNull()) user = root.createNestedObject("u");
- JsonArray lightArr = user.createNestedArray("Light"); //name
- lightArr.add(reading); //value
- lightArr.add(" lux"); //unit
- }
+/*
+ * addToJsonInfo() can be used to add custom entries to the /json/info part of the JSON API.
+ * Creating an "u" object allows you to add custom key/value pairs to the Info section of the WLED web UI.
+ * Below it is shown how this could be used for e.g. a light sensor
*/
+/*
+void RotaryEncoderUIUsermod::addToJsonInfo(JsonObject& root)
+{
+ int reading = 20;
+ //this code adds "u":{"Light":[20," lux"]} to the info object
+ JsonObject user = root["u"];
+ if (user.isNull()) user = root.createNestedObject("u");
+ JsonArray lightArr = user.createNestedArray("Light"); //name
+ lightArr.add(reading); //value
+ lightArr.add(" lux"); //unit
+}
+*/
- /*
- * addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
- * Values in the state object may be modified by connected clients
- */
- /*
- void addToJsonState(JsonObject &root)
- {
- //root["user0"] = userVar0;
- }
+/*
+ * addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
+ * Values in the state object may be modified by connected clients
*/
+/*
+void RotaryEncoderUIUsermod::addToJsonState(JsonObject &root)
+{
+ //root["user0"] = userVar0;
+}
+*/
- /*
- * readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
- * Values in the state object may be modified by connected clients
- */
- /*
- void readFromJsonState(JsonObject &root)
- {
- //userVar0 = root["user0"] | userVar0; //if "user0" key exists in JSON, update, else keep old value
- //if (root["bri"] == 255) Serial.println(F("Don't burn down your garage!"));
- }
+/*
+ * readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
+ * Values in the state object may be modified by connected clients
*/
+/*
+void RotaryEncoderUIUsermod::readFromJsonState(JsonObject &root)
+{
+ //userVar0 = root["user0"] | userVar0; //if "user0" key exists in JSON, update, else keep old value
+ //if (root["bri"] == 255) Serial.println(F("Don't burn down your garage!"));
+}
+*/
- /**
- * addToConfig() (called from set.cpp) stores persistent properties to cfg.json
- */
- void addToConfig(JsonObject &root) {
- // we add JSON object: {"Rotary-Encoder":{"DT-pin":12,"CLK-pin":14,"SW-pin":13}}
- JsonObject top = root.createNestedObject(FPSTR(_name)); // usermodname
- top[FPSTR(_enabled)] = enabled;
- top[FPSTR(_DT_pin)] = pinA;
- top[FPSTR(_CLK_pin)] = pinB;
- top[FPSTR(_SW_pin)] = pinC;
- top[FPSTR(_presetLow)] = presetLow;
- top[FPSTR(_presetHigh)] = presetHigh;
- top[FPSTR(_applyToAll)] = applyToAll;
- DEBUG_PRINTLN(F("Rotary Encoder config saved."));
- }
-
- /**
- * readFromConfig() is called before setup() to populate properties from values stored in cfg.json
- *
- * The function should return true if configuration was successfully loaded or false if there was no configuration.
- */
- bool readFromConfig(JsonObject &root) {
- // we look for JSON object: {"Rotary-Encoder":{"DT-pin":12,"CLK-pin":14,"SW-pin":13}}
- JsonObject top = root[FPSTR(_name)];
- if (top.isNull()) {
- DEBUG_PRINT(FPSTR(_name));
- DEBUG_PRINTLN(F(": No config found. (Using defaults.)"));
- return false;
- }
- int8_t newDTpin = top[FPSTR(_DT_pin)] | pinA;
- int8_t newCLKpin = top[FPSTR(_CLK_pin)] | pinB;
- int8_t newSWpin = top[FPSTR(_SW_pin)] | pinC;
-
- presetHigh = top[FPSTR(_presetHigh)] | presetHigh;
- presetLow = top[FPSTR(_presetLow)] | presetLow;
- presetHigh = MIN(250,MAX(0,presetHigh));
- presetLow = MIN(250,MAX(0,presetLow));
+/**
+ * addToConfig() (called from set.cpp) stores persistent properties to cfg.json
+ */
+void RotaryEncoderUIUsermod::addToConfig(JsonObject &root) {
+ // we add JSON object: {"Rotary-Encoder":{"DT-pin":12,"CLK-pin":14,"SW-pin":13}}
+ JsonObject top = root.createNestedObject(FPSTR(_name)); // usermodname
+ top[FPSTR(_enabled)] = enabled;
+ top[FPSTR(_DT_pin)] = pinA;
+ top[FPSTR(_CLK_pin)] = pinB;
+ top[FPSTR(_SW_pin)] = pinC;
+ top[FPSTR(_presetLow)] = presetLow;
+ top[FPSTR(_presetHigh)] = presetHigh;
+ top[FPSTR(_applyToAll)] = applyToAll;
+ top[FPSTR(_pcf8574)] = usePcf8574;
+ top[FPSTR(_pcfAddress)] = addrPcf8574;
+ top[FPSTR(_pcfINTpin)] = pinIRQ;
+ DEBUG_PRINTLN(F("Rotary Encoder config saved."));
+}
- enabled = top[FPSTR(_enabled)] | enabled;
- applyToAll = top[FPSTR(_applyToAll)] | applyToAll;
+void RotaryEncoderUIUsermod::appendConfigData() {
+ oappend(SET_F("addInfo('Rotary-Encoder:PCF8574-address',1,'(not hex!)');"));
+ oappend(SET_F("d.extra.push({'Rotary-Encoder':{pin:[['P0',100],['P1',101],['P2',102],['P3',103],['P4',104],['P5',105],['P6',106],['P7',107]]}});"));
+}
+/**
+ * readFromConfig() is called before setup() to populate properties from values stored in cfg.json
+ *
+ * The function should return true if configuration was successfully loaded or false if there was no configuration.
+ */
+bool RotaryEncoderUIUsermod::readFromConfig(JsonObject &root) {
+ // we look for JSON object: {"Rotary-Encoder":{"DT-pin":12,"CLK-pin":14,"SW-pin":13}}
+ JsonObject top = root[FPSTR(_name)];
+ if (top.isNull()) {
DEBUG_PRINT(FPSTR(_name));
- if (!initDone) {
- // first run: reading from cfg.json
- pinA = newDTpin;
- pinB = newCLKpin;
- pinC = newSWpin;
- DEBUG_PRINTLN(F(" config loaded."));
- } else {
- DEBUG_PRINTLN(F(" config (re)loaded."));
- // changing parameters from settings page
- if (pinA!=newDTpin || pinB!=newCLKpin || pinC!=newSWpin) {
+ DEBUG_PRINTLN(F(": No config found. (Using defaults.)"));
+ return false;
+ }
+ int8_t newDTpin = top[FPSTR(_DT_pin)] | pinA;
+ int8_t newCLKpin = top[FPSTR(_CLK_pin)] | pinB;
+ int8_t newSWpin = top[FPSTR(_SW_pin)] | pinC;
+ int8_t newIRQpin = top[FPSTR(_pcfINTpin)] | pinIRQ;
+ bool oldPcf8574 = usePcf8574;
+
+ presetHigh = top[FPSTR(_presetHigh)] | presetHigh;
+ presetLow = top[FPSTR(_presetLow)] | presetLow;
+ presetHigh = MIN(250,MAX(0,presetHigh));
+ presetLow = MIN(250,MAX(0,presetLow));
+
+ enabled = top[FPSTR(_enabled)] | enabled;
+ applyToAll = top[FPSTR(_applyToAll)] | applyToAll;
+
+ usePcf8574 = top[FPSTR(_pcf8574)] | usePcf8574;
+ addrPcf8574 = top[FPSTR(_pcfAddress)] | addrPcf8574;
+
+ DEBUG_PRINT(FPSTR(_name));
+ if (!initDone) {
+ // first run: reading from cfg.json
+ pinA = newDTpin;
+ pinB = newCLKpin;
+ pinC = newSWpin;
+ DEBUG_PRINTLN(F(" config loaded."));
+ } else {
+ DEBUG_PRINTLN(F(" config (re)loaded."));
+ // changing parameters from settings page
+ if (pinA!=newDTpin || pinB!=newCLKpin || pinC!=newSWpin || pinIRQ!=newIRQpin) {
+ if (oldPcf8574) {
+ if (pinIRQ >= 0) {
+ detachInterrupt(pinIRQ);
+ pinManager.deallocatePin(pinIRQ, PinOwner::UM_RotaryEncoderUI);
+ DEBUG_PRINTLN(F("Deallocated old IRQ pin."));
+ }
+ pinIRQ = newIRQpin<100 ? newIRQpin : -1; // ignore PCF8574 pins
+ } else {
pinManager.deallocatePin(pinA, PinOwner::UM_RotaryEncoderUI);
pinManager.deallocatePin(pinB, PinOwner::UM_RotaryEncoderUI);
pinManager.deallocatePin(pinC, PinOwner::UM_RotaryEncoderUI);
- pinA = newDTpin;
- pinB = newCLKpin;
- pinC = newSWpin;
- if (pinA<0 || pinB<0 || pinC<0) {
- enabled = false;
- return true;
- }
- setup();
+ DEBUG_PRINTLN(F("Deallocated old pins."));
+ }
+ pinA = newDTpin;
+ pinB = newCLKpin;
+ pinC = newSWpin;
+ if (pinA<0 || pinB<0 || pinC<0) {
+ enabled = false;
+ return true;
}
+ setup();
}
- // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
- return !top[FPSTR(_applyToAll)].isNull();
}
+ // use "return !top["newestParameter"].isNull();" when updating Usermod with new features
+ return !top[FPSTR(_pcfINTpin)].isNull();
+}
- /*
- * getId() allows you to optionally give your V2 usermod an unique ID (please define it in const.h!).
- * This could be used in the future for the system to determine whether your usermod is installed.
- */
- uint16_t getId()
- {
- return USERMOD_ID_ROTARY_ENC_UI;
- }
-};
// strings to reduce flash memory usage (used more than twice)
const char RotaryEncoderUIUsermod::_name[] PROGMEM = "Rotary-Encoder";
@@ -826,3 +1172,6 @@ const char RotaryEncoderUIUsermod::_SW_pin[] PROGMEM = "SW-pin";
const char RotaryEncoderUIUsermod::_presetHigh[] PROGMEM = "preset-high";
const char RotaryEncoderUIUsermod::_presetLow[] PROGMEM = "preset-low";
const char RotaryEncoderUIUsermod::_applyToAll[] PROGMEM = "apply-2-all-seg";
+const char RotaryEncoderUIUsermod::_pcf8574[] PROGMEM = "use-PCF8574";
+const char RotaryEncoderUIUsermod::_pcfAddress[] PROGMEM = "PCF8574-address";
+const char RotaryEncoderUIUsermod::_pcfINTpin[] PROGMEM = "PCF8574-INT-pin";
diff --git a/usermods/usermod_v2_word_clock/readme.md b/usermods/usermod_v2_word_clock/readme.md
new file mode 100644
index 0000000000..c42ee0ee47
--- /dev/null
+++ b/usermods/usermod_v2_word_clock/readme.md
@@ -0,0 +1,39 @@
+# Word Clock Usermod V2
+
+This usermod drives an 11x10 pixel matrix wordclock with WLED. There are 4 additional dots for the minutes.
+The visualisation is described by 4 masks with LED numbers (single dots for minutes, minutes, hours and "clock"). The index of the LEDs in the masks always starts at 0, even if the ledOffset is not 0.
+There are 3 parameters that control behavior:
+
+active: enable/disable usermod
+diplayItIs: enable/disable display of "Es ist" on the clock
+ledOffset: number of LEDs before the wordclock LEDs
+
+### Update for alternative wiring pattern
+Based on this fantastic work I added an alternative wiring pattern.
+The original used a long wire to connect DO to DI, from one line to the next line.
+
+I wired my clock in meander style. So the first LED in the second line is on the right.
+With this method, every other line was inverted and showed the wrong letter.
+
+I added a switch in usermod called "meander wiring?" to enable/disable the alternate wiring pattern.
+
+
+## Installation
+
+Copy and update the example `platformio_override.ini.sample`
+from the Rotary Encoder UI usermod folder to the root directory of your particular build.
+This file should be placed in the same directory as `platformio.ini`.
+
+### Define Your Options
+
+* `USERMOD_WORDCLOCK` - define this to have this usermod included wled00\usermods_list.cpp
+
+### PlatformIO requirements
+
+No special requirements.
+
+## Change Log
+
+2022/08/18 added meander wiring pattern.
+
+2022/03/30 initial commit
diff --git a/usermods/usermod_v2_word_clock/usermod_v2_word_clock.h b/usermods/usermod_v2_word_clock/usermod_v2_word_clock.h
new file mode 100644
index 0000000000..b66be290a5
--- /dev/null
+++ b/usermods/usermod_v2_word_clock/usermod_v2_word_clock.h
@@ -0,0 +1,507 @@
+#pragma once
+
+#include "wled.h"
+
+/*
+ * Usermods allow you to add own functionality to WLED more easily
+ * See: https://github.com/Aircoookie/WLED/wiki/Add-own-functionality
+ *
+ * This usermod can be used to drive a wordclock with a 11x10 pixel matrix with WLED. There are also 4 additional dots for the minutes.
+ * The visualisation is described in 4 mask with LED numbers (single dots for minutes, minutes, hours and "clock/Uhr").
+ * There are 2 parameters to change the behaviour:
+ *
+ * active: enable/disable usermod
+ * diplayItIs: enable/disable display of "Es ist" on the clock.
+ */
+
+class WordClockUsermod : public Usermod
+{
+ private:
+ unsigned long lastTime = 0;
+ int lastTimeMinutes = -1;
+
+ // set your config variables to their boot default value (this can also be done in readFromConfig() or a constructor if you prefer)
+ bool usermodActive = false;
+ bool displayItIs = false;
+ int ledOffset = 100;
+ bool meander = false;
+ bool nord = false;
+
+ // defines for mask sizes
+ #define maskSizeLeds 114
+ #define maskSizeMinutes 12
+ #define maskSizeMinutesMea 12
+ #define maskSizeHours 6
+ #define maskSizeHoursMea 6
+ #define maskSizeItIs 5
+ #define maskSizeMinuteDots 4
+
+ // "minute" masks
+ // Normal wiring
+ const int maskMinutes[14][maskSizeMinutes] =
+ {
+ {107, 108, 109, -1, -1, -1, -1, -1, -1, -1, -1, -1}, // 0 - 00
+ { 7, 8, 9, 10, 40, 41, 42, 43, -1, -1, -1, -1}, // 1 - 05 fünf nach
+ { 11, 12, 13, 14, 40, 41, 42, 43, -1, -1, -1, -1}, // 2 - 10 zehn nach
+ { 26, 27, 28, 29, 30, 31, 32, -1, -1, -1, -1, -1}, // 3 - 15 viertel
+ { 15, 16, 17, 18, 19, 20, 21, 40, 41, 42, 43, -1}, // 4 - 20 zwanzig nach
+ { 7, 8, 9, 10, 33, 34, 35, 44, 45, 46, 47, -1}, // 5 - 25 fünf vor halb
+ { 44, 45, 46, 47, -1, -1, -1, -1, -1, -1, -1, -1}, // 6 - 30 halb
+ { 7, 8, 9, 10, 40, 41, 42, 43, 44, 45, 46, 47}, // 7 - 35 fünf nach halb
+ { 15, 16, 17, 18, 19, 20, 21, 33, 34, 35, -1, -1}, // 8 - 40 zwanzig vor
+ { 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, -1}, // 9 - 45 dreiviertel
+ { 11, 12, 13, 14, 33, 34, 35, -1, -1, -1, -1, -1}, // 10 - 50 zehn vor
+ { 7, 8, 9, 10, 33, 34, 35, -1, -1, -1, -1, -1}, // 11 - 55 fünf vor
+ { 26, 27, 28, 29, 30, 31, 32, 40, 41, 42, 43, -1}, // 12 - 15 alternative viertel nach
+ { 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1} // 13 - 45 alternative viertel vor
+ };
+
+ // Meander wiring
+ const int maskMinutesMea[14][maskSizeMinutesMea] =
+ {
+ { 99, 100, 101, -1, -1, -1, -1, -1, -1, -1, -1, -1}, // 0 - 00
+ { 7, 8, 9, 10, 33, 34, 35, 36, -1, -1, -1, -1}, // 1 - 05 fünf nach
+ { 18, 19, 20, 21, 33, 34, 35, 36, -1, -1, -1, -1}, // 2 - 10 zehn nach
+ { 26, 27, 28, 29, 30, 31, 32, -1, -1, -1, -1, -1}, // 3 - 15 viertel
+ { 11, 12, 13, 14, 15, 16, 17, 33, 34, 35, 36, -1}, // 4 - 20 zwanzig nach
+ { 7, 8, 9, 10, 41, 42, 43, 44, 45, 46, 47, -1}, // 5 - 25 fünf vor halb
+ { 44, 45, 46, 47, -1, -1, -1, -1, -1, -1, -1, -1}, // 6 - 30 halb
+ { 7, 8, 9, 10, 33, 34, 35, 36, 44, 45, 46, 47}, // 7 - 35 fünf nach halb
+ { 11, 12, 13, 14, 15, 16, 17, 41, 42, 43, -1, -1}, // 8 - 40 zwanzig vor
+ { 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, -1}, // 9 - 45 dreiviertel
+ { 18, 19, 20, 21, 41, 42, 43, -1, -1, -1, -1, -1}, // 10 - 50 zehn vor
+ { 7, 8, 9, 10, 41, 42, 43, -1, -1, -1, -1, -1}, // 11 - 55 fünf vor
+ { 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, -1}, // 12 - 15 alternative viertel nach
+ { 26, 27, 28, 29, 30, 31, 32, 41, 42, 43, -1, -1} // 13 - 45 alternative viertel vor
+ };
+
+
+ // hour masks
+ // Normal wiring
+ const int maskHours[13][maskSizeHours] =
+ {
+ { 55, 56, 57, -1, -1, -1}, // 01: ein
+ { 55, 56, 57, 58, -1, -1}, // 01: eins
+ { 62, 63, 64, 65, -1, -1}, // 02: zwei
+ { 66, 67, 68, 69, -1, -1}, // 03: drei
+ { 73, 74, 75, 76, -1, -1}, // 04: vier
+ { 51, 52, 53, 54, -1, -1}, // 05: fünf
+ { 77, 78, 79, 80, 81, -1}, // 06: sechs
+ { 88, 89, 90, 91, 92, 93}, // 07: sieben
+ { 84, 85, 86, 87, -1, -1}, // 08: acht
+ {102, 103, 104, 105, -1, -1}, // 09: neun
+ { 99, 100, 101, 102, -1, -1}, // 10: zehn
+ { 49, 50, 51, -1, -1, -1}, // 11: elf
+ { 94, 95, 96, 97, 98, -1} // 12: zwölf and 00: null
+ };
+ // Meander wiring
+ const int maskHoursMea[13][maskSizeHoursMea] =
+ {
+ { 63, 64, 65, -1, -1, -1}, // 01: ein
+ { 62, 63, 64, 65, -1, -1}, // 01: eins
+ { 55, 56, 57, 58, -1, -1}, // 02: zwei
+ { 66, 67, 68, 69, -1, -1}, // 03: drei
+ { 73, 74, 75, 76, -1, -1}, // 04: vier
+ { 51, 52, 53, 54, -1, -1}, // 05: fünf
+ { 83, 84, 85, 86, 87, -1}, // 06: sechs
+ { 88, 89, 90, 91, 92, 93}, // 07: sieben
+ { 77, 78, 79, 80, -1, -1}, // 08: acht
+ {103, 104, 105, 106, -1, -1}, // 09: neun
+ {106, 107, 108, 109, -1, -1}, // 10: zehn
+ { 49, 50, 51, -1, -1, -1}, // 11: elf
+ { 94, 95, 96, 97, 98, -1} // 12: zwölf and 00: null
+ };
+
+ // mask "it is"
+ const int maskItIs[maskSizeItIs] = {0, 1, 3, 4, 5};
+
+ // mask minute dots
+ const int maskMinuteDots[maskSizeMinuteDots] = {110, 111, 112, 113};
+
+ // overall mask to define which LEDs are on
+ int maskLedsOn[maskSizeLeds] =
+ {
+ 0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0
+ };
+
+ // update led mask
+ void updateLedMask(const int wordMask[], int arraySize)
+ {
+ // loop over array
+ for (int x=0; x < arraySize; x++)
+ {
+ // check if mask has a valid LED number
+ if (wordMask[x] >= 0 && wordMask[x] < maskSizeLeds)
+ {
+ // turn LED on
+ maskLedsOn[wordMask[x]] = 1;
+ }
+ }
+ }
+
+ // set hours
+ void setHours(int hours, bool fullClock)
+ {
+ int index = hours;
+
+ // handle 00:xx as 12:xx
+ if (hours == 0)
+ {
+ index = 12;
+ }
+
+ // check if we get an overrun of 12 o´clock
+ if (hours == 13)
+ {
+ index = 1;
+ }
+
+ // special handling for "ein Uhr" instead of "eins Uhr"
+ if (hours == 1 && fullClock == true)
+ {
+ index = 0;
+ }
+
+ // update led mask
+ if (meander)
+ {
+ updateLedMask(maskHoursMea[index], maskSizeHoursMea);
+ } else {
+ updateLedMask(maskHours[index], maskSizeHours);
+ }
+ }
+
+ // set minutes
+ void setMinutes(int index)
+ {
+ // update led mask
+ if (meander)
+ {
+ updateLedMask(maskMinutesMea[index], maskSizeMinutesMea);
+ } else {
+ updateLedMask(maskMinutes[index], maskSizeMinutes);
+ }
+ }
+
+ // set minutes dot
+ void setSingleMinuteDots(int minutes)
+ {
+ // modulo to get minute dots
+ int minutesDotCount = minutes % 5;
+
+ // check if minute dots are active
+ if (minutesDotCount > 0)
+ {
+ // activate all minute dots until number is reached
+ for (int i = 0; i < minutesDotCount; i++)
+ {
+ // activate LED
+ maskLedsOn[maskMinuteDots[i]] = 1;
+ }
+ }
+ }
+
+ // update the display
+ void updateDisplay(uint8_t hours, uint8_t minutes)
+ {
+ // disable complete matrix at the bigging
+ for (int x = 0; x < maskSizeLeds; x++)
+ {
+ maskLedsOn[x] = 0;
+ }
+
+ // display it is/es ist if activated
+ if (displayItIs)
+ {
+ updateLedMask(maskItIs, maskSizeItIs);
+ }
+
+ // set single minute dots
+ setSingleMinuteDots(minutes);
+
+ // switch minutes
+ switch (minutes / 5)
+ {
+ case 0:
+ // full hour
+ setMinutes(0);
+ setHours(hours, true);
+ break;
+ case 1:
+ // 5 nach
+ setMinutes(1);
+ setHours(hours, false);
+ break;
+ case 2:
+ // 10 nach
+ setMinutes(2);
+ setHours(hours, false);
+ break;
+ case 3:
+ if (nord) {
+ // viertel nach
+ setMinutes(12);
+ setHours(hours, false);
+ } else {
+ // viertel
+ setMinutes(3);
+ setHours(hours + 1, false);
+ };
+ break;
+ case 4:
+ // 20 nach
+ setMinutes(4);
+ setHours(hours, false);
+ break;
+ case 5:
+ // 5 vor halb
+ setMinutes(5);
+ setHours(hours + 1, false);
+ break;
+ case 6:
+ // halb
+ setMinutes(6);
+ setHours(hours + 1, false);
+ break;
+ case 7:
+ // 5 nach halb
+ setMinutes(7);
+ setHours(hours + 1, false);
+ break;
+ case 8:
+ // 20 vor
+ setMinutes(8);
+ setHours(hours + 1, false);
+ break;
+ case 9:
+ // viertel vor
+ if (nord) {
+ setMinutes(13);
+ }
+ // dreiviertel
+ else {
+ setMinutes(9);
+ }
+ setHours(hours + 1, false);
+ break;
+ case 10:
+ // 10 vor
+ setMinutes(10);
+ setHours(hours + 1, false);
+ break;
+ case 11:
+ // 5 vor
+ setMinutes(11);
+ setHours(hours + 1, false);
+ break;
+ }
+ }
+
+ public:
+ //Functions called by WLED
+
+ /*
+ * setup() is called once at boot. WiFi is not yet connected at this point.
+ * You can use it to initialize variables, sensors or similar.
+ */
+ void setup()
+ {
+ }
+
+ /*
+ * connected() is called every time the WiFi is (re)connected
+ * Use it to initialize network interfaces
+ */
+ void connected()
+ {
+ }
+
+ /*
+ * loop() is called continuously. Here you can check for events, read sensors, etc.
+ *
+ * Tips:
+ * 1. You can use "if (WLED_CONNECTED)" to check for a successful network connection.
+ * Additionally, "if (WLED_MQTT_CONNECTED)" is available to check for a connection to an MQTT broker.
+ *
+ * 2. Try to avoid using the delay() function. NEVER use delays longer than 10 milliseconds.
+ * Instead, use a timer check as shown here.
+ */
+ void loop() {
+
+ // do it every 5 seconds
+ if (millis() - lastTime > 5000)
+ {
+ // check the time
+ int minutes = minute(localTime);
+
+ // check if we already updated this minute
+ if (lastTimeMinutes != minutes)
+ {
+ // update the display with new time
+ updateDisplay(hourFormat12(localTime), minute(localTime));
+
+ // remember last update time
+ lastTimeMinutes = minutes;
+ }
+
+ // remember last update
+ lastTime = millis();
+ }
+ }
+
+ /*
+ * addToJsonInfo() can be used to add custom entries to the /json/info part of the JSON API.
+ * Creating an "u" object allows you to add custom key/value pairs to the Info section of the WLED web UI.
+ * Below it is shown how this could be used for e.g. a light sensor
+ */
+ /*
+ void addToJsonInfo(JsonObject& root)
+ {
+ }
+ */
+
+ /*
+ * addToJsonState() can be used to add custom entries to the /json/state part of the JSON API (state object).
+ * Values in the state object may be modified by connected clients
+ */
+ void addToJsonState(JsonObject& root)
+ {
+ }
+
+ /*
+ * readFromJsonState() can be used to receive data clients send to the /json/state part of the JSON API (state object).
+ * Values in the state object may be modified by connected clients
+ */
+ void readFromJsonState(JsonObject& root)
+ {
+ }
+
+ /*
+ * addToConfig() can be used to add custom persistent settings to the cfg.json file in the "um" (usermod) object.
+ * It will be called by WLED when settings are actually saved (for example, LED settings are saved)
+ * If you want to force saving the current state, use serializeConfig() in your loop().
+ *
+ * CAUTION: serializeConfig() will initiate a filesystem write operation.
+ * It might cause the LEDs to stutter and will cause flash wear if called too often.
+ * Use it sparingly and always in the loop, never in network callbacks!
+ *
+ * addToConfig() will make your settings editable through the Usermod Settings page automatically.
+ *
+ * Usermod Settings Overview:
+ * - Numeric values are treated as floats in the browser.
+ * - If the numeric value entered into the browser contains a decimal point, it will be parsed as a C float
+ * before being returned to the Usermod. The float data type has only 6-7 decimal digits of precision, and
+ * doubles are not supported, numbers will be rounded to the nearest float value when being parsed.
+ * The range accepted by the input field is +/- 1.175494351e-38 to +/- 3.402823466e+38.
+ * - If the numeric value entered into the browser doesn't contain a decimal point, it will be parsed as a
+ * C int32_t (range: -2147483648 to 2147483647) before being returned to the usermod.
+ * Overflows or underflows are truncated to the max/min value for an int32_t, and again truncated to the type
+ * used in the Usermod when reading the value from ArduinoJson.
+ * - Pin values can be treated differently from an integer value by using the key name "pin"
+ * - "pin" can contain a single or array of integer values
+ * - On the Usermod Settings page there is simple checking for pin conflicts and warnings for special pins
+ * - Red color indicates a conflict. Yellow color indicates a pin with a warning (e.g. an input-only pin)
+ * - Tip: use int8_t to store the pin value in the Usermod, so a -1 value (pin not set) can be used
+ *
+ * See usermod_v2_auto_save.h for an example that saves Flash space by reusing ArduinoJson key name strings
+ *
+ * If you need a dedicated settings page with custom layout for your Usermod, that takes a lot more work.
+ * You will have to add the setting to the HTML, xml.cpp and set.cpp manually.
+ * See the WLED Soundreactive fork (code and wiki) for reference. https://github.com/atuline/WLED
+ *
+ * I highly recommend checking out the basics of ArduinoJson serialization and deserialization in order to use custom settings!
+ */
+ void addToConfig(JsonObject& root)
+ {
+ JsonObject top = root.createNestedObject(F("WordClockUsermod"));
+ top[F("active")] = usermodActive;
+ top[F("displayItIs")] = displayItIs;
+ top[F("ledOffset")] = ledOffset;
+ top[F("Meander wiring?")] = meander;
+ top[F("Norddeutsch")] = nord;
+ }
+
+ void appendConfigData()
+ {
+ oappend(SET_F("addInfo('WordClockUsermod:ledOffset', 1, 'Number of LEDs before the letters');"));
+ oappend(SET_F("addInfo('WordClockUsermod:Norddeutsch', 1, 'Viertel vor instead of Dreiviertel');"));
+ }
+
+ /*
+ * readFromConfig() can be used to read back the custom settings you added with addToConfig().
+ * This is called by WLED when settings are loaded (currently this only happens immediately after boot, or after saving on the Usermod Settings page)
+ *
+ * readFromConfig() is called BEFORE setup(). This means you can use your persistent values in setup() (e.g. pin assignments, buffer sizes),
+ * but also that if you want to write persistent values to a dynamic buffer, you'd need to allocate it here instead of in setup.
+ * If you don't know what that is, don't fret. It most likely doesn't affect your use case :)
+ *
+ * Return true in case the config values returned from Usermod Settings were complete, or false if you'd like WLED to save your defaults to disk (so any missing values are editable in Usermod Settings)
+ *
+ * getJsonValue() returns false if the value is missing, or copies the value into the variable provided and returns true if the value is present
+ * The configComplete variable is true only if the "exampleUsermod" object and all values are present. If any values are missing, WLED will know to call addToConfig() to save them
+ *
+ * This function is guaranteed to be called on boot, but could also be called every time settings are updated
+ */
+ bool readFromConfig(JsonObject& root)
+ {
+ // default settings values could be set here (or below using the 3-argument getJsonValue()) instead of in the class definition or constructor
+ // setting them inside readFromConfig() is slightly more robust, handling the rare but plausible use case of single value being missing after boot (e.g. if the cfg.json was manually edited and a value was removed)
+
+ JsonObject top = root[F("WordClockUsermod")];
+
+ bool configComplete = !top.isNull();
+
+ configComplete &= getJsonValue(top[F("active")], usermodActive);
+ configComplete &= getJsonValue(top[F("displayItIs")], displayItIs);
+ configComplete &= getJsonValue(top[F("ledOffset")], ledOffset);
+ configComplete &= getJsonValue(top[F("Meander wiring?")], meander);
+ configComplete &= getJsonValue(top[F("Norddeutsch")], nord);
+
+ return configComplete;
+ }
+
+ /*
+ * handleOverlayDraw() is called just before every show() (LED strip update frame) after effects have set the colors.
+ * Use this to blank out some LEDs or set them to a different color regardless of the set effect mode.
+ * Commonly used for custom clocks (Cronixie, 7 segment)
+ */
+ void handleOverlayDraw()
+ {
+ // check if usermod is active
+ if (usermodActive == true)
+ {
+ // loop over all leds
+ for (int x = 0; x < maskSizeLeds; x++)
+ {
+ // check mask
+ if (maskLedsOn[x] == 0)
+ {
+ // set pixel off
+ strip.setPixelColor(x + ledOffset, RGBW32(0,0,0,0));
+ }
+ }
+ }
+ }
+
+ /*
+ * getId() allows you to optionally give your V2 usermod an unique ID (please define it in const.h!).
+ * This could be used in the future for the system to determine whether your usermod is installed.
+ */
+ uint16_t getId()
+ {
+ return USERMOD_ID_WORDCLOCK;
+ }
+
+ //More methods can be added in the future, this example will then be extended.
+ //Your usermod will remain compatible as it does not need to implement all methods from the Usermod base class!
+};
\ No newline at end of file
diff --git a/usermods/wireguard/platformio_override.ini b/usermods/wireguard/platformio_override.ini
new file mode 100644
index 0000000000..fc0ae5fc99
--- /dev/null
+++ b/usermods/wireguard/platformio_override.ini
@@ -0,0 +1,22 @@
+# Example PlatformIO Project Configuration Override for WireGuard
+# ------------------------------------------------------------------------------
+# Copy to platformio_override.ini to activate.
+# ------------------------------------------------------------------------------
+# Please visit documentation: https://docs.platformio.org/page/projectconf.html
+
+[platformio]
+default_envs = WLED_ESP32-WireGuard
+
+[env:WLED_ESP32-WireGuard]
+board = esp32dev
+platform = ${esp32.platform}
+platform_packages = ${esp32.platform_packages}
+build_unflags = ${common.build_unflags}
+build_flags = ${common.build_flags_esp32}
+ -D WLED_RELEASE_NAME=ESP32-WireGuard
+ -D USERMOD_WIREGUARD
+lib_deps = ${esp32.lib_deps}
+ https://github.com/kienvu58/WireGuard-ESP32-Arduino.git
+monitor_filters = esp32_exception_decoder
+board_build.partitions = ${esp32.default_partitions}
+upload_speed = 921600
\ No newline at end of file
diff --git a/usermods/wireguard/readme.md b/usermods/wireguard/readme.md
new file mode 100644
index 0000000000..071bea9f91
--- /dev/null
+++ b/usermods/wireguard/readme.md
@@ -0,0 +1,19 @@
+# WireGuard VPN
+
+This usermod will connect your WLED instance to a remote WireGuard subnet.
+
+Configuration is performed via the Usermod menu. There are no parameters to set in code!
+
+## Installation
+
+Copy the `platformio_override.ini` file to the root project directory, review the build options, and select the `WLED_ESP32-WireGuard` environment.
+
+
+## Author
+
+Aiden Vigue [vigue.me](https://vigue.me)
+[@acvigue](https://github.com/acvigue)
+aiden@vigue.me
+
+
+
diff --git a/usermods/wireguard/wireguard.h b/usermods/wireguard/wireguard.h
new file mode 100644
index 0000000000..a83b9fe78e
--- /dev/null
+++ b/usermods/wireguard/wireguard.h
@@ -0,0 +1,127 @@
+#pragma once
+
+#include
+
+#include "wled.h"
+
+class WireguardUsermod : public Usermod {
+ public:
+ void setup() { configTzTime(posix_tz, ntpServerName); }
+
+ void connected() {
+ if (wg.is_initialized()) {
+ wg.end();
+ }
+ }
+
+ void loop() {
+ if (millis() - lastTime > 5000) {
+ if (is_enabled && WLED_CONNECTED) {
+ if (!wg.is_initialized()) {
+ struct tm timeinfo;
+ if (getLocalTime(&timeinfo, 0)) {
+ if (strlen(preshared_key) < 1) {
+ wg.begin(local_ip, private_key, endpoint_address, public_key, endpoint_port, NULL);
+ } else {
+ wg.begin(local_ip, private_key, endpoint_address, public_key, endpoint_port, preshared_key);
+ }
+ }
+ }
+ }
+
+ lastTime = millis();
+ }
+ }
+
+ void addToJsonInfo(JsonObject& root) {
+ JsonObject user = root["u"];
+ if (user.isNull()) user = root.createNestedObject("u");
+
+ JsonArray infoArr = user.createNestedArray(F("WireGuard"));
+ String uiDomString;
+
+ struct tm timeinfo;
+ if (!getLocalTime(&timeinfo, 0)) {
+ uiDomString = "Time out of sync!";
+ } else {
+ if (wg.is_initialized()) {
+ uiDomString = "netif up!";
+ } else {
+ uiDomString = "netif down :(";
+ }
+ }
+ if (is_enabled) infoArr.add(uiDomString);
+ }
+
+ void appendConfigData() {
+ oappend(SET_F("addInfo('WireGuard:host',1,'Server Hostname');")); // 0 is field type, 1 is actual field
+ oappend(SET_F("addInfo('WireGuard:port',1,'Server Port');")); // 0 is field type, 1 is actual field
+ oappend(SET_F("addInfo('WireGuard:ip',1,'Device IP');")); // 0 is field type, 1 is actual field
+ oappend(SET_F("addInfo('WireGuard:psk',1,'Pre Shared Key (optional)');")); // 0 is field type, 1 is actual field
+ oappend(SET_F("addInfo('WireGuard:pem',1,'Private Key');")); // 0 is field type, 1 is actual field
+ oappend(SET_F("addInfo('WireGuard:pub',1,'Public Key');")); // 0 is field type, 1 is actual field
+ oappend(SET_F("addInfo('WireGuard:tz',1,'POSIX timezone string');")); // 0 is field type, 1 is actual field
+ }
+
+ void addToConfig(JsonObject& root) {
+ JsonObject top = root.createNestedObject(F("WireGuard"));
+ top[F("host")] = endpoint_address;
+ top[F("port")] = endpoint_port;
+ top[F("ip")] = local_ip.toString();
+ top[F("psk")] = preshared_key;
+ top[F("pem")] = private_key;
+ top[F("pub")] = public_key;
+ top[F("tz")] = posix_tz;
+ }
+
+ bool readFromConfig(JsonObject& root) {
+ JsonObject top = root[F("WireGuard")];
+
+ if (top["host"].isNull() || top["port"].isNull() || top["ip"].isNull() || top["pem"].isNull() || top["pub"].isNull() || top["tz"].isNull()) {
+ is_enabled = false;
+ return false;
+ } else {
+ const char* host = top["host"];
+ strncpy(endpoint_address, host, 100);
+
+ const char* ip_s = top["ip"];
+ uint8_t ip[4];
+ sscanf(ip_s, "%u.%u.%u.%u", &ip[0], &ip[1], &ip[2], &ip[3]);
+ local_ip = IPAddress(ip[0], ip[1], ip[2], ip[3]);
+
+ const char* pem = top["pem"];
+ strncpy(private_key, pem, 45);
+
+ const char* pub = top["pub"];
+ strncpy(public_key, pub, 45);
+
+ const char* tz = top["tz"];
+ strncpy(posix_tz, tz, 150);
+
+ endpoint_port = top["port"];
+
+ if (!top["psk"].isNull()) {
+ const char* psk = top["psk"];
+ strncpy(preshared_key, psk, 45);
+ }
+
+ is_enabled = true;
+ }
+
+ return is_enabled;
+ }
+
+ uint16_t getId() { return USERMOD_ID_WIREGUARD; }
+
+ private:
+ WireGuard wg;
+ char preshared_key[45];
+ char private_key[45];
+ IPAddress local_ip;
+ char public_key[45];
+ char endpoint_address[100];
+ char posix_tz[150];
+ int endpoint_port = 0;
+ bool is_enabled = false;
+ unsigned long lastTime = 0;
+};
\ No newline at end of file
diff --git a/usermods/wizlights/readme.md b/usermods/wizlights/readme.md
new file mode 100644
index 0000000000..9e633043bf
--- /dev/null
+++ b/usermods/wizlights/readme.md
@@ -0,0 +1,35 @@
+# Controlling Wiz lights
+
+Enables controlling [WiZ](https://www.wizconnected.com/en/consumer/) lights that are part of the same network as the WLED controller.
+
+The mod takes the colors from the first few pixels and sends them to the lights.
+
+## Configuration
+
+- Interval (ms)
+ - How frequently to update the WiZ lights, in milliseconds.
+ - Setting it too low may cause the ESP to become unresponsive.
+- Send Delay (ms)
+ - An optional millisecond delay after updating each WiZ light.
+ - Can help smooth out effects when using a large number of WiZ lights
+- Use Enhanced White
+ - Uses the WiZ lights onboard white LEDs instead of sending maximum RGB values.
+ - Tunable with warm and cool LEDs as supported by WiZ bulbs
+ - Note: Only sent when max RGB value is set, the automatic brightness limiter must be disabled
+ - ToDo: Have better logic for white value mixing to take advantage of the light's capabilities
+- Always Force Update
+ - Can be enabled to always send update message to light even if the new value matches the old value.
+- Force update every x minutes
+ - adjusts the default force update timeout of 5 minutes.
+ - Setting to 0 is the same as enabling Always Force Update
+ -
+Next, enter the IP addresses for the lights to be controlled, in order. The limit is 15 devices, but that number
+can be easily changed by updating _MAX_WIZ_LIGHTS_.
+
+
+
+
+## Related project
+
+If you use these lights and python, make sure to check out the [pywizlight](https://github.com/sbidy/pywizlight) project. You can learn how to
+format the messages to control the lights from that project.
diff --git a/usermods/wizlights/wizlights.h b/usermods/wizlights/wizlights.h
new file mode 100644
index 0000000000..08d204934c
--- /dev/null
+++ b/usermods/wizlights/wizlights.h
@@ -0,0 +1,158 @@
+#pragma once
+
+#include "wled.h"
+#include
+
+// Maximum number of lights supported
+#define MAX_WIZ_LIGHTS 15
+
+WiFiUDP UDP;
+
+
+
+
+class WizLightsUsermod : public Usermod {
+
+ private:
+ unsigned long lastTime = 0;
+ long updateInterval;
+ long sendDelay;
+
+ long forceUpdateMinutes;
+ bool forceUpdate;
+
+ bool useEnhancedWhite;
+ long warmWhite;
+ long coldWhite;
+
+ IPAddress lightsIP[MAX_WIZ_LIGHTS]; // Stores Light IP addresses
+ bool lightsValid[MAX_WIZ_LIGHTS]; // Stores Light IP address validity
+ uint32_t colorsSent[MAX_WIZ_LIGHTS]; // Stores last color sent for each light
+
+
+
+ public:
+
+
+
+ // Send JSON blob to WiZ Light over UDP
+ // RGB or C/W white
+ // TODO:
+ // Better utilize WLED existing white mixing logic
+ void wizSendColor(IPAddress ip, uint32_t color) {
+ UDP.beginPacket(ip, 38899);
+
+ // If no LED color, turn light off. Note wiz light setting for "Off fade-out" will be applied by the light itself.
+ if (color == 0) {
+ UDP.print("{\"method\":\"setPilot\",\"params\":{\"state\":false}}");
+
+ // If color is WHITE, try and use the lights WHITE LEDs instead of mixing RGB LEDs
+ } else if (color == 16777215 && useEnhancedWhite){
+
+ // set cold white light only
+ if (coldWhite > 0 && warmWhite == 0){
+ UDP.print("{\"method\":\"setPilot\",\"params\":{\"c\":"); UDP.print(coldWhite) ;UDP.print("}}");}
+
+ // set warm white light only
+ if (warmWhite > 0 && coldWhite == 0){
+ UDP.print("{\"method\":\"setPilot\",\"params\":{\"w\":"); UDP.print(warmWhite) ;UDP.print("}}");}
+
+ // set combination of warm and cold white light
+ if (coldWhite > 0 && warmWhite > 0){
+ UDP.print("{\"method\":\"setPilot\",\"params\":{\"c\":"); UDP.print(coldWhite) ;UDP.print(",\"w\":"); UDP.print(warmWhite); UDP.print("}}");}
+
+ // Send color as RGB
+ } else {
+ UDP.print("{\"method\":\"setPilot\",\"params\":{\"r\":");
+ UDP.print(R(color));
+ UDP.print(",\"g\":");
+ UDP.print(G(color));
+ UDP.print(",\"b\":");
+ UDP.print(B(color));
+ UDP.print("}}");
+ }
+
+ UDP.endPacket();
+ }
+
+ // Override definition so it compiles
+ void setup() {
+
+ }
+
+
+ // TODO: Check millis() rollover
+ void loop() {
+
+ // Make sure we are connected first
+ if (!WLED_CONNECTED) return;
+
+ unsigned long ellapsedTime = millis() - lastTime;
+ if (ellapsedTime > updateInterval) {
+ bool update = false;
+ for (uint8_t i = 0; i < MAX_WIZ_LIGHTS; i++) {
+ if (!lightsValid[i]) { continue; }
+ uint32_t newColor = strip.getPixelColor(i);
+ if (forceUpdate || (newColor != colorsSent[i]) || (ellapsedTime > forceUpdateMinutes*60000)){
+ wizSendColor(lightsIP[i], newColor);
+ colorsSent[i] = newColor;
+ update = true;
+ delay(sendDelay);
+ }
+ }
+ if (update) lastTime = millis();
+ }
+ }
+
+
+
+ void addToConfig(JsonObject& root)
+ {
+ JsonObject top = root.createNestedObject("wizLightsUsermod");
+ top["Interval (ms)"] = updateInterval;
+ top["Send Delay (ms)"] = sendDelay;
+ top["Use Enhanced White *"] = useEnhancedWhite;
+ top["* Warm White Value (0-255)"] = warmWhite;
+ top["* Cold White Value (0-255)"] = coldWhite;
+ top["Always Force Update"] = forceUpdate;
+ top["Force Update Every x Minutes"] = forceUpdateMinutes;
+
+ for (uint8_t i = 0; i < MAX_WIZ_LIGHTS; i++) {
+ top[getJsonLabel(i)] = lightsIP[i].toString();
+ }
+ }
+
+
+
+ bool readFromConfig(JsonObject& root)
+ {
+ JsonObject top = root["wizLightsUsermod"];
+ bool configComplete = !top.isNull();
+
+ configComplete &= getJsonValue(top["Interval (ms)"], updateInterval, 1000); // How frequently to update the wiz lights
+ configComplete &= getJsonValue(top["Send Delay (ms)"], sendDelay, 0); // Optional delay after sending each UDP message
+ configComplete &= getJsonValue(top["Use Enhanced White *"], useEnhancedWhite, false); // When color is white use wiz white LEDs instead of mixing RGB
+ configComplete &= getJsonValue(top["* Warm White Value (0-255)"], warmWhite, 0); // Warm White LED value for Enhanced White
+ configComplete &= getJsonValue(top["* Cold White Value (0-255)"], coldWhite, 50); // Cold White LED value for Enhanced White
+ configComplete &= getJsonValue(top["Always Force Update"], forceUpdate, false); // Update wiz light every loop, even if color value has not changed
+ configComplete &= getJsonValue(top["Force Update Every x Minutes"], forceUpdateMinutes, 5); // Update wiz light if color value has not changed, every x minutes
+
+ // Read list of IPs
+ String tempIp;
+ for (uint8_t i = 0; i < MAX_WIZ_LIGHTS; i++) {
+ configComplete &= getJsonValue(top[getJsonLabel(i)], tempIp, "0.0.0.0");
+ lightsValid[i] = lightsIP[i].fromString(tempIp);
+
+ // If the IP is not valid, force the value to be empty
+ if (!lightsValid[i]){lightsIP[i].fromString("0.0.0.0");}
+ }
+
+ return configComplete;
+ }
+
+
+ // Create label for the usermod page (I cannot make it work with JSON arrays...)
+ String getJsonLabel(uint8_t i) {return "WiZ Light IP #" + String(i+1);}
+
+ uint16_t getId(){return USERMOD_ID_WIZLIGHTS;}
+};
diff --git a/usermods/word-clock-matrix/readme.md b/usermods/word-clock-matrix/readme.md
index d226537f42..cfaa93e24d 100644
--- a/usermods/word-clock-matrix/readme.md
+++ b/usermods/word-clock-matrix/readme.md
@@ -2,5 +2,18 @@
By @bwente
-See https://www.hackster.io/bwente/word-clock-with-just-two-components-073834 for the hardware guide!
-Includes a customizable feature to lower the brightness at night.
+See https://www.hackster.io/bwente/word-clock-with-just-two-components-073834 for the hardware guide!
+Includes a customizable feature to reduce the brightness at night.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/usermods/word-clock-matrix/usermod_word_clock_matrix.h b/usermods/word-clock-matrix/usermod_word_clock_matrix.h
new file mode 100644
index 0000000000..5825630043
--- /dev/null
+++ b/usermods/word-clock-matrix/usermod_word_clock_matrix.h
@@ -0,0 +1,338 @@
+#pragma once
+
+#include "wled.h"
+
+/*
+ * Things to do...
+ * Turn on ntp clock 24h format
+ * 64 LEDS
+ */
+
+
+class WordClockMatrix : public Usermod
+{
+private:
+ unsigned long lastTime = 0;
+ uint8_t minuteLast = 99;
+ int dayBrightness = 128;
+ int nightBrightness = 16;
+
+public:
+ void setup()
+ {
+ Serial.println("Hello from my usermod!");
+
+ //saveMacro(14, "A=128", false);
+ //saveMacro(15, "A=64", false);
+ //saveMacro(16, "A=16", false);
+
+ //saveMacro(1, "&FX=0&R=255&G=255&B=255", false);
+
+ //strip.getSegment(1).setOption(SEG_OPTION_SELECTED, true);
+
+ //select first two segments (background color + FX settable)
+ WS2812FX::Segment &seg = strip.getSegment(0);
+ seg.colors[0] = ((0 << 24) | ((0 & 0xFF) << 16) | ((0 & 0xFF) << 8) | ((0 & 0xFF)));
+ strip.getSegment(0).setOption(0, false);
+ strip.getSegment(0).setOption(2, false);
+ //other segments are text
+ for (int i = 1; i < 10; i++)
+ {
+ WS2812FX::Segment &seg = strip.getSegment(i);
+ seg.colors[0] = ((0 << 24) | ((0 & 0xFF) << 16) | ((190 & 0xFF) << 8) | ((180 & 0xFF)));
+ strip.getSegment(i).setOption(0, true);
+ strip.setBrightness(64);
+ }
+ }
+
+ void connected()
+ {
+ Serial.println("Connected to WiFi!");
+ }
+
+ void selectWordSegments(bool state)
+ {
+ for (int i = 1; i < 10; i++)
+ {
+ //WS2812FX::Segment &seg = strip.getSegment(i);
+ strip.getSegment(i).setOption(0, state);
+ // strip.getSegment(1).setOption(SEG_OPTION_SELECTED, true);
+ //seg.mode = 12;
+ //seg.palette = 1;
+ //strip.setBrightness(255);
+ }
+ strip.getSegment(0).setOption(0, !state);
+ }
+
+ void hourChime()
+ {
+ //strip.resetSegments();
+ selectWordSegments(true);
+ colorUpdated(CALL_MODE_FX_CHANGED);
+ savePreset(13, false);
+ selectWordSegments(false);
+ //strip.getSegment(0).setOption(0, true);
+ strip.getSegment(0).setOption(2, true);
+ applyPreset(12);
+ colorUpdated(CALL_MODE_FX_CHANGED);
+ }
+
+ void displayTime(byte hour, byte minute)
+ {
+ bool isToHour = false; //true if minute > 30
+ strip.setSegment(0, 0, 64); // background
+ strip.setSegment(1, 0, 2); //It is
+
+ strip.setSegment(2, 0, 0);
+ strip.setSegment(3, 0, 0); //disable minutes
+ strip.setSegment(4, 0, 0); //past
+ strip.setSegment(6, 0, 0); //to
+ strip.setSegment(8, 0, 0); //disable o'clock
+
+ if (hour < 24) //valid time, display
+ {
+ if (minute == 30)
+ {
+ strip.setSegment(2, 3, 6); //half
+ strip.setSegment(3, 0, 0); //minutes
+ }
+ else if (minute == 15 || minute == 45)
+ {
+ strip.setSegment(3, 0, 0); //minutes
+ }
+ else if (minute == 10)
+ {
+ //strip.setSegment(5, 6, 8); //ten
+ }
+ else if (minute == 5)
+ {
+ //strip.setSegment(5, 16, 18); //five
+ }
+ else if (minute == 0)
+ {
+ strip.setSegment(3, 0, 0); //minutes
+ //hourChime();
+ }
+ else
+ {
+ strip.setSegment(3, 18, 22); //minutes
+ }
+
+ //past or to?
+ if (minute == 0)
+ { //full hour
+ strip.setSegment(3, 0, 0); //disable minutes
+ strip.setSegment(4, 0, 0); //disable past
+ strip.setSegment(6, 0, 0); //disable to
+ strip.setSegment(8, 60, 64); //o'clock
+ }
+ else if (minute > 34)
+ {
+ //strip.setSegment(6, 22, 24); //to
+ //minute = 60 - minute;
+ isToHour = true;
+ }
+ else
+ {
+ //strip.setSegment(4, 24, 27); //past
+ //isToHour = false;
+ }
+ }
+
+ //byte minuteRem = minute %10;
+
+ if (minute <= 4)
+ {
+ strip.setSegment(3, 0, 0); //nothing
+ strip.setSegment(5, 0, 0); //nothing
+ strip.setSegment(6, 0, 0); //nothing
+ strip.setSegment(8, 60, 64); //o'clock
+ }
+ else if (minute <= 9)
+ {
+ strip.setSegment(5, 16, 18); // five past
+ strip.setSegment(4, 24, 27); //past
+ }
+ else if (minute <= 14)
+ {
+ strip.setSegment(5, 6, 8); // ten past
+ strip.setSegment(4, 24, 27); //past
+ }
+ else if (minute <= 19)
+ {
+ strip.setSegment(5, 8, 12); // quarter past
+ strip.setSegment(3, 0, 0); //minutes
+ strip.setSegment(4, 24, 27); //past
+ }
+ else if (minute <= 24)
+ {
+ strip.setSegment(5, 12, 16); // twenty past
+ strip.setSegment(4, 24, 27); //past
+ }
+ else if (minute <= 29)
+ {
+ strip.setSegment(5, 12, 18); // twenty-five past
+ strip.setSegment(4, 24, 27); //past
+ }
+ else if (minute <= 34)
+ {
+ strip.setSegment(5, 3, 6); // half past
+ strip.setSegment(3, 0, 0); //minutes
+ strip.setSegment(4, 24, 27); //past
+ }
+ else if (minute <= 39)
+ {
+ strip.setSegment(5, 12, 18); // twenty-five to
+ strip.setSegment(6, 22, 24); //to
+ }
+ else if (minute <= 44)
+ {
+ strip.setSegment(5, 12, 16); // twenty to
+ strip.setSegment(6, 22, 24); //to
+ }
+ else if (minute <= 49)
+ {
+ strip.setSegment(5, 8, 12); // quarter to
+ strip.setSegment(3, 0, 0); //minutes
+ strip.setSegment(6, 22, 24); //to
+ }
+ else if (minute <= 54)
+ {
+ strip.setSegment(5, 6, 8); // ten to
+ strip.setSegment(6, 22, 24); //to
+ }
+ else if (minute <= 59)
+ {
+ strip.setSegment(5, 16, 18); // five to
+ strip.setSegment(6, 22, 24); //to
+ }
+
+ //hours
+ if (hour > 23)
+ return;
+ if (isToHour)
+ hour++;
+ if (hour > 12)
+ hour -= 12;
+ if (hour == 0)
+ hour = 12;
+
+ switch (hour)
+ {
+ case 1:
+ strip.setSegment(7, 27, 29);
+ break; //one
+ case 2:
+ strip.setSegment(7, 35, 37);
+ break; //two
+ case 3:
+ strip.setSegment(7, 29, 32);
+ break; //three
+ case 4:
+ strip.setSegment(7, 32, 35);
+ break; //four
+ case 5:
+ strip.setSegment(7, 37, 40);
+ break; //five
+ case 6:
+ strip.setSegment(7, 43, 45);
+ break; //six
+ case 7:
+ strip.setSegment(7, 40, 43);
+ break; //seven
+ case 8:
+ strip.setSegment(7, 45, 48);
+ break; //eight
+ case 9:
+ strip.setSegment(7, 48, 50);
+ break; //nine
+ case 10:
+ strip.setSegment(7, 54, 56);
+ break; //ten
+ case 11:
+ strip.setSegment(7, 50, 54);
+ break; //eleven
+ case 12:
+ strip.setSegment(7, 56, 60);
+ break; //twelve
+ }
+
+ selectWordSegments(true);
+ applyMacro(1);
+ }
+
+ void timeOfDay()
+ {
+ // NOT USED: use timed macros instead
+ //Used to set brightness dependant of time of day - lights dimmed at night
+
+ //monday to thursday and sunday
+
+ if ((weekday(localTime) == 6) | (weekday(localTime) == 7))
+ {
+ if ((hour(localTime) > 0) | (hour(localTime) < 8))
+ {
+ strip.setBrightness(nightBrightness);
+ }
+ else
+ {
+ strip.setBrightness(dayBrightness);
+ }
+ }
+ else
+ {
+ if ((hour(localTime) < 6) | (hour(localTime) >= 22))
+ {
+ strip.setBrightness(nightBrightness);
+ }
+ else
+ {
+ strip.setBrightness(dayBrightness);
+ }
+ }
+ }
+
+ //loop. You can use "if (WLED_CONNECTED)" to check for successful connection
+ void loop()
+ {
+
+ if (millis() - lastTime > 1000) {
+ //Serial.println("I'm alive!");
+ Serial.println(hour(localTime));
+ lastTime = millis();
+ }
+
+
+ if (minute(localTime) != minuteLast)
+ {
+ updateLocalTime();
+ //timeOfDay();
+ minuteLast = minute(localTime);
+ displayTime(hour(localTime), minute(localTime));
+ if (minute(localTime) == 0)
+ {
+ hourChime();
+ }
+ if (minute(localTime) == 1)
+ {
+ //turn off background segment;
+ strip.getSegment(0).setOption(2, false);
+ //applyPreset(13);
+ }
+ }
+ }
+
+ void addToConfig(JsonObject& root)
+ {
+ JsonObject modName = root.createNestedObject("id");
+ modName["mdns"] = "wled-word-clock";
+ modName["name"] = "WLED WORD CLOCK";
+ }
+
+ uint16_t getId()
+ {
+ return USERMOD_ID_WORD_CLOCK_MATRIX;
+ }
+
+
+};
diff --git a/usermods/word-clock-matrix/word-clock-matrix.cpp b/usermods/word-clock-matrix/word-clock-matrix.cpp
index 628b52625a..67c5b1e472 100644
--- a/usermods/word-clock-matrix/word-clock-matrix.cpp
+++ b/usermods/word-clock-matrix/word-clock-matrix.cpp
@@ -27,14 +27,14 @@ saveMacro(1, "&FX=0&R=255&G=255&B=255", false);
//strip.getSegment(1).setOption(SEG_OPTION_SELECTED, true);
//select first two segments (background color + FX settable)
- WS2812FX::Segment &seg = strip.getSegment(0);
+ Segment &seg = strip.getSegment(0);
seg.colors[0] = ((0 << 24) | ((0 & 0xFF) << 16) | ((0 & 0xFF) << 8) | ((0 & 0xFF)));
strip.getSegment(0).setOption(0, false);
strip.getSegment(0).setOption(2, false);
//other segments are text
for (int i = 1; i < 10; i++)
{
- WS2812FX::Segment &seg = strip.getSegment(i);
+ Segment &seg = strip.getSegment(i);
seg.colors[0] = ((0 << 24) | ((0 & 0xFF) << 16) | ((190 & 0xFF) << 8) | ((180 & 0xFF)));
strip.getSegment(i).setOption(0, true);
strip.setBrightness(128);
@@ -50,7 +50,7 @@ void selectWordSegments(bool state)
{
for (int i = 1; i < 10; i++)
{
- //WS2812FX::Segment &seg = strip.getSegment(i);
+ //Segment &seg = strip.getSegment(i);
strip.getSegment(i).setOption(0, state);
// strip.getSegment(1).setOption(SEG_OPTION_SELECTED, true);
//seg.mode = 12;
diff --git a/wled00.sln b/wled00.sln
deleted file mode 100644
index b2f12b8359..0000000000
--- a/wled00.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2046
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wled00", "wled00\wled00.vcxproj", "{C5F80730-F44F-4478-BDAE-6634EFC2CA88}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x86 = Debug|x86
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Debug|x86.ActiveCfg = Debug|Win32
- {C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Debug|x86.Build.0 = Debug|Win32
- {C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Release|x86.ActiveCfg = Release|Win32
- {C5F80730-F44F-4478-BDAE-6634EFC2CA88}.Release|x86.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {9A679C2B-61D3-400B-B96F-06E604E9CED2}
- EndGlobalSection
-EndGlobal
diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index fa6cb35513..cb8813c930 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -24,19 +24,65 @@
Modified heavily for WLED
*/
-#include "FX.h"
#include "wled.h"
+#include "FX.h"
+#include "fcn_declare.h"
#define IBN 5100
-#define PALETTE_SOLID_WRAP (paletteBlend == 1 || paletteBlend == 3)
+
+// paletteBlend: 0 - wrap when moving, 1 - always wrap, 2 - never wrap, 3 - none (undefined)
+#define PALETTE_SOLID_WRAP (strip.paletteBlend == 1 || strip.paletteBlend == 3)
+#define PALETTE_MOVING_WRAP !(strip.paletteBlend == 2 || (strip.paletteBlend == 0 && SEGMENT.speed == 0))
+
+#define indexToVStrip(index, stripNr) ((index) | (int((stripNr)+1)<<16))
+
+// effect utility functions
+uint8_t sin_gap(uint16_t in) {
+ if (in & 0x100) return 0;
+ return sin8(in + 192); // correct phase shift of sine so that it starts and stops at 0
+}
+
+uint16_t triwave16(uint16_t in) {
+ if (in < 0x8000) return in *2;
+ return 0xFFFF - (in - 0x8000)*2;
+}
+
+/*
+ * Generates a tristate square wave w/ attac & decay
+ * @param x input value 0-255
+ * @param pulsewidth 0-127
+ * @param attdec attack & decay, max. pulsewidth / 2
+ * @returns signed waveform value
+ */
+int8_t tristate_square8(uint8_t x, uint8_t pulsewidth, uint8_t attdec) {
+ int8_t a = 127;
+ if (x > 127) {
+ a = -127;
+ x -= 127;
+ }
+
+ if (x < attdec) { //inc to max
+ return (int16_t) x * a / attdec;
+ }
+ else if (x < pulsewidth - attdec) { //max
+ return a;
+ }
+ else if (x < pulsewidth) { //dec to 0
+ return (int16_t) (pulsewidth - x) * a / attdec;
+ }
+ return 0;
+}
+
+// effect functions
/*
* No blinking. Just plain old static light.
*/
-uint16_t WS2812FX::mode_static(void) {
- fill(SEGCOLOR(0));
- return (SEGMENT.getOption(SEG_OPTION_TRANSITIONAL)) ? FRAMETIME : 350; //update faster if in transition
+uint16_t mode_static(void) {
+ SEGMENT.fill(SEGCOLOR(0));
+ return strip.isOffRefreshRequired() ? FRAMETIME : 350;
}
+static const char _data_FX_MODE_STATIC[] PROGMEM = "Solid";
/*
@@ -44,64 +90,68 @@ uint16_t WS2812FX::mode_static(void) {
* Alternate between color1 and color2
* if(strobe == true) then create a strobe effect
*/
-uint16_t WS2812FX::blink(uint32_t color1, uint32_t color2, bool strobe, bool do_palette) {
+uint16_t blink(uint32_t color1, uint32_t color2, bool strobe, bool do_palette) {
uint32_t cycleTime = (255 - SEGMENT.speed)*20;
uint32_t onTime = FRAMETIME;
if (!strobe) onTime += ((cycleTime * SEGMENT.intensity) >> 8);
cycleTime += FRAMETIME*2;
- uint32_t it = now / cycleTime;
- uint32_t rem = now % cycleTime;
-
+ uint32_t it = strip.now / cycleTime;
+ uint32_t rem = strip.now % cycleTime;
+
bool on = false;
if (it != SEGENV.step //new iteration, force on state for one frame, even if set time is too brief
- || rem <= onTime) {
+ || rem <= onTime) {
on = true;
}
-
+
SEGENV.step = it; //save previous iteration
uint32_t color = on ? color1 : color2;
if (color == color1 && do_palette)
{
- for(uint16_t i = 0; i < SEGLEN; i++) {
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
+ for (int i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
}
- } else fill(color);
+ } else SEGMENT.fill(color);
return FRAMETIME;
}
/*
- * Normal blinking. 50% on/off time.
+ * Normal blinking. Intensity sets duty cycle.
*/
-uint16_t WS2812FX::mode_blink(void) {
+uint16_t mode_blink(void) {
return blink(SEGCOLOR(0), SEGCOLOR(1), false, true);
}
+static const char _data_FX_MODE_BLINK[] PROGMEM = "Blink@!,Duty cycle;!,!;!;01";
/*
* Classic Blink effect. Cycling through the rainbow.
*/
-uint16_t WS2812FX::mode_blink_rainbow(void) {
- return blink(color_wheel(SEGENV.call & 0xFF), SEGCOLOR(1), false, false);
+uint16_t mode_blink_rainbow(void) {
+ return blink(SEGMENT.color_wheel(SEGENV.call & 0xFF), SEGCOLOR(1), false, false);
}
+static const char _data_FX_MODE_BLINK_RAINBOW[] PROGMEM = "Blink Rainbow@Frequency,Blink duration;!,!;!;01";
/*
* Classic Strobe effect.
*/
-uint16_t WS2812FX::mode_strobe(void) {
+uint16_t mode_strobe(void) {
return blink(SEGCOLOR(0), SEGCOLOR(1), true, true);
}
+static const char _data_FX_MODE_STROBE[] PROGMEM = "Strobe@!;!,!;!;01";
/*
* Classic Strobe effect. Cycling through the rainbow.
*/
-uint16_t WS2812FX::mode_strobe_rainbow(void) {
- return blink(color_wheel(SEGENV.call & 0xFF), SEGCOLOR(1), true, false);
+uint16_t mode_strobe_rainbow(void) {
+ return blink(SEGMENT.color_wheel(SEGENV.call & 0xFF), SEGCOLOR(1), true, false);
}
+static const char _data_FX_MODE_STROBE_RAINBOW[] PROGMEM = "Strobe Rainbow@!;,!;!;01";
/*
@@ -109,9 +159,9 @@ uint16_t WS2812FX::mode_strobe_rainbow(void) {
* LEDs are turned on (color1) in sequence, then turned off (color2) in sequence.
* if (bool rev == true) then LEDs are turned off in reverse order
*/
-uint16_t WS2812FX::color_wipe(bool rev, bool useRandomColors) {
+uint16_t color_wipe(bool rev, bool useRandomColors) {
uint32_t cycleTime = 750 + (255 - SEGMENT.speed)*150;
- uint32_t perc = now % cycleTime;
+ uint32_t perc = strip.now % cycleTime;
uint16_t prog = (perc * 65535) / cycleTime;
bool back = (prog > 32767);
if (back) {
@@ -142,21 +192,21 @@ uint16_t WS2812FX::color_wipe(bool rev, bool useRandomColors) {
rem /= (SEGMENT.intensity +1);
if (rem > 255) rem = 255;
- uint32_t col1 = useRandomColors? color_wheel(SEGENV.aux1) : SEGCOLOR(1);
- for (uint16_t i = 0; i < SEGLEN; i++)
+ uint32_t col1 = useRandomColors? SEGMENT.color_wheel(SEGENV.aux1) : SEGCOLOR(1);
+ for (int i = 0; i < SEGLEN; i++)
{
uint16_t index = (rev && back)? SEGLEN -1 -i : i;
- uint32_t col0 = useRandomColors? color_wheel(SEGENV.aux0) : color_from_palette(index, true, PALETTE_SOLID_WRAP, 0);
-
- if (i < ledIndex)
+ uint32_t col0 = useRandomColors? SEGMENT.color_wheel(SEGENV.aux0) : SEGMENT.color_from_palette(index, true, PALETTE_SOLID_WRAP, 0);
+
+ if (i < ledIndex)
{
- setPixelColor(index, back? col1 : col0);
+ SEGMENT.setPixelColor(index, back? col1 : col0);
} else
{
- setPixelColor(index, back? col0 : col1);
- if (i == ledIndex) setPixelColor(index, color_blend(back? col0 : col1, back? col1 : col0, rem));
+ SEGMENT.setPixelColor(index, back? col0 : col1);
+ if (i == ledIndex) SEGMENT.setPixelColor(index, color_blend(back? col0 : col1, back? col1 : col0, rem));
}
- }
+ }
return FRAMETIME;
}
@@ -164,43 +214,48 @@ uint16_t WS2812FX::color_wipe(bool rev, bool useRandomColors) {
/*
* Lights all LEDs one after another.
*/
-uint16_t WS2812FX::mode_color_wipe(void) {
+uint16_t mode_color_wipe(void) {
return color_wipe(false, false);
}
+static const char _data_FX_MODE_COLOR_WIPE[] PROGMEM = "Wipe@!,!;!,!;!";
+
/*
* Lights all LEDs one after another. Turns off opposite
*/
-uint16_t WS2812FX::mode_color_sweep(void) {
+uint16_t mode_color_sweep(void) {
return color_wipe(true, false);
}
+static const char _data_FX_MODE_COLOR_SWEEP[] PROGMEM = "Sweep@!,!;!,!;!";
/*
* Turns all LEDs after each other to a random color.
* Then starts over with another color.
*/
-uint16_t WS2812FX::mode_color_wipe_random(void) {
+uint16_t mode_color_wipe_random(void) {
return color_wipe(false, true);
}
+static const char _data_FX_MODE_COLOR_WIPE_RANDOM[] PROGMEM = "Wipe Random@!;;!";
/*
* Random color introduced alternating from start and end of strip.
*/
-uint16_t WS2812FX::mode_color_sweep_random(void) {
+uint16_t mode_color_sweep_random(void) {
return color_wipe(true, true);
}
+static const char _data_FX_MODE_COLOR_SWEEP_RANDOM[] PROGMEM = "Sweep Random@!;;!";
/*
- * Lights all LEDs in one random color up. Then switches them
+ * Lights all LEDs up in one random color. Then switches them
* to the next random color.
*/
-uint16_t WS2812FX::mode_random_color(void) {
+uint16_t mode_random_color(void) {
uint32_t cycleTime = 200 + (255 - SEGMENT.speed)*50;
- uint32_t it = now / cycleTime;
- uint32_t rem = now % cycleTime;
+ uint32_t it = strip.now / cycleTime;
+ uint32_t rem = strip.now % cycleTime;
uint16_t fadedur = (cycleTime * SEGMENT.intensity) >> 8;
uint32_t fade = 255;
@@ -220,119 +275,124 @@ uint16_t WS2812FX::mode_random_color(void) {
SEGENV.step = it;
}
- fill(color_blend(color_wheel(SEGENV.aux1), color_wheel(SEGENV.aux0), fade));
+ SEGMENT.fill(color_blend(SEGMENT.color_wheel(SEGENV.aux1), SEGMENT.color_wheel(SEGENV.aux0), fade));
return FRAMETIME;
}
+static const char _data_FX_MODE_RANDOM_COLOR[] PROGMEM = "Random Colors@!,Fade time;;!;01";
/*
* Lights every LED in a random color. Changes all LED at the same time
* to new random colors.
*/
-uint16_t WS2812FX::dynamic(boolean smooth=false) {
+uint16_t mode_dynamic(void) {
if (!SEGENV.allocateData(SEGLEN)) return mode_static(); //allocation failed
-
+
if(SEGENV.call == 0) {
- for (uint16_t i = 0; i < SEGLEN; i++) SEGENV.data[i] = random8();
+ //SEGMENT.fill(BLACK);
+ for (int i = 0; i < SEGLEN; i++) SEGENV.data[i] = random8();
}
uint32_t cycleTime = 50 + (255 - SEGMENT.speed)*15;
- uint32_t it = now / cycleTime;
+ uint32_t it = strip.now / cycleTime;
if (it != SEGENV.step && SEGMENT.speed != 0) //new color
{
- for (uint16_t i = 0; i < SEGLEN; i++) {
- if (random8() <= SEGMENT.intensity) SEGENV.data[i] = random8();
+ for (int i = 0; i < SEGLEN; i++) {
+ if (random8() <= SEGMENT.intensity) SEGENV.data[i] = random8(); // random color index
}
SEGENV.step = it;
}
-
- if (smooth) {
- for (uint16_t i = 0; i < SEGLEN; i++) {
- blendPixelColor(i, color_wheel(SEGENV.data[i]),16);
+
+ if (SEGMENT.check1) {
+ for (int i = 0; i < SEGLEN; i++) {
+ SEGMENT.blendPixelColor(i, SEGMENT.color_wheel(SEGENV.data[i]), 16);
}
} else {
- for (uint16_t i = 0; i < SEGLEN; i++) {
- setPixelColor(i, color_wheel(SEGENV.data[i]));
+ for (int i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, SEGMENT.color_wheel(SEGENV.data[i]));
}
- }
+ }
return FRAMETIME;
}
+static const char _data_FX_MODE_DYNAMIC[] PROGMEM = "Dynamic@!,!,,,,Smooth;;!";
-/*
- * Original effect "Dynamic"
- */
-uint16_t WS2812FX::mode_dynamic(void) {
- return dynamic(false);
-}
/*
- * effect "Dynamic" with smoth color-fading
+ * effect "Dynamic" with smooth color-fading
*/
-uint16_t WS2812FX::mode_dynamic_smooth(void) {
- return dynamic(true);
+uint16_t mode_dynamic_smooth(void) {
+ bool old = SEGMENT.check1;
+ SEGMENT.check1 = true;
+ mode_dynamic();
+ SEGMENT.check1 = old;
+ return FRAMETIME;
}
+static const char _data_FX_MODE_DYNAMIC_SMOOTH[] PROGMEM = "Dynamic Smooth@!,!;;!";
+
/*
* Does the "standby-breathing" of well known i-Devices.
*/
-uint16_t WS2812FX::mode_breath(void) {
+uint16_t mode_breath(void) {
uint16_t var = 0;
- uint16_t counter = (now * ((SEGMENT.speed >> 3) +10));
+ uint16_t counter = (strip.now * ((SEGMENT.speed >> 3) +10));
counter = (counter >> 2) + (counter >> 4); //0-16384 + 0-2048
if (counter < 16384) {
if (counter > 8192) counter = 8192 - (counter - 8192);
var = sin16(counter) / 103; //close to parabolic in range 0-8192, max val. 23170
}
-
+
uint8_t lum = 30 + var;
- for(uint16_t i = 0; i < SEGLEN; i++) {
- setPixelColor(i, color_blend(SEGCOLOR(1), color_from_palette(i, true, PALETTE_SOLID_WRAP, 0), lum));
+ for (int i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0), lum));
}
return FRAMETIME;
}
+static const char _data_FX_MODE_BREATH[] PROGMEM = "Breathe@!;!,!;!;01";
/*
* Fades the LEDs between two colors
*/
-uint16_t WS2812FX::mode_fade(void) {
- uint16_t counter = (now * ((SEGMENT.speed >> 3) +10));
+uint16_t mode_fade(void) {
+ uint16_t counter = (strip.now * ((SEGMENT.speed >> 3) +10));
uint8_t lum = triwave16(counter) >> 8;
- for(uint16_t i = 0; i < SEGLEN; i++) {
- setPixelColor(i, color_blend(SEGCOLOR(1), color_from_palette(i, true, PALETTE_SOLID_WRAP, 0), lum));
+ for (int i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0), lum));
}
return FRAMETIME;
}
+static const char _data_FX_MODE_FADE[] PROGMEM = "Fade@!;!,!;!;01";
/*
* Scan mode parent function
*/
-uint16_t WS2812FX::scan(bool dual)
+uint16_t scan(bool dual)
{
uint32_t cycleTime = 750 + (255 - SEGMENT.speed)*150;
- uint32_t perc = now % cycleTime;
+ uint32_t perc = strip.now % cycleTime;
uint16_t prog = (perc * 65535) / cycleTime;
uint16_t size = 1 + ((SEGMENT.intensity * SEGLEN) >> 9);
uint16_t ledIndex = (prog * ((SEGLEN *2) - size *2)) >> 16;
- fill(SEGCOLOR(1));
+ if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1));
int led_offset = ledIndex - (SEGLEN - size);
led_offset = abs(led_offset);
if (dual) {
- for (uint16_t j = led_offset; j < led_offset + size; j++) {
+ for (int j = led_offset; j < led_offset + size; j++) {
uint16_t i2 = SEGLEN -1 -j;
- setPixelColor(i2, color_from_palette(i2, true, PALETTE_SOLID_WRAP, (SEGCOLOR(2))? 2:0));
+ SEGMENT.setPixelColor(i2, SEGMENT.color_from_palette(i2, true, PALETTE_SOLID_WRAP, (SEGCOLOR(2))? 2:0));
}
}
- for (uint16_t j = led_offset; j < led_offset + size; j++) {
- setPixelColor(j, color_from_palette(j, true, PALETTE_SOLID_WRAP, 0));
+ for (int j = led_offset; j < led_offset + size; j++) {
+ SEGMENT.setPixelColor(j, SEGMENT.color_from_palette(j, true, PALETTE_SOLID_WRAP, 0));
}
return FRAMETIME;
@@ -342,49 +402,82 @@ uint16_t WS2812FX::scan(bool dual)
/*
* Runs a single pixel back and forth.
*/
-uint16_t WS2812FX::mode_scan(void) {
+uint16_t mode_scan(void) {
return scan(false);
}
+static const char _data_FX_MODE_SCAN[] PROGMEM = "Scan@!,# of dots,,,,,Overlay;!,!,!;!";
/*
* Runs two pixel back and forth in opposite directions.
*/
-uint16_t WS2812FX::mode_dual_scan(void) {
+uint16_t mode_dual_scan(void) {
return scan(true);
}
+static const char _data_FX_MODE_DUAL_SCAN[] PROGMEM = "Scan Dual@!,# of dots,,,,,Overlay;!,!,!;!";
/*
* Cycles all LEDs at once through a rainbow.
*/
-uint16_t WS2812FX::mode_rainbow(void) {
- uint16_t counter = (now * ((SEGMENT.speed >> 2) +2)) & 0xFFFF;
+uint16_t mode_rainbow(void) {
+ uint16_t counter = (strip.now * ((SEGMENT.speed >> 2) +2)) & 0xFFFF;
counter = counter >> 8;
if (SEGMENT.intensity < 128){
- fill(color_blend(color_wheel(counter),WHITE,128-SEGMENT.intensity));
+ SEGMENT.fill(color_blend(SEGMENT.color_wheel(counter),WHITE,128-SEGMENT.intensity));
} else {
- fill(color_wheel(counter));
+ SEGMENT.fill(SEGMENT.color_wheel(counter));
}
return FRAMETIME;
}
+static const char _data_FX_MODE_RAINBOW[] PROGMEM = "Colorloop@!,Saturation;;!;01";
/*
* Cycles a rainbow over the entire string of LEDs.
*/
-uint16_t WS2812FX::mode_rainbow_cycle(void) {
- uint16_t counter = (now * ((SEGMENT.speed >> 2) +2)) & 0xFFFF;
+uint16_t mode_rainbow_cycle(void) {
+ uint16_t counter = (strip.now * ((SEGMENT.speed >> 2) +2)) & 0xFFFF;
counter = counter >> 8;
-
- for(uint16_t i = 0; i < SEGLEN; i++) {
+
+ for (int i = 0; i < SEGLEN; i++) {
//intensity/29 = 0 (1/16) 1 (1/8) 2 (1/4) 3 (1/2) 4 (1) 5 (2) 6 (4) 7 (8) 8 (16)
uint8_t index = (i * (16 << (SEGMENT.intensity /29)) / SEGLEN) + counter;
- setPixelColor(i, color_wheel(index));
+ SEGMENT.setPixelColor(i, SEGMENT.color_wheel(index));
+ }
+
+ return FRAMETIME;
+}
+static const char _data_FX_MODE_RAINBOW_CYCLE[] PROGMEM = "Rainbow@!,Size;;!";
+
+
+/*
+ * Alternating pixels running function.
+ */
+uint16_t running(uint32_t color1, uint32_t color2, bool theatre = false) {
+ uint8_t width = (theatre ? 3 : 1) + (SEGMENT.intensity >> 4); // window
+ uint32_t cycleTime = 50 + (255 - SEGMENT.speed);
+ uint32_t it = strip.now / cycleTime;
+ bool usePalette = color1 == SEGCOLOR(0);
+
+ for (int i = 0; i < SEGLEN; i++) {
+ uint32_t col = color2;
+ if (usePalette) color1 = SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0);
+ if (theatre) {
+ if ((i % width) == SEGENV.aux0) col = color1;
+ } else {
+ int8_t pos = (i % (width<<1));
+ if ((pos < SEGENV.aux0-width) || ((pos >= SEGENV.aux0) && (pos < SEGENV.aux0+width))) col = color1;
+ }
+ SEGMENT.setPixelColor(i,col);
}
+ if (it != SEGENV.step) {
+ SEGENV.aux0 = (SEGENV.aux0 +1) % (theatre ? width : (width<<1));
+ SEGENV.step = it;
+ }
return FRAMETIME;
}
@@ -393,28 +486,30 @@ uint16_t WS2812FX::mode_rainbow_cycle(void) {
* Theatre-style crawling lights.
* Inspired by the Adafruit examples.
*/
-uint16_t WS2812FX::mode_theater_chase(void) {
+uint16_t mode_theater_chase(void) {
return running(SEGCOLOR(0), SEGCOLOR(1), true);
}
+static const char _data_FX_MODE_THEATER_CHASE[] PROGMEM = "Theater@!,Gap size;!,!;!";
/*
* Theatre-style crawling lights with rainbow effect.
* Inspired by the Adafruit examples.
*/
-uint16_t WS2812FX::mode_theater_chase_rainbow(void) {
- return running(color_wheel(SEGENV.step), SEGCOLOR(1), true);
+uint16_t mode_theater_chase_rainbow(void) {
+ return running(SEGMENT.color_wheel(SEGENV.step), SEGCOLOR(1), true);
}
+static const char _data_FX_MODE_THEATER_CHASE_RAINBOW[] PROGMEM = "Theater Rainbow@!,Gap size;,!;!";
/*
* Running lights effect with smooth sine transition base.
*/
-uint16_t WS2812FX::running_base(bool saw, bool dual=false) {
+uint16_t running_base(bool saw, bool dual=false) {
uint8_t x_scale = SEGMENT.intensity >> 2;
- uint32_t counter = (now * SEGMENT.speed) >> 9;
+ uint32_t counter = (strip.now * SEGMENT.speed) >> 9;
- for(uint16_t i = 0; i < SEGLEN; i++) {
+ for (int i = 0; i < SEGLEN; i++) {
uint16_t a = i*x_scale - counter;
if (saw) {
a &= 0xFF;
@@ -427,15 +522,16 @@ uint16_t WS2812FX::running_base(bool saw, bool dual=false) {
a = 255 - a;
}
uint8_t s = dual ? sin_gap(a) : sin8(a);
- uint32_t ca = color_blend(SEGCOLOR(1), color_from_palette(i, true, PALETTE_SOLID_WRAP, 0), s);
+ uint32_t ca = color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0), s);
if (dual) {
uint16_t b = (SEGLEN-1-i)*x_scale - counter;
uint8_t t = sin_gap(b);
- uint32_t cb = color_blend(SEGCOLOR(1), color_from_palette(i, true, PALETTE_SOLID_WRAP, 2), t);
+ uint32_t cb = color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 2), t);
ca = color_blend(ca, cb, 127);
}
- setPixelColor(i, ca);
+ SEGMENT.setPixelColor(i, ca);
}
+
return FRAMETIME;
}
@@ -444,36 +540,39 @@ uint16_t WS2812FX::running_base(bool saw, bool dual=false) {
* Running lights in opposite directions.
* Idea: Make the gap width controllable with a third slider in the future
*/
-uint16_t WS2812FX::mode_running_dual(void) {
+uint16_t mode_running_dual(void) {
return running_base(false, true);
}
+static const char _data_FX_MODE_RUNNING_DUAL[] PROGMEM = "Running Dual@!,Wave width;L,!,R;!";
/*
* Running lights effect with smooth sine transition.
*/
-uint16_t WS2812FX::mode_running_lights(void) {
+uint16_t mode_running_lights(void) {
return running_base(false);
}
+static const char _data_FX_MODE_RUNNING_LIGHTS[] PROGMEM = "Running@!,Wave width;!,!;!";
/*
* Running lights effect with sawtooth transition.
*/
-uint16_t WS2812FX::mode_saw(void) {
+uint16_t mode_saw(void) {
return running_base(true);
}
+static const char _data_FX_MODE_SAW[] PROGMEM = "Saw@!,Width;!,!;!";
/*
* Blink several LEDs in random colors on, reset, repeat.
* Inspired by www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/
*/
-uint16_t WS2812FX::mode_twinkle(void) {
- fill(SEGCOLOR(1));
+uint16_t mode_twinkle(void) {
+ SEGMENT.fade_out(224);
uint32_t cycleTime = 20 + (255 - SEGMENT.speed)*5;
- uint32_t it = now / cycleTime;
+ uint32_t it = strip.now / cycleTime;
if (it != SEGENV.step)
{
uint16_t maxOn = map(SEGMENT.intensity, 0, 255, 1, SEGLEN); // make sure at least one LED is on
@@ -485,7 +584,7 @@ uint16_t WS2812FX::mode_twinkle(void) {
SEGENV.aux0++;
SEGENV.step = it;
}
-
+
uint16_t PRNG16 = SEGENV.aux1;
for (uint16_t i = 0; i < SEGENV.aux0; i++)
@@ -493,46 +592,61 @@ uint16_t WS2812FX::mode_twinkle(void) {
PRNG16 = (uint16_t)(PRNG16 * 2053) + 13849; // next 'random' number
uint32_t p = (uint32_t)SEGLEN * (uint32_t)PRNG16;
uint16_t j = p >> 16;
- setPixelColor(j, color_from_palette(j, true, PALETTE_SOLID_WRAP, 0));
+ SEGMENT.setPixelColor(j, SEGMENT.color_from_palette(j, true, PALETTE_SOLID_WRAP, 0));
}
return FRAMETIME;
}
+static const char _data_FX_MODE_TWINKLE[] PROGMEM = "Twinkle@!,!;!,!;!;;m12=0"; //pixels
/*
* Dissolve function
*/
-uint16_t WS2812FX::dissolve(uint32_t color) {
- bool wa = (SEGCOLOR(1) != 0 && _brightness < 255); //workaround, can't compare getPixel to color if not full brightness
-
- for (uint16_t j = 0; j <= SEGLEN / 15; j++)
- {
+uint16_t dissolve(uint32_t color) {
+ uint16_t dataSize = (SEGLEN+7) >> 3; //1 bit per LED
+ if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
+
+ if (SEGENV.call == 0) {
+ memset(SEGMENT.data, 0xFF, dataSize); // start by fading pixels up
+ SEGENV.aux0 = 1;
+ }
+
+ for (int j = 0; j <= SEGLEN / 15; j++) {
if (random8() <= SEGMENT.intensity) {
- for (uint8_t times = 0; times < 10; times++) //attempt to spawn a new pixel 5 times
- {
- uint16_t i = random16(SEGLEN);
+ for (size_t times = 0; times < 10; times++) { //attempt to spawn a new pixel 10 times
+ unsigned i = random16(SEGLEN);
+ unsigned index = i >> 3;
+ unsigned bitNum = i & 0x07;
+ bool fadeUp = bitRead(SEGENV.data[index], bitNum);
if (SEGENV.aux0) { //dissolve to primary/palette
- if (getPixelColor(i) == SEGCOLOR(1) || wa) {
- if (color == SEGCOLOR(0))
- {
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
- } else { setPixelColor(i, color); }
+ if (fadeUp) {
+ if (color == SEGCOLOR(0)) {
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
+ } else {
+ SEGMENT.setPixelColor(i, color);
+ }
+ bitWrite(SEGENV.data[index], bitNum, false);
break; //only spawn 1 new pixel per frame per 50 LEDs
}
} else { //dissolve to secondary
- if (getPixelColor(i) != SEGCOLOR(1)) { setPixelColor(i, SEGCOLOR(1)); break; }
+ if (!fadeUp) {
+ SEGMENT.setPixelColor(i, SEGCOLOR(1)); break;
+ bitWrite(SEGENV.data[index], bitNum, true);
+ }
}
}
}
}
- if (SEGENV.call > (255 - SEGMENT.speed) + 15U)
- {
+ if (SEGENV.step > (255 - SEGMENT.speed) + 15U) {
SEGENV.aux0 = !SEGENV.aux0;
- SEGENV.call = 0;
+ SEGENV.step = 0;
+ memset(SEGMENT.data, (SEGENV.aux0 ? 0xFF : 0), dataSize); // switch fading
+ } else {
+ SEGENV.step++;
}
-
+
return FRAMETIME;
}
@@ -540,120 +654,127 @@ uint16_t WS2812FX::dissolve(uint32_t color) {
/*
* Blink several LEDs on and then off
*/
-uint16_t WS2812FX::mode_dissolve(void) {
- return dissolve(SEGCOLOR(0));
+uint16_t mode_dissolve(void) {
+ return dissolve(SEGMENT.check1 ? SEGMENT.color_wheel(random8()) : SEGCOLOR(0));
}
+static const char _data_FX_MODE_DISSOLVE[] PROGMEM = "Dissolve@Repeat speed,Dissolve speed,,,,Random;!,!;!";
/*
* Blink several LEDs on and then off in random colors
*/
-uint16_t WS2812FX::mode_dissolve_random(void) {
- return dissolve(color_wheel(random8()));
+uint16_t mode_dissolve_random(void) {
+ return dissolve(SEGMENT.color_wheel(random8()));
}
+static const char _data_FX_MODE_DISSOLVE_RANDOM[] PROGMEM = "Dissolve Rnd@Repeat speed,Dissolve speed;,!;!";
/*
* Blinks one LED at a time.
* Inspired by www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/
*/
-uint16_t WS2812FX::mode_sparkle(void) {
- for(uint16_t i = 0; i < SEGLEN; i++) {
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
+uint16_t mode_sparkle(void) {
+ if (!SEGMENT.check2) for(int i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
}
uint32_t cycleTime = 10 + (255 - SEGMENT.speed)*2;
- uint32_t it = now / cycleTime;
+ uint32_t it = strip.now / cycleTime;
if (it != SEGENV.step)
{
SEGENV.aux0 = random16(SEGLEN); // aux0 stores the random led index
SEGENV.step = it;
}
-
- setPixelColor(SEGENV.aux0, SEGCOLOR(0));
+
+ SEGMENT.setPixelColor(SEGENV.aux0, SEGCOLOR(0));
return FRAMETIME;
}
+static const char _data_FX_MODE_SPARKLE[] PROGMEM = "Sparkle@!,,,,,,Overlay;!,!;!;;m12=0";
/*
* Lights all LEDs in the color. Flashes single col 1 pixels randomly. (List name: Sparkle Dark)
* Inspired by www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/
*/
-uint16_t WS2812FX::mode_flash_sparkle(void) {
- for(uint16_t i = 0; i < SEGLEN; i++) {
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
+uint16_t mode_flash_sparkle(void) {
+ if (!SEGMENT.check2) for(uint16_t i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
}
- if (now - SEGENV.aux0 > SEGENV.step) {
+ if (strip.now - SEGENV.aux0 > SEGENV.step) {
if(random8((255-SEGMENT.intensity) >> 4) == 0) {
- setPixelColor(random16(SEGLEN), SEGCOLOR(1)); //flash
+ SEGMENT.setPixelColor(random16(SEGLEN), SEGCOLOR(1)); //flash
}
- SEGENV.step = now;
+ SEGENV.step = strip.now;
SEGENV.aux0 = 255-SEGMENT.speed;
}
return FRAMETIME;
}
+static const char _data_FX_MODE_FLASH_SPARKLE[] PROGMEM = "Sparkle Dark@!,!,,,,,Overlay;Bg,Fx;!;;m12=0";
/*
* Like flash sparkle. With more flash.
* Inspired by www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/
*/
-uint16_t WS2812FX::mode_hyper_sparkle(void) {
- for(uint16_t i = 0; i < SEGLEN; i++) {
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
+uint16_t mode_hyper_sparkle(void) {
+ if (!SEGMENT.check2) for (int i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
}
- if (now - SEGENV.aux0 > SEGENV.step) {
- if(random8((255-SEGMENT.intensity) >> 4) == 0) {
- for(uint16_t i = 0; i < MAX(1, SEGLEN/3); i++) {
- setPixelColor(random16(SEGLEN), SEGCOLOR(1));
+ if (strip.now - SEGENV.aux0 > SEGENV.step) {
+ if (random8((255-SEGMENT.intensity) >> 4) == 0) {
+ for (int i = 0; i < max(1, SEGLEN/3); i++) {
+ SEGMENT.setPixelColor(random16(SEGLEN), SEGCOLOR(1));
}
}
- SEGENV.step = now;
+ SEGENV.step = strip.now;
SEGENV.aux0 = 255-SEGMENT.speed;
}
return FRAMETIME;
}
+static const char _data_FX_MODE_HYPER_SPARKLE[] PROGMEM = "Sparkle+@!,!,,,,,Overlay;Bg,Fx;!;;m12=0";
/*
* Strobe effect with different strobe count and pause, controlled by speed.
*/
-uint16_t WS2812FX::mode_multi_strobe(void) {
- for(uint16_t i = 0; i < SEGLEN; i++) {
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
+uint16_t mode_multi_strobe(void) {
+ for (int i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
}
SEGENV.aux0 = 50 + 20*(uint16_t)(255-SEGMENT.speed);
uint16_t count = 2 * ((SEGMENT.intensity / 10) + 1);
if(SEGENV.aux1 < count) {
if((SEGENV.aux1 & 1) == 0) {
- fill(SEGCOLOR(0));
+ SEGMENT.fill(SEGCOLOR(0));
SEGENV.aux0 = 15;
} else {
SEGENV.aux0 = 50;
}
}
- if (now - SEGENV.aux0 > SEGENV.step) {
+ if (strip.now - SEGENV.aux0 > SEGENV.step) {
SEGENV.aux1++;
if (SEGENV.aux1 > count) SEGENV.aux1 = 0;
- SEGENV.step = now;
+ SEGENV.step = strip.now;
}
return FRAMETIME;
}
+static const char _data_FX_MODE_MULTI_STROBE[] PROGMEM = "Strobe Mega@!,!;!,!;!;01";
+
/*
* Android loading circle
*/
-uint16_t WS2812FX::mode_android(void) {
-
- for(uint16_t i = 0; i < SEGLEN; i++) {
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
+uint16_t mode_android(void) {
+
+ for (int i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
}
- if (SEGENV.aux1 > ((float)SEGMENT.intensity/255.0)*(float)SEGLEN)
+ if (SEGENV.aux1 > (SEGMENT.intensity*SEGLEN)/255)
{
SEGENV.aux0 = 1;
} else
@@ -662,7 +783,7 @@ uint16_t WS2812FX::mode_android(void) {
}
uint16_t a = SEGENV.step;
-
+
if (SEGENV.aux0 == 0)
{
if (SEGENV.call %3 == 1) {a++;}
@@ -672,36 +793,38 @@ uint16_t WS2812FX::mode_android(void) {
a++;
if (SEGENV.call %3 != 1) SEGENV.aux1--;
}
-
+
if (a >= SEGLEN) a = 0;
if (a + SEGENV.aux1 < SEGLEN)
{
- for(int i = a; i < a+SEGENV.aux1; i++) {
- setPixelColor(i, SEGCOLOR(0));
+ for (int i = a; i < a+SEGENV.aux1; i++) {
+ SEGMENT.setPixelColor(i, SEGCOLOR(0));
}
} else
{
- for(int i = a; i < SEGLEN; i++) {
- setPixelColor(i, SEGCOLOR(0));
+ for (int i = a; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, SEGCOLOR(0));
}
- for(int i = 0; i < SEGENV.aux1 - (SEGLEN -a); i++) {
- setPixelColor(i, SEGCOLOR(0));
+ for (int i = 0; i < SEGENV.aux1 - (SEGLEN -a); i++) {
+ SEGMENT.setPixelColor(i, SEGCOLOR(0));
}
}
SEGENV.step = a;
return 3 + ((8 * (uint32_t)(255 - SEGMENT.speed)) / SEGLEN);
}
+static const char _data_FX_MODE_ANDROID[] PROGMEM = "Android@!,Width;!,!;!;;m12=1"; //vertical
+
/*
* color chase function.
* color1 = background color
* color2 and color3 = colors of two adjacent leds
*/
-uint16_t WS2812FX::chase(uint32_t color1, uint32_t color2, uint32_t color3, bool do_palette) {
- uint16_t counter = now * ((SEGMENT.speed >> 2) + 1);
- uint16_t a = counter * SEGLEN >> 16;
+uint16_t chase(uint32_t color1, uint32_t color2, uint32_t color3, bool do_palette) {
+ uint16_t counter = strip.now * ((SEGMENT.speed >> 2) + 1);
+ uint16_t a = (counter * SEGLEN) >> 16;
bool chase_random = (SEGMENT.mode == FX_MODE_CHASE_RANDOM);
if (chase_random) {
@@ -710,14 +833,14 @@ uint16_t WS2812FX::chase(uint32_t color1, uint32_t color2, uint32_t color3, bool
SEGENV.aux1 = SEGENV.aux0; //store previous random color
SEGENV.aux0 = get_random_wheel_index(SEGENV.aux0);
}
- color1 = color_wheel(SEGENV.aux0);
+ color1 = SEGMENT.color_wheel(SEGENV.aux0);
}
SEGENV.step = a;
// Use intensity setting to vary chase up to 1/2 string length
- uint8_t size = 1 + (SEGMENT.intensity * SEGLEN >> 10);
+ uint8_t size = 1 + ((SEGMENT.intensity * SEGLEN) >> 10);
- uint16_t b = a + size; //"trail" of chase, filled with color1
+ uint16_t b = a + size; //"trail" of chase, filled with color1
if (b > SEGLEN) b -= SEGLEN;
uint16_t c = b + size;
if (c > SEGLEN) c -= SEGLEN;
@@ -725,41 +848,41 @@ uint16_t WS2812FX::chase(uint32_t color1, uint32_t color2, uint32_t color3, bool
//background
if (do_palette)
{
- for(uint16_t i = 0; i < SEGLEN; i++) {
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
+ for (int i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
}
- } else fill(color1);
+ } else SEGMENT.fill(color1);
//if random, fill old background between a and end
if (chase_random)
{
- color1 = color_wheel(SEGENV.aux1);
- for (uint16_t i = a; i < SEGLEN; i++)
- setPixelColor(i, color1);
+ color1 = SEGMENT.color_wheel(SEGENV.aux1);
+ for (int i = a; i < SEGLEN; i++)
+ SEGMENT.setPixelColor(i, color1);
}
//fill between points a and b with color2
if (a < b)
{
- for (uint16_t i = a; i < b; i++)
- setPixelColor(i, color2);
+ for (int i = a; i < b; i++)
+ SEGMENT.setPixelColor(i, color2);
} else {
- for (uint16_t i = a; i < SEGLEN; i++) //fill until end
- setPixelColor(i, color2);
- for (uint16_t i = 0; i < b; i++) //fill from start until b
- setPixelColor(i, color2);
+ for (int i = a; i < SEGLEN; i++) //fill until end
+ SEGMENT.setPixelColor(i, color2);
+ for (int i = 0; i < b; i++) //fill from start until b
+ SEGMENT.setPixelColor(i, color2);
}
//fill between points b and c with color2
if (b < c)
{
- for (uint16_t i = b; i < c; i++)
- setPixelColor(i, color3);
+ for (int i = b; i < c; i++)
+ SEGMENT.setPixelColor(i, color3);
} else {
- for (uint16_t i = b; i < SEGLEN; i++) //fill until end
- setPixelColor(i, color3);
- for (uint16_t i = 0; i < c; i++) //fill from start until c
- setPixelColor(i, color3);
+ for (int i = b; i < SEGLEN; i++) //fill until end
+ SEGMENT.setPixelColor(i, color3);
+ for (int i = 0; i < c; i++) //fill from start until c
+ SEGMENT.setPixelColor(i, color3);
}
return FRAMETIME;
@@ -769,60 +892,64 @@ uint16_t WS2812FX::chase(uint32_t color1, uint32_t color2, uint32_t color3, bool
/*
* Bicolor chase, more primary color.
*/
-uint16_t WS2812FX::mode_chase_color(void) {
+uint16_t mode_chase_color(void) {
return chase(SEGCOLOR(1), (SEGCOLOR(2)) ? SEGCOLOR(2) : SEGCOLOR(0), SEGCOLOR(0), true);
}
+static const char _data_FX_MODE_CHASE_COLOR[] PROGMEM = "Chase@!,Width;!,!,!;!";
/*
* Primary running followed by random color.
*/
-uint16_t WS2812FX::mode_chase_random(void) {
+uint16_t mode_chase_random(void) {
return chase(SEGCOLOR(1), (SEGCOLOR(2)) ? SEGCOLOR(2) : SEGCOLOR(0), SEGCOLOR(0), false);
}
+static const char _data_FX_MODE_CHASE_RANDOM[] PROGMEM = "Chase Random@!,Width;!,,!;!";
/*
* Primary, secondary running on rainbow.
*/
-uint16_t WS2812FX::mode_chase_rainbow(void) {
+uint16_t mode_chase_rainbow(void) {
uint8_t color_sep = 256 / SEGLEN;
if (color_sep == 0) color_sep = 1; // correction for segments longer than 256 LEDs
uint8_t color_index = SEGENV.call & 0xFF;
- uint32_t color = color_wheel(((SEGENV.step * color_sep) + color_index) & 0xFF);
+ uint32_t color = SEGMENT.color_wheel(((SEGENV.step * color_sep) + color_index) & 0xFF);
return chase(color, SEGCOLOR(0), SEGCOLOR(1), false);
}
+static const char _data_FX_MODE_CHASE_RAINBOW[] PROGMEM = "Chase Rainbow@!,Width;!,!;!";
/*
* Primary running on rainbow.
*/
-uint16_t WS2812FX::mode_chase_rainbow_white(void) {
+uint16_t mode_chase_rainbow_white(void) {
uint16_t n = SEGENV.step;
uint16_t m = (SEGENV.step + 1) % SEGLEN;
- uint32_t color2 = color_wheel(((n * 256 / SEGLEN) + (SEGENV.call & 0xFF)) & 0xFF);
- uint32_t color3 = color_wheel(((m * 256 / SEGLEN) + (SEGENV.call & 0xFF)) & 0xFF);
+ uint32_t color2 = SEGMENT.color_wheel(((n * 256 / SEGLEN) + (SEGENV.call & 0xFF)) & 0xFF);
+ uint32_t color3 = SEGMENT.color_wheel(((m * 256 / SEGLEN) + (SEGENV.call & 0xFF)) & 0xFF);
return chase(SEGCOLOR(0), color2, color3, false);
}
+static const char _data_FX_MODE_CHASE_RAINBOW_WHITE[] PROGMEM = "Rainbow Runner@!,Size;Bg;!";
/*
* Red - Amber - Green - Blue lights running
*/
-uint16_t WS2812FX::mode_colorful(void) {
+uint16_t mode_colorful(void) {
uint8_t numColors = 4; //3, 4, or 5
uint32_t cols[9]{0x00FF0000,0x00EEBB00,0x0000EE00,0x000077CC};
if (SEGMENT.intensity > 160 || SEGMENT.palette) { //palette or color
if (!SEGMENT.palette) {
numColors = 3;
- for (uint8_t i = 0; i < 3; i++) cols[i] = SEGCOLOR(i);
+ for (size_t i = 0; i < 3; i++) cols[i] = SEGCOLOR(i);
} else {
uint16_t fac = 80;
if (SEGMENT.palette == 52) {numColors = 5; fac = 61;} //C9 2 has 5 colors
- for (uint8_t i = 0; i < numColors; i++) {
- cols[i] = color_from_palette(i*fac, false, true, 255);
+ for (size_t i = 0; i < numColors; i++) {
+ cols[i] = SEGMENT.color_from_palette(i*fac, false, true, 255);
}
}
} else if (SEGMENT.intensity < 80) //pastel (easter) colors
@@ -832,65 +959,69 @@ uint16_t WS2812FX::mode_colorful(void) {
cols[2] = 0x0077FF77;
cols[3] = 0x0077F0F0;
}
- for (uint8_t i = numColors; i < numColors*2 -1; i++) cols[i] = cols[i-numColors];
-
+ for (size_t i = numColors; i < numColors*2 -1U; i++) cols[i] = cols[i-numColors];
+
uint32_t cycleTime = 50 + (8 * (uint32_t)(255 - SEGMENT.speed));
- uint32_t it = now / cycleTime;
+ uint32_t it = strip.now / cycleTime;
if (it != SEGENV.step)
{
if (SEGMENT.speed > 0) SEGENV.aux0++;
if (SEGENV.aux0 >= numColors) SEGENV.aux0 = 0;
SEGENV.step = it;
}
-
- for (uint16_t i = 0; i < SEGLEN; i+= numColors)
+
+ for (int i = 0; i < SEGLEN; i+= numColors)
{
- for (uint16_t j = 0; j < numColors; j++) setPixelColor(i + j, cols[SEGENV.aux0 + j]);
+ for (int j = 0; j < numColors; j++) SEGMENT.setPixelColor(i + j, cols[SEGENV.aux0 + j]);
}
-
+
return FRAMETIME;
}
+static const char _data_FX_MODE_COLORFUL[] PROGMEM = "Colorful@!,Saturation;1,2,3;!";
/*
* Emulates a traffic light.
*/
-uint16_t WS2812FX::mode_traffic_light(void) {
- for(uint16_t i=0; i < SEGLEN; i++)
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
+uint16_t mode_traffic_light(void) {
+ if (SEGLEN == 1) return mode_static();
+ for (int i=0; i < SEGLEN; i++)
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
uint32_t mdelay = 500;
for (int i = 0; i < SEGLEN-2 ; i+=3)
{
switch (SEGENV.aux0)
{
- case 0: setPixelColor(i, 0x00FF0000); mdelay = 150 + (100 * (uint32_t)(255 - SEGMENT.speed));break;
- case 1: setPixelColor(i, 0x00FF0000); mdelay = 150 + (20 * (uint32_t)(255 - SEGMENT.speed)); setPixelColor(i+1, 0x00EECC00); break;
- case 2: setPixelColor(i+2, 0x0000FF00); mdelay = 150 + (100 * (uint32_t)(255 - SEGMENT.speed));break;
- case 3: setPixelColor(i+1, 0x00EECC00); mdelay = 150 + (20 * (uint32_t)(255 - SEGMENT.speed));break;
+ case 0: SEGMENT.setPixelColor(i, 0x00FF0000); mdelay = 150 + (100 * (uint32_t)(255 - SEGMENT.speed));break;
+ case 1: SEGMENT.setPixelColor(i, 0x00FF0000); mdelay = 150 + (20 * (uint32_t)(255 - SEGMENT.speed)); SEGMENT.setPixelColor(i+1, 0x00EECC00); break;
+ case 2: SEGMENT.setPixelColor(i+2, 0x0000FF00); mdelay = 150 + (100 * (uint32_t)(255 - SEGMENT.speed));break;
+ case 3: SEGMENT.setPixelColor(i+1, 0x00EECC00); mdelay = 150 + (20 * (uint32_t)(255 - SEGMENT.speed));break;
}
}
- if (now - SEGENV.step > mdelay)
+ if (strip.now - SEGENV.step > mdelay)
{
SEGENV.aux0++;
if (SEGENV.aux0 == 1 && SEGMENT.intensity > 140) SEGENV.aux0 = 2; //skip Red + Amber, to get US-style sequence
if (SEGENV.aux0 > 3) SEGENV.aux0 = 0;
- SEGENV.step = now;
+ SEGENV.step = strip.now;
}
-
+
return FRAMETIME;
}
+static const char _data_FX_MODE_TRAFFIC_LIGHT[] PROGMEM = "Traffic Light@!,US style;,!;!";
/*
* Sec flashes running on prim.
*/
#define FLASH_COUNT 4
-uint16_t WS2812FX::mode_chase_flash(void) {
+uint16_t mode_chase_flash(void) {
+ if (SEGLEN == 1) return mode_static();
uint8_t flash_step = SEGENV.call % ((FLASH_COUNT * 2) + 1);
- for(uint16_t i = 0; i < SEGLEN; i++) {
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
+ for (int i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
}
uint16_t delay = 10 + ((30 * (uint16_t)(255 - SEGMENT.speed)) / SEGLEN);
@@ -898,8 +1029,8 @@ uint16_t WS2812FX::mode_chase_flash(void) {
if(flash_step % 2 == 0) {
uint16_t n = SEGENV.step;
uint16_t m = (SEGENV.step + 1) % SEGLEN;
- setPixelColor( n, SEGCOLOR(1));
- setPixelColor( m, SEGCOLOR(1));
+ SEGMENT.setPixelColor( n, SEGCOLOR(1));
+ SEGMENT.setPixelColor( m, SEGCOLOR(1));
delay = 20;
} else {
delay = 30;
@@ -909,98 +1040,60 @@ uint16_t WS2812FX::mode_chase_flash(void) {
}
return delay;
}
+static const char _data_FX_MODE_CHASE_FLASH[] PROGMEM = "Chase Flash@!;Bg,Fx;!";
/*
* Prim flashes running, followed by random color.
*/
-uint16_t WS2812FX::mode_chase_flash_random(void) {
+uint16_t mode_chase_flash_random(void) {
+ if (SEGLEN == 1) return mode_static();
uint8_t flash_step = SEGENV.call % ((FLASH_COUNT * 2) + 1);
- for(uint16_t i = 0; i < SEGENV.step; i++) {
- setPixelColor(i, color_wheel(SEGENV.aux0));
+ for (int i = 0; i < SEGENV.aux1; i++) {
+ SEGMENT.setPixelColor(i, SEGMENT.color_wheel(SEGENV.aux0));
}
uint16_t delay = 1 + ((10 * (uint16_t)(255 - SEGMENT.speed)) / SEGLEN);
if(flash_step < (FLASH_COUNT * 2)) {
- uint16_t n = SEGENV.step;
- uint16_t m = (SEGENV.step + 1) % SEGLEN;
+ uint16_t n = SEGENV.aux1;
+ uint16_t m = (SEGENV.aux1 + 1) % SEGLEN;
if(flash_step % 2 == 0) {
- setPixelColor( n, SEGCOLOR(0));
- setPixelColor( m, SEGCOLOR(0));
+ SEGMENT.setPixelColor( n, SEGCOLOR(0));
+ SEGMENT.setPixelColor( m, SEGCOLOR(0));
delay = 20;
} else {
- setPixelColor( n, color_wheel(SEGENV.aux0));
- setPixelColor( m, SEGCOLOR(1));
+ SEGMENT.setPixelColor( n, SEGMENT.color_wheel(SEGENV.aux0));
+ SEGMENT.setPixelColor( m, SEGCOLOR(1));
delay = 30;
}
} else {
- SEGENV.step = (SEGENV.step + 1) % SEGLEN;
+ SEGENV.aux1 = (SEGENV.aux1 + 1) % SEGLEN;
- if (SEGENV.step == 0) {
+ if (SEGENV.aux1 == 0) {
SEGENV.aux0 = get_random_wheel_index(SEGENV.aux0);
}
}
return delay;
}
+static const char _data_FX_MODE_CHASE_FLASH_RANDOM[] PROGMEM = "Chase Flash Rnd@!;!,!;!";
-/*
- * Alternating pixels running function.
- */
-uint16_t WS2812FX::running(uint32_t color1, uint32_t color2, bool theatre) {
- uint8_t width = (theatre ? 3 : 1) + (SEGMENT.intensity >> 4); // window
- uint32_t cycleTime = 50 + (255 - SEGMENT.speed);
- uint32_t it = now / cycleTime;
- bool usePalette = color1 == SEGCOLOR(0);
-
- for(uint16_t i = 0; i < SEGLEN; i++) {
- uint32_t col = color2;
- if (usePalette) color1 = color_from_palette(i, true, PALETTE_SOLID_WRAP, 0);
- if (theatre) {
- if ((i % width) == SEGENV.aux0) col = color1;
- } else {
- int8_t pos = (i % (width<<1));
- if ((pos < SEGENV.aux0-width) || ((pos >= SEGENV.aux0) && (pos < SEGENV.aux0+width))) col = color1;
- }
- setPixelColor(i,col);
- }
-
- if (it != SEGENV.step) {
- SEGENV.aux0 = (SEGENV.aux0 +1) % (theatre ? width : (width<<1));
- SEGENV.step = it;
- }
- return FRAMETIME;
-}
-
/*
* Alternating color/sec pixels running.
*/
-uint16_t WS2812FX::mode_running_color(void) {
+uint16_t mode_running_color(void) {
return running(SEGCOLOR(0), SEGCOLOR(1));
}
-
-/*
- * Alternating red/white pixels running.
- */
-uint16_t WS2812FX::mode_candy_cane(void) {
- return running(RED, WHITE);
-}
-
-/*
- * Alternating orange/purple pixels running.
- */
-uint16_t WS2812FX::mode_halloween(void) {
- return running(PURPLE, ORANGE);
-}
+static const char _data_FX_MODE_RUNNING_COLOR[] PROGMEM = "Chase 2@!,Width;!,!;!";
/*
* Random colored pixels running. ("Stream")
*/
-uint16_t WS2812FX::mode_running_random(void) {
+uint16_t mode_running_random(void) {
uint32_t cycleTime = 25 + (3 * (uint32_t)(255 - SEGMENT.speed));
- uint32_t it = now / cycleTime;
+ uint32_t it = strip.now / cycleTime;
if (SEGENV.call == 0) SEGENV.aux0 = random16(); // random seed for PRNG on start
uint8_t zoneSize = ((255-SEGMENT.intensity) >> 4) +1;
@@ -1008,7 +1101,7 @@ uint16_t WS2812FX::mode_running_random(void) {
uint8_t z = it % zoneSize;
bool nzone = (!z && it != SEGENV.aux1);
- for (uint16_t i=SEGLEN-1; i > 0; i--) {
+ for (int i=SEGLEN-1; i > 0; i--) {
if (nzone || z >= zoneSize) {
uint8_t lastrand = PRNG16 >> 8;
int16_t diff = 0;
@@ -1022,47 +1115,42 @@ uint16_t WS2812FX::mode_running_random(void) {
}
z = 0;
}
- setPixelColor(i, color_wheel(PRNG16 >> 8));
+ SEGMENT.setPixelColor(i, SEGMENT.color_wheel(PRNG16 >> 8));
z++;
}
SEGENV.aux1 = it;
return FRAMETIME;
}
+static const char _data_FX_MODE_RUNNING_RANDOM[] PROGMEM = "Stream@!,Zone size;;!";
-/*
- * K.I.T.T.
- */
-uint16_t WS2812FX::mode_larson_scanner(void){
- return larson_scanner(false);
-}
-
-uint16_t WS2812FX::larson_scanner(bool dual) {
- uint16_t counter = now * ((SEGMENT.speed >> 2) +8);
- uint16_t index = counter * SEGLEN >> 16;
+uint16_t larson_scanner(bool dual) {
+ if (SEGLEN == 1) return mode_static();
+ uint16_t counter = strip.now * ((SEGMENT.speed >> 2) +8);
+ uint16_t index = (counter * SEGLEN) >> 16;
- fade_out(SEGMENT.intensity);
+ SEGMENT.fade_out(SEGMENT.intensity);
if (SEGENV.step > index && SEGENV.step - index > SEGLEN/2) {
SEGENV.aux0 = !SEGENV.aux0;
}
-
- for (uint16_t i = SEGENV.step; i < index; i++) {
+
+ for (int i = SEGENV.step; i < index; i++) {
uint16_t j = (SEGENV.aux0)?i:SEGLEN-1-i;
- setPixelColor( j, color_from_palette(j, true, PALETTE_SOLID_WRAP, 0));
+ SEGMENT.setPixelColor( j, SEGMENT.color_from_palette(j, true, PALETTE_SOLID_WRAP, 0));
}
if (dual) {
uint32_t c;
if (SEGCOLOR(2) != 0) {
c = SEGCOLOR(2);
} else {
- c = color_from_palette(index, true, PALETTE_SOLID_WRAP, 0);
+ c = SEGMENT.color_from_palette(index, true, PALETTE_SOLID_WRAP, 0);
}
- for (uint16_t i = SEGENV.step; i < index; i++) {
+ for (int i = SEGENV.step; i < index; i++) {
uint16_t j = (SEGENV.aux0)?SEGLEN-1-i:i;
- setPixelColor(j, c);
+ SEGMENT.setPixelColor(j, c);
}
}
@@ -1071,136 +1159,180 @@ uint16_t WS2812FX::larson_scanner(bool dual) {
}
+/*
+ * K.I.T.T.
+ */
+uint16_t mode_larson_scanner(void){
+ return larson_scanner(false);
+}
+static const char _data_FX_MODE_LARSON_SCANNER[] PROGMEM = "Scanner@!,Fade rate;!,!;!;;m12=0";
+
+
+/*
+ * Creates two Larson scanners moving in opposite directions
+ * Custom mode by Keith Lord: https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/DualLarson.h
+ */
+uint16_t mode_dual_larson_scanner(void){
+ return larson_scanner(true);
+}
+static const char _data_FX_MODE_DUAL_LARSON_SCANNER[] PROGMEM = "Scanner Dual@!,Fade rate;!,!,!;!;;m12=0";
+
+
/*
* Firing comets from one end. "Lighthouse"
*/
-uint16_t WS2812FX::mode_comet(void) {
- uint16_t counter = now * ((SEGMENT.speed >>2) +1);
- uint16_t index = counter * SEGLEN >> 16;
+uint16_t mode_comet(void) {
+ if (SEGLEN == 1) return mode_static();
+ uint16_t counter = strip.now * ((SEGMENT.speed >>2) +1);
+ uint16_t index = (counter * SEGLEN) >> 16;
if (SEGENV.call == 0) SEGENV.aux0 = index;
- fade_out(SEGMENT.intensity);
+ SEGMENT.fade_out(SEGMENT.intensity);
- setPixelColor( index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
+ SEGMENT.setPixelColor( index, SEGMENT.color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
if (index > SEGENV.aux0) {
- for (uint16_t i = SEGENV.aux0; i < index ; i++) {
- setPixelColor( i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
+ for (int i = SEGENV.aux0; i < index ; i++) {
+ SEGMENT.setPixelColor( i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
}
} else if (index < SEGENV.aux0 && index < 10) {
- for (uint16_t i = 0; i < index ; i++) {
- setPixelColor( i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
- }
+ for (int i = 0; i < index ; i++) {
+ SEGMENT.setPixelColor( i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
+ }
}
SEGENV.aux0 = index++;
return FRAMETIME;
}
+static const char _data_FX_MODE_COMET[] PROGMEM = "Lighthouse@!,Fade rate;!,!;!";
/*
* Fireworks function.
*/
-uint16_t WS2812FX::mode_fireworks() {
- fade_out(0);
+uint16_t mode_fireworks() {
+ if (SEGLEN == 1) return mode_static();
+ const uint16_t width = SEGMENT.is2D() ? SEGMENT.virtualWidth() : SEGMENT.virtualLength();
+ const uint16_t height = SEGMENT.virtualHeight();
+
if (SEGENV.call == 0) {
SEGENV.aux0 = UINT16_MAX;
SEGENV.aux1 = UINT16_MAX;
}
- bool valid1 = (SEGENV.aux0 < SEGLEN);
- bool valid2 = (SEGENV.aux1 < SEGLEN);
- uint32_t sv1 = 0, sv2 = 0;
- if (valid1) sv1 = getPixelColor(SEGENV.aux0);
- if (valid2) sv2 = getPixelColor(SEGENV.aux1);
- blur(255-SEGMENT.speed);
- if (valid1) setPixelColor(SEGENV.aux0 , sv1);
- if (valid2) setPixelColor(SEGENV.aux1, sv2);
+ SEGMENT.fade_out(128);
- for(uint16_t i=0; i> 1)) == 0) {
- uint16_t index = random(SEGLEN);
- setPixelColor(index, color_from_palette(random8(), false, false, 0));
- SEGENV.aux1 = SEGENV.aux0;
- SEGENV.aux0 = index;
+ bool valid1 = (SEGENV.aux0 < width*height);
+ bool valid2 = (SEGENV.aux1 < width*height);
+ uint8_t x = SEGENV.aux0%width, y = SEGENV.aux0/width; // 2D coordinates stored in upper and lower byte
+ uint32_t sv1 = 0, sv2 = 0;
+ if (valid1) sv1 = SEGMENT.is2D() ? SEGMENT.getPixelColorXY(x, y) : SEGMENT.getPixelColor(SEGENV.aux0); // get spark color
+ if (valid2) sv2 = SEGMENT.is2D() ? SEGMENT.getPixelColorXY(x, y) : SEGMENT.getPixelColor(SEGENV.aux1);
+ if (!SEGENV.step) SEGMENT.blur(16);
+ if (valid1) { if (SEGMENT.is2D()) SEGMENT.setPixelColorXY(x, y, sv1); else SEGMENT.setPixelColor(SEGENV.aux0, sv1); } // restore spark color after blur
+ if (valid2) { if (SEGMENT.is2D()) SEGMENT.setPixelColorXY(x, y, sv2); else SEGMENT.setPixelColor(SEGENV.aux1, sv2); } // restore old spark color after blur
+
+ for (int i=0; i> 1)) == 0) {
+ uint16_t index = random16(width*height);
+ x = index % width;
+ y = index / width;
+ uint32_t col = SEGMENT.color_from_palette(random8(), false, false, 0);
+ if (SEGMENT.is2D()) SEGMENT.setPixelColorXY(x, y, col);
+ else SEGMENT.setPixelColor(index, col);
+ SEGENV.aux1 = SEGENV.aux0; // old spark
+ SEGENV.aux0 = index; // remember where spark occurred
}
}
return FRAMETIME;
}
+static const char _data_FX_MODE_FIREWORKS[] PROGMEM = "Fireworks@,Frequency;!,!;!;12;ix=192,pal=11";
//Twinkling LEDs running. Inspired by https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/Rain.h
-uint16_t WS2812FX::mode_rain()
-{
+uint16_t mode_rain() {
+ if (SEGLEN == 1) return mode_static();
+ const uint16_t width = SEGMENT.virtualWidth();
+ const uint16_t height = SEGMENT.virtualHeight();
SEGENV.step += FRAMETIME;
- if (SEGENV.step > SPEED_FORMULA_L) {
- SEGENV.step = 0;
- //shift all leds left
- uint32_t ctemp = getPixelColor(0);
- for(uint16_t i = 0; i < SEGLEN - 1; i++) {
- setPixelColor(i, getPixelColor(i+1));
+ if (SEGENV.call && SEGENV.step > SPEED_FORMULA_L) {
+ SEGENV.step = 1;
+ if (strip.isMatrix) {
+ //uint32_t ctemp[width];
+ //for (int i = 0; i= width*height) SEGENV.aux0 = 0; // ignore
+ if (SEGENV.aux1 >= width*height) SEGENV.aux1 = 0;
}
return mode_fireworks();
}
+static const char _data_FX_MODE_RAIN[] PROGMEM = "Rain@!,Spawning rate;!,!;!;12;ix=128,pal=0";
/*
* Fire flicker function
*/
-uint16_t WS2812FX::mode_fire_flicker(void) {
+uint16_t mode_fire_flicker(void) {
uint32_t cycleTime = 40 + (255 - SEGMENT.speed);
- uint32_t it = now / cycleTime;
+ uint32_t it = strip.now / cycleTime;
if (SEGENV.step == it) return FRAMETIME;
-
+
byte w = (SEGCOLOR(0) >> 24);
byte r = (SEGCOLOR(0) >> 16);
byte g = (SEGCOLOR(0) >> 8);
byte b = (SEGCOLOR(0) );
byte lum = (SEGMENT.palette == 0) ? MAX(w, MAX(r, MAX(g, b))) : 255;
lum /= (((256-SEGMENT.intensity)/16)+1);
- for(uint16_t i = 0; i < SEGLEN; i++) {
+ for (int i = 0; i < SEGLEN; i++) {
byte flicker = random8(lum);
if (SEGMENT.palette == 0) {
- setPixelColor(i, MAX(r - flicker, 0), MAX(g - flicker, 0), MAX(b - flicker, 0), MAX(w - flicker, 0));
+ SEGMENT.setPixelColor(i, MAX(r - flicker, 0), MAX(g - flicker, 0), MAX(b - flicker, 0), MAX(w - flicker, 0));
} else {
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0, 255 - flicker));
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0, 255 - flicker));
}
}
SEGENV.step = it;
return FRAMETIME;
}
+static const char _data_FX_MODE_FIRE_FLICKER[] PROGMEM = "Fire Flicker@!,!;!;!;01";
/*
* Gradient run base function
*/
-uint16_t WS2812FX::gradient_base(bool loading) {
- uint16_t counter = now * ((SEGMENT.speed >> 2) + 1);
- uint16_t pp = counter * SEGLEN >> 16;
+uint16_t gradient_base(bool loading) {
+ if (SEGLEN == 1) return mode_static();
+ uint16_t counter = strip.now * ((SEGMENT.speed >> 2) + 1);
+ uint16_t pp = (counter * SEGLEN) >> 16;
if (SEGENV.call == 0) pp = 0;
- float val; //0.0 = sec 1.0 = pri
- float brd = loading ? SEGMENT.intensity : SEGMENT.intensity/2;
- if (brd <1.0) brd = 1.0;
+ int val; //0 = sec 1 = pri
+ int brd = 1 + loading ? SEGMENT.intensity/2 : SEGMENT.intensity/4;
+ //if (brd < 1) brd = 1;
int p1 = pp-SEGLEN;
int p2 = pp+SEGLEN;
- for(uint16_t i = 0; i < SEGLEN; i++)
- {
- if (loading)
- {
- val = abs(((i>pp) ? p2:pp) -i);
+ for (int i = 0; i < SEGLEN; i++) {
+ if (loading) {
+ val = abs(((i>pp) ? p2:pp) - i);
} else {
- val = MIN(abs(pp-i),MIN(abs(p1-i),abs(p2-i)));
+ val = min(abs(pp-i),min(abs(p1-i),abs(p2-i)));
}
- val = (brd > val) ? val/brd * 255 : 255;
- setPixelColor(i, color_blend(SEGCOLOR(0), color_from_palette(i, true, PALETTE_SOLID_WRAP, 1), val));
+ val = (brd > val) ? (val * 255) / brd : 255;
+ SEGMENT.setPixelColor(i, color_blend(SEGCOLOR(0), SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 1), val));
}
return FRAMETIME;
@@ -1210,54 +1342,57 @@ uint16_t WS2812FX::gradient_base(bool loading) {
/*
* Gradient run
*/
-uint16_t WS2812FX::mode_gradient(void) {
+uint16_t mode_gradient(void) {
return gradient_base(false);
}
+static const char _data_FX_MODE_GRADIENT[] PROGMEM = "Gradient@!,Spread;!,!;!;;ix=16";
/*
* Gradient run with hard transition
*/
-uint16_t WS2812FX::mode_loading(void) {
+uint16_t mode_loading(void) {
return gradient_base(true);
}
+static const char _data_FX_MODE_LOADING[] PROGMEM = "Loading@!,Fade;!,!;!;;ix=16";
-//American Police Light with all LEDs Red and Blue
-uint16_t WS2812FX::police_base(uint32_t color1, uint32_t color2)
-{
+//American Police Light with all LEDs Red and Blue
+uint16_t police_base(uint32_t color1, uint32_t color2) {
+ if (SEGLEN == 1) return mode_static();
uint16_t delay = 1 + (FRAMETIME<<3) / SEGLEN; // longer segments should change faster
- uint32_t it = now / map(SEGMENT.speed, 0, 255, delay<<4, delay);
+ uint32_t it = strip.now / map(SEGMENT.speed, 0, 255, delay<<4, delay);
uint16_t offset = it % SEGLEN;
-
- uint16_t width = ((SEGLEN*(SEGMENT.intensity+1))>>9); //max width is half the strip
+
+ uint16_t width = ((SEGLEN*(SEGMENT.intensity+1))>>9); //max width is half the strip
if (!width) width = 1;
- for (uint16_t i = 0; i < width; i++) {
+ for (int i = 0; i < width; i++) {
uint16_t indexR = (offset + i) % SEGLEN;
uint16_t indexB = (offset + i + (SEGLEN>>1)) % SEGLEN;
- setPixelColor(indexR, color1);
- setPixelColor(indexB, color2);
+ SEGMENT.setPixelColor(indexR, color1);
+ SEGMENT.setPixelColor(indexB, color2);
}
return FRAMETIME;
}
-//Police Lights Red and Blue
-uint16_t WS2812FX::mode_police()
-{
- fill(SEGCOLOR(1));
- return police_base(RED, BLUE);
-}
+//Police Lights Red and Blue
+//uint16_t mode_police()
+//{
+// SEGMENT.fill(SEGCOLOR(1));
+// return police_base(RED, BLUE);
+//}
+//static const char _data_FX_MODE_POLICE[] PROGMEM = "Police@!,Width;,Bg;0";
-//Police Lights with custom colors
-uint16_t WS2812FX::mode_two_dots()
+//Police Lights with custom colors
+uint16_t mode_two_dots()
{
- fill(SEGCOLOR(2));
+ if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(2));
uint32_t color2 = (SEGCOLOR(1) == SEGCOLOR(2)) ? SEGCOLOR(0) : SEGCOLOR(1);
-
return police_base(SEGCOLOR(0), color2);
}
+static const char _data_FX_MODE_TWO_DOTS[] PROGMEM = "Two Dots@!,Dot size,,,,,Overlay;1,2,Bg;!";
/*
@@ -1267,151 +1402,153 @@ uint16_t WS2812FX::mode_two_dots()
typedef struct Flasher {
uint16_t stateStart;
uint8_t stateDur;
- bool stateOn;
+ bool stateOn;
} flasher;
#define FLASHERS_PER_ZONE 6
#define MAX_SHIMMER 92
-uint16_t WS2812FX::mode_fairy() {
- //set every pixel to a 'random' color from palette (using seed so it doesn't change between frames)
- uint16_t PRNG16 = 5100 + _segment_index;
- for (uint16_t i = 0; i < SEGLEN; i++) {
- PRNG16 = (uint16_t)(PRNG16 * 2053) + 1384; //next 'random' number
- setPixelColor(i, color_from_palette(PRNG16 >> 8, false, false, 0));
- }
-
- //amount of flasher pixels depending on intensity (0: none, 255: every LED)
- if (SEGMENT.intensity == 0) return FRAMETIME;
- uint8_t flasherDistance = ((255 - SEGMENT.intensity) / 28) +1; //1-10
- uint16_t numFlashers = (SEGLEN / flasherDistance) +1;
-
- uint16_t dataSize = sizeof(flasher) * numFlashers;
+uint16_t mode_fairy() {
+ //set every pixel to a 'random' color from palette (using seed so it doesn't change between frames)
+ uint16_t PRNG16 = 5100 + strip.getCurrSegmentId();
+ for (int i = 0; i < SEGLEN; i++) {
+ PRNG16 = (uint16_t)(PRNG16 * 2053) + 1384; //next 'random' number
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(PRNG16 >> 8, false, false, 0));
+ }
+
+ //amount of flasher pixels depending on intensity (0: none, 255: every LED)
+ if (SEGMENT.intensity == 0) return FRAMETIME;
+ uint8_t flasherDistance = ((255 - SEGMENT.intensity) / 28) +1; //1-10
+ uint16_t numFlashers = (SEGLEN / flasherDistance) +1;
+
+ uint16_t dataSize = sizeof(flasher) * numFlashers;
if (!SEGENV.allocateData(dataSize)) return FRAMETIME; //allocation failed
- Flasher* flashers = reinterpret_cast(SEGENV.data);
- uint16_t now16 = now & 0xFFFF;
-
- //Up to 11 flashers in one brightness zone, afterwards a new zone for every 6 flashers
- uint16_t zones = numFlashers/FLASHERS_PER_ZONE;
- if (!zones) zones = 1;
- uint8_t flashersInZone = numFlashers/zones;
- uint8_t flasherBri[FLASHERS_PER_ZONE*2 -1];
-
- for (uint16_t z = 0; z < zones; z++) {
- uint16_t flasherBriSum = 0;
- uint16_t firstFlasher = z*flashersInZone;
- if (z == zones-1) flashersInZone = numFlashers-(flashersInZone*(zones-1));
-
- for (uint16_t f = firstFlasher; f < firstFlasher + flashersInZone; f++) {
- uint16_t stateTime = now16 - flashers[f].stateStart;
- //random on/off time reached, switch state
- if (stateTime > flashers[f].stateDur * 10) {
- flashers[f].stateOn = !flashers[f].stateOn;
- if (flashers[f].stateOn) {
- flashers[f].stateDur = 12 + random8(12 + ((255 - SEGMENT.speed) >> 2)); //*10, 250ms to 1250ms
- } else {
- flashers[f].stateDur = 20 + random8(6 + ((255 - SEGMENT.speed) >> 2)); //*10, 250ms to 1250ms
- }
- //flashers[f].stateDur = 51 + random8(2 + ((255 - SEGMENT.speed) >> 1));
- flashers[f].stateStart = now16;
- if (stateTime < 255) {
- flashers[f].stateStart -= 255 -stateTime; //start early to get correct bri
- flashers[f].stateDur += 26 - stateTime/10;
- stateTime = 255 - stateTime;
- } else {
- stateTime = 0;
- }
- }
- if (stateTime > 255) stateTime = 255; //for flasher brightness calculation, fades in first 255 ms of state
- //flasherBri[f - firstFlasher] = (flashers[f].stateOn) ? 255-gamma8((510 - stateTime) >> 1) : gamma8((510 - stateTime) >> 1);
- flasherBri[f - firstFlasher] = (flashers[f].stateOn) ? stateTime : 255 - (stateTime >> 0);
- flasherBriSum += flasherBri[f - firstFlasher];
- }
- //dim factor, to create "shimmer" as other pixels get less voltage if a lot of flashers are on
- uint8_t avgFlasherBri = flasherBriSum / flashersInZone;
- uint8_t globalPeakBri = 255 - ((avgFlasherBri * MAX_SHIMMER) >> 8); //183-255, suitable for 1/5th of LEDs flashers
-
- for (uint16_t f = firstFlasher; f < firstFlasher + flashersInZone; f++) {
- uint8_t bri = (flasherBri[f - firstFlasher] * globalPeakBri) / 255;
- PRNG16 = (uint16_t)(PRNG16 * 2053) + 1384; //next 'random' number
- uint16_t flasherPos = f*flasherDistance;
- setPixelColor(flasherPos, color_blend(SEGCOLOR(1), color_from_palette(PRNG16 >> 8, false, false, 0), bri));
- for (uint16_t i = flasherPos+1; i < flasherPos+flasherDistance && i < SEGLEN; i++) {
- PRNG16 = (uint16_t)(PRNG16 * 2053) + 1384; //next 'random' number
- setPixelColor(i, color_from_palette(PRNG16 >> 8, false, false, 0, globalPeakBri));
- }
- }
- }
- return FRAMETIME;
+ Flasher* flashers = reinterpret_cast(SEGENV.data);
+ uint16_t now16 = strip.now & 0xFFFF;
+
+ //Up to 11 flashers in one brightness zone, afterwards a new zone for every 6 flashers
+ uint16_t zones = numFlashers/FLASHERS_PER_ZONE;
+ if (!zones) zones = 1;
+ uint8_t flashersInZone = numFlashers/zones;
+ uint8_t flasherBri[FLASHERS_PER_ZONE*2 -1];
+
+ for (int z = 0; z < zones; z++) {
+ uint16_t flasherBriSum = 0;
+ uint16_t firstFlasher = z*flashersInZone;
+ if (z == zones-1) flashersInZone = numFlashers-(flashersInZone*(zones-1));
+
+ for (int f = firstFlasher; f < firstFlasher + flashersInZone; f++) {
+ uint16_t stateTime = now16 - flashers[f].stateStart;
+ //random on/off time reached, switch state
+ if (stateTime > flashers[f].stateDur * 10) {
+ flashers[f].stateOn = !flashers[f].stateOn;
+ if (flashers[f].stateOn) {
+ flashers[f].stateDur = 12 + random8(12 + ((255 - SEGMENT.speed) >> 2)); //*10, 250ms to 1250ms
+ } else {
+ flashers[f].stateDur = 20 + random8(6 + ((255 - SEGMENT.speed) >> 2)); //*10, 250ms to 1250ms
+ }
+ //flashers[f].stateDur = 51 + random8(2 + ((255 - SEGMENT.speed) >> 1));
+ flashers[f].stateStart = now16;
+ if (stateTime < 255) {
+ flashers[f].stateStart -= 255 -stateTime; //start early to get correct bri
+ flashers[f].stateDur += 26 - stateTime/10;
+ stateTime = 255 - stateTime;
+ } else {
+ stateTime = 0;
+ }
+ }
+ if (stateTime > 255) stateTime = 255; //for flasher brightness calculation, fades in first 255 ms of state
+ //flasherBri[f - firstFlasher] = (flashers[f].stateOn) ? 255-SEGMENT.gamma8((510 - stateTime) >> 1) : SEGMENT.gamma8((510 - stateTime) >> 1);
+ flasherBri[f - firstFlasher] = (flashers[f].stateOn) ? stateTime : 255 - (stateTime >> 0);
+ flasherBriSum += flasherBri[f - firstFlasher];
+ }
+ //dim factor, to create "shimmer" as other pixels get less voltage if a lot of flashers are on
+ uint8_t avgFlasherBri = flasherBriSum / flashersInZone;
+ uint8_t globalPeakBri = 255 - ((avgFlasherBri * MAX_SHIMMER) >> 8); //183-255, suitable for 1/5th of LEDs flashers
+
+ for (int f = firstFlasher; f < firstFlasher + flashersInZone; f++) {
+ uint8_t bri = (flasherBri[f - firstFlasher] * globalPeakBri) / 255;
+ PRNG16 = (uint16_t)(PRNG16 * 2053) + 1384; //next 'random' number
+ uint16_t flasherPos = f*flasherDistance;
+ SEGMENT.setPixelColor(flasherPos, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(PRNG16 >> 8, false, false, 0), bri));
+ for (int i = flasherPos+1; i < flasherPos+flasherDistance && i < SEGLEN; i++) {
+ PRNG16 = (uint16_t)(PRNG16 * 2053) + 1384; //next 'random' number
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(PRNG16 >> 8, false, false, 0, globalPeakBri));
+ }
+ }
+ }
+ return FRAMETIME;
}
+static const char _data_FX_MODE_FAIRY[] PROGMEM = "Fairy@!,# of flashers;!,!;!";
/*
- * Fairytwinkle. Like Colortwinkle, but starting from all lit and not relying on getPixelColor
+ * Fairytwinkle. Like Colortwinkle, but starting from all lit and not relying on strip.getPixelColor
* Warning: Uses 4 bytes of segment data per pixel
*/
-uint16_t WS2812FX::mode_fairytwinkle() {
- uint16_t dataSize = sizeof(flasher) * SEGLEN;
+uint16_t mode_fairytwinkle() {
+ uint16_t dataSize = sizeof(flasher) * SEGLEN;
if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
- Flasher* flashers = reinterpret_cast(SEGENV.data);
- uint16_t now16 = now & 0xFFFF;
- uint16_t PRNG16 = 5100 + _segment_index;
-
- uint16_t riseFallTime = 400 + (255-SEGMENT.speed)*3;
- uint16_t maxDur = riseFallTime/100 + ((255 - SEGMENT.intensity) >> 2) + 13 + ((255 - SEGMENT.intensity) >> 1);
-
- for (uint16_t f = 0; f < SEGLEN; f++) {
- uint16_t stateTime = now16 - flashers[f].stateStart;
- //random on/off time reached, switch state
- if (stateTime > flashers[f].stateDur * 100) {
- flashers[f].stateOn = !flashers[f].stateOn;
- bool init = !flashers[f].stateDur;
- if (flashers[f].stateOn) {
- flashers[f].stateDur = riseFallTime/100 + ((255 - SEGMENT.intensity) >> 2) + random8(12 + ((255 - SEGMENT.intensity) >> 1)) +1;
- } else {
- flashers[f].stateDur = riseFallTime/100 + random8(3 + ((255 - SEGMENT.speed) >> 6)) +1;
- }
- flashers[f].stateStart = now16;
- stateTime = 0;
- if (init) {
- flashers[f].stateStart -= riseFallTime; //start lit
- flashers[f].stateDur = riseFallTime/100 + random8(12 + ((255 - SEGMENT.intensity) >> 1)) +5; //fire up a little quicker
- stateTime = riseFallTime;
- }
- }
- if (flashers[f].stateOn && flashers[f].stateDur > maxDur) flashers[f].stateDur = maxDur; //react more quickly on intensity change
- if (stateTime > riseFallTime) stateTime = riseFallTime; //for flasher brightness calculation, fades in first 255 ms of state
- uint8_t fadeprog = 255 - ((stateTime * 255) / riseFallTime);
- uint8_t flasherBri = (flashers[f].stateOn) ? 255-gamma8(fadeprog) : gamma8(fadeprog);
- uint16_t lastR = PRNG16;
- uint16_t diff = 0;
- while (diff < 0x4000) { //make sure colors of two adjacent LEDs differ enough
- PRNG16 = (uint16_t)(PRNG16 * 2053) + 1384; //next 'random' number
- diff = (PRNG16 > lastR) ? PRNG16 - lastR : lastR - PRNG16;
- }
- setPixelColor(f, color_blend(SEGCOLOR(1), color_from_palette(PRNG16 >> 8, false, false, 0), flasherBri));
- }
+ Flasher* flashers = reinterpret_cast(SEGENV.data);
+ uint16_t now16 = strip.now & 0xFFFF;
+ uint16_t PRNG16 = 5100 + strip.getCurrSegmentId();
+
+ uint16_t riseFallTime = 400 + (255-SEGMENT.speed)*3;
+ uint16_t maxDur = riseFallTime/100 + ((255 - SEGMENT.intensity) >> 2) + 13 + ((255 - SEGMENT.intensity) >> 1);
+
+ for (int f = 0; f < SEGLEN; f++) {
+ uint16_t stateTime = now16 - flashers[f].stateStart;
+ //random on/off time reached, switch state
+ if (stateTime > flashers[f].stateDur * 100) {
+ flashers[f].stateOn = !flashers[f].stateOn;
+ bool init = !flashers[f].stateDur;
+ if (flashers[f].stateOn) {
+ flashers[f].stateDur = riseFallTime/100 + ((255 - SEGMENT.intensity) >> 2) + random8(12 + ((255 - SEGMENT.intensity) >> 1)) +1;
+ } else {
+ flashers[f].stateDur = riseFallTime/100 + random8(3 + ((255 - SEGMENT.speed) >> 6)) +1;
+ }
+ flashers[f].stateStart = now16;
+ stateTime = 0;
+ if (init) {
+ flashers[f].stateStart -= riseFallTime; //start lit
+ flashers[f].stateDur = riseFallTime/100 + random8(12 + ((255 - SEGMENT.intensity) >> 1)) +5; //fire up a little quicker
+ stateTime = riseFallTime;
+ }
+ }
+ if (flashers[f].stateOn && flashers[f].stateDur > maxDur) flashers[f].stateDur = maxDur; //react more quickly on intensity change
+ if (stateTime > riseFallTime) stateTime = riseFallTime; //for flasher brightness calculation, fades in first 255 ms of state
+ uint8_t fadeprog = 255 - ((stateTime * 255) / riseFallTime);
+ uint8_t flasherBri = (flashers[f].stateOn) ? 255-gamma8(fadeprog) : gamma8(fadeprog);
+ uint16_t lastR = PRNG16;
+ uint16_t diff = 0;
+ while (diff < 0x4000) { //make sure colors of two adjacent LEDs differ enough
+ PRNG16 = (uint16_t)(PRNG16 * 2053) + 1384; //next 'random' number
+ diff = (PRNG16 > lastR) ? PRNG16 - lastR : lastR - PRNG16;
+ }
+ SEGMENT.setPixelColor(f, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(PRNG16 >> 8, false, false, 0), flasherBri));
+ }
return FRAMETIME;
}
+static const char _data_FX_MODE_FAIRYTWINKLE[] PROGMEM = "Fairytwinkle@!,!;!,!;!;;m12=0"; //pixels
/*
* Tricolor chase function
*/
-uint16_t WS2812FX::tricolor_chase(uint32_t color1, uint32_t color2) {
+uint16_t tricolor_chase(uint32_t color1, uint32_t color2) {
uint32_t cycleTime = 50 + ((255 - SEGMENT.speed)<<1);
- uint32_t it = now / cycleTime; // iterator
+ uint32_t it = strip.now / cycleTime; // iterator
uint8_t width = (1 + (SEGMENT.intensity>>4)); // value of 1-16 for each colour
uint8_t index = it % (width*3);
-
- for (uint16_t i = 0; i < SEGLEN; i++, index++) {
+
+ for (int i = 0; i < SEGLEN; i++, index++) {
if (index > (width*3)-1) index = 0;
uint32_t color = color1;
- if (index > (width<<1)-1) color = color_from_palette(i, true, PALETTE_SOLID_WRAP, 1);
+ if (index > (width<<1)-1) color = SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 1);
else if (index > width-1) color = color2;
- setPixelColor(SEGLEN - i -1, color);
+ SEGMENT.setPixelColor(SEGLEN - i -1, color);
}
return FRAMETIME;
}
@@ -1420,30 +1557,31 @@ uint16_t WS2812FX::tricolor_chase(uint32_t color1, uint32_t color2) {
/*
* Tricolor chase mode
*/
-uint16_t WS2812FX::mode_tricolor_chase(void) {
+uint16_t mode_tricolor_chase(void) {
return tricolor_chase(SEGCOLOR(2), SEGCOLOR(0));
}
+static const char _data_FX_MODE_TRICOLOR_CHASE[] PROGMEM = "Chase 3@!,Size;1,2,3;!";
/*
* ICU mode
*/
-uint16_t WS2812FX::mode_icu(void) {
+uint16_t mode_icu(void) {
uint16_t dest = SEGENV.step & 0xFFFF;
uint8_t space = (SEGMENT.intensity >> 3) +2;
- fill(SEGCOLOR(1));
+ if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1));
byte pindex = map(dest, 0, SEGLEN-SEGLEN/space, 0, 255);
- uint32_t col = color_from_palette(pindex, false, false, 0);
+ uint32_t col = SEGMENT.color_from_palette(pindex, false, false, 0);
- setPixelColor(dest, col);
- setPixelColor(dest + SEGLEN/space, col);
+ SEGMENT.setPixelColor(dest, col);
+ SEGMENT.setPixelColor(dest + SEGLEN/space, col);
if(SEGENV.aux0 == dest) { // pause between eye movements
if(random8(6) == 0) { // blink once in a while
- setPixelColor(dest, SEGCOLOR(1));
- setPixelColor(dest + SEGLEN/space, SEGCOLOR(1));
+ SEGMENT.setPixelColor(dest, SEGCOLOR(1));
+ SEGMENT.setPixelColor(dest + SEGLEN/space, SEGCOLOR(1));
return 200;
}
SEGENV.aux0 = random16(SEGLEN-SEGLEN/space);
@@ -1458,51 +1596,52 @@ uint16_t WS2812FX::mode_icu(void) {
dest--;
}
- setPixelColor(dest, col);
- setPixelColor(dest + SEGLEN/space, col);
+ SEGMENT.setPixelColor(dest, col);
+ SEGMENT.setPixelColor(dest + SEGLEN/space, col);
return SPEED_FORMULA_L;
}
+static const char _data_FX_MODE_ICU[] PROGMEM = "ICU@!,!,,,,,Overlay;!,!;!";
/*
* Custom mode by Aircoookie. Color Wipe, but with 3 colors
*/
-uint16_t WS2812FX::mode_tricolor_wipe(void)
-{
+uint16_t mode_tricolor_wipe(void) {
uint32_t cycleTime = 1000 + (255 - SEGMENT.speed)*200;
- uint32_t perc = now % cycleTime;
+ uint32_t perc = strip.now % cycleTime;
uint16_t prog = (perc * 65535) / cycleTime;
uint16_t ledIndex = (prog * SEGLEN * 3) >> 16;
uint16_t ledOffset = ledIndex;
- for (uint16_t i = 0; i < SEGLEN; i++)
+ for (int i = 0; i < SEGLEN; i++)
{
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 2));
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 2));
}
-
+
if(ledIndex < SEGLEN) { //wipe from 0 to 1
- for (uint16_t i = 0; i < SEGLEN; i++)
+ for (int i = 0; i < SEGLEN; i++)
{
- setPixelColor(i, (i > ledOffset)? SEGCOLOR(0) : SEGCOLOR(1));
+ SEGMENT.setPixelColor(i, (i > ledOffset)? SEGCOLOR(0) : SEGCOLOR(1));
}
} else if (ledIndex < SEGLEN*2) { //wipe from 1 to 2
ledOffset = ledIndex - SEGLEN;
- for (uint16_t i = ledOffset +1; i < SEGLEN; i++)
+ for (int i = ledOffset +1; i < SEGLEN; i++)
{
- setPixelColor(i, SEGCOLOR(1));
+ SEGMENT.setPixelColor(i, SEGCOLOR(1));
}
} else //wipe from 2 to 0
{
ledOffset = ledIndex - SEGLEN*2;
- for (uint16_t i = 0; i <= ledOffset; i++)
+ for (int i = 0; i <= ledOffset; i++)
{
- setPixelColor(i, SEGCOLOR(0));
+ SEGMENT.setPixelColor(i, SEGCOLOR(0));
}
}
return FRAMETIME;
}
+static const char _data_FX_MODE_TRICOLOR_WIPE[] PROGMEM = "Tri Wipe@!;1,2,3;!";
/*
@@ -1510,9 +1649,8 @@ uint16_t WS2812FX::mode_tricolor_wipe(void)
* Custom mode by Keith Lord: https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/TriFade.h
* Modified by Aircoookie
*/
-uint16_t WS2812FX::mode_tricolor_fade(void)
-{
- uint16_t counter = now * ((SEGMENT.speed >> 3) +1);
+uint16_t mode_tricolor_fade(void) {
+ uint16_t counter = strip.now * ((SEGMENT.speed >> 3) +1);
uint32_t prog = (counter * 768) >> 16;
uint32_t color1 = 0, color2 = 0;
@@ -1533,46 +1671,46 @@ uint16_t WS2812FX::mode_tricolor_fade(void)
}
byte stp = prog; // % 256
- for(uint16_t i = 0; i < SEGLEN; i++) {
+ for (int i = 0; i < SEGLEN; i++) {
uint32_t color;
if (stage == 2) {
- color = color_blend(color_from_palette(i, true, PALETTE_SOLID_WRAP, 2), color2, stp);
+ color = color_blend(SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 2), color2, stp);
} else if (stage == 1) {
- color = color_blend(color1, color_from_palette(i, true, PALETTE_SOLID_WRAP, 2), stp);
+ color = color_blend(color1, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 2), stp);
} else {
color = color_blend(color1, color2, stp);
}
- setPixelColor(i, color);
+ SEGMENT.setPixelColor(i, color);
}
return FRAMETIME;
}
+static const char _data_FX_MODE_TRICOLOR_FADE[] PROGMEM = "Tri Fade@!;1,2,3;!";
/*
* Creates random comets
* Custom mode by Keith Lord: https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/MultiComet.h
*/
-uint16_t WS2812FX::mode_multi_comet(void)
-{
+uint16_t mode_multi_comet(void) {
uint32_t cycleTime = 10 + (uint32_t)(255 - SEGMENT.speed);
- uint32_t it = now / cycleTime;
+ uint32_t it = strip.now / cycleTime;
if (SEGENV.step == it) return FRAMETIME;
if (!SEGENV.allocateData(sizeof(uint16_t) * 8)) return mode_static(); //allocation failed
-
- fade_out(SEGMENT.intensity);
-
+
+ SEGMENT.fade_out(SEGMENT.intensity);
+
uint16_t* comets = reinterpret_cast(SEGENV.data);
- for(uint8_t i=0; i < 8; i++) {
+ for (int i=0; i < 8; i++) {
if(comets[i] < SEGLEN) {
uint16_t index = comets[i];
if (SEGCOLOR(2) != 0)
{
- setPixelColor(index, i % 2 ? color_from_palette(index, true, PALETTE_SOLID_WRAP, 0) : SEGCOLOR(2));
+ SEGMENT.setPixelColor(index, i % 2 ? SEGMENT.color_from_palette(index, true, PALETTE_SOLID_WRAP, 0) : SEGCOLOR(2));
} else
{
- setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
+ SEGMENT.setPixelColor(index, SEGMENT.color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
}
comets[i]++;
} else {
@@ -1585,39 +1723,30 @@ uint16_t WS2812FX::mode_multi_comet(void)
SEGENV.step = it;
return FRAMETIME;
}
-
-
-/*
- * Creates two Larson scanners moving in opposite directions
- * Custom mode by Keith Lord: https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/DualLarson.h
- */
-uint16_t WS2812FX::mode_dual_larson_scanner(void){
- return larson_scanner(true);
-}
+static const char _data_FX_MODE_MULTI_COMET[] PROGMEM = "Multi Comet";
/*
* Running random pixels ("Stream 2")
* Custom mode by Keith Lord: https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/RandomChase.h
*/
-uint16_t WS2812FX::mode_random_chase(void)
-{
+uint16_t mode_random_chase(void) {
if (SEGENV.call == 0) {
SEGENV.step = RGBW32(random8(), random8(), random8(), 0);
SEGENV.aux0 = random16();
}
uint16_t prevSeed = random16_get_seed(); // save seed so we can restore it at the end of the function
uint32_t cycleTime = 25 + (3 * (uint32_t)(255 - SEGMENT.speed));
- uint32_t it = now / cycleTime;
+ uint32_t it = strip.now / cycleTime;
uint32_t color = SEGENV.step;
random16_set_seed(SEGENV.aux0);
- for(uint16_t i = SEGLEN -1; i > 0; i--) {
+ for (int i = SEGLEN -1; i > 0; i--) {
uint8_t r = random8(6) != 0 ? (color >> 16 & 0xFF) : random8();
uint8_t g = random8(6) != 0 ? (color >> 8 & 0xFF) : random8();
uint8_t b = random8(6) != 0 ? (color & 0xFF) : random8();
color = RGBW32(r, g, b, 0);
- setPixelColor(i, r, g, b);
+ SEGMENT.setPixelColor(i, r, g, b);
if (i == SEGLEN -1 && SEGENV.aux1 != (it & 0xFFFF)) { //new first color in next frame
SEGENV.step = color;
SEGENV.aux0 = random16_get_seed();
@@ -1629,6 +1758,8 @@ uint16_t WS2812FX::mode_random_chase(void)
random16_set_seed(prevSeed); // restore original seed so other effects can use "random" PRNG
return FRAMETIME;
}
+static const char _data_FX_MODE_RANDOM_CHASE[] PROGMEM = "Stream 2@!;;";
+
//7 bytes
typedef struct Oscillator {
@@ -1641,13 +1772,12 @@ typedef struct Oscillator {
/*
/ Oscillating bars of color, updated with standard framerate
*/
-uint16_t WS2812FX::mode_oscillate(void)
-{
+uint16_t mode_oscillate(void) {
uint8_t numOscillators = 3;
uint16_t dataSize = sizeof(oscillator) * numOscillators;
if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
-
+
Oscillator* oscillators = reinterpret_cast(SEGENV.data);
if (SEGENV.call == 0)
@@ -1658,9 +1788,9 @@ uint16_t WS2812FX::mode_oscillate(void)
}
uint32_t cycleTime = 20 + (2 * (uint32_t)(255 - SEGMENT.speed));
- uint32_t it = now / cycleTime;
+ uint32_t it = strip.now / cycleTime;
- for(uint8_t i = 0; i < numOscillators; i++) {
+ for (int i = 0; i < numOscillators; i++) {
// if the counter has increased, move the oscillator by the random step
if (it != SEGENV.step) oscillators[i].pos += oscillators[i].dir * oscillators[i].speed;
oscillators[i].size = SEGLEN/(3+SEGMENT.intensity/8);
@@ -1677,23 +1807,25 @@ uint16_t WS2812FX::mode_oscillate(void)
}
}
- for(uint16_t i=0; i < SEGLEN; i++) {
+ for (int i = 0; i < SEGLEN; i++) {
uint32_t color = BLACK;
- for(uint8_t j=0; j < numOscillators; j++) {
+ for (int j = 0; j < numOscillators; j++) {
if(i >= oscillators[j].pos - oscillators[j].size && i <= oscillators[j].pos + oscillators[j].size) {
color = (color == BLACK) ? SEGCOLOR(j) : color_blend(color, SEGCOLOR(j), 128);
}
}
- setPixelColor(i, color);
+ SEGMENT.setPixelColor(i, color);
}
-
+
SEGENV.step = it;
return FRAMETIME;
}
+static const char _data_FX_MODE_OSCILLATE[] PROGMEM = "Oscillate";
-uint16_t WS2812FX::mode_lightning(void)
-{
+//TODO
+uint16_t mode_lightning(void) {
+ if (SEGLEN == 1) return mode_static();
uint16_t ledstart = random16(SEGLEN); // Determine starting location of flash
uint16_t ledlen = 1 + random16(SEGLEN -ledstart); // Determine length of flash (not to go beyond NUM_LEDS-1)
uint8_t bri = 255/random8(1, 3);
@@ -1707,12 +1839,12 @@ uint16_t WS2812FX::mode_lightning(void)
SEGENV.aux0 = 200; //200ms delay after leader
}
- fill(SEGCOLOR(1));
+ if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1));
if (SEGENV.aux1 > 3 && !(SEGENV.aux1 & 0x01)) { //flash on even number >2
for (int i = ledstart; i < ledstart + ledlen; i++)
{
- setPixelColor(i,color_from_palette(i, true, PALETTE_SOLID_WRAP, 0, bri));
+ SEGMENT.setPixelColor(i,SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0, bri));
}
SEGENV.aux1--;
@@ -1732,13 +1864,13 @@ uint16_t WS2812FX::mode_lightning(void)
}
return FRAMETIME;
}
+static const char _data_FX_MODE_LIGHTNING[] PROGMEM = "Lightning@!,!,,,,,Overlay;!,!;!";
// Pride2015
// Animated, ever-changing rainbows.
// by Mark Kriegsman: https://gist.github.com/kriegsman/964de772d64c502760e5
-uint16_t WS2812FX::mode_pride_2015(void)
-{
+uint16_t mode_pride_2015(void) {
uint16_t duration = 10 + SEGMENT.speed;
uint16_t sPseudotime = SEGENV.step;
uint16_t sHue16 = SEGENV.aux0;
@@ -1754,9 +1886,8 @@ uint16_t WS2812FX::mode_pride_2015(void)
sPseudotime += duration * msmultiplier;
sHue16 += duration * beatsin88( 400, 5,9);
uint16_t brightnesstheta16 = sPseudotime;
- CRGB fastled_col;
- for (uint16_t i = 0 ; i < SEGLEN; i++) {
+ for (int i = 0 ; i < SEGLEN; i++) {
hue16 += hueinc16;
uint8_t hue8 = hue16 >> 8;
@@ -1767,63 +1898,62 @@ uint16_t WS2812FX::mode_pride_2015(void)
uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536;
bri8 += (255 - brightdepth);
- CRGB newcolor = CHSV( hue8, sat8, bri8);
- fastled_col = col_to_crgb(getPixelColor(i));
-
- nblend(fastled_col, newcolor, 64);
- setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ CRGB newcolor = CHSV(hue8, sat8, bri8);
+ SEGMENT.blendPixelColor(i, newcolor, 64);
}
SEGENV.step = sPseudotime;
SEGENV.aux0 = sHue16;
+
return FRAMETIME;
}
+static const char _data_FX_MODE_PRIDE_2015[] PROGMEM = "Pride 2015@!;;";
//eight colored dots, weaving in and out of sync with each other
-uint16_t WS2812FX::mode_juggle(void){
- fade_out(SEGMENT.intensity);
+uint16_t mode_juggle(void) {
+ if (SEGLEN == 1) return mode_static();
+
+ SEGMENT.fadeToBlackBy(192 - (3*SEGMENT.intensity/4));
CRGB fastled_col;
byte dothue = 0;
- for ( byte i = 0; i < 8; i++) {
- uint16_t index = 0 + beatsin88((128 + SEGMENT.speed)*(i + 7), 0, SEGLEN -1);
- fastled_col = col_to_crgb(getPixelColor(index));
- fastled_col |= (SEGMENT.palette==0)?CHSV(dothue, 220, 255):ColorFromPalette(currentPalette, dothue, 255);
- setPixelColor(index, fastled_col.red, fastled_col.green, fastled_col.blue);
+ for (int i = 0; i < 8; i++) {
+ uint16_t index = 0 + beatsin88((16 + SEGMENT.speed)*(i + 7), 0, SEGLEN -1);
+ fastled_col = CRGB(SEGMENT.getPixelColor(index));
+ fastled_col |= (SEGMENT.palette==0)?CHSV(dothue, 220, 255):ColorFromPalette(SEGPALETTE, dothue, 255);
+ SEGMENT.setPixelColor(index, fastled_col);
dothue += 32;
}
return FRAMETIME;
}
+static const char _data_FX_MODE_JUGGLE[] PROGMEM = "Juggle@!,Trail;;!;;sx=64,ix=128";
-uint16_t WS2812FX::mode_palette()
-{
+uint16_t mode_palette() {
uint16_t counter = 0;
- if (SEGMENT.speed != 0)
+ if (SEGMENT.speed != 0)
{
- counter = (now * ((SEGMENT.speed >> 3) +1)) & 0xFFFF;
+ counter = (strip.now * ((SEGMENT.speed >> 3) +1)) & 0xFFFF;
counter = counter >> 8;
}
-
- bool noWrap = (paletteBlend == 2 || (paletteBlend == 0 && SEGMENT.speed == 0));
- for (uint16_t i = 0; i < SEGLEN; i++)
+
+ for (int i = 0; i < SEGLEN; i++)
{
uint8_t colorIndex = (i * 255 / SEGLEN) - counter;
-
- if (noWrap) colorIndex = map(colorIndex, 0, 255, 0, 240); //cut off blend at palette "end"
-
- setPixelColor(i, color_from_palette(colorIndex, false, true, 255));
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(colorIndex, false, PALETTE_MOVING_WRAP, 255));
}
+
return FRAMETIME;
}
+static const char _data_FX_MODE_PALETTE[] PROGMEM = "Palette@Cycle speed;;!;;c3=0,o2=0";
// WLED limitation: Analog Clock overlay will NOT work when Fire2012 is active
// Fire2012 by Mark Kriegsman, July 2012
// as part of "Five Elements" shown here: http://youtu.be/knWiGsmgycY
-////
+////
// This basic one-dimensional 'fire' simulation works roughly as follows:
// There's a underlying array of 'heat' cells, that model the temperature
-// at each point along the line. Every cycle through the simulation,
+// at each point along the line. Every cycle through the simulation,
// four steps are performed:
// 1) All cells cool down a little bit, losing heat to the air
// 2) The heat from each cell drifts 'up' and diffuses a little
@@ -1833,8 +1963,8 @@ uint16_t WS2812FX::mode_palette()
//
// Temperature is in arbitrary units from 0 (cold black) to 255 (white hot).
//
-// This simulation scales it self a bit depending on NUM_LEDS; it should look
-// "OK" on anywhere from 20 to 100 LEDs without too much tweaking.
+// This simulation scales it self a bit depending on SEGLEN; it should look
+// "OK" on anywhere from 20 to 100 LEDs without too much tweaking.
//
// I recommend running this simulation at anywhere from 30-100 frames per second,
// meaning an interframe delay of about 10-35 milliseconds.
@@ -1845,53 +1975,65 @@ uint16_t WS2812FX::mode_palette()
// There are two main parameters you can play with to control the look and
// feel of your fire: COOLING (used in step 1 above) (Speed = COOLING), and SPARKING (used
// in step 3 above) (Effect Intensity = Sparking).
+uint16_t mode_fire_2012() {
+ if (SEGLEN == 1) return mode_static();
+ const uint16_t strips = SEGMENT.nrOfVStrips();
+ if (!SEGENV.allocateData(strips * SEGLEN)) return mode_static(); //allocation failed
+ byte* heat = SEGENV.data;
+ const uint32_t it = strip.now >> 5; //div 32
-uint16_t WS2812FX::mode_fire_2012()
-{
- uint32_t it = now >> 5; //div 32
+ struct virtualStrip {
+ static void runStrip(uint16_t stripNr, byte* heat, uint32_t it) {
- if (!SEGENV.allocateData(SEGLEN)) return mode_static(); //allocation failed
-
- byte* heat = SEGENV.data;
+ const uint8_t ignition = max(3,SEGLEN/10); // ignition area: 10% of segment length or minimum 3 pixels
- if (it != SEGENV.step)
- {
- uint8_t ignition = max(7,SEGLEN/10); // ignition area: 10% of segment length or minimum 7 pixels
-
- // Step 1. Cool down every cell a little
- for (uint16_t i = 0; i < SEGLEN; i++) {
- uint8_t temp = qsub8(heat[i], random8(0, (((20 + SEGMENT.speed /3) * 10) / SEGLEN) + 2));
- heat[i] = (temp==0 && i 1; k--) {
- heat[k] = (heat[k - 1] + (heat[k - 2]<<1) ) / 3; // heat[k-2] multiplied by 2
- }
-
- // Step 3. Randomly ignite new 'sparks' of heat near the bottom
- if (random8() <= SEGMENT.intensity) {
- uint8_t y = random8(ignition);
- if (y < SEGLEN) heat[y] = qadd8(heat[y], random8(160,255));
+ // Step 1. Cool down every cell a little
+ for (int i = 0; i < SEGLEN; i++) {
+ uint8_t cool = (it != SEGENV.step) ? random8((((20 + SEGMENT.speed/3) * 16) / SEGLEN)+2) : random(4);
+ uint8_t minTemp = (i 1; k--) {
+ heat[k] = (heat[k - 1] + (heat[k - 2]<<1) ) / 3; // heat[k-2] multiplied by 2
+ }
+
+ // Step 3. Randomly ignite new 'sparks' of heat near the bottom
+ if (random8() <= SEGMENT.intensity) {
+ uint8_t y = random8(ignition);
+ uint8_t boost = (17+SEGMENT.custom3) * (ignition - y/2) / ignition; // integer math!
+ heat[y] = qadd8(heat[y], random8(96+2*boost,207+boost));
+ }
+ }
+
+ // Step 4. Map from heat cells to LED colors
+ for (int j = 0; j < SEGLEN; j++) {
+ SEGMENT.setPixelColor(indexToVStrip(j, stripNr), ColorFromPalette(SEGPALETTE, MIN(heat[j],240), 255, NOBLEND));
+ }
}
+ };
+
+ for (int stripNr=0; stripNr> 8;
uint16_t h16_128 = hue16 >> 7;
@@ -1920,160 +2060,150 @@ uint16_t WS2812FX::mode_colorwaves()
}
brightnesstheta16 += brightnessthetainc16;
- uint16_t b16 = sin16( brightnesstheta16 ) + 32768;
+ uint16_t b16 = sin16(brightnesstheta16) + 32768;
uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536;
uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536;
bri8 += (255 - brightdepth);
- CRGB newcolor = ColorFromPalette(currentPalette, hue8, bri8);
- fastled_col = col_to_crgb(getPixelColor(i));
-
- nblend(fastled_col, newcolor, 128);
- setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ SEGMENT.blendPixelColor(i, SEGMENT.color_from_palette(hue8, false, PALETTE_SOLID_WRAP, 0, bri8), 128); // 50/50 mix
}
SEGENV.step = sPseudotime;
SEGENV.aux0 = sHue16;
+
return FRAMETIME;
}
+static const char _data_FX_MODE_COLORWAVES[] PROGMEM = "Colorwaves@!,Hue;!;!";
// colored stripes pulsing at a defined Beats-Per-Minute (BPM)
-uint16_t WS2812FX::mode_bpm()
-{
- CRGB fastled_col;
- uint32_t stp = (now / 20) & 0xFF;
+uint16_t mode_bpm() {
+ uint32_t stp = (strip.now / 20) & 0xFF;
uint8_t beat = beatsin8(SEGMENT.speed, 64, 255);
- for (uint16_t i = 0; i < SEGLEN; i++) {
- fastled_col = ColorFromPalette(currentPalette, stp + (i * 2), beat - stp + (i * 10));
- setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ for (int i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(stp + (i * 2), false, PALETTE_SOLID_WRAP, 0, beat - stp + (i * 10)));
}
+
return FRAMETIME;
}
+static const char _data_FX_MODE_BPM[] PROGMEM = "Bpm@!;!;!;;sx=64";
-uint16_t WS2812FX::mode_fillnoise8()
-{
+uint16_t mode_fillnoise8() {
if (SEGENV.call == 0) SEGENV.step = random16(12345);
- CRGB fastled_col;
- for (uint16_t i = 0; i < SEGLEN; i++) {
+ //CRGB fastled_col;
+ for (int i = 0; i < SEGLEN; i++) {
uint8_t index = inoise8(i * SEGLEN, SEGENV.step + i * SEGLEN);
- fastled_col = ColorFromPalette(currentPalette, index, 255, LINEARBLEND);
- setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ //fastled_col = ColorFromPalette(SEGPALETTE, index, 255, LINEARBLEND);
+ //SEGMENT.setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(index, false, PALETTE_SOLID_WRAP, 0));
}
SEGENV.step += beatsin8(SEGMENT.speed, 1, 6); //10,1,4
return FRAMETIME;
}
+static const char _data_FX_MODE_FILLNOISE8[] PROGMEM = "Fill Noise@!;!;!";
-uint16_t WS2812FX::mode_noise16_1()
-{
- uint16_t scale = 320; // the "zoom factor" for the noise
- CRGB fastled_col;
- SEGENV.step += (1 + SEGMENT.speed/16);
-
- for (uint16_t i = 0; i < SEGLEN; i++) {
-
- uint16_t shift_x = beatsin8(11); // the x position of the noise field swings @ 17 bpm
- uint16_t shift_y = SEGENV.step/42; // the y position becomes slowly incremented
+uint16_t mode_noise16_1() {
+ uint16_t scale = 320; // the "zoom factor" for the noise
+ //CRGB fastled_col;
+ SEGENV.step += (1 + SEGMENT.speed/16);
+ for (int i = 0; i < SEGLEN; i++) {
+ uint16_t shift_x = beatsin8(11); // the x position of the noise field swings @ 17 bpm
+ uint16_t shift_y = SEGENV.step/42; // the y position becomes slowly incremented
uint16_t real_x = (i + shift_x) * scale; // the x position of the noise field swings @ 17 bpm
uint16_t real_y = (i + shift_y) * scale; // the y position becomes slowly incremented
- uint32_t real_z = SEGENV.step; // the z position becomes quickly incremented
-
- uint8_t noise = inoise16(real_x, real_y, real_z) >> 8; // get the noise data and scale it down
-
- uint8_t index = sin8(noise * 3); // map LED color based on noise data
+ uint32_t real_z = SEGENV.step; // the z position becomes quickly incremented
+ uint8_t noise = inoise16(real_x, real_y, real_z) >> 8; // get the noise data and scale it down
+ uint8_t index = sin8(noise * 3); // map LED color based on noise data
- fastled_col = ColorFromPalette(currentPalette, index, 255, LINEARBLEND); // With that value, look up the 8 bit colour palette value and assign it to the current LED.
- setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ //fastled_col = ColorFromPalette(SEGPALETTE, index, 255, LINEARBLEND); // With that value, look up the 8 bit colour palette value and assign it to the current LED.
+ //SEGMENT.setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(index, false, PALETTE_SOLID_WRAP, 0));
}
return FRAMETIME;
}
+static const char _data_FX_MODE_NOISE16_1[] PROGMEM = "Noise 1@!;!;!";
-uint16_t WS2812FX::mode_noise16_2()
-{
- uint16_t scale = 1000; // the "zoom factor" for the noise
- CRGB fastled_col;
+uint16_t mode_noise16_2() {
+ uint16_t scale = 1000; // the "zoom factor" for the noise
+ //CRGB fastled_col;
SEGENV.step += (1 + (SEGMENT.speed >> 1));
- for (uint16_t i = 0; i < SEGLEN; i++) {
-
- uint16_t shift_x = SEGENV.step >> 6; // x as a function of time
-
- uint32_t real_x = (i + shift_x) * scale; // calculate the coordinates within the noise field
-
- uint8_t noise = inoise16(real_x, 0, 4223) >> 8; // get the noise data and scale it down
-
- uint8_t index = sin8(noise * 3); // map led color based on noise data
+ for (int i = 0; i < SEGLEN; i++) {
+ uint16_t shift_x = SEGENV.step >> 6; // x as a function of time
+ uint32_t real_x = (i + shift_x) * scale; // calculate the coordinates within the noise field
+ uint8_t noise = inoise16(real_x, 0, 4223) >> 8; // get the noise data and scale it down
+ uint8_t index = sin8(noise * 3); // map led color based on noise data
- fastled_col = ColorFromPalette(currentPalette, index, noise, LINEARBLEND); // With that value, look up the 8 bit colour palette value and assign it to the current LED.
- setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ //fastled_col = ColorFromPalette(SEGPALETTE, index, noise, LINEARBLEND); // With that value, look up the 8 bit colour palette value and assign it to the current LED.
+ //SEGMENT.setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(index, false, PALETTE_SOLID_WRAP, 0, noise));
}
return FRAMETIME;
}
+static const char _data_FX_MODE_NOISE16_2[] PROGMEM = "Noise 2@!;!;!";
-uint16_t WS2812FX::mode_noise16_3()
-{
+uint16_t mode_noise16_3() {
uint16_t scale = 800; // the "zoom factor" for the noise
- CRGB fastled_col;
+ //CRGB fastled_col;
SEGENV.step += (1 + SEGMENT.speed);
- for (uint16_t i = 0; i < SEGLEN; i++) {
-
+ for (int i = 0; i < SEGLEN; i++) {
uint16_t shift_x = 4223; // no movement along x and y
uint16_t shift_y = 1234;
-
uint32_t real_x = (i + shift_x) * scale; // calculate the coordinates within the noise field
uint32_t real_y = (i + shift_y) * scale; // based on the precalculated positions
- uint32_t real_z = SEGENV.step*8;
-
+ uint32_t real_z = SEGENV.step*8;
uint8_t noise = inoise16(real_x, real_y, real_z) >> 8; // get the noise data and scale it down
-
uint8_t index = sin8(noise * 3); // map led color based on noise data
- fastled_col = ColorFromPalette(currentPalette, index, noise, LINEARBLEND); // With that value, look up the 8 bit colour palette value and assign it to the current LED.
- setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ //fastled_col = ColorFromPalette(SEGPALETTE, index, noise, LINEARBLEND); // With that value, look up the 8 bit colour palette value and assign it to the current LED.
+ //SEGMENT.setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(index, false, PALETTE_SOLID_WRAP, 0, noise));
}
return FRAMETIME;
}
+static const char _data_FX_MODE_NOISE16_3[] PROGMEM = "Noise 3@!;!;!";
//https://github.com/aykevl/ledstrip-spark/blob/master/ledstrip.ino
-uint16_t WS2812FX::mode_noise16_4()
-{
- CRGB fastled_col;
- uint32_t stp = (now * SEGMENT.speed) >> 7;
- for (uint16_t i = 0; i < SEGLEN; i++) {
+uint16_t mode_noise16_4() {
+ //CRGB fastled_col;
+ uint32_t stp = (strip.now * SEGMENT.speed) >> 7;
+ for (int i = 0; i < SEGLEN; i++) {
int16_t index = inoise16(uint32_t(i) << 12, stp);
- fastled_col = ColorFromPalette(currentPalette, index);
- setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ //fastled_col = ColorFromPalette(SEGPALETTE, index);
+ //SEGMENT.setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(index, false, PALETTE_SOLID_WRAP, 0));
}
return FRAMETIME;
}
+static const char _data_FX_MODE_NOISE16_4[] PROGMEM = "Noise 4@!;!;!";
//based on https://gist.github.com/kriegsman/5408ecd397744ba0393e
-uint16_t WS2812FX::mode_colortwinkle()
-{
+uint16_t mode_colortwinkle() {
uint16_t dataSize = (SEGLEN+7) >> 3; //1 bit per LED
if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
-
+
CRGB fastled_col, prev;
- fract8 fadeUpAmount = _brightness>28 ? 8 + (SEGMENT.speed>>2) : 68-_brightness, fadeDownAmount = _brightness>28 ? 8 + (SEGMENT.speed>>3) : 68-_brightness;
+ fract8 fadeUpAmount = strip.getBrightness()>28 ? 8 + (SEGMENT.speed>>2) : 68-strip.getBrightness();
+ fract8 fadeDownAmount = strip.getBrightness()>28 ? 8 + (SEGMENT.speed>>3) : 68-strip.getBrightness();
for (uint16_t i = 0; i < SEGLEN; i++) {
- fastled_col = col_to_crgb(getPixelColor(i));
+ fastled_col = SEGMENT.getPixelColor(i);
prev = fastled_col;
uint16_t index = i >> 3;
uint8_t bitNum = i & 0x07;
bool fadeUp = bitRead(SEGENV.data[index], bitNum);
-
+
if (fadeUp) {
CRGB incrementalColor = fastled_col;
incrementalColor.nscale8_video(fadeUpAmount);
@@ -2082,15 +2212,15 @@ uint16_t WS2812FX::mode_colortwinkle()
if (fastled_col.red == 255 || fastled_col.green == 255 || fastled_col.blue == 255) {
bitWrite(SEGENV.data[index], bitNum, false);
}
- setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ SEGMENT.setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
- if (col_to_crgb(getPixelColor(i)) == prev) { //fix "stuck" pixels
+ if (SEGMENT.getPixelColor(i) == RGBW32(prev.r, prev.g, prev.b, 0)) { //fix "stuck" pixels
fastled_col += fastled_col;
- setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ SEGMENT.setPixelColor(i, fastled_col);
}
} else {
fastled_col.nscale8(255 - fadeDownAmount);
- setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ SEGMENT.setPixelColor(i, fastled_col);
}
}
@@ -2098,12 +2228,12 @@ uint16_t WS2812FX::mode_colortwinkle()
if (random8() <= SEGMENT.intensity) {
for (uint8_t times = 0; times < 5; times++) { //attempt to spawn a new pixel 5 times
int i = random16(SEGLEN);
- if (getPixelColor(i) == 0) {
- fastled_col = ColorFromPalette(currentPalette, random8(), 64, NOBLEND);
+ if (SEGMENT.getPixelColor(i) == 0) {
+ fastled_col = ColorFromPalette(SEGPALETTE, random8(), 64, NOBLEND);
uint16_t index = i >> 3;
uint8_t bitNum = i & 0x07;
bitWrite(SEGENV.data[index], bitNum, true);
- setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ SEGMENT.setPixelColor(i, fastled_col);
break; //only spawn 1 new pixel per frame per 50 LEDs
}
}
@@ -2111,106 +2241,115 @@ uint16_t WS2812FX::mode_colortwinkle()
}
return FRAMETIME_FIXED;
}
+static const char _data_FX_MODE_COLORTWINKLE[] PROGMEM = "Colortwinkles@Fade speed,Spawn speed;;!;;m12=0"; //pixels
//Calm effect, like a lake at night
-uint16_t WS2812FX::mode_lake() {
+uint16_t mode_lake() {
uint8_t sp = SEGMENT.speed/10;
int wave1 = beatsin8(sp +2, -64,64);
int wave2 = beatsin8(sp +1, -64,64);
uint8_t wave3 = beatsin8(sp +2, 0,80);
- CRGB fastled_col;
+ //CRGB fastled_col;
- for (uint16_t i = 0; i < SEGLEN; i++)
+ for (int i = 0; i < SEGLEN; i++)
{
- int index = cos8((i*15)+ wave1)/2 + cubicwave8((i*23)+ wave2)/2;
+ int index = cos8((i*15)+ wave1)/2 + cubicwave8((i*23)+ wave2)/2;
uint8_t lum = (index > wave3) ? index - wave3 : 0;
- fastled_col = ColorFromPalette(currentPalette, map(index,0,255,0,240), lum, LINEARBLEND);
- setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ //fastled_col = ColorFromPalette(SEGPALETTE, map(index,0,255,0,240), lum, LINEARBLEND);
+ //SEGMENT.setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(index, false, false, 0, lum));
}
+
return FRAMETIME;
}
+static const char _data_FX_MODE_LAKE[] PROGMEM = "Lake@!;Fx;!";
// meteor effect
// send a meteor from begining to to the end of the strip with a trail that randomly decays.
// adapted from https://www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/#LEDStripEffectMeteorRain
-uint16_t WS2812FX::mode_meteor() {
+uint16_t mode_meteor() {
+ if (SEGLEN == 1) return mode_static();
if (!SEGENV.allocateData(SEGLEN)) return mode_static(); //allocation failed
byte* trail = SEGENV.data;
-
- byte meteorSize= 1+ SEGLEN / 10;
- uint16_t counter = now * ((SEGMENT.speed >> 2) +8);
+
+ const unsigned meteorSize= 1 + SEGLEN / 20; // 5%
+ uint16_t counter = strip.now * ((SEGMENT.speed >> 2) +8);
uint16_t in = counter * SEGLEN >> 16;
+ const int max = SEGMENT.palette==5 || !SEGMENT.check1 ? 240 : 255;
// fade all leds to colors[1] in LEDs one step
- for (uint16_t i = 0; i < SEGLEN; i++) {
- if (random8() <= 255 - SEGMENT.intensity)
- {
- byte meteorTrailDecay = 128 + random8(127);
+ for (int i = 0; i < SEGLEN; i++) {
+ if (random8() <= 255 - SEGMENT.intensity) {
+ byte meteorTrailDecay = 162 + random8(92);
trail[i] = scale8(trail[i], meteorTrailDecay);
- setPixelColor(i, color_from_palette(trail[i], false, true, 255));
+ uint32_t col = SEGMENT.check1 ? SEGMENT.color_from_palette(i, true, false, 0, trail[i]) : SEGMENT.color_from_palette(trail[i], false, true, 255);
+ SEGMENT.setPixelColor(i, col);
}
}
// draw meteor
- for(int j = 0; j < meteorSize; j++) {
+ for (unsigned j = 0; j < meteorSize; j++) {
uint16_t index = in + j;
- if(index >= SEGLEN) {
- index = (in + j - SEGLEN);
+ if (index >= SEGLEN) {
+ index -= SEGLEN;
}
-
- trail[index] = 240;
- setPixelColor(index, color_from_palette(trail[index], false, true, 255));
+ trail[index] = max;
+ uint32_t col = SEGMENT.check1 ? SEGMENT.color_from_palette(index, true, false, 0, trail[index]) : SEGMENT.color_from_palette(trail[index], false, true, 255);
+ SEGMENT.setPixelColor(index, col);
}
return FRAMETIME;
}
+static const char _data_FX_MODE_METEOR[] PROGMEM = "Meteor@!,Trail,,,,Gradient;;!;1";
// smooth meteor effect
// send a meteor from begining to to the end of the strip with a trail that randomly decays.
// adapted from https://www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/#LEDStripEffectMeteorRain
-uint16_t WS2812FX::mode_meteor_smooth() {
+uint16_t mode_meteor_smooth() {
+ if (SEGLEN == 1) return mode_static();
if (!SEGENV.allocateData(SEGLEN)) return mode_static(); //allocation failed
byte* trail = SEGENV.data;
-
- byte meteorSize= 1+ SEGLEN / 10;
+
+ const unsigned meteorSize= 1+ SEGLEN / 20; // 5%
uint16_t in = map((SEGENV.step >> 6 & 0xFF), 0, 255, 0, SEGLEN -1);
+ const int max = SEGMENT.palette==5 || !SEGMENT.check1 ? 240 : 255;
// fade all leds to colors[1] in LEDs one step
- for (uint16_t i = 0; i < SEGLEN; i++) {
- if (trail[i] != 0 && random8() <= 255 - SEGMENT.intensity)
- {
- int change = 3 - random8(12); //change each time between -8 and +3
- trail[i] += change;
- if (trail[i] > 245) trail[i] = 0;
- if (trail[i] > 240) trail[i] = 240;
- setPixelColor(i, color_from_palette(trail[i], false, true, 255));
+ for (int i = 0; i < SEGLEN; i++) {
+ if (/*trail[i] != 0 &&*/ random8() <= 255 - SEGMENT.intensity) {
+ int change = trail[i] + 4 - random8(24); //change each time between -20 and +4
+ trail[i] = constrain(change, 0, max);
+ uint32_t col = SEGMENT.check1 ? SEGMENT.color_from_palette(i, true, false, 0, trail[i]) : SEGMENT.color_from_palette(trail[i], false, true, 255);
+ SEGMENT.setPixelColor(i, col);
}
}
-
+
// draw meteor
- for(int j = 0; j < meteorSize; j++) {
- uint16_t index = in + j;
- if(in + j >= SEGLEN) {
- index = (in + j - SEGLEN);
+ for (unsigned j = 0; j < meteorSize; j++) {
+ uint16_t index = in + j;
+ if (index >= SEGLEN) {
+ index -= SEGLEN;
}
- setPixelColor(index, color_blend(getPixelColor(index), color_from_palette(240, false, true, 255), 48));
- trail[index] = 240;
+ trail[index] = max;
+ uint32_t col = SEGMENT.check1 ? SEGMENT.color_from_palette(index, true, false, 0, trail[index]) : SEGMENT.color_from_palette(trail[index], false, true, 255);
+ SEGMENT.setPixelColor(index, col);
}
SEGENV.step += SEGMENT.speed +1;
return FRAMETIME;
}
+static const char _data_FX_MODE_METEOR_SMOOTH[] PROGMEM = "Meteor Smooth@!,Trail,,,,Gradient;;!;1";
//Railway Crossing / Christmas Fairy lights
-uint16_t WS2812FX::mode_railway()
-{
- uint16_t dur = 40 + (255 - SEGMENT.speed) * 10;
+uint16_t mode_railway() {
+ if (SEGLEN == 1) return mode_static();
+ uint16_t dur = (256 - SEGMENT.speed) * 40;
uint16_t rampdur = (dur * SEGMENT.intensity) >> 8;
if (SEGENV.step > dur)
{
@@ -2225,17 +2364,18 @@ uint16_t WS2812FX::mode_railway()
if (p0 < 255) pos = p0;
}
if (SEGENV.aux0) pos = 255 - pos;
- for (uint16_t i = 0; i < SEGLEN; i += 2)
+ for (int i = 0; i < SEGLEN; i += 2)
{
- setPixelColor(i, color_from_palette(255 - pos, false, false, 255));
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(255 - pos, false, false, 255)); // do not use color 1 or 2, always use palette
if (i < SEGLEN -1)
{
- setPixelColor(i + 1, color_from_palette(pos, false, false, 255));
+ SEGMENT.setPixelColor(i + 1, SEGMENT.color_from_palette(pos, false, false, 255)); // do not use color 1 or 2, always use palette
}
}
SEGENV.step += FRAMETIME;
return FRAMETIME;
}
+static const char _data_FX_MODE_RAILWAY[] PROGMEM = "Railway@!,Smoothness;1,2;!";
//Water ripple
@@ -2254,99 +2394,94 @@ typedef struct Ripple {
#else
#define MAX_RIPPLES 100
#endif
-uint16_t WS2812FX::ripple_base(bool rainbow)
+uint16_t ripple_base()
{
uint16_t maxRipples = min(1 + (SEGLEN >> 2), MAX_RIPPLES); // 56 max for 16 segment ESP8266
uint16_t dataSize = sizeof(ripple) * maxRipples;
if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
-
+
Ripple* ripples = reinterpret_cast(SEGENV.data);
- // ranbow background or chosen background, all very dim.
- if (rainbow) {
- if (SEGENV.call ==0) {
- SEGENV.aux0 = random8();
- SEGENV.aux1 = random8();
- }
- if (SEGENV.aux0 == SEGENV.aux1) {
- SEGENV.aux1 = random8();
- }
- else if (SEGENV.aux1 > SEGENV.aux0) {
- SEGENV.aux0++;
- } else {
- SEGENV.aux0--;
- }
- fill(color_blend(color_wheel(SEGENV.aux0),BLACK,235));
- } else {
- fill(SEGCOLOR(1));
- }
-
//draw wave
- for (uint16_t i = 0; i < maxRipples; i++)
- {
+ for (int i = 0; i < maxRipples; i++) {
uint16_t ripplestate = ripples[i].state;
- if (ripplestate)
- {
+ if (ripplestate) {
uint8_t rippledecay = (SEGMENT.speed >> 4) +1; //faster decay if faster propagation
uint16_t rippleorigin = ripples[i].pos;
- uint32_t col = color_from_palette(ripples[i].color, false, false, 255);
- uint16_t propagation = ((ripplestate/rippledecay -1) * SEGMENT.speed);
+ uint32_t col = SEGMENT.color_from_palette(ripples[i].color, false, false, 255);
+ uint16_t propagation = ((ripplestate/rippledecay - 1) * (SEGMENT.speed + 1));
int16_t propI = propagation >> 8;
uint8_t propF = propagation & 0xFF;
- int16_t left = rippleorigin - propI -1;
uint8_t amp = (ripplestate < 17) ? triwave8((ripplestate-1)*8) : map(ripplestate,17,255,255,2);
- for (int16_t v = left; v < left +4; v++)
+ #ifndef WLED_DISABLE_2D
+ if (SEGMENT.is2D()) {
+ propI /= 2;
+ uint16_t cx = rippleorigin >> 8;
+ uint16_t cy = rippleorigin & 0xFF;
+ uint8_t mag = scale8(sin8((propF>>2)), amp);
+ if (propI > 0) SEGMENT.draw_circle(cx, cy, propI, color_blend(SEGMENT.getPixelColorXY(cx + propI, cy), col, mag));
+ } else
+ #endif
{
- uint8_t mag = scale8(cubicwave8((propF>>2)+(v-left)*64), amp);
- if (v < SEGLEN && v >= 0)
- {
- setPixelColor(v, color_blend(getPixelColor(v), col, mag));
- }
- int16_t w = left + propI*2 + 3 -(v-left);
- if (w < SEGLEN && w >= 0)
- {
- setPixelColor(w, color_blend(getPixelColor(w), col, mag));
+ int16_t left = rippleorigin - propI -1;
+ for (int16_t v = left; v < left +4; v++) {
+ uint8_t mag = scale8(cubicwave8((propF>>2)+(v-left)*64), amp);
+ SEGMENT.setPixelColor(v, color_blend(SEGMENT.getPixelColor(v), col, mag)); // TODO
+ int16_t w = left + propI*2 + 3 -(v-left);
+ SEGMENT.setPixelColor(w, color_blend(SEGMENT.getPixelColor(w), col, mag)); // TODO
}
- }
+ }
ripplestate += rippledecay;
ripples[i].state = (ripplestate > 254) ? 0 : ripplestate;
- } else //randomly create new wave
- {
- if (random16(IBN + 10000) <= SEGMENT.intensity)
- {
+ } else {//randomly create new wave
+ if (random16(IBN + 10000) <= (SEGMENT.intensity >> (SEGMENT.is2D()*3))) {
ripples[i].state = 1;
- ripples[i].pos = random16(SEGLEN);
+ ripples[i].pos = SEGMENT.is2D() ? ((random8(SEGENV.virtualWidth())<<8) | (random8(SEGENV.virtualHeight()))) : random16(SEGLEN);
ripples[i].color = random8(); //color
}
}
}
+
return FRAMETIME;
}
#undef MAX_RIPPLES
-uint16_t WS2812FX::mode_ripple(void) {
- return ripple_base(false);
-}
-uint16_t WS2812FX::mode_ripple_rainbow(void) {
- return ripple_base(true);
+uint16_t mode_ripple(void) {
+ if (SEGLEN == 1) return mode_static();
+ if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1));
+ else SEGMENT.fade_out(250);
+ return ripple_base();
}
+static const char _data_FX_MODE_RIPPLE[] PROGMEM = "Ripple@!,Wave #,,,,,Overlay;,!;!;12";
+uint16_t mode_ripple_rainbow(void) {
+ if (SEGLEN == 1) return mode_static();
+ if (SEGENV.call ==0) {
+ SEGENV.aux0 = random8();
+ SEGENV.aux1 = random8();
+ }
+ if (SEGENV.aux0 == SEGENV.aux1) {
+ SEGENV.aux1 = random8();
+ } else if (SEGENV.aux1 > SEGENV.aux0) {
+ SEGENV.aux0++;
+ } else {
+ SEGENV.aux0--;
+ }
+ SEGMENT.fill(color_blend(SEGMENT.color_wheel(SEGENV.aux0),BLACK,235));
+ return ripple_base();
+}
+static const char _data_FX_MODE_RIPPLE_RAINBOW[] PROGMEM = "Ripple Rainbow@!,Wave #;;!;12";
+
// TwinkleFOX by Mark Kriegsman: https://gist.github.com/kriegsman/756ea6dcae8e30845b5a
//
// TwinkleFOX: Twinkling 'holiday' lights that fade in and out.
// Colors are chosen from a palette. Read more about this effect using the link above!
-
-// If COOL_LIKE_INCANDESCENT is set to 1, colors will
-// fade out slighted 'reddened', similar to how
-// incandescent bulbs change color as they get dim down.
-#define COOL_LIKE_INCANDESCENT 1
-
-CRGB IRAM_ATTR WS2812FX::twinklefox_one_twinkle(uint32_t ms, uint8_t salt, bool cat)
+CRGB twinklefox_one_twinkle(uint32_t ms, uint8_t salt, bool cat)
{
// Overall twinkle speed (changed)
uint16_t ticks = ms / SEGENV.aux0;
@@ -2355,7 +2490,7 @@ CRGB IRAM_ATTR WS2812FX::twinklefox_one_twinkle(uint32_t ms, uint8_t salt, bool
slowcycle16 += sin8(slowcycle16);
slowcycle16 = (slowcycle16 * 2053) + 1384;
uint8_t slowcycle8 = (slowcycle16 & 0xFF) + (slowcycle16 >> 8);
-
+
// Overall twinkle density.
// 0 (NONE lit) to 8 (ALL lit at once).
// Default is 5.
@@ -2383,12 +2518,12 @@ CRGB IRAM_ATTR WS2812FX::twinklefox_one_twinkle(uint32_t ms, uint8_t salt, bool
uint8_t hue = slowcycle8 - salt;
CRGB c;
if (bright > 0) {
- c = ColorFromPalette(currentPalette, hue, bright, NOBLEND);
- if(COOL_LIKE_INCANDESCENT == 1) {
+ c = ColorFromPalette(SEGPALETTE, hue, bright, NOBLEND);
+ if (!SEGMENT.check1) {
// This code takes a pixel, and if its in the 'fading down'
// part of the cycle, it adjusts the color a little bit like the
// way that incandescent bulbs fade toward 'red' as they dim.
- if (fastcycle8 >= 128)
+ if (fastcycle8 >= 128)
{
uint8_t cooling = (fastcycle8 - 128) >> 4;
c.g = qsub8(c.g, cooling);
@@ -2406,7 +2541,7 @@ CRGB IRAM_ATTR WS2812FX::twinklefox_one_twinkle(uint32_t ms, uint8_t salt, bool
// "CalculateOneTwinkle" on each pixel. It then displays
// either the twinkle color of the background color,
// whichever is brighter.
-uint16_t WS2812FX::twinklefox_base(bool cat)
+uint16_t twinklefox_base(bool cat)
{
// "PRNG16" is the pseudorandom number generator
// It MUST be reset to the same starting value each time
@@ -2419,8 +2554,7 @@ uint16_t WS2812FX::twinklefox_base(bool cat)
else SEGENV.aux0 = 22 + ((100 - SEGMENT.speed) >> 1);
// Set up the background color, "bg".
- CRGB bg;
- bg = col_to_crgb(SEGCOLOR(1));
+ CRGB bg = CRGB(SEGCOLOR(1));
uint8_t bglight = bg.getAverageLight();
if (bglight > 64) {
bg.nscale8_video(16); // very bright, so scale to 1/16th
@@ -2432,14 +2566,14 @@ uint16_t WS2812FX::twinklefox_base(bool cat)
uint8_t backgroundBrightness = bg.getAverageLight();
- for (uint16_t i = 0; i < SEGLEN; i++) {
-
+ for (int i = 0; i < SEGLEN; i++) {
+
PRNG16 = (uint16_t)(PRNG16 * 2053) + 1384; // next 'random' number
uint16_t myclockoffset16= PRNG16; // use that number as clock offset
PRNG16 = (uint16_t)(PRNG16 * 2053) + 1384; // next 'random' number
// use that number as clock speed adjustment factor (in 8ths, from 8/8ths to 23/8ths)
uint8_t myspeedmultiplierQ5_3 = ((((PRNG16 & 0xFF)>>4) + (PRNG16 & 0x0F)) & 0x0F) + 0x08;
- uint32_t myclock30 = (uint32_t)((now * myspeedmultiplierQ5_3) >> 3) + myclockoffset16;
+ uint32_t myclock30 = (uint32_t)((strip.now * myspeedmultiplierQ5_3) >> 3) + myclockoffset16;
uint8_t myunique8 = PRNG16 >> 8; // get 'salt' value for this pixel
// We now have the adjusted 'clock' for this pixel, now we call
@@ -2452,122 +2586,133 @@ uint16_t WS2812FX::twinklefox_base(bool cat)
if (deltabright >= 32 || (!bg)) {
// If the new pixel is significantly brighter than the background color,
// use the new color.
- setPixelColor(i, c.red, c.green, c.blue);
+ SEGMENT.setPixelColor(i, c.red, c.green, c.blue);
} else if (deltabright > 0) {
// If the new pixel is just slightly brighter than the background color,
// mix a blend of the new color and the background color
- setPixelColor(i, color_blend(crgb_to_col(bg), crgb_to_col(c), deltabright * 8));
+ SEGMENT.setPixelColor(i, color_blend(RGBW32(bg.r,bg.g,bg.b,0), RGBW32(c.r,c.g,c.b,0), deltabright * 8));
} else {
// if the new pixel is not at all brighter than the background color,
// just use the background color.
- setPixelColor(i, bg.r, bg.g, bg.b);
+ SEGMENT.setPixelColor(i, bg.r, bg.g, bg.b);
}
}
return FRAMETIME;
}
-uint16_t WS2812FX::mode_twinklefox()
+
+uint16_t mode_twinklefox()
{
return twinklefox_base(false);
}
+static const char _data_FX_MODE_TWINKLEFOX[] PROGMEM = "Twinklefox@!,Twinkle rate,,,,Cool;!,!;!";
+
-uint16_t WS2812FX::mode_twinklecat()
+uint16_t mode_twinklecat()
{
return twinklefox_base(true);
}
+static const char _data_FX_MODE_TWINKLECAT[] PROGMEM = "Twinklecat@!,Twinkle rate,,,,Cool;!,!;!";
//inspired by https://www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/#LEDStripEffectBlinkingHalloweenEyes
-#define HALLOWEEN_EYE_SPACE 3
-#define HALLOWEEN_EYE_WIDTH 1
-
-uint16_t WS2812FX::mode_halloween_eyes()
-{
+uint16_t mode_halloween_eyes()
+{
+ if (SEGLEN == 1) return mode_static();
+ const uint16_t maxWidth = strip.isMatrix ? SEGMENT.virtualWidth() : SEGLEN;
+ const uint16_t HALLOWEEN_EYE_SPACE = MAX(2, strip.isMatrix ? SEGMENT.virtualWidth()>>4: SEGLEN>>5);
+ const uint16_t HALLOWEEN_EYE_WIDTH = HALLOWEEN_EYE_SPACE/2;
uint16_t eyeLength = (2*HALLOWEEN_EYE_WIDTH) + HALLOWEEN_EYE_SPACE;
- if (eyeLength > SEGLEN) return mode_static(); //bail if segment too short
+ if (eyeLength >= maxWidth) return mode_static(); //bail if segment too short
- fill(SEGCOLOR(1)); //fill background
+ if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1)); //fill background
uint8_t state = SEGENV.aux1 >> 8;
uint16_t stateTime = SEGENV.call;
if (stateTime == 0) stateTime = 2000;
if (state == 0) { //spawn eyes
- SEGENV.aux0 = random16(0, SEGLEN - eyeLength); //start pos
+ SEGENV.aux0 = random16(0, maxWidth - eyeLength - 1); //start pos
SEGENV.aux1 = random8(); //color
+ if (strip.isMatrix) SEGMENT.offset = random16(SEGMENT.virtualHeight()-1); // a hack: reuse offset since it is not used in matrices
state = 1;
}
-
+
if (state < 2) { //fade eyes
uint16_t startPos = SEGENV.aux0;
uint16_t start2ndEye = startPos + HALLOWEEN_EYE_WIDTH + HALLOWEEN_EYE_SPACE;
-
- uint32_t fadestage = (now - SEGENV.step)*255 / stateTime;
+
+ uint32_t fadestage = (strip.now - SEGENV.step)*255 / stateTime;
if (fadestage > 255) fadestage = 255;
- uint32_t c = color_blend(color_from_palette(SEGENV.aux1 & 0xFF, false, false, 0), SEGCOLOR(1), fadestage);
-
- for (uint16_t i = 0; i < HALLOWEEN_EYE_WIDTH; i++)
- {
- setPixelColor(startPos + i, c);
- setPixelColor(start2ndEye + i, c);
+ uint32_t c = color_blend(SEGMENT.color_from_palette(SEGENV.aux1 & 0xFF, false, false, 0), SEGCOLOR(1), fadestage);
+
+ for (int i = 0; i < HALLOWEEN_EYE_WIDTH; i++) {
+ if (strip.isMatrix) {
+ SEGMENT.setPixelColorXY(startPos + i, SEGMENT.offset, c);
+ SEGMENT.setPixelColorXY(start2ndEye + i, SEGMENT.offset, c);
+ } else {
+ SEGMENT.setPixelColor(startPos + i, c);
+ SEGMENT.setPixelColor(start2ndEye + i, c);
+ }
}
}
- if (now - SEGENV.step > stateTime)
- {
+ if (strip.now - SEGENV.step > stateTime) {
state++;
if (state > 2) state = 0;
-
- if (state < 2)
- {
- stateTime = 100 + (255 - SEGMENT.intensity)*10; //eye fade time
+
+ if (state < 2) {
+ stateTime = 100 + SEGMENT.intensity*10; //eye fade time
} else {
- uint16_t eyeOffTimeBase = (255 - SEGMENT.speed)*10;
+ uint16_t eyeOffTimeBase = (256 - SEGMENT.speed)*10;
stateTime = eyeOffTimeBase + random16(eyeOffTimeBase);
}
- SEGENV.step = now;
+ SEGENV.step = strip.now;
SEGENV.call = stateTime;
}
SEGENV.aux1 = (SEGENV.aux1 & 0xFF) + (state << 8); //save state
-
+
return FRAMETIME;
}
+static const char _data_FX_MODE_HALLOWEEN_EYES[] PROGMEM = "Halloween Eyes@Duration,Eye fade time,,,,,Overlay;!,!;!;12";
//Speed slider sets amount of LEDs lit, intensity sets unlit
-uint16_t WS2812FX::mode_static_pattern()
+uint16_t mode_static_pattern()
{
uint16_t lit = 1 + SEGMENT.speed;
uint16_t unlit = 1 + SEGMENT.intensity;
bool drawingLit = true;
uint16_t cnt = 0;
- for (uint16_t i = 0; i < SEGLEN; i++) {
- setPixelColor(i, (drawingLit) ? color_from_palette(i, true, PALETTE_SOLID_WRAP, 0) : SEGCOLOR(1));
+ for (int i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, (drawingLit) ? SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0) : SEGCOLOR(1));
cnt++;
if (cnt >= ((drawingLit) ? lit : unlit)) {
cnt = 0;
drawingLit = !drawingLit;
}
}
-
+
return FRAMETIME;
}
+static const char _data_FX_MODE_STATIC_PATTERN[] PROGMEM = "Solid Pattern@Fg size,Bg size;Fg,!;!;;pal=0";
-uint16_t WS2812FX::mode_tri_static_pattern()
+
+uint16_t mode_tri_static_pattern()
{
uint8_t segSize = (SEGMENT.intensity >> 5) +1;
uint8_t currSeg = 0;
uint16_t currSegCount = 0;
- for (uint16_t i = 0; i < SEGLEN; i++) {
+ for (int i = 0; i < SEGLEN; i++) {
if ( currSeg % 3 == 0 ) {
- setPixelColor(i, SEGCOLOR(0));
+ SEGMENT.setPixelColor(i, SEGCOLOR(0));
} else if( currSeg % 3 == 1) {
- setPixelColor(i, SEGCOLOR(1));
+ SEGMENT.setPixelColor(i, SEGCOLOR(1));
} else {
- setPixelColor(i, (SEGCOLOR(2) > 0 ? SEGCOLOR(2) : WHITE));
+ SEGMENT.setPixelColor(i, (SEGCOLOR(2) > 0 ? SEGCOLOR(2) : WHITE));
}
currSegCount += 1;
if (currSegCount >= segSize) {
@@ -2578,50 +2723,54 @@ uint16_t WS2812FX::mode_tri_static_pattern()
return FRAMETIME;
}
+static const char _data_FX_MODE_TRI_STATIC_PATTERN[] PROGMEM = "Solid Pattern Tri@,Size;1,2,3;;;pal=0";
-uint16_t WS2812FX::spots_base(uint16_t threshold)
+uint16_t spots_base(uint16_t threshold)
{
- fill(SEGCOLOR(1));
-
+ if (SEGLEN == 1) return mode_static();
+ if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1));
+
uint16_t maxZones = SEGLEN >> 2;
uint16_t zones = 1 + ((SEGMENT.intensity * maxZones) >> 8);
uint16_t zoneLen = SEGLEN / zones;
uint16_t offset = (SEGLEN - zones * zoneLen) >> 1;
- for (uint16_t z = 0; z < zones; z++)
+ for (int z = 0; z < zones; z++)
{
uint16_t pos = offset + z * zoneLen;
- for (uint16_t i = 0; i < zoneLen; i++)
+ for (int i = 0; i < zoneLen; i++)
{
uint16_t wave = triwave16((i * 0xFFFF) / zoneLen);
if (wave > threshold) {
uint16_t index = 0 + pos + i;
uint8_t s = (wave - threshold)*255 / (0xFFFF - threshold);
- setPixelColor(index, color_blend(color_from_palette(index, true, PALETTE_SOLID_WRAP, 0), SEGCOLOR(1), 255-s));
+ SEGMENT.setPixelColor(index, color_blend(SEGMENT.color_from_palette(index, true, PALETTE_SOLID_WRAP, 0), SEGCOLOR(1), 255-s));
}
}
}
-
+
return FRAMETIME;
}
//Intensity slider sets number of "lights", speed sets LEDs per light
-uint16_t WS2812FX::mode_spots()
+uint16_t mode_spots()
{
return spots_base((255 - SEGMENT.speed) << 8);
}
+static const char _data_FX_MODE_SPOTS[] PROGMEM = "Spots@Spread,Width,,,,,Overlay;!,!;!";
//Intensity slider sets number of "lights", LEDs per light fade in and out
-uint16_t WS2812FX::mode_spots_fade()
+uint16_t mode_spots_fade()
{
- uint16_t counter = now * ((SEGMENT.speed >> 2) +8);
+ uint16_t counter = strip.now * ((SEGMENT.speed >> 2) +8);
uint16_t t = triwave16(counter);
uint16_t tr = (t >> 1) + (t >> 2);
return spots_base(tr);
}
+static const char _data_FX_MODE_SPOTS_FADE[] PROGMEM = "Spots Fade@Spread,Width,,,,,Overlay;!,!;!";
//each needs 12 bytes
@@ -2634,89 +2783,206 @@ typedef struct Ball {
/*
* Bouncing Balls Effect
*/
-uint16_t WS2812FX::mode_bouncing_balls(void) {
+uint16_t mode_bouncing_balls(void) {
+ if (SEGLEN == 1) return mode_static();
//allocate segment data
- uint16_t maxNumBalls = 16;
+ const uint16_t strips = SEGMENT.nrOfVStrips(); // adapt for 2D
+ const size_t maxNumBalls = 16;
uint16_t dataSize = sizeof(ball) * maxNumBalls;
- if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
-
+ if (!SEGENV.allocateData(dataSize * strips)) return mode_static(); //allocation failed
+
Ball* balls = reinterpret_cast(SEGENV.data);
-
- // number of balls based on intensity setting to max of 7 (cycles colors)
- // non-chosen color is a random color
- uint8_t numBalls = int(((SEGMENT.intensity * (maxNumBalls - 0.8f)) / 255) + 1);
-
- float gravity = -9.81; // standard value of gravity
- float impactVelocityStart = sqrt( -2 * gravity);
- unsigned long time = millis();
+ if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(2) ? BLACK : SEGCOLOR(1));
+
+ // virtualStrip idea by @ewowi (Ewoud Wijma)
+ // requires virtual strip # to be embedded into upper 16 bits of index in setPixelColor()
+ // the following functions will not work on virtual strips: fill(), fade_out(), fadeToBlack(), blur()
+ struct virtualStrip {
+ static void runStrip(size_t stripNr, Ball* balls) {
+ // number of balls based on intensity setting to max of 7 (cycles colors)
+ // non-chosen color is a random color
+ uint16_t numBalls = (SEGMENT.intensity * (maxNumBalls - 1)) / 255 + 1; // minimum 1 ball
+ const float gravity = -9.81f; // standard value of gravity
+ const bool hasCol2 = SEGCOLOR(2);
+ const unsigned long time = millis();
+
+ if (SEGENV.call == 0) {
+ for (size_t i = 0; i < maxNumBalls; i++) balls[i].lastBounceTime = time;
+ }
+
+ for (size_t i = 0; i < numBalls; i++) {
+ float timeSinceLastBounce = (time - balls[i].lastBounceTime)/((255-SEGMENT.speed)/64 +1);
+ float timeSec = timeSinceLastBounce/1000.0f;
+ balls[i].height = (0.5f * gravity * timeSec + balls[i].impactVelocity) * timeSec; // avoid use pow(x, 2) - its extremely slow !
+
+ if (balls[i].height <= 0.0f) {
+ balls[i].height = 0.0f;
+ //damping for better effect using multiple balls
+ float dampening = 0.9f - float(i)/float(numBalls * numBalls); // avoid use pow(x, 2) - its extremely slow !
+ balls[i].impactVelocity = dampening * balls[i].impactVelocity;
+ balls[i].lastBounceTime = time;
+
+ if (balls[i].impactVelocity < 0.015f) {
+ float impactVelocityStart = sqrtf(-2.0f * gravity) * random8(5,11)/10.0f; // randomize impact velocity
+ balls[i].impactVelocity = impactVelocityStart;
+ }
+ } else if (balls[i].height > 1.0f) {
+ continue; // do not draw OOB ball
+ }
+
+ uint32_t color = SEGCOLOR(0);
+ if (SEGMENT.palette) {
+ color = SEGMENT.color_wheel(i*(256/MAX(numBalls, 8)));
+ } else if (hasCol2) {
+ color = SEGCOLOR(i % NUM_COLORS);
+ }
+
+ int pos = roundf(balls[i].height * (SEGLEN - 1));
+ if (SEGLEN<32) SEGMENT.setPixelColor(indexToVStrip(pos, stripNr), color); // encode virtual strip into index
+ else SEGMENT.setPixelColor(balls[i].height + (stripNr+1)*10.0f, color);
+ }
+ }
+ };
+
+ for (int stripNr=0; stripNr(SEGENV.data);
+
+ // number of balls based on intensity setting to max of 16 (cycles colors)
+ // non-chosen color is a random color
+ uint8_t numBalls = SEGMENT.intensity/16 + 1;
+ bool hasCol2 = SEGCOLOR(2);
if (SEGENV.call == 0) {
- for (uint8_t i = 0; i < maxNumBalls; i++) balls[i].lastBounceTime = time;
+ SEGMENT.fill(hasCol2 ? BLACK : SEGCOLOR(1)); // start clean
+ for (int i = 0; i < maxNumBalls; i++) {
+ balls[i].lastBounceUpdate = strip.now;
+ balls[i].velocity = 20.0f * float(random16(1000, 10000))/10000.0f; // number from 1 to 10
+ if (random8()<128) balls[i].velocity = -balls[i].velocity; // 50% chance of reverse direction
+ balls[i].height = (float(random16(0, 10000)) / 10000.0f); // from 0. to 1.
+ balls[i].mass = (float(random16(1000, 10000)) / 10000.0f); // from .1 to 1.
+ }
}
-
- bool hasCol2 = SEGCOLOR(2);
- fill(hasCol2 ? BLACK : SEGCOLOR(1));
-
- for (uint8_t i = 0; i < numBalls; i++) {
- float timeSinceLastBounce = (time - balls[i].lastBounceTime)/((255-SEGMENT.speed)*8/256 +1);
- balls[i].height = 0.5 * gravity * pow(timeSinceLastBounce/1000 , 2.0) + balls[i].impactVelocity * timeSinceLastBounce/1000;
-
- if (balls[i].height < 0) { //start bounce
- balls[i].height = 0;
- //damping for better effect using multiple balls
- float dampening = 0.90 - float(i)/pow(numBalls,2);
- balls[i].impactVelocity = dampening * balls[i].impactVelocity;
- balls[i].lastBounceTime = time;
-
- if (balls[i].impactVelocity < 0.015) {
- balls[i].impactVelocity = impactVelocityStart;
+
+ float cfac = float(scale8(8, 255-SEGMENT.speed) +1)*20000.0f; // this uses the Aircoookie conversion factor for scaling time using speed slider
+
+ if (SEGMENT.check3) SEGMENT.fade_out(250); // 2-8 pixel trails (optional)
+ else {
+ if (!SEGMENT.check2) SEGMENT.fill(hasCol2 ? BLACK : SEGCOLOR(1)); // don't fill with background color if user wants to see trails
+ }
+
+ for (int i = 0; i < numBalls; i++) {
+ float timeSinceLastUpdate = float((strip.now - balls[i].lastBounceUpdate))/cfac;
+ float thisHeight = balls[i].height + balls[i].velocity * timeSinceLastUpdate; // this method keeps higher resolution
+ // test if intensity level was increased and some balls are way off the track then put them back
+ if (thisHeight < -0.5f || thisHeight > 1.5f) {
+ thisHeight = balls[i].height = (float(random16(0, 10000)) / 10000.0f); // from 0. to 1.
+ balls[i].lastBounceUpdate = strip.now;
+ }
+ // check if reached ends of the strip
+ if ((thisHeight <= 0.0f && balls[i].velocity < 0.0f) || (thisHeight >= 1.0f && balls[i].velocity > 0.0f)) {
+ balls[i].velocity = -balls[i].velocity; // reverse velocity
+ balls[i].lastBounceUpdate = strip.now;
+ balls[i].height = thisHeight;
+ }
+ // check for collisions
+ if (SEGMENT.check1) {
+ for (int j = i+1; j < numBalls; j++) {
+ if (balls[j].velocity != balls[i].velocity) {
+ // tcollided + balls[j].lastBounceUpdate is acutal time of collision (this keeps precision with long to float conversions)
+ float tcollided = (cfac*(balls[i].height - balls[j].height) +
+ balls[i].velocity*float(balls[j].lastBounceUpdate - balls[i].lastBounceUpdate))/(balls[j].velocity - balls[i].velocity);
+
+ if ((tcollided > 2.0f) && (tcollided < float(strip.now - balls[j].lastBounceUpdate))) { // 2ms minimum to avoid duplicate bounces
+ balls[i].height = balls[i].height + balls[i].velocity*(tcollided + float(balls[j].lastBounceUpdate - balls[i].lastBounceUpdate))/cfac;
+ balls[j].height = balls[i].height;
+ balls[i].lastBounceUpdate = (unsigned long)(tcollided + 0.5f) + balls[j].lastBounceUpdate;
+ balls[j].lastBounceUpdate = balls[i].lastBounceUpdate;
+ float vtmp = balls[i].velocity;
+ balls[i].velocity = ((balls[i].mass - balls[j].mass)*vtmp + 2.0f*balls[j].mass*balls[j].velocity)/(balls[i].mass + balls[j].mass);
+ balls[j].velocity = ((balls[j].mass - balls[i].mass)*balls[j].velocity + 2.0f*balls[i].mass*vtmp) /(balls[i].mass + balls[j].mass);
+ thisHeight = balls[i].height + balls[i].velocity*(strip.now - balls[i].lastBounceUpdate)/cfac;
+ }
+ }
}
}
-
+
uint32_t color = SEGCOLOR(0);
if (SEGMENT.palette) {
- color = color_wheel(i*(256/MAX(numBalls, 8)));
+ //color = SEGMENT.color_wheel(i*(256/MAX(numBalls, 8)));
+ color = SEGMENT.color_from_palette(i*255/numBalls, false, PALETTE_SOLID_WRAP, 0);
} else if (hasCol2) {
color = SEGCOLOR(i % NUM_COLORS);
}
- uint16_t pos = round(balls[i].height * (SEGLEN - 1));
- setPixelColor(pos, color);
+ if (thisHeight < 0.0f) thisHeight = 0.0f;
+ if (thisHeight > 1.0f) thisHeight = 1.0f;
+ uint16_t pos = round(thisHeight * (SEGLEN - 1));
+ SEGMENT.setPixelColor(pos, color);
+ balls[i].lastBounceUpdate = strip.now;
+ balls[i].height = thisHeight;
}
return FRAMETIME;
}
+static const char _data_FX_MODE_ROLLINGBALLS[] PROGMEM = "Rolling Balls@!,# of balls,,,,Collisions,Overlay,Trails;!,!,!;!;1;m12=1"; //bar
/*
* Sinelon stolen from FASTLED examples
*/
-uint16_t WS2812FX::sinelon_base(bool dual, bool rainbow=false) {
- fade_out(SEGMENT.intensity);
+uint16_t sinelon_base(bool dual, bool rainbow=false) {
+ if (SEGLEN == 1) return mode_static();
+ SEGMENT.fade_out(SEGMENT.intensity);
uint16_t pos = beatsin16(SEGMENT.speed/10,0,SEGLEN-1);
if (SEGENV.call == 0) SEGENV.aux0 = pos;
- uint32_t color1 = color_from_palette(pos, true, false, 0);
+ uint32_t color1 = SEGMENT.color_from_palette(pos, true, false, 0);
uint32_t color2 = SEGCOLOR(2);
if (rainbow) {
- color1 = color_wheel((pos & 0x07) * 32);
+ color1 = SEGMENT.color_wheel((pos & 0x07) * 32);
}
- setPixelColor(pos, color1);
+ SEGMENT.setPixelColor(pos, color1);
if (dual) {
- if (!color2) color2 = color_from_palette(pos, true, false, 0);
+ if (!color2) color2 = SEGMENT.color_from_palette(pos, true, false, 0);
if (rainbow) color2 = color1; //rainbow
- setPixelColor(SEGLEN-1-pos, color2);
+ SEGMENT.setPixelColor(SEGLEN-1-pos, color2);
}
- if (SEGENV.aux0 != pos) {
+ if (SEGENV.aux0 != pos) {
if (SEGENV.aux0 < pos) {
- for (uint16_t i = SEGENV.aux0; i < pos ; i++) {
- setPixelColor(i, color1);
- if (dual) setPixelColor(SEGLEN-1-i, color2);
+ for (int i = SEGENV.aux0; i < pos ; i++) {
+ SEGMENT.setPixelColor(i, color1);
+ if (dual) SEGMENT.setPixelColor(SEGLEN-1-i, color2);
}
} else {
- for (uint16_t i = SEGENV.aux0; i > pos ; i--) {
- setPixelColor(i, color1);
- if (dual) setPixelColor(SEGLEN-1-i, color2);
+ for (int i = SEGENV.aux0; i > pos ; i--) {
+ SEGMENT.setPixelColor(i, color1);
+ if (dual) SEGMENT.setPixelColor(SEGLEN-1-i, color2);
}
}
SEGENV.aux0 = pos;
@@ -2725,109 +2991,139 @@ uint16_t WS2812FX::sinelon_base(bool dual, bool rainbow=false) {
return FRAMETIME;
}
-uint16_t WS2812FX::mode_sinelon(void) {
+
+uint16_t mode_sinelon(void) {
return sinelon_base(false);
}
+static const char _data_FX_MODE_SINELON[] PROGMEM = "Sinelon@!,Trail;!,!,!;!";
+
-uint16_t WS2812FX::mode_sinelon_dual(void) {
+uint16_t mode_sinelon_dual(void) {
return sinelon_base(true);
}
+static const char _data_FX_MODE_SINELON_DUAL[] PROGMEM = "Sinelon Dual@!,Trail;!,!,!;!";
-uint16_t WS2812FX::mode_sinelon_rainbow(void) {
+
+uint16_t mode_sinelon_rainbow(void) {
return sinelon_base(false, true);
}
+static const char _data_FX_MODE_SINELON_RAINBOW[] PROGMEM = "Sinelon Rainbow@!,Trail;,,!;!";
-//Rainbow with glitter, inspired by https://gist.github.com/kriegsman/062e10f7f07ba8518af6
-uint16_t WS2812FX::mode_glitter()
-{
- mode_palette();
-
- if (SEGMENT.intensity > random8())
- {
- setPixelColor(random16(SEGLEN), ULTRAWHITE);
+// utility function that will add random glitter to SEGMENT
+void glitter_base(uint8_t intensity, uint32_t col = ULTRAWHITE) {
+ if (intensity > random8()) {
+ if (SEGMENT.is2D()) {
+ SEGMENT.setPixelColorXY(random16(SEGMENT.virtualWidth()),random16(SEGMENT.virtualHeight()), col);
+ } else {
+ SEGMENT.setPixelColor(random16(SEGLEN), col);
+ }
}
-
+}
+
+//Glitter with palette background, inspired by https://gist.github.com/kriegsman/062e10f7f07ba8518af6
+uint16_t mode_glitter()
+{
+ if (!SEGMENT.check2) mode_palette(); // use "* Color 1" palette for solid background (replacing "Solid glitter")
+ glitter_base(SEGMENT.intensity, SEGCOLOR(2) ? SEGCOLOR(2) : ULTRAWHITE);
return FRAMETIME;
}
+static const char _data_FX_MODE_GLITTER[] PROGMEM = "Glitter@!,!,,,,,Overlay;1,2,Glitter color;!;;pal=0,m12=0"; //pixels
+//Solid colour background with glitter (can be replaced by Glitter)
+uint16_t mode_solid_glitter()
+{
+ SEGMENT.fill(SEGCOLOR(0));
+ glitter_base(SEGMENT.intensity, SEGCOLOR(2) ? SEGCOLOR(2) : ULTRAWHITE);
+ return FRAMETIME;
+}
+static const char _data_FX_MODE_SOLID_GLITTER[] PROGMEM = "Solid Glitter@,!;Bg,,Glitter color;;;m12=0";
-//each needs 12 bytes
+
+//each needs 19 bytes
//Spark type is used for popcorn, 1D fireworks, and drip
typedef struct Spark {
- float pos;
- float vel;
+ float pos, posX;
+ float vel, velX;
uint16_t col;
uint8_t colIndex;
} spark;
+#define maxNumPopcorn 21 // max 21 on 16 segment ESP8266
/*
* POPCORN
* modified from https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/Popcorn.h
*/
-uint16_t WS2812FX::mode_popcorn(void) {
+uint16_t mode_popcorn(void) {
+ if (SEGLEN == 1) return mode_static();
//allocate segment data
- uint16_t maxNumPopcorn = 21; // max 21 on 16 segment ESP8266
+ uint16_t strips = SEGMENT.nrOfVStrips();
uint16_t dataSize = sizeof(spark) * maxNumPopcorn;
- if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
-
- Spark* popcorn = reinterpret_cast(SEGENV.data);
+ if (!SEGENV.allocateData(dataSize * strips)) return mode_static(); //allocation failed
- float gravity = -0.0001 - (SEGMENT.speed/200000.0); // m/s/s
- gravity *= SEGLEN;
+ Spark* popcorn = reinterpret_cast(SEGENV.data);
bool hasCol2 = SEGCOLOR(2);
- fill(hasCol2 ? BLACK : SEGCOLOR(1));
-
- uint8_t numPopcorn = SEGMENT.intensity*maxNumPopcorn/255;
- if (numPopcorn == 0) numPopcorn = 1;
-
- for(uint8_t i = 0; i < numPopcorn; i++) {
- if (popcorn[i].pos >= 0.0f) { // if kernel is active, update its position
- popcorn[i].pos += popcorn[i].vel;
- popcorn[i].vel += gravity;
- } else { // if kernel is inactive, randomly pop it
- if (random8() < 2) { // POP!!!
- popcorn[i].pos = 0.01f;
-
- uint16_t peakHeight = 128 + random8(128); //0-255
- peakHeight = (peakHeight * (SEGLEN -1)) >> 8;
- popcorn[i].vel = sqrt(-2.0 * gravity * peakHeight);
-
- if (SEGMENT.palette)
- {
- popcorn[i].colIndex = random8();
- } else {
- byte col = random8(0, NUM_COLORS);
- if (!hasCol2 || !SEGCOLOR(col)) col = 0;
- popcorn[i].colIndex = col;
+ if (!SEGMENT.check2) SEGMENT.fill(hasCol2 ? BLACK : SEGCOLOR(1));
+
+ struct virtualStrip {
+ static void runStrip(uint16_t stripNr, Spark* popcorn) {
+ float gravity = -0.0001 - (SEGMENT.speed/200000.0); // m/s/s
+ gravity *= SEGLEN;
+
+ uint8_t numPopcorn = SEGMENT.intensity*maxNumPopcorn/255;
+ if (numPopcorn == 0) numPopcorn = 1;
+
+ for(int i = 0; i < numPopcorn; i++) {
+ if (popcorn[i].pos >= 0.0f) { // if kernel is active, update its position
+ popcorn[i].pos += popcorn[i].vel;
+ popcorn[i].vel += gravity;
+ } else { // if kernel is inactive, randomly pop it
+ if (random8() < 2) { // POP!!!
+ popcorn[i].pos = 0.01f;
+
+ uint16_t peakHeight = 128 + random8(128); //0-255
+ peakHeight = (peakHeight * (SEGLEN -1)) >> 8;
+ popcorn[i].vel = sqrtf(-2.0f * gravity * peakHeight);
+
+ if (SEGMENT.palette)
+ {
+ popcorn[i].colIndex = random8();
+ } else {
+ byte col = random8(0, NUM_COLORS);
+ if (!SEGCOLOR(2) || !SEGCOLOR(col)) col = 0;
+ popcorn[i].colIndex = col;
+ }
+ }
+ }
+ if (popcorn[i].pos >= 0.0f) { // draw now active popcorn (either active before or just popped)
+ uint32_t col = SEGMENT.color_wheel(popcorn[i].colIndex);
+ if (!SEGMENT.palette && popcorn[i].colIndex < NUM_COLORS) col = SEGCOLOR(popcorn[i].colIndex);
+ uint16_t ledIndex = popcorn[i].pos;
+ if (ledIndex < SEGLEN) SEGMENT.setPixelColor(indexToVStrip(ledIndex, stripNr), col);
}
}
}
- if (popcorn[i].pos >= 0.0f) { // draw now active popcorn (either active before or just popped)
- uint32_t col = color_wheel(popcorn[i].colIndex);
- if (!SEGMENT.palette && popcorn[i].colIndex < NUM_COLORS) col = SEGCOLOR(popcorn[i].colIndex);
-
- uint16_t ledIndex = popcorn[i].pos;
- if (ledIndex < SEGLEN) setPixelColor(ledIndex, col);
- }
- }
+ };
+
+ for (int stripNr=0; stripNr 1) {
//allocate segment data
- uint16_t dataSize = (SEGLEN -1) *3; //max. 1365 pixels (ESP8266)
+ uint16_t dataSize = max(1, SEGLEN -1) *3; //max. 1365 pixels (ESP8266)
if (!SEGENV.allocateData(dataSize)) return candle(false); //allocation failed
}
@@ -2847,7 +3143,7 @@ uint16_t WS2812FX::candle(bool multi)
uint16_t numCandles = (multi) ? SEGLEN : 1;
- for (uint16_t i = 0; i < numCandles; i++)
+ for (int i = 0; i < numCandles; i++)
{
uint16_t d = 0; //data location
@@ -2876,18 +3172,18 @@ uint16_t WS2812FX::candle(bool multi)
s_target += offset;
uint8_t dif = (s_target > s) ? s_target - s : s - s_target;
-
+
fadeStep = dif >> speedFactor;
if (fadeStep == 0) fadeStep = 1;
}
if (i > 0) {
- setPixelColor(i, color_blend(SEGCOLOR(1), color_from_palette(i, true, PALETTE_SOLID_WRAP, 0), s));
+ SEGMENT.setPixelColor(i, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0), s));
SEGENV.data[d] = s; SEGENV.data[d+1] = s_target; SEGENV.data[d+2] = fadeStep;
} else {
- for (uint16_t j = 0; j < SEGLEN; j++) {
- setPixelColor(j, color_blend(SEGCOLOR(1), color_from_palette(j, true, PALETTE_SOLID_WRAP, 0), s));
+ for (int j = 0; j < SEGLEN; j++) {
+ SEGMENT.setPixelColor(j, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(j, true, PALETTE_SOLID_WRAP, 0), s));
}
SEGENV.aux0 = s; SEGENV.aux1 = s_target; SEGENV.step = fadeStep;
@@ -2897,16 +3193,19 @@ uint16_t WS2812FX::candle(bool multi)
return FRAMETIME_FIXED;
}
-uint16_t WS2812FX::mode_candle()
+
+uint16_t mode_candle()
{
return candle(false);
}
+static const char _data_FX_MODE_CANDLE[] PROGMEM = "Candle@!,!;!,!;!;01;sx=96,ix=224,pal=0";
-uint16_t WS2812FX::mode_candle_multi()
+uint16_t mode_candle_multi()
{
return candle(true);
}
+static const char _data_FX_MODE_CANDLE_MULTI[] PROGMEM = "Candle Multi@!,!;!,!;!;;sx=96,ix=224,pal=0";
/*
@@ -2929,11 +3228,12 @@ typedef struct particle {
float fragment[STARBURST_MAX_FRAG];
} star;
-uint16_t WS2812FX::mode_starburst(void) {
+uint16_t mode_starburst(void) {
+ if (SEGLEN == 1) return mode_static();
uint16_t maxData = FAIR_DATA_PER_SEG; //ESP8266: 256 ESP32: 640
- uint8_t segs = getActiveSegmentsNum();
- if (segs <= (MAX_NUM_SEGMENTS /2)) maxData *= 2; //ESP8266: 512 if <= 8 segs ESP32: 1280 if <= 16 segs
- if (segs <= (MAX_NUM_SEGMENTS /4)) maxData *= 2; //ESP8266: 1024 if <= 4 segs ESP32: 2560 if <= 8 segs
+ uint8_t segs = strip.getActiveSegmentsNum();
+ if (segs <= (strip.getMaxSegments() /2)) maxData *= 2; //ESP8266: 512 if <= 8 segs ESP32: 1280 if <= 16 segs
+ if (segs <= (strip.getMaxSegments() /4)) maxData *= 2; //ESP8266: 1024 if <= 4 segs ESP32: 2560 if <= 8 segs
uint16_t maxStars = maxData / sizeof(star); //ESP8266: max. 4/9/19 stars/seg, ESP32: max. 10/21/42 stars/seg
uint8_t numStars = 1 + (SEGLEN >> 3);
@@ -2941,26 +3241,26 @@ uint16_t WS2812FX::mode_starburst(void) {
uint16_t dataSize = sizeof(star) * numStars;
if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
-
+
uint32_t it = millis();
-
+
star* stars = reinterpret_cast(SEGENV.data);
-
+
float maxSpeed = 375.0f; // Max velocity
float particleIgnition = 250.0f; // How long to "flash"
float particleFadeTime = 1500.0f; // Fade out time
-
+
for (int j = 0; j < numStars; j++)
{
// speed to adjust chance of a burst, max is nearly always.
if (random8((144-(SEGMENT.speed >> 1))) == 0 && stars[j].birth == 0)
{
- // Pick a random color and location.
- uint16_t startPos = random16(SEGLEN-1);
+ // Pick a random color and location.
+ uint16_t startPos = (SEGLEN > 1) ? random16(SEGLEN-1) : 0;
float multiplier = (float)(random8())/255.0 * 1.0;
- stars[j].color = col_to_crgb(color_wheel(random8()));
- stars[j].pos = startPos;
+ stars[j].color = CRGB(SEGMENT.color_wheel(random8()));
+ stars[j].pos = startPos;
stars[j].vel = maxSpeed * (float)(random8())/255.0 * multiplier;
stars[j].birth = it;
stars[j].last = it;
@@ -2973,9 +3273,9 @@ uint16_t WS2812FX::mode_starburst(void) {
}
}
}
-
- fill(SEGCOLOR(1));
-
+
+ if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1));
+
for (int j=0; j> 1;
-
+
if (stars[j].fragment[i] > 0) {
//all fragments travel right, will be mirrored on other side
stars[j].fragment[i] += stars[j].vel * dt * (float)var/3.0;
@@ -2992,34 +3292,34 @@ uint16_t WS2812FX::mode_starburst(void) {
stars[j].last = it;
stars[j].vel -= 3*stars[j].vel*dt;
}
-
+
CRGB c = stars[j].color;
- // If the star is brand new, it flashes white briefly.
+ // If the star is brand new, it flashes white briefly.
// Otherwise it just fades over time.
float fade = 0.0f;
float age = it-stars[j].birth;
if (age < particleIgnition) {
- c = col_to_crgb(color_blend(WHITE, crgb_to_col(c), 254.5f*((age / particleIgnition))));
+ c = CRGB(color_blend(WHITE, RGBW32(c.r,c.g,c.b,0), 254.5f*((age / particleIgnition))));
} else {
- // Figure out how much to fade and shrink the star based on
+ // Figure out how much to fade and shrink the star based on
// its age relative to its lifetime
if (age > particleIgnition + particleFadeTime) {
fade = 1.0f; // Black hole, all faded out
stars[j].birth = 0;
- c = col_to_crgb(SEGCOLOR(1));
+ c = CRGB(SEGCOLOR(1));
} else {
age -= particleIgnition;
fade = (age / particleFadeTime); // Fading star
byte f = 254.5f*fade;
- c = col_to_crgb(color_blend(crgb_to_col(c), SEGCOLOR(1), f));
+ c = CRGB(color_blend(RGBW32(c.r,c.g,c.b,0), SEGCOLOR(1), f));
}
}
-
- float particleSize = (1.0 - fade) * 2;
- for (uint8_t index=0; index < STARBURST_MAX_FRAG*2; index++) {
+ float particleSize = (1.0f - fade) * 2.0f;
+
+ for (size_t index=0; index < STARBURST_MAX_FRAG*2; index++) {
bool mirrored = index & 0x1;
uint8_t i = index >> 1;
if (stars[j].fragment[i] > 0) {
@@ -3029,9 +3329,9 @@ uint16_t WS2812FX::mode_starburst(void) {
int end = loc + particleSize;
if (start < 0) start = 0;
if (start == end) end++;
- if (end > SEGLEN) end = SEGLEN;
+ if (end > SEGLEN) end = SEGLEN;
for (int p = start; p < end; p++) {
- setPixelColor(p, c.r, c.g, c.b);
+ SEGMENT.setPixelColor(p, c.r, c.g, c.b);
}
}
}
@@ -3039,113 +3339,129 @@ uint16_t WS2812FX::mode_starburst(void) {
return FRAMETIME;
}
#undef STARBURST_MAX_FRAG
+static const char _data_FX_MODE_STARBURST[] PROGMEM = "Fireworks Starburst@Chance,Fragments,,,,,Overlay;,!;!;;pal=11,m12=0";
+
/*
* Exploding fireworks effect
* adapted from: http://www.anirama.com/1000leds/1d-fireworks/
+ * adapted for 2D WLED by blazoncek (Blaz Kristan (AKA blazoncek))
*/
-uint16_t WS2812FX::mode_exploding_fireworks(void)
+uint16_t mode_exploding_fireworks(void)
{
+ if (SEGLEN == 1) return mode_static();
+ const uint16_t cols = strip.isMatrix ? SEGMENT.virtualWidth() : 1;
+ const uint16_t rows = strip.isMatrix ? SEGMENT.virtualHeight() : SEGMENT.virtualLength();
+
//allocate segment data
uint16_t maxData = FAIR_DATA_PER_SEG; //ESP8266: 256 ESP32: 640
- uint8_t segs = getActiveSegmentsNum();
- if (segs <= (MAX_NUM_SEGMENTS /2)) maxData *= 2; //ESP8266: 512 if <= 8 segs ESP32: 1280 if <= 16 segs
- if (segs <= (MAX_NUM_SEGMENTS /4)) maxData *= 2; //ESP8266: 1024 if <= 4 segs ESP32: 2560 if <= 8 segs
+ uint8_t segs = strip.getActiveSegmentsNum();
+ if (segs <= (strip.getMaxSegments() /2)) maxData *= 2; //ESP8266: 512 if <= 8 segs ESP32: 1280 if <= 16 segs
+ if (segs <= (strip.getMaxSegments() /4)) maxData *= 2; //ESP8266: 1024 if <= 4 segs ESP32: 2560 if <= 8 segs
int maxSparks = maxData / sizeof(spark); //ESP8266: max. 21/42/85 sparks/seg, ESP32: max. 53/106/213 sparks/seg
- uint16_t numSparks = min(2 + (SEGLEN >> 1), maxSparks);
+ uint16_t numSparks = min(2 + ((rows*cols) >> 1), maxSparks);
uint16_t dataSize = sizeof(spark) * numSparks;
- if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
+ if (!SEGENV.allocateData(dataSize + sizeof(float))) return mode_static(); //allocation failed
+ float *dying_gravity = reinterpret_cast(SEGENV.data + dataSize);
- if (dataSize != SEGENV.aux1) { //reset to flare if sparks were reallocated
+ if (dataSize != SEGENV.aux1) { //reset to flare if sparks were reallocated (it may be good idea to reset segment if bounds change)
+ *dying_gravity = 0.0f;
SEGENV.aux0 = 0;
SEGENV.aux1 = dataSize;
}
- fill(BLACK);
-
- bool actuallyReverse = SEGMENT.getOption(SEG_OPTION_REVERSED);
- //have fireworks start in either direction based on intensity
- SEGMENT.setOption(SEG_OPTION_REVERSED, SEGENV.step);
-
+ SEGMENT.fade_out(252);
+
Spark* sparks = reinterpret_cast(SEGENV.data);
Spark* flare = sparks; //first spark is flare data
- float gravity = -0.0004 - (SEGMENT.speed/800000.0); // m/s/s
- gravity *= SEGLEN;
-
+ float gravity = -0.0004f - (SEGMENT.speed/800000.0f); // m/s/s
+ gravity *= rows;
+
if (SEGENV.aux0 < 2) { //FLARE
if (SEGENV.aux0 == 0) { //init flare
flare->pos = 0;
+ flare->posX = strip.isMatrix ? random16(2,cols-3) : (SEGMENT.intensity > random8()); // will enable random firing side on 1D
uint16_t peakHeight = 75 + random8(180); //0-255
- peakHeight = (peakHeight * (SEGLEN -1)) >> 8;
- flare->vel = sqrt(-2.0 * gravity * peakHeight);
+ peakHeight = (peakHeight * (rows -1)) >> 8;
+ flare->vel = sqrtf(-2.0f * gravity * peakHeight);
+ flare->velX = strip.isMatrix ? (random8(9)-4)/32.f : 0; // no X velocity on 1D
flare->col = 255; //brightness
-
- SEGENV.aux0 = 1;
+ SEGENV.aux0 = 1;
}
-
- // launch
+
+ // launch
if (flare->vel > 12 * gravity) {
// flare
- setPixelColor(int(flare->pos),flare->col,flare->col,flare->col);
-
- flare->pos += flare->vel;
- flare->pos = constrain(flare->pos, 0, SEGLEN-1);
- flare->vel += gravity;
- flare->col -= 2;
+ if (strip.isMatrix) SEGMENT.setPixelColorXY(int(flare->posX), rows - uint16_t(flare->pos) - 1, flare->col, flare->col, flare->col);
+ else SEGMENT.setPixelColor(int(flare->posX) ? rows - int(flare->pos) - 1 : int(flare->pos), flare->col, flare->col, flare->col);
+ flare->pos += flare->vel;
+ flare->posX += flare->velX;
+ flare->pos = constrain(flare->pos, 0, rows-1);
+ flare->posX = constrain(flare->posX, 0, cols-strip.isMatrix);
+ flare->vel += gravity;
+ flare->col -= 2;
} else {
SEGENV.aux0 = 2; // ready to explode
}
} else if (SEGENV.aux0 < 4) {
/*
* Explode!
- *
+ *
* Explosion happens where the flare ended.
* Size is proportional to the height.
*/
- int nSparks = flare->pos;
- nSparks = constrain(nSparks, 0, numSparks);
- static float dying_gravity;
-
+ int nSparks = flare->pos + random8(4);
+ nSparks = constrain(nSparks, 4, numSparks);
+
// initialize sparks
if (SEGENV.aux0 == 2) {
- for (int i = 1; i < nSparks; i++) {
- sparks[i].pos = flare->pos;
- sparks[i].vel = (float(random16(0, 20000)) / 10000.0) - 0.9; // from -0.9 to 1.1
- sparks[i].col = 345;//abs(sparks[i].vel * 750.0); // set colors before scaling velocity to keep them bright
- //sparks[i].col = constrain(sparks[i].col, 0, 345);
+ for (int i = 1; i < nSparks; i++) {
+ sparks[i].pos = flare->pos;
+ sparks[i].posX = flare->posX;
+ sparks[i].vel = (float(random16(20001)) / 10000.0f) - 0.9f; // from -0.9 to 1.1
+ sparks[i].vel *= rows<32 ? 0.5f : 1; // reduce velocity for smaller strips
+ sparks[i].velX = strip.isMatrix ? (float(random16(10001)) / 10000.0f) - 0.5f : 0; // from -0.5 to 0.5
+ sparks[i].col = 345;//abs(sparks[i].vel * 750.0); // set colors before scaling velocity to keep them bright
+ //sparks[i].col = constrain(sparks[i].col, 0, 345);
sparks[i].colIndex = random8();
- sparks[i].vel *= flare->pos/SEGLEN; // proportional to height
- sparks[i].vel *= -gravity *50;
- }
- //sparks[1].col = 345; // this will be our known spark
- dying_gravity = gravity/2;
+ sparks[i].vel *= flare->pos/rows; // proportional to height
+ sparks[i].velX *= strip.isMatrix ? flare->posX/cols : 0; // proportional to width
+ sparks[i].vel *= -gravity *50;
+ }
+ //sparks[1].col = 345; // this will be our known spark
+ *dying_gravity = gravity/2;
SEGENV.aux0 = 3;
}
-
- if (sparks[1].col > 4) {//&& sparks[1].pos > 0) { // as long as our known spark is lit, work with all the sparks
- for (int i = 1; i < nSparks; i++) {
- sparks[i].pos += sparks[i].vel;
- sparks[i].vel += dying_gravity;
- if (sparks[i].col > 3) sparks[i].col -= 4;
- if (sparks[i].pos > 0 && sparks[i].pos < SEGLEN) {
+ if (sparks[1].col > 4) {//&& sparks[1].pos > 0) { // as long as our known spark is lit, work with all the sparks
+ for (int i = 1; i < nSparks; i++) {
+ sparks[i].pos += sparks[i].vel;
+ sparks[i].posX += sparks[i].velX;
+ sparks[i].vel += *dying_gravity;
+ sparks[i].velX += strip.isMatrix ? *dying_gravity : 0;
+ if (sparks[i].col > 3) sparks[i].col -= 4;
+
+ if (sparks[i].pos > 0 && sparks[i].pos < rows) {
+ if (strip.isMatrix && !(sparks[i].posX >= 0 && sparks[i].posX < cols)) continue;
uint16_t prog = sparks[i].col;
- uint32_t spColor = (SEGMENT.palette) ? color_wheel(sparks[i].colIndex) : SEGCOLOR(0);
+ uint32_t spColor = (SEGMENT.palette) ? SEGMENT.color_wheel(sparks[i].colIndex) : SEGCOLOR(0);
CRGB c = CRGB::Black; //HeatColor(sparks[i].col);
if (prog > 300) { //fade from white to spark color
- c = col_to_crgb(color_blend(spColor, WHITE, (prog - 300)*5));
+ c = CRGB(color_blend(spColor, WHITE, (prog - 300)*5));
} else if (prog > 45) { //fade from spark color to black
- c = col_to_crgb(color_blend(BLACK, spColor, prog - 45));
+ c = CRGB(color_blend(BLACK, spColor, prog - 45));
uint8_t cooling = (300 - prog) >> 5;
c.g = qsub8(c.g, cooling);
c.b = qsub8(c.b, cooling * 2);
}
- setPixelColor(int(sparks[i].pos), c.red, c.green, c.blue);
+ if (strip.isMatrix) SEGMENT.setPixelColorXY(int(sparks[i].posX), rows - int(sparks[i].pos) - 1, c.red, c.green, c.blue);
+ else SEGMENT.setPixelColor(int(sparks[i].posX) ? rows - int(sparks[i].pos) - 1 : int(sparks[i].pos), c.red, c.green, c.blue);
}
}
- dying_gravity *= .99; // as sparks burn out they fall slower
+ SEGMENT.blur(16);
+ *dying_gravity *= .8f; // as sparks burn out they fall slower
} else {
SEGENV.aux0 = 6 + random8(10); //wait for this many frames
}
@@ -3153,152 +3469,198 @@ uint16_t WS2812FX::mode_exploding_fireworks(void)
SEGENV.aux0--;
if (SEGENV.aux0 < 4) {
SEGENV.aux0 = 0; //back to flare
- SEGENV.step = actuallyReverse ^ (SEGMENT.intensity > random8()); //decide firing side
}
}
- SEGMENT.setOption(SEG_OPTION_REVERSED, actuallyReverse);
-
- return FRAMETIME;
+ return FRAMETIME;
}
#undef MAX_SPARKS
+static const char _data_FX_MODE_EXPLODING_FIREWORKS[] PROGMEM = "Fireworks 1D@Gravity,Firing side;!,!;!;12;pal=11,ix=128";
/*
* Drip Effect
* ported of: https://www.youtube.com/watch?v=sru2fXh4r7k
*/
-uint16_t WS2812FX::mode_drip(void)
+uint16_t mode_drip(void)
{
+ if (SEGLEN == 1) return mode_static();
//allocate segment data
- uint8_t numDrops = 4;
- uint16_t dataSize = sizeof(spark) * numDrops;
- if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
-
- fill(SEGCOLOR(1));
-
+ uint16_t strips = SEGMENT.nrOfVStrips();
+ const int maxNumDrops = 4;
+ uint16_t dataSize = sizeof(spark) * maxNumDrops;
+ if (!SEGENV.allocateData(dataSize * strips)) return mode_static(); //allocation failed
Spark* drops = reinterpret_cast(SEGENV.data);
- numDrops = 1 + (SEGMENT.intensity >> 6); // 255>>6 = 3
-
- float gravity = -0.0005 - (SEGMENT.speed/50000.0);
- gravity *= SEGLEN;
- int sourcedrop = 12;
-
- for (uint8_t j=0;j255) drops[j].col=255;
- setPixelColor(uint16_t(drops[j].pos),color_blend(BLACK,SEGCOLOR(0),drops[j].col));
-
- drops[j].col += map(SEGMENT.speed, 0, 255, 1, 6); // swelling
-
- if (random8() < drops[j].col/10) { // random drop
- drops[j].colIndex=2; //fall
- drops[j].col=255;
- }
- }
- if (drops[j].colIndex > 1) { // falling
- if (drops[j].pos > 0) { // fall until end of segment
- drops[j].pos += drops[j].vel;
- if (drops[j].pos < 0) drops[j].pos = 0;
- drops[j].vel += gravity; // gravity is negative
-
- for (uint16_t i=1;i<7-drops[j].colIndex;i++) { // some minor math so we don't expand bouncing droplets
- uint16_t pos = constrain(uint16_t(drops[j].pos) +i, 0, SEGLEN-1); //this is BAD, returns a pos >= SEGLEN occasionally
- setPixelColor(pos,color_blend(BLACK,SEGCOLOR(0),drops[j].col/i)); //spread pixel with fade while falling
- }
+ if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1));
- if (drops[j].colIndex > 2) { // during bounce, some water is on the floor
- setPixelColor(0,color_blend(SEGCOLOR(0),BLACK,drops[j].col));
+ struct virtualStrip {
+ static void runStrip(uint16_t stripNr, Spark* drops) {
+
+ uint8_t numDrops = 1 + (SEGMENT.intensity >> 6); // 255>>6 = 3
+
+ float gravity = -0.0005 - (SEGMENT.speed/50000.0);
+ gravity *= max(1, SEGLEN-1);
+ int sourcedrop = 12;
+
+ for (int j=0;j 2) { // already hit once, so back to forming
- drops[j].colIndex = 0;
- drops[j].col = sourcedrop;
-
- } else {
- if (drops[j].colIndex==2) { // init bounce
- drops[j].vel = -drops[j].vel/4;// reverse velocity with damping
+ SEGMENT.setPixelColor(indexToVStrip(SEGLEN-1, stripNr), color_blend(BLACK,SEGCOLOR(0), sourcedrop));// water source
+ if (drops[j].colIndex==1) {
+ if (drops[j].col>255) drops[j].col=255;
+ SEGMENT.setPixelColor(indexToVStrip(uint16_t(drops[j].pos), stripNr), color_blend(BLACK,SEGCOLOR(0),drops[j].col));
+
+ drops[j].col += map(SEGMENT.speed, 0, 255, 1, 6); // swelling
+
+ if (random8() < drops[j].col/10) { // random drop
+ drops[j].colIndex=2; //fall
+ drops[j].col=255;
+ }
+ }
+ if (drops[j].colIndex > 1) { // falling
+ if (drops[j].pos > 0) { // fall until end of segment
drops[j].pos += drops[j].vel;
- }
- drops[j].col = sourcedrop*2;
- drops[j].colIndex = 5; // bouncing
+ if (drops[j].pos < 0) drops[j].pos = 0;
+ drops[j].vel += gravity; // gravity is negative
+
+ for (int i=1;i<7-drops[j].colIndex;i++) { // some minor math so we don't expand bouncing droplets
+ uint16_t pos = constrain(uint16_t(drops[j].pos) +i, 0, SEGLEN-1); //this is BAD, returns a pos >= SEGLEN occasionally
+ SEGMENT.setPixelColor(indexToVStrip(pos, stripNr), color_blend(BLACK,SEGCOLOR(0),drops[j].col/i)); //spread pixel with fade while falling
+ }
+
+ if (drops[j].colIndex > 2) { // during bounce, some water is on the floor
+ SEGMENT.setPixelColor(indexToVStrip(0, stripNr), color_blend(SEGCOLOR(0),BLACK,drops[j].col));
+ }
+ } else { // we hit bottom
+ if (drops[j].colIndex > 2) { // already hit once, so back to forming
+ drops[j].colIndex = 0;
+ drops[j].col = sourcedrop;
+
+ } else {
+
+ if (drops[j].colIndex==2) { // init bounce
+ drops[j].vel = -drops[j].vel/4;// reverse velocity with damping
+ drops[j].pos += drops[j].vel;
+ }
+ drops[j].col = sourcedrop*2;
+ drops[j].colIndex = 5; // bouncing
+ }
+ }
}
}
}
- }
- return FRAMETIME;
+ };
+
+ for (int stripNr=0; stripNr(SEGENV.data);
+ if (!SEGENV.allocateData(dataSize * strips)) return mode_static(); //allocation failed
+ Tetris* drops = reinterpret_cast(SEGENV.data);
+
+ //if (SEGENV.call == 0) SEGMENT.fill(SEGCOLOR(1)); // will fill entire segment (1D or 2D), then use drop->step = 0 below
+
+ // virtualStrip idea by @ewowi (Ewoud Wijma)
+ // requires virtual strip # to be embedded into upper 16 bits of index in setPixelcolor()
+ // the following functions will not work on virtual strips: fill(), fade_out(), fadeToBlack(), blur()
+ struct virtualStrip {
+ static void runStrip(size_t stripNr, Tetris *drop) {
+ // initialize dropping on first call or segment full
+ if (SEGENV.call == 0) {
+ drop->stack = 0; // reset brick stack size
+ drop->step = millis() + 2000; // start by fading out strip
+ if (SEGMENT.check1) drop->col = 0;// use only one color from palette
+ }
- // initialize dropping on first call or segment full
- if (SEGENV.call == 0 || SEGENV.aux1 >= SEGLEN) {
- SEGENV.aux1 = 0; // reset brick stack size
- SEGENV.step = 0;
- fill(SEGCOLOR(1));
- return 250; // short wait
- }
-
- if (SEGENV.step == 0) { //init
- drop->speed = 0.0238 * (SEGMENT.speed ? (SEGMENT.speed>>2)+1 : random8(6,64)); // set speed
- drop->pos = SEGLEN; // start at end of segment (no need to subtract 1)
- drop->col = color_from_palette(random8(0,15)<<4,false,false,0); // limit color choices so there is enough HUE gap
- SEGENV.step = 1; // drop state (0 init, 1 forming, 2 falling)
- SEGENV.aux0 = (SEGMENT.intensity ? (SEGMENT.intensity>>5)+1 : random8(1,5)) * (1+(SEGLEN>>6)); // size of brick
- }
-
- if (SEGENV.step == 1) { // forming
- if (random8()>>6) { // random drop
- SEGENV.step = 2; // fall
- }
- }
+ if (drop->step == 0) { // init brick
+ // speed calculation: a single brick should reach bottom of strip in X seconds
+ // if the speed is set to 1 this should take 5s and at 255 it should take 0.25s
+ // as this is dependant on SEGLEN it should be taken into account and the fact that effect runs every FRAMETIME s
+ int speed = SEGMENT.speed ? SEGMENT.speed : random8(1,255);
+ speed = map(speed, 1, 255, 5000, 250); // time taken for full (SEGLEN) drop
+ drop->speed = float(SEGLEN * FRAMETIME) / float(speed); // set speed
+ drop->pos = SEGLEN; // start at end of segment (no need to subtract 1)
+ if (!SEGMENT.check1) drop->col = random8(0,15)<<4; // limit color choices so there is enough HUE gap
+ drop->step = 1; // drop state (0 init, 1 forming, 2 falling)
+ drop->brick = (SEGMENT.intensity ? (SEGMENT.intensity>>5)+1 : random8(1,5)) * (1+(SEGLEN>>6)); // size of brick
+ }
+
+ if (drop->step == 1) { // forming
+ if (random8()>>6) { // random drop
+ drop->step = 2; // fall
+ }
+ }
+
+ if (drop->step == 2) { // falling
+ if (drop->pos > drop->stack) { // fall until top of stack
+ drop->pos -= drop->speed; // may add gravity as: speed += gravity
+ if (int(drop->pos) < int(drop->stack)) drop->pos = drop->stack;
+ for (int i = int(drop->pos); i < SEGLEN; i++) {
+ uint32_t col = ipos)+drop->brick ? SEGMENT.color_from_palette(drop->col, false, false, 0) : SEGCOLOR(1);
+ SEGMENT.setPixelColor(indexToVStrip(i, stripNr), col);
+ }
+ } else { // we hit bottom
+ drop->step = 0; // proceed with next brick, go back to init
+ drop->stack += drop->brick; // increase the stack size
+ if (drop->stack >= SEGLEN) drop->step = millis() + 2000; // fade out stack
+ }
+ }
- if (SEGENV.step > 1) { // falling
- if (drop->pos > SEGENV.aux1) { // fall until top of stack
- drop->pos -= drop->speed; // may add gravity as: speed += gravity
- if (int(drop->pos) < SEGENV.aux1) drop->pos = SEGENV.aux1;
- for (uint16_t i=int(drop->pos); ipos)+SEGENV.aux0 ? drop->col : SEGCOLOR(1));
- } else { // we hit bottom
- SEGENV.step = 0; // go back to init
- SEGENV.aux1 += SEGENV.aux0; // increase the stack size
- if (SEGENV.aux1 >= SEGLEN) return 1000; // wait for a second
+ if (drop->step > 2) { // fade strip
+ drop->brick = 0; // reset brick size (no more growing)
+ if (drop->step > millis()) {
+ // allow fading of virtual strip
+ for (int i = 0; i < SEGLEN; i++) SEGMENT.blendPixelColor(indexToVStrip(i, stripNr), SEGCOLOR(1), 25); // 10% blend
+ } else {
+ drop->stack = 0; // reset brick stack size
+ drop->step = 0; // proceed with next brick
+ if (SEGMENT.check1) drop->col += 8; // gradually increase palette index
+ }
+ }
}
- }
- return FRAMETIME;
+ };
+
+ for (int stripNr=0; stripNr> 5))+thisPhase) & 0xFF)/2 // factor=23 // Create a wave and add a phase change and add another wave with its own phase change.
+ cos8((i*(1+ 2*(SEGMENT.speed >> 5))+thatPhase) & 0xFF)/2; // factor=15 // Hey, you can even change the frequencies if you wish.
uint8_t thisBright = qsub8(colorIndex, beatsin8(7,0, (128 - (SEGMENT.intensity>>1))));
- CRGB color = ColorFromPalette(currentPalette, colorIndex, thisBright, LINEARBLEND);
- setPixelColor(i, color.red, color.green, color.blue);
+ //CRGB color = ColorFromPalette(SEGPALETTE, colorIndex, thisBright, LINEARBLEND);
+ //SEGMENT.setPixelColor(i, color.red, color.green, color.blue);
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(colorIndex, false, PALETTE_SOLID_WRAP, 0, thisBright));
}
return FRAMETIME;
-}
+}
+static const char _data_FX_MODE_PLASMA[] PROGMEM = "Plasma@Phase,!;!;!";
/*
* Percentage display
- * Intesity values from 0-100 turn on the leds.
+ * Intensity values from 0-100 turn on the leds.
*/
-uint16_t WS2812FX::mode_percent(void) {
+uint16_t mode_percent(void) {
+
+ uint8_t percent = SEGMENT.intensity;
+ percent = constrain(percent, 0, 200);
+ uint16_t active_leds = (percent < 100) ? roundf(SEGLEN * percent / 100.0f)
+ : roundf(SEGLEN * (200 - percent) / 100.0f);
- uint8_t percent = MAX(0, MIN(200, SEGMENT.intensity));
- uint16_t active_leds = (percent < 100) ? SEGLEN * percent / 100.0
- : SEGLEN * (200 - percent) / 100.0;
-
uint8_t size = (1 + ((SEGMENT.speed * SEGLEN) >> 11));
if (SEGMENT.speed == 255) size = 255;
-
- if (percent < 100) {
- for (uint16_t i = 0; i < SEGLEN; i++) {
- if (i < SEGENV.step) {
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
- }
- else {
- setPixelColor(i, SEGCOLOR(1));
- }
- }
+
+ if (percent <= 100) {
+ for (int i = 0; i < SEGLEN; i++) {
+ if (i < SEGENV.aux1) {
+ if (SEGMENT.check1)
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(map(percent,0,100,0,255), false, false, 0));
+ else
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
+ }
+ else {
+ SEGMENT.setPixelColor(i, SEGCOLOR(1));
+ }
+ }
} else {
- for (uint16_t i = 0; i < SEGLEN; i++) {
- if (i < (SEGLEN - SEGENV.step)) {
- setPixelColor(i, SEGCOLOR(1));
- }
- else {
- setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
- }
- }
+ for (int i = 0; i < SEGLEN; i++) {
+ if (i < (SEGLEN - SEGENV.aux1)) {
+ SEGMENT.setPixelColor(i, SEGCOLOR(1));
+ }
+ else {
+ if (SEGMENT.check1)
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(map(percent,100,200,255,0), false, false, 0));
+ else
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
+ }
+ }
}
- if(active_leds > SEGENV.step) { // smooth transition to the target value
- SEGENV.step += size;
- if (SEGENV.step > active_leds) SEGENV.step = active_leds;
- } else if (active_leds < SEGENV.step) {
- if (SEGENV.step > size) SEGENV.step -= size; else SEGENV.step = 0;
- if (SEGENV.step < active_leds) SEGENV.step = active_leds;
+ if(active_leds > SEGENV.aux1) { // smooth transition to the target value
+ SEGENV.aux1 += size;
+ if (SEGENV.aux1 > active_leds) SEGENV.aux1 = active_leds;
+ } else if (active_leds < SEGENV.aux1) {
+ if (SEGENV.aux1 > size) SEGENV.aux1 -= size; else SEGENV.aux1 = 0;
+ if (SEGENV.aux1 < active_leds) SEGENV.aux1 = active_leds;
}
return FRAMETIME;
}
+static const char _data_FX_MODE_PERCENT[] PROGMEM = "Percent@,% of fill,,,,One color;!,!;!";
+
/*
-/ Modulates the brightness similar to a heartbeat
-*/
-uint16_t WS2812FX::mode_heartbeat(void) {
- uint8_t bpm = 40 + (SEGMENT.speed >> 4);
- uint32_t msPerBeat = (60000 / bpm);
+ * Modulates the brightness similar to a heartbeat
+ * (unimplemented?) tries to draw an ECG approximation on a 2D matrix
+ */
+uint16_t mode_heartbeat(void) {
+ uint8_t bpm = 40 + (SEGMENT.speed >> 3);
+ uint32_t msPerBeat = (60000L / bpm);
uint32_t secondBeat = (msPerBeat / 3);
-
uint32_t bri_lower = SEGENV.aux1;
+ unsigned long beatTimer = strip.now - SEGENV.step;
+
bri_lower = bri_lower * 2042 / (2048 + SEGMENT.intensity);
SEGENV.aux1 = bri_lower;
- unsigned long beatTimer = millis() - SEGENV.step;
- if((beatTimer > secondBeat) && !SEGENV.aux0) { // time for the second beat?
- SEGENV.aux1 = UINT16_MAX; //full bri
+ if ((beatTimer > secondBeat) && !SEGENV.aux0) { // time for the second beat?
+ SEGENV.aux1 = UINT16_MAX; //3/4 bri
SEGENV.aux0 = 1;
}
- if(beatTimer > msPerBeat) { // time to reset the beat timer?
+ if (beatTimer > msPerBeat) { // time to reset the beat timer?
SEGENV.aux1 = UINT16_MAX; //full bri
SEGENV.aux0 = 0;
- SEGENV.step = millis();
+ SEGENV.step = strip.now;
}
- for (uint16_t i = 0; i < SEGLEN; i++) {
- setPixelColor(i, color_blend(color_from_palette(i, true, PALETTE_SOLID_WRAP, 0), SEGCOLOR(1), 255 - (SEGENV.aux1 >> 8)));
+ for (int i = 0; i < SEGLEN; i++) {
+ SEGMENT.setPixelColor(i, color_blend(SEGMENT.color_from_palette(i, true, PALETTE_SOLID_WRAP, 0), SEGCOLOR(1), 255 - (SEGENV.aux1 >> 8)));
}
return FRAMETIME;
}
+static const char _data_FX_MODE_HEARTBEAT[] PROGMEM = "Heartbeat@!,!;!,!;!;01;m12=1";
// "Pacifica"
@@ -3399,16 +3774,16 @@ uint16_t WS2812FX::mode_heartbeat(void) {
// For Dan.
//
//
-// In this animation, there are four "layers" of waves of light.
+// In this animation, there are four "layers" of waves of light.
//
// Each layer moves independently, and each is scaled separately.
//
-// All four wave layers are added together on top of each other, and then
-// another filter is applied that adds "whitecaps" of brightness where the
+// All four wave layers are added together on top of each other, and then
+// another filter is applied that adds "whitecaps" of brightness where the
// waves line up with each other more. Finally, another pass is taken
// over the led array to 'deepen' (dim) the blues and greens.
//
-// The speed and scale and motion each layer varies slowly within independent
+// The speed and scale and motion each layer varies slowly within independent
// hand-chosen ranges, which is why the code has a lot of low-speed 'beatsin8' functions
// with a lot of oddly specific numeric ranges.
//
@@ -3417,34 +3792,48 @@ uint16_t WS2812FX::mode_heartbeat(void) {
//
// Modified for WLED, based on https://github.com/FastLED/FastLED/blob/master/examples/Pacifica/Pacifica.ino
//
-uint16_t WS2812FX::mode_pacifica()
+// Add one layer of waves into the led array
+CRGB pacifica_one_layer(uint16_t i, CRGBPalette16& p, uint16_t cistart, uint16_t wavescale, uint8_t bri, uint16_t ioff)
+{
+ uint16_t ci = cistart;
+ uint16_t waveangle = ioff;
+ uint16_t wavescale_half = (wavescale >> 1) + 20;
+
+ waveangle += ((120 + SEGMENT.intensity) * i); //original 250 * i
+ uint16_t s16 = sin16(waveangle) + 32768;
+ uint16_t cs = scale16(s16, wavescale_half) + wavescale_half;
+ ci += (cs * i);
+ uint16_t sindex16 = sin16(ci) + 32768;
+ uint8_t sindex8 = scale16(sindex16, 240);
+ return ColorFromPalette(p, sindex8, bri, LINEARBLEND);
+}
+
+uint16_t mode_pacifica()
{
- uint32_t nowOld = now;
+ uint32_t nowOld = strip.now;
- CRGBPalette16 pacifica_palette_1 =
- { 0x000507, 0x000409, 0x00030B, 0x00030D, 0x000210, 0x000212, 0x000114, 0x000117,
+ CRGBPalette16 pacifica_palette_1 =
+ { 0x000507, 0x000409, 0x00030B, 0x00030D, 0x000210, 0x000212, 0x000114, 0x000117,
0x000019, 0x00001C, 0x000026, 0x000031, 0x00003B, 0x000046, 0x14554B, 0x28AA50 };
- CRGBPalette16 pacifica_palette_2 =
- { 0x000507, 0x000409, 0x00030B, 0x00030D, 0x000210, 0x000212, 0x000114, 0x000117,
+ CRGBPalette16 pacifica_palette_2 =
+ { 0x000507, 0x000409, 0x00030B, 0x00030D, 0x000210, 0x000212, 0x000114, 0x000117,
0x000019, 0x00001C, 0x000026, 0x000031, 0x00003B, 0x000046, 0x0C5F52, 0x19BE5F };
- CRGBPalette16 pacifica_palette_3 =
- { 0x000208, 0x00030E, 0x000514, 0x00061A, 0x000820, 0x000927, 0x000B2D, 0x000C33,
+ CRGBPalette16 pacifica_palette_3 =
+ { 0x000208, 0x00030E, 0x000514, 0x00061A, 0x000820, 0x000927, 0x000B2D, 0x000C33,
0x000E39, 0x001040, 0x001450, 0x001860, 0x001C70, 0x002080, 0x1040BF, 0x2060FF };
if (SEGMENT.palette) {
- pacifica_palette_1 = currentPalette;
- pacifica_palette_2 = currentPalette;
- pacifica_palette_3 = currentPalette;
+ pacifica_palette_1 = SEGPALETTE;
+ pacifica_palette_2 = SEGPALETTE;
+ pacifica_palette_3 = SEGPALETTE;
}
// Increment the four "color index start" counters, one for each wave layer.
// Each is incremented at a different speed, and the speeds vary over time.
uint16_t sCIStart1 = SEGENV.aux0, sCIStart2 = SEGENV.aux1, sCIStart3 = SEGENV.step, sCIStart4 = SEGENV.step >> 16;
- //static uint16_t sCIStart1, sCIStart2, sCIStart3, sCIStart4;
- //uint32_t deltams = 26 + (SEGMENT.speed >> 3);
uint32_t deltams = (FRAMETIME >> 2) + ((FRAMETIME * SEGMENT.speed) >> 7);
- uint64_t deltat = (now >> 2) + ((now * SEGMENT.speed) >> 7);
- now = deltat;
+ uint64_t deltat = (strip.now >> 2) + ((strip.now * SEGMENT.speed) >> 7);
+ strip.now = deltat;
uint16_t speedfactor1 = beatsin16(3, 179, 269);
uint16_t speedfactor2 = beatsin16(4, 179, 269);
@@ -3459,19 +3848,19 @@ uint16_t WS2812FX::mode_pacifica()
SEGENV.step = sCIStart4; SEGENV.step = (SEGENV.step << 16) + sCIStart3;
// Clear out the LED array to a dim background blue-green
- //fill(132618);
+ //SEGMENT.fill(132618);
uint8_t basethreshold = beatsin8( 9, 55, 65);
uint8_t wave = beat8( 7 );
-
- for( uint16_t i = 0; i < SEGLEN; i++) {
+
+ for (int i = 0; i < SEGLEN; i++) {
CRGB c = CRGB(2, 6, 10);
// Render each of four layers, with different scales and speeds, that vary over time
c += pacifica_one_layer(i, pacifica_palette_1, sCIStart1, beatsin16(3, 11 * 256, 14 * 256), beatsin8(10, 70, 130), 0-beat16(301));
c += pacifica_one_layer(i, pacifica_palette_2, sCIStart2, beatsin16(4, 6 * 256, 9 * 256), beatsin8(17, 40, 80), beat16(401));
c += pacifica_one_layer(i, pacifica_palette_3, sCIStart3, 6 * 256 , beatsin8(9, 10,38) , 0-beat16(503));
c += pacifica_one_layer(i, pacifica_palette_3, sCIStart4, 5 * 256 , beatsin8(8, 10,28) , beat16(601));
-
+
// Add extra 'white' to areas where the four layers of light have lined up brightly
uint8_t threshold = scale8( sin8( wave), 20) + basethreshold;
wave += 7;
@@ -3483,121 +3872,94 @@ uint16_t WS2812FX::mode_pacifica()
}
//deepen the blues and greens
- c.blue = scale8(c.blue, 145);
- c.green = scale8(c.green, 200);
+ c.blue = scale8(c.blue, 145);
+ c.green = scale8(c.green, 200);
c |= CRGB( 2, 5, 7);
- setPixelColor(i, c.red, c.green, c.blue);
+ SEGMENT.setPixelColor(i, c.red, c.green, c.blue);
}
- now = nowOld;
- return FRAMETIME;
-}
-
-// Add one layer of waves into the led array
-CRGB WS2812FX::pacifica_one_layer(uint16_t i, CRGBPalette16& p, uint16_t cistart, uint16_t wavescale, uint8_t bri, uint16_t ioff)
-{
- uint16_t ci = cistart;
- uint16_t waveangle = ioff;
- uint16_t wavescale_half = (wavescale >> 1) + 20;
-
- waveangle += ((120 + SEGMENT.intensity) * i); //original 250 * i
- uint16_t s16 = sin16(waveangle) + 32768;
- uint16_t cs = scale16(s16, wavescale_half) + wavescale_half;
- ci += (cs * i);
- uint16_t sindex16 = sin16(ci) + 32768;
- uint8_t sindex8 = scale16(sindex16, 240);
- return ColorFromPalette(p, sindex8, bri, LINEARBLEND);
-}
-
-//Solid colour background with glitter
-uint16_t WS2812FX::mode_solid_glitter()
-{
- fill(SEGCOLOR(0));
-
- if (SEGMENT.intensity > random8())
- {
- setPixelColor(random16(SEGLEN), ULTRAWHITE);
- }
+ strip.now = nowOld;
return FRAMETIME;
}
+static const char _data_FX_MODE_PACIFICA[] PROGMEM = "Pacifica@!,Angle;;!;;pal=51";
/*
* Mode simulates a gradual sunrise
*/
-uint16_t WS2812FX::mode_sunrise() {
+uint16_t mode_sunrise() {
+ if (SEGLEN == 1) return mode_static();
//speed 0 - static sun
//speed 1 - 60: sunrise time in minutes
//speed 60 - 120 : sunset time in minutes - 60;
//speed above: "breathing" rise and set
if (SEGENV.call == 0 || SEGMENT.speed != SEGENV.aux0) {
- SEGENV.step = millis(); //save starting time, millis() because now can change from sync
+ SEGENV.step = millis(); //save starting time, millis() because now can change from sync
SEGENV.aux0 = SEGMENT.speed;
}
-
- fill(0);
+
+ SEGMENT.fill(BLACK);
uint16_t stage = 0xFFFF;
-
+
uint32_t s10SinceStart = (millis() - SEGENV.step) /100; //tenths of seconds
-
+
if (SEGMENT.speed > 120) { //quick sunrise and sunset
- uint16_t counter = (now >> 1) * (((SEGMENT.speed -120) >> 1) +1);
- stage = triwave16(counter);
+ uint16_t counter = (strip.now >> 1) * (((SEGMENT.speed -120) >> 1) +1);
+ stage = triwave16(counter);
} else if (SEGMENT.speed) { //sunrise
- uint8_t durMins = SEGMENT.speed;
- if (durMins > 60) durMins -= 60;
- uint32_t s10Target = durMins * 600;
- if (s10SinceStart > s10Target) s10SinceStart = s10Target;
- stage = map(s10SinceStart, 0, s10Target, 0, 0xFFFF);
- if (SEGMENT.speed > 60) stage = 0xFFFF - stage; //sunset
+ uint8_t durMins = SEGMENT.speed;
+ if (durMins > 60) durMins -= 60;
+ uint32_t s10Target = durMins * 600;
+ if (s10SinceStart > s10Target) s10SinceStart = s10Target;
+ stage = map(s10SinceStart, 0, s10Target, 0, 0xFFFF);
+ if (SEGMENT.speed > 60) stage = 0xFFFF - stage; //sunset
}
-
- for (uint16_t i = 0; i <= SEGLEN/2; i++)
+
+ for (int i = 0; i <= SEGLEN/2; i++)
{
//default palette is Fire
- uint32_t c = color_from_palette(0, false, true, 255); //background
+ uint32_t c = SEGMENT.color_from_palette(0, false, true, 255); //background
uint16_t wave = triwave16((i * stage) / SEGLEN);
wave = (wave >> 8) + ((wave * SEGMENT.intensity) >> 15);
if (wave > 240) { //clipped, full white sun
- c = color_from_palette( 240, false, true, 255);
+ c = SEGMENT.color_from_palette( 240, false, true, 255);
} else { //transition
- c = color_from_palette(wave, false, true, 255);
+ c = SEGMENT.color_from_palette(wave, false, true, 255);
}
- setPixelColor(i, c);
- setPixelColor(SEGLEN - i - 1, c);
+ SEGMENT.setPixelColor(i, c);
+ SEGMENT.setPixelColor(SEGLEN - i - 1, c);
}
return FRAMETIME;
}
+static const char _data_FX_MODE_SUNRISE[] PROGMEM = "Sunrise@Time [min],Width;;!;;sx=60";
/*
* Effects by Andrew Tuline
*/
-uint16_t WS2812FX::phased_base(uint8_t moder) { // We're making sine waves here. By Andrew Tuline.
+uint16_t phased_base(uint8_t moder) { // We're making sine waves here. By Andrew Tuline.
uint8_t allfreq = 16; // Base frequency.
- //float* phasePtr = reinterpret_cast(SEGENV.step); // Phase change value gets calculated.
- static float phase = 0;//phasePtr[0];
+ float *phase = reinterpret_cast(&SEGENV.step); // Phase change value gets calculated (float fits into unsigned long).
uint8_t cutOff = (255-SEGMENT.intensity); // You can change the number of pixels. AKA INTENSITY (was 192).
uint8_t modVal = 5;//SEGMENT.fft1/8+1; // You can change the modulus. AKA FFT1 (was 5).
- uint8_t index = now/64; // Set color rotation speed
- phase += SEGMENT.speed/32.0; // You can change the speed of the wave. AKA SPEED (was .4)
- //phasePtr[0] = phase;
+ uint8_t index = strip.now/64; // Set color rotation speed
+ *phase += SEGMENT.speed/32.0; // You can change the speed of the wave. AKA SPEED (was .4)
for (int i = 0; i < SEGLEN; i++) {
if (moder == 1) modVal = (inoise8(i*10 + i*10) /16); // Let's randomize our mod length with some Perlin noise.
- uint16_t val = (i+1) * allfreq; // This sets the frequency of the waves. The +1 makes sure that leds[0] is used.
+ uint16_t val = (i+1) * allfreq; // This sets the frequency of the waves. The +1 makes sure that led 0 is used.
if (modVal == 0) modVal = 1;
- val += phase * (i % modVal +1) /2; // This sets the varying phase change of the waves. By Andrew Tuline.
+ val += *phase * (i % modVal +1) /2; // This sets the varying phase change of the waves. By Andrew Tuline.
uint8_t b = cubicwave8(val); // Now we make an 8 bit sinewave.
b = (b > cutOff) ? (b - cutOff) : 0; // A ternary operator to cutoff the light.
- setPixelColor(i, color_blend(SEGCOLOR(1), color_from_palette(index, false, false, 0), b));
+ SEGMENT.setPixelColor(i, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(index, false, false, 0), b));
index += 256 / SEGLEN;
if (SEGLEN > 256) index ++; // Correction for segments longer than 256 LEDs
}
@@ -3606,35 +3968,35 @@ uint16_t WS2812FX::phased_base(uint8_t moder) { // We're making
}
-
-uint16_t WS2812FX::mode_phased(void) {
+uint16_t mode_phased(void) {
return phased_base(0);
}
+static const char _data_FX_MODE_PHASED[] PROGMEM = "Phased@!,!;!,!;!";
-
-uint16_t WS2812FX::mode_phased_noise(void) {
+uint16_t mode_phased_noise(void) {
return phased_base(1);
}
+static const char _data_FX_MODE_PHASEDNOISE[] PROGMEM = "Phased Noise@!,!;!,!;!";
+uint16_t mode_twinkleup(void) { // A very short twinkle routine with fade-in and dual controls. By Andrew Tuline.
+ random16_set_seed(535); // The randomizer needs to be re-set each time through the loop in order for the same 'random' numbers to be the same each time through.
-uint16_t WS2812FX::mode_twinkleup(void) { // A very short twinkle routine with fade-in and dual controls. By Andrew Tuline.
- random16_set_seed(535); // The randomizer needs to be re-set each time through the loop in order for the same 'random' numbers to be the same each time through.
-
- for (int i = 0; i SEGMENT.intensity) pixBri = 0;
- setPixelColor(i, color_blend(SEGCOLOR(1), color_from_palette(random8()+now/100, false, PALETTE_SOLID_WRAP, 0), pixBri));
+ SEGMENT.setPixelColor(i, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(random8()+strip.now/100, false, PALETTE_SOLID_WRAP, 0), pixBri));
}
return FRAMETIME;
}
+static const char _data_FX_MODE_TWINKLEUP[] PROGMEM = "Twinkleup@!,Intensity;!,!;!;;m12=0";
// Peaceful noise that's slow and with gradually changing palettes. Does not support WLED palettes or default colours or controls.
-uint16_t WS2812FX::mode_noisepal(void) { // Slow noise palette by Andrew Tuline.
+uint16_t mode_noisepal(void) { // Slow noise palette by Andrew Tuline.
uint16_t scale = 15 + (SEGMENT.intensity >> 2); //default was 30
//#define scale 30
@@ -3657,53 +4019,55 @@ uint16_t WS2812FX::mode_noisepal(void) { // S
//EVERY_N_MILLIS(10) { //(don't have to time this, effect function is only called every 24ms)
nblendPaletteTowardPalette(palettes[0], palettes[1], 48); // Blend towards the target palette over 48 iterations.
- if (SEGMENT.palette > 0) palettes[0] = currentPalette;
+ if (SEGMENT.palette > 0) palettes[0] = SEGPALETTE;
- for(int i = 0; i < SEGLEN; i++) {
+ for (int i = 0; i < SEGLEN; i++) {
uint8_t index = inoise8(i*scale, SEGENV.aux0+i*scale); // Get a value from the noise function. I'm using both x and y axis.
color = ColorFromPalette(palettes[0], index, 255, LINEARBLEND); // Use the my own palette.
- setPixelColor(i, color.red, color.green, color.blue);
+ SEGMENT.setPixelColor(i, color.red, color.green, color.blue);
}
SEGENV.aux0 += beatsin8(10,1,4); // Moving along the distance. Vary it a bit with a sine wave.
return FRAMETIME;
}
+static const char _data_FX_MODE_NOISEPAL[] PROGMEM = "Noise Pal@!,Scale;;!";
// Sine waves that have controllable phase change speed, frequency and cutoff. By Andrew Tuline.
// SEGMENT.speed ->Speed, SEGMENT.intensity -> Frequency (SEGMENT.fft1 -> Color change, SEGMENT.fft2 -> PWM cutoff)
//
-uint16_t WS2812FX::mode_sinewave(void) { // Adjustable sinewave. By Andrew Tuline
+uint16_t mode_sinewave(void) { // Adjustable sinewave. By Andrew Tuline
//#define qsuba(x, b) ((x>b)?x-b:0) // Analog Unsigned subtraction macro. if result <0, then => 0
- uint16_t colorIndex = now /32;//(256 - SEGMENT.fft1); // Amount of colour change.
+ uint16_t colorIndex = strip.now /32;//(256 - SEGMENT.fft1); // Amount of colour change.
SEGENV.step += SEGMENT.speed/16; // Speed of animation.
uint16_t freq = SEGMENT.intensity/4;//SEGMENT.fft2/8; // Frequency of the signal.
- for (int i=0; i> 2) +1);
+ counter = strip.now * ((SEGMENT.speed >> 2) +1);
counter = counter >> 8;
}
-
+
uint16_t maxZones = SEGLEN / 6; //only looks good if each zone has at least 6 LEDs
uint16_t zones = (SEGMENT.intensity * maxZones) >> 8;
if (zones & 0x01) zones++; //zones must be even
@@ -3711,45 +4075,50 @@ uint16_t WS2812FX::mode_flow(void)
uint16_t zoneLen = SEGLEN / zones;
uint16_t offset = (SEGLEN - zones * zoneLen) >> 1;
- fill(color_from_palette(-counter, false, true, 255));
+ SEGMENT.fill(SEGMENT.color_from_palette(-counter, false, true, 255));
- for (uint16_t z = 0; z < zones; z++)
+ for (int z = 0; z < zones; z++)
{
uint16_t pos = offset + z * zoneLen;
- for (uint16_t i = 0; i < zoneLen; i++)
+ for (int i = 0; i < zoneLen; i++)
{
uint8_t colorIndex = (i * 255 / zoneLen) - counter;
uint16_t led = (z & 0x01) ? i : (zoneLen -1) -i;
- if (IS_REVERSE) led = (zoneLen -1) -led;
- setPixelColor(pos + led, color_from_palette(colorIndex, false, true, 255));
+ if (SEGMENT.reverse) led = (zoneLen -1) -led;
+ SEGMENT.setPixelColor(pos + led, SEGMENT.color_from_palette(colorIndex, false, true, 255));
}
}
return FRAMETIME;
}
+static const char _data_FX_MODE_FLOW[] PROGMEM = "Flow@!,Zones;;!;;m12=1"; //vertical
/*
* Dots waving around in a sine/pendulum motion.
* Little pixel birds flying in a circle. By Aircoookie
*/
-uint16_t WS2812FX::mode_chunchun(void)
+uint16_t mode_chunchun(void)
{
- fill(SEGCOLOR(1));
- uint16_t counter = now*(6 + (SEGMENT.speed >> 4));
+ if (SEGLEN == 1) return mode_static();
+ SEGMENT.fade_out(254); // add a bit of trail
+ uint16_t counter = strip.now * (6 + (SEGMENT.speed >> 4));
uint16_t numBirds = 2 + (SEGLEN >> 3); // 2 + 1/8 of a segment
uint16_t span = (SEGMENT.intensity << 8) / numBirds;
- for (uint16_t i = 0; i < numBirds; i++)
+ for (int i = 0; i < numBirds; i++)
{
counter -= span;
uint16_t megumin = sin16(counter) + 0x8000;
- uint32_t bird = (megumin * SEGLEN) >> 16;
- uint32_t c = color_from_palette((i * 255)/ numBirds, false, false, 0); // no palette wrapping
- setPixelColor(bird, c);
+ uint16_t bird = uint32_t(megumin * SEGLEN) >> 16;
+ uint32_t c = SEGMENT.color_from_palette((i * 255)/ numBirds, false, false, 0); // no palette wrapping
+ bird = constrain(bird, 0, SEGLEN-1);
+ SEGMENT.setPixelColor(bird, c);
}
return FRAMETIME;
}
+static const char _data_FX_MODE_CHUNCHUN[] PROGMEM = "Chunchun@!,Gap size;!,!;!";
+
//13 bytes
typedef struct Spotlight {
@@ -3781,8 +4150,9 @@ typedef struct Spotlight {
*
* By Steve Pomeroy @xxv
*/
-uint16_t WS2812FX::mode_dancing_shadows(void)
+uint16_t mode_dancing_shadows(void)
{
+ if (SEGLEN == 1) return mode_static();
uint8_t numSpotlights = map(SEGMENT.intensity, 0, 255, 2, SPOT_MAX_COUNT); // 49 on 32 segment ESP32, 17 on 16 segment ESP8266
bool initialize = SEGENV.aux0 != numSpotlights;
SEGENV.aux0 = numSpotlights;
@@ -3791,12 +4161,12 @@ uint16_t WS2812FX::mode_dancing_shadows(void)
if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
Spotlight* spotlights = reinterpret_cast(SEGENV.data);
- fill(BLACK);
+ SEGMENT.fill(BLACK);
unsigned long time = millis();
bool respawn = false;
- for (uint8_t i = 0; i < numSpotlights; i++) {
+ for (size_t i = 0; i < numSpotlights; i++) {
if (!initialize) {
// advance the position of the spotlight
int16_t delta = (float)(time - spotlights[i].lastUpdateTime) *
@@ -3833,61 +4203,59 @@ uint16_t WS2812FX::mode_dancing_shadows(void)
spotlights[i].type = random8(SPOT_TYPES_COUNT);
}
- uint32_t color = color_from_palette(spotlights[i].colorIdx, false, false, 0);
+ uint32_t color = SEGMENT.color_from_palette(spotlights[i].colorIdx, false, false, 255);
int start = spotlights[i].position;
if (spotlights[i].width <= 1) {
if (start >= 0 && start < SEGLEN) {
- blendPixelColor(start, color, 128);
+ SEGMENT.blendPixelColor(start, color, 128);
}
} else {
switch (spotlights[i].type) {
case SPOT_TYPE_SOLID:
- for (uint8_t j = 0; j < spotlights[i].width; j++) {
+ for (size_t j = 0; j < spotlights[i].width; j++) {
if ((start + j) >= 0 && (start + j) < SEGLEN) {
- blendPixelColor(start + j, color, 128);
+ SEGMENT.blendPixelColor(start + j, color, 128);
}
}
break;
case SPOT_TYPE_GRADIENT:
- for (uint8_t j = 0; j < spotlights[i].width; j++) {
+ for (size_t j = 0; j < spotlights[i].width; j++) {
if ((start + j) >= 0 && (start + j) < SEGLEN) {
- blendPixelColor(start + j, color,
- cubicwave8(map(j, 0, spotlights[i].width - 1, 0, 255)));
+ SEGMENT.blendPixelColor(start + j, color, cubicwave8(map(j, 0, spotlights[i].width - 1, 0, 255)));
}
}
break;
case SPOT_TYPE_2X_GRADIENT:
- for (uint8_t j = 0; j < spotlights[i].width; j++) {
+ for (size_t j = 0; j < spotlights[i].width; j++) {
if ((start + j) >= 0 && (start + j) < SEGLEN) {
- blendPixelColor(start + j, color,
- cubicwave8(2 * map(j, 0, spotlights[i].width - 1, 0, 255)));
+ SEGMENT.blendPixelColor(start + j, color, cubicwave8(2 * map(j, 0, spotlights[i].width - 1, 0, 255)));
}
}
break;
case SPOT_TYPE_2X_DOT:
- for (uint8_t j = 0; j < spotlights[i].width; j += 2) {
+ for (size_t j = 0; j < spotlights[i].width; j += 2) {
if ((start + j) >= 0 && (start + j) < SEGLEN) {
- blendPixelColor(start + j, color, 128);
+ SEGMENT.blendPixelColor(start + j, color, 128);
}
}
break;
case SPOT_TYPE_3X_DOT:
- for (uint8_t j = 0; j < spotlights[i].width; j += 3) {
+ for (size_t j = 0; j < spotlights[i].width; j += 3) {
if ((start + j) >= 0 && (start + j) < SEGLEN) {
- blendPixelColor(start + j, color, 128);
+ SEGMENT.blendPixelColor(start + j, color, 128);
}
}
break;
case SPOT_TYPE_4X_DOT:
- for (uint8_t j = 0; j < spotlights[i].width; j += 4) {
+ for (size_t j = 0; j < spotlights[i].width; j += 4) {
if ((start + j) >= 0 && (start + j) < SEGLEN) {
- blendPixelColor(start + j, color, 128);
+ SEGMENT.blendPixelColor(start + j, color, 128);
}
}
break;
@@ -3897,51 +4265,55 @@ uint16_t WS2812FX::mode_dancing_shadows(void)
return FRAMETIME;
}
+static const char _data_FX_MODE_DANCING_SHADOWS[] PROGMEM = "Dancing Shadows@!,# of shadows;!;!";
+
/*
Imitates a washing machine, rotating same waves forward, then pause, then backward.
By Stefan Seegel
*/
-uint16_t WS2812FX::mode_washing_machine(void) {
- float speed = tristate_square8(now >> 7, 90, 15);
- float quot = 32.0f - ((float)SEGMENT.speed / 16.0f);
- speed /= quot;
+uint16_t mode_washing_machine(void) {
+ int speed = tristate_square8(strip.now >> 7, 90, 15);
- SEGENV.step += (speed * 128.0f);
-
- for (int i=0; i> 7));
- setPixelColor(i, color_from_palette(col, false, PALETTE_SOLID_WRAP, 3));
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(col, false, PALETTE_SOLID_WRAP, 3));
}
return FRAMETIME;
}
+static const char _data_FX_MODE_WASHING_MACHINE[] PROGMEM = "Washing Machine@!,!;;!";
+
/*
Blends random colors across palette
Modified, originally by Mark Kriegsman https://gist.github.com/kriegsman/1f7ccbbfa492a73c015e
*/
-uint16_t WS2812FX::mode_blends(void) {
+uint16_t mode_blends(void) {
uint16_t pixelLen = SEGLEN > UINT8_MAX ? UINT8_MAX : SEGLEN;
uint16_t dataSize = sizeof(uint32_t) * (pixelLen + 1); // max segment length of 56 pixels on 16 segment ESP8266
if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
uint32_t* pixels = reinterpret_cast(SEGENV.data);
uint8_t blendSpeed = map(SEGMENT.intensity, 0, UINT8_MAX, 10, 128);
- uint8_t shift = (now * ((SEGMENT.speed >> 3) +1)) >> 8;
+ uint8_t shift = (strip.now * ((SEGMENT.speed >> 3) +1)) >> 8;
for (int i = 0; i < pixelLen; i++) {
- pixels[i] = color_blend(pixels[i], color_from_palette(shift + quadwave8((i + 1) * 16), false, PALETTE_SOLID_WRAP, 255), blendSpeed);
+ pixels[i] = color_blend(pixels[i], SEGMENT.color_from_palette(shift + quadwave8((i + 1) * 16), false, PALETTE_SOLID_WRAP, 255), blendSpeed);
shift += 3;
}
uint16_t offset = 0;
for (int i = 0; i < SEGLEN; i++) {
- setPixelColor(i, pixels[offset++]);
+ SEGMENT.setPixelColor(i, pixels[offset++]);
if (offset > pixelLen) offset = 0;
}
return FRAMETIME;
}
+static const char _data_FX_MODE_BLENDS[] PROGMEM = "Blends@Shift speed,Blend speed;;!";
+
/*
TV Simulator
@@ -3968,7 +4340,7 @@ typedef struct TvSim {
uint16_t pb = 0;
} tvSim;
-uint16_t WS2812FX::mode_tv_simulator(void) {
+uint16_t mode_tv_simulator(void) {
uint16_t nr, ng, nb, r, g, b, i, hue;
uint8_t sat, bri, j;
@@ -3993,19 +4365,19 @@ uint16_t WS2812FX::mode_tv_simulator(void) {
tvSimulator->sceeneColorBri = random8 ( 200, 240); // random start color-brightness for the sceene
SEGENV.aux1 = 1;
SEGENV.aux0 = 0;
- }
-
+ }
+
// slightly change the color-tone in this sceene
if ( SEGENV.aux0 == 0) {
// hue change in both directions
j = random8(4 * colorIntensity);
hue = (random8() < 128) ? ((j < tvSimulator->sceeneColorHue) ? tvSimulator->sceeneColorHue - j : 767 - tvSimulator->sceeneColorHue - j) : // negative
((j + tvSimulator->sceeneColorHue) < 767 ? tvSimulator->sceeneColorHue + j : tvSimulator->sceeneColorHue + j - 767) ; // positive
-
+
// saturation
j = random8(2 * colorIntensity);
sat = (tvSimulator->sceeneColorSat - j) < 0 ? 0 : tvSimulator->sceeneColorSat - j;
-
+
// brightness
j = random8(100);
bri = (tvSimulator->sceeneColorBri - j) < 0 ? 0 : tvSimulator->sceeneColorBri - j;
@@ -4029,7 +4401,7 @@ uint16_t WS2812FX::mode_tv_simulator(void) {
ng = (uint8_t)gamma8(tvSimulator->actualColorG) * 257;
nb = (uint8_t)gamma8(tvSimulator->actualColorB) * 257;
- if (SEGENV.aux0 == 0) { // initialize next iteration
+ if (SEGENV.aux0 == 0) { // initialize next iteration
SEGENV.aux0 = 1;
// randomize total duration and fade duration for the actual color
@@ -4043,9 +4415,9 @@ uint16_t WS2812FX::mode_tv_simulator(void) {
// how much time is elapsed ?
tvSimulator->elapsed = millis() - tvSimulator->startTime;
- // fade from prev volor to next color
+ // fade from prev color to next color
if (tvSimulator->elapsed < tvSimulator->fadeTime) {
- r = map(tvSimulator->elapsed, 0, tvSimulator->fadeTime, tvSimulator->pr, nr);
+ r = map(tvSimulator->elapsed, 0, tvSimulator->fadeTime, tvSimulator->pr, nr);
g = map(tvSimulator->elapsed, 0, tvSimulator->fadeTime, tvSimulator->pg, ng);
b = map(tvSimulator->elapsed, 0, tvSimulator->fadeTime, tvSimulator->pb, nb);
} else { // Avoid divide-by-zero in map()
@@ -4056,7 +4428,7 @@ uint16_t WS2812FX::mode_tv_simulator(void) {
// set strip color
for (i = 0; i < SEGLEN; i++) {
- setPixelColor(i, r >> 8, g >> 8, b >> 8); // Quantize to 8-bit
+ SEGMENT.setPixelColor(i, r >> 8, g >> 8, b >> 8); // Quantize to 8-bit
}
// if total duration has passed, remember last color and restart the loop
@@ -4066,9 +4438,11 @@ uint16_t WS2812FX::mode_tv_simulator(void) {
tvSimulator->pb = nb;
SEGENV.aux0 = 0;
}
-
+
return FRAMETIME;
}
+static const char _data_FX_MODE_TV_SIMULATOR[] PROGMEM = "TV Simulator@!,!;;";
+
/*
Aurora effect
@@ -4110,7 +4484,7 @@ class AuroraWave {
alive = true;
}
- CRGB getColorForLED(int ledIndex) {
+ CRGB getColorForLED(int ledIndex) {
if(ledIndex < center - width || ledIndex > center + width) return 0; //Position out of range of this wave
CRGB rgb;
@@ -4123,7 +4497,7 @@ class AuroraWave {
//The age of the wave determines it brightness.
//At half its maximum age it will be the brightest.
- float ageFactor = 0.1;
+ float ageFactor = 0.1;
if((float)age / ttl < 0.5) {
ageFactor = (float)age / (ttl / 2);
} else {
@@ -4135,7 +4509,7 @@ class AuroraWave {
rgb.r = basecolor.r * factor;
rgb.g = basecolor.g * factor;
rgb.b = basecolor.b * factor;
-
+
return rgb;
};
@@ -4170,12 +4544,15 @@ class AuroraWave {
};
};
-uint16_t WS2812FX::mode_aurora(void) {
+uint16_t mode_aurora(void) {
//aux1 = Wavecount
//aux2 = Intensity in last loop
AuroraWave* waves;
+//TODO: I am not sure this is a correct way of handling memory allocation since if it fails on 1st run
+// it will display static effect but on second run it may crash ESP since data will be nullptr
+
if(SEGENV.aux0 != SEGMENT.intensity || SEGENV.call == 0) {
//Intensity slider changed or first call
SEGENV.aux1 = map(SEGMENT.intensity, 0, 255, 2, W_MAX_COUNT);
@@ -4187,20 +4564,20 @@ uint16_t WS2812FX::mode_aurora(void) {
waves = reinterpret_cast(SEGENV.data);
- for(int i = 0; i < SEGENV.aux1; i++) {
- waves[i].init(SEGLEN, col_to_crgb(color_from_palette(random8(), false, false, random(0, 3))));
+ for (int i = 0; i < SEGENV.aux1; i++) {
+ waves[i].init(SEGLEN, CRGB(SEGMENT.color_from_palette(random8(), false, false, random(0, 3))));
}
} else {
waves = reinterpret_cast(SEGENV.data);
}
- for(int i = 0; i < SEGENV.aux1; i++) {
+ for (int i = 0; i < SEGENV.aux1; i++) {
//Update values of wave
waves[i].update(SEGLEN, SEGMENT.speed);
if(!(waves[i].stillAlive())) {
//If a wave dies, reinitialize it starts over.
- waves[i].init(SEGLEN, col_to_crgb(color_from_palette(random8(), false, false, random(0, 3))));
+ waves[i].init(SEGLEN, CRGB(SEGMENT.color_from_palette(random8(), false, false, random(0, 3))));
}
}
@@ -4209,21 +4586,3318 @@ uint16_t WS2812FX::mode_aurora(void) {
if (SEGCOLOR(1)) backlight++;
if (SEGCOLOR(2)) backlight++;
//Loop through LEDs to determine color
- for(int i = 0; i < SEGLEN; i++) {
+ for (int i = 0; i < SEGLEN; i++) {
CRGB mixedRgb = CRGB(backlight, backlight, backlight);
//For each LED we must check each wave if it is "active" at this position.
//If there are multiple waves active on a LED we multiply their values.
- for(int j = 0; j < SEGENV.aux1; j++) {
+ for (int j = 0; j < SEGENV.aux1; j++) {
CRGB rgb = waves[j].getColorForLED(i);
-
- if(rgb != CRGB(0)) {
+
+ if(rgb != CRGB(0)) {
mixedRgb += rgb;
}
}
- setPixelColor(i, mixedRgb[0], mixedRgb[1], mixedRgb[2]);
+ SEGMENT.setPixelColor(i, mixedRgb[0], mixedRgb[1], mixedRgb[2]);
}
-
+
+ return FRAMETIME;
+}
+static const char _data_FX_MODE_AURORA[] PROGMEM = "Aurora@!,!;1,2,3;!;;sx=24,pal=50";
+
+// WLED-SR effects
+
+/////////////////////////
+// Perlin Move //
+/////////////////////////
+// 16 bit perlinmove. Use Perlin Noise instead of sinewaves for movement. By Andrew Tuline.
+// Controls are speed, # of pixels, faderate.
+uint16_t mode_perlinmove(void) {
+ if (SEGLEN == 1) return mode_static();
+ SEGMENT.fade_out(255-SEGMENT.custom1);
+ for (int i = 0; i < SEGMENT.intensity/16 + 1; i++) {
+ uint16_t locn = inoise16(millis()*128/(260-SEGMENT.speed)+i*15000, millis()*128/(260-SEGMENT.speed)); // Get a new pixel location from moving noise.
+ uint16_t pixloc = map(locn, 50*256, 192*256, 0, SEGLEN-1); // Map that to the length of the strand, and ensure we don't go over.
+ SEGMENT.setPixelColor(pixloc, SEGMENT.color_from_palette(pixloc%255, false, PALETTE_SOLID_WRAP, 0));
+ }
+
+ return FRAMETIME;
+} // mode_perlinmove()
+static const char _data_FX_MODE_PERLINMOVE[] PROGMEM = "Perlin Move@!,# of pixels,Fade rate;!,!;!";
+
+
+/////////////////////////
+// Waveins //
+/////////////////////////
+// Uses beatsin8() + phase shifting. By: Andrew Tuline
+uint16_t mode_wavesins(void) {
+
+ for (int i = 0; i < SEGLEN; i++) {
+ uint8_t bri = sin8(millis()/4 + i * SEGMENT.intensity);
+ uint8_t index = beatsin8(SEGMENT.speed, SEGMENT.custom1, SEGMENT.custom1+SEGMENT.custom2, 0, i * (SEGMENT.custom3<<3)); // custom3 is reduced resolution slider
+ //SEGMENT.setPixelColor(i, ColorFromPalette(SEGPALETTE, index, bri, LINEARBLEND));
+ SEGMENT.setPixelColor(i, SEGMENT.color_from_palette(index, false, PALETTE_SOLID_WRAP, 0, bri));
+ }
+
+ return FRAMETIME;
+} // mode_waveins()
+static const char _data_FX_MODE_WAVESINS[] PROGMEM = "Wavesins@!,Brightness variation,Starting color,Range of colors,Color variation;!;!";
+
+
+//////////////////////////////
+// Flow Stripe //
+//////////////////////////////
+// By: ldirko https://editor.soulmatelights.com/gallery/392-flow-led-stripe , modifed by: Andrew Tuline
+uint16_t mode_FlowStripe(void) {
+
+ const uint16_t hl = SEGLEN * 10 / 13;
+ uint8_t hue = millis() / (SEGMENT.speed+1);
+ uint32_t t = millis() / (SEGMENT.intensity/8+1);
+
+ for (int i = 0; i < SEGLEN; i++) {
+ int c = (abs(i - hl) / hl) * 127;
+ c = sin8(c);
+ c = sin8(c / 2 + t);
+ byte b = sin8(c + t/8);
+ SEGMENT.setPixelColor(i, CHSV(b + hue, 255, 255));
+ }
+
+ return FRAMETIME;
+} // mode_FlowStripe()
+static const char _data_FX_MODE_FLOWSTRIPE[] PROGMEM = "Flow Stripe@Hue speed,Effect speed;;";
+
+
+#ifndef WLED_DISABLE_2D
+///////////////////////////////////////////////////////////////////////////////
+//*************************** 2D routines ***********************************
+#define XY(x,y) SEGMENT.XY(x,y)
+
+
+// Black hole
+uint16_t mode_2DBlackHole(void) { // By: Stepko https://editor.soulmatelights.com/gallery/1012 , Modified by: Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+ uint16_t x, y;
+
+ SEGMENT.fadeToBlackBy(16 + (SEGMENT.speed>>3)); // create fading trails
+ unsigned long t = millis()/128; // timebase
+ // outer stars
+ for (size_t i = 0; i < 8; i++) {
+ x = beatsin8(SEGMENT.custom1>>3, 0, cols - 1, 0, ((i % 2) ? 128 : 0) + t * i);
+ y = beatsin8(SEGMENT.intensity>>3, 0, rows - 1, 0, ((i % 2) ? 192 : 64) + t * i);
+ SEGMENT.addPixelColorXY(x, y, SEGMENT.color_from_palette(i*32, false, PALETTE_SOLID_WRAP, SEGMENT.check1?0:255));
+ }
+ // inner stars
+ for (size_t i = 0; i < 4; i++) {
+ x = beatsin8(SEGMENT.custom2>>3, cols/4, cols - 1 - cols/4, 0, ((i % 2) ? 128 : 0) + t * i);
+ y = beatsin8(SEGMENT.custom3 , rows/4, rows - 1 - rows/4, 0, ((i % 2) ? 192 : 64) + t * i);
+ SEGMENT.addPixelColorXY(x, y, SEGMENT.color_from_palette(255-i*64, false, PALETTE_SOLID_WRAP, SEGMENT.check1?0:255));
+ }
+ // central white dot
+ SEGMENT.setPixelColorXY(cols/2, rows/2, WHITE);
+ // blur everything a bit
+ SEGMENT.blur(16);
+
+ return FRAMETIME;
+} // mode_2DBlackHole()
+static const char _data_FX_MODE_2DBLACKHOLE[] PROGMEM = "Black Hole@Fade rate,Outer Y freq.,Outer X freq.,Inner X freq.,Inner Y freq.,Solid;!;!;2;pal=11";
+
+
+////////////////////////////
+// 2D Colored Bursts //
+////////////////////////////
+uint16_t mode_2DColoredBursts() { // By: ldirko https://editor.soulmatelights.com/gallery/819-colored-bursts , modified by: Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ if (SEGENV.call == 0) {
+ SEGENV.aux0 = 0; // start with red hue
+ }
+
+ bool dot = SEGMENT.check3;
+ bool grad = SEGMENT.check1;
+
+ byte numLines = SEGMENT.intensity/16 + 1;
+
+ SEGENV.aux0++; // hue
+ SEGMENT.fadeToBlackBy(40);
+ for (size_t i = 0; i < numLines; i++) {
+ byte x1 = beatsin8(2 + SEGMENT.speed/16, 0, (cols - 1));
+ byte x2 = beatsin8(1 + SEGMENT.speed/16, 0, (cols - 1));
+ byte y1 = beatsin8(5 + SEGMENT.speed/16, 0, (rows - 1), 0, i * 24);
+ byte y2 = beatsin8(3 + SEGMENT.speed/16, 0, (rows - 1), 0, i * 48 + 64);
+ CRGB color = ColorFromPalette(SEGPALETTE, i * 255 / numLines + (SEGENV.aux0&0xFF), 255, LINEARBLEND);
+
+ byte xsteps = abs8(x1 - y1) + 1;
+ byte ysteps = abs8(x2 - y2) + 1;
+ byte steps = xsteps >= ysteps ? xsteps : ysteps;
+ //Draw gradient line
+ for (size_t j = 1; j <= steps; j++) {
+ uint8_t rate = j * 255 / steps;
+ byte dx = lerp8by8(x1, y1, rate);
+ byte dy = lerp8by8(x2, y2, rate);
+ //SEGMENT.setPixelColorXY(dx, dy, grad ? color.nscale8_video(255-rate) : color); // use addPixelColorXY for different look
+ SEGMENT.addPixelColorXY(dx, dy, color); // use setPixelColorXY for different look
+ if (grad) SEGMENT.fadePixelColorXY(dx, dy, rate);
+ }
+
+ if (dot) { //add white point at the ends of line
+ SEGMENT.setPixelColorXY(x1, x2, WHITE);
+ SEGMENT.setPixelColorXY(y1, y2, DARKSLATEGRAY);
+ }
+ }
+ if (SEGMENT.custom3) SEGMENT.blur(SEGMENT.custom3/2);
+
+ return FRAMETIME;
+} // mode_2DColoredBursts()
+static const char _data_FX_MODE_2DCOLOREDBURSTS[] PROGMEM = "Colored Bursts@Speed,# of lines,,,Blur,Gradient,,Dots;;!;2;c3=16";
+
+
+/////////////////////
+// 2D DNA //
+/////////////////////
+uint16_t mode_2Ddna(void) { // dna originally by by ldirko at https://pastebin.com/pCkkkzcs. Updated by Preyy. WLED conversion by Andrew Tuline.
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ SEGMENT.fadeToBlackBy(64);
+ for (int i = 0; i < cols; i++) {
+ SEGMENT.setPixelColorXY(i, beatsin8(SEGMENT.speed/8, 0, rows-1, 0, i*4 ), ColorFromPalette(SEGPALETTE, i*5+millis()/17, beatsin8(5, 55, 255, 0, i*10), LINEARBLEND));
+ SEGMENT.setPixelColorXY(i, beatsin8(SEGMENT.speed/8, 0, rows-1, 0, i*4+128), ColorFromPalette(SEGPALETTE, i*5+128+millis()/17, beatsin8(5, 55, 255, 0, i*10+128), LINEARBLEND));
+ }
+ SEGMENT.blur(SEGMENT.intensity>>3);
+
+ return FRAMETIME;
+} // mode_2Ddna()
+static const char _data_FX_MODE_2DDNA[] PROGMEM = "DNA@Scroll speed,Blur;;!;2";
+
+
+/////////////////////////
+// 2D DNA Spiral //
+/////////////////////////
+uint16_t mode_2DDNASpiral() { // By: ldirko https://editor.soulmatelights.com/gallery/810 , modified by: Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ if (SEGENV.call == 0) {
+ SEGMENT.fill(BLACK);
+ }
+
+ uint8_t speeds = SEGMENT.speed/2 + 1;
+ uint8_t freq = SEGMENT.intensity/8;
+
+ uint32_t ms = millis() / 20;
+ SEGMENT.fadeToBlackBy(135);
+
+ for (int i = 0; i < rows; i++) {
+ uint16_t x = beatsin8(speeds, 0, cols - 1, 0, i * freq) + beatsin8(speeds - 7, 0, cols - 1, 0, i * freq + 128);
+ uint16_t x1 = beatsin8(speeds, 0, cols - 1, 0, 128 + i * freq) + beatsin8(speeds - 7, 0, cols - 1, 0, 128 + 64 + i * freq);
+ uint8_t hue = (i * 128 / rows) + ms;
+ // skip every 4th row every now and then (fade it more)
+ if ((i + ms / 8) & 3) {
+ // draw a gradient line between x and x1
+ x = x / 2; x1 = x1 / 2;
+ uint8_t steps = abs8(x - x1) + 1;
+ for (size_t k = 1; k <= steps; k++) {
+ uint8_t rate = k * 255 / steps;
+ uint8_t dx = lerp8by8(x, x1, rate);
+ //SEGMENT.setPixelColorXY(dx, i, ColorFromPalette(SEGPALETTE, hue, 255, LINEARBLEND).nscale8_video(rate));
+ SEGMENT.addPixelColorXY(dx, i, ColorFromPalette(SEGPALETTE, hue, 255, LINEARBLEND)); // use setPixelColorXY for different look
+ SEGMENT.fadePixelColorXY(dx, i, rate);
+ }
+ SEGMENT.setPixelColorXY(x, i, DARKSLATEGRAY);
+ SEGMENT.setPixelColorXY(x1, i, WHITE);
+ }
+ }
+
+ return FRAMETIME;
+} // mode_2DDNASpiral()
+static const char _data_FX_MODE_2DDNASPIRAL[] PROGMEM = "DNA Spiral@Scroll speed,Y frequency;;!;2";
+
+
+/////////////////////////
+// 2D Drift //
+/////////////////////////
+uint16_t mode_2DDrift() { // By: Stepko https://editor.soulmatelights.com/gallery/884-drift , Modified by: Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ SEGMENT.fadeToBlackBy(128);
+ const uint16_t maxDim = MAX(cols, rows)/2;
+ unsigned long t = millis() / (32 - (SEGMENT.speed>>3));
+ unsigned long t_20 = t/20; // softhack007: pre-calculating this gives about 10% speedup
+ for (float i = 1; i < maxDim; i += 0.25) {
+ float angle = radians(t * (maxDim - i));
+ uint16_t myX = (cols>>1) + (uint16_t)(sin_t(angle) * i) + (cols%2);
+ uint16_t myY = (rows>>1) + (uint16_t)(cos_t(angle) * i) + (rows%2);
+ SEGMENT.setPixelColorXY(myX, myY, ColorFromPalette(SEGPALETTE, (i * 20) + t_20, 255, LINEARBLEND));
+ }
+ SEGMENT.blur(SEGMENT.intensity>>3);
+
+ return FRAMETIME;
+} // mode_2DDrift()
+static const char _data_FX_MODE_2DDRIFT[] PROGMEM = "Drift@Rotation speed,Blur amount;;!;2";
+
+
+//////////////////////////
+// 2D Firenoise //
+//////////////////////////
+uint16_t mode_2Dfirenoise(void) { // firenoise2d. By Andrew Tuline. Yet another short routine.
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ if (SEGENV.call == 0) {
+ SEGMENT.fill(BLACK);
+ }
+
+ unsigned xscale = SEGMENT.intensity*4;
+ unsigned yscale = SEGMENT.speed*8;
+ unsigned indexx = 0;
+
+ CRGBPalette16 pal = SEGMENT.check1 ? SEGPALETTE : CRGBPalette16(CRGB::Black, CRGB::Black, CRGB::Black, CRGB::Black,
+ CRGB::Red, CRGB::Red, CRGB::Red, CRGB::DarkOrange,
+ CRGB::DarkOrange,CRGB::DarkOrange, CRGB::Orange, CRGB::Orange,
+ CRGB::Yellow, CRGB::Orange, CRGB::Yellow, CRGB::Yellow);
+
+ for (int j=0; j < cols; j++) {
+ for (int i=0; i < rows; i++) {
+ indexx = inoise8(j*yscale*rows/255, i*xscale+strip.now/4); // We're moving along our Perlin map.
+ SEGMENT.setPixelColorXY(j, i, ColorFromPalette(pal, min(i*(indexx)>>4, 255U), i*255/cols, LINEARBLEND)); // With that value, look up the 8 bit colour palette value and assign it to the current LED.
+ } // for i
+ } // for j
+
+ return FRAMETIME;
+} // mode_2Dfirenoise()
+static const char _data_FX_MODE_2DFIRENOISE[] PROGMEM = "Firenoise@X scale,Y scale,,,,Palette;;!;2;pal=66";
+
+
+//////////////////////////////
+// 2D Frizzles //
+//////////////////////////////
+uint16_t mode_2DFrizzles(void) { // By: Stepko https://editor.soulmatelights.com/gallery/640-color-frizzles , Modified by: Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ SEGMENT.fadeToBlackBy(16);
+ for (size_t i = 8; i > 0; i--) {
+ SEGMENT.addPixelColorXY(beatsin8(SEGMENT.speed/8 + i, 0, cols - 1),
+ beatsin8(SEGMENT.intensity/8 - i, 0, rows - 1),
+ ColorFromPalette(SEGPALETTE, beatsin8(12, 0, 255), 255, LINEARBLEND));
+ }
+ SEGMENT.blur(SEGMENT.custom1>>3);
+
+ return FRAMETIME;
+} // mode_2DFrizzles()
+static const char _data_FX_MODE_2DFRIZZLES[] PROGMEM = "Frizzles@X frequency,Y frequency,Blur;;!;2";
+
+
+///////////////////////////////////////////
+// 2D Cellular Automata Game of life //
+///////////////////////////////////////////
+typedef struct ColorCount {
+ CRGB color;
+ int8_t count;
+} colorCount;
+
+uint16_t mode_2Dgameoflife(void) { // Written by Ewoud Wijma, inspired by https://natureofcode.com/book/chapter-7-cellular-automata/ and https://github.com/DougHaber/nlife-color
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+ const uint16_t dataSize = sizeof(CRGB) * SEGMENT.length(); // using width*height prevents reallocation if mirroring is enabled
+ const uint16_t crcBufferLen = 2; //(SEGMENT.width() + SEGMENT.height())*71/100; // roughly sqrt(2)/2 for better repetition detection (Ewowi)
+
+ if (!SEGENV.allocateData(dataSize + sizeof(uint16_t)*crcBufferLen)) return mode_static(); //allocation failed
+ CRGB *prevLeds = reinterpret_cast(SEGENV.data);
+ uint16_t *crcBuffer = reinterpret_cast(SEGENV.data + dataSize);
+
+ CRGB backgroundColor = SEGCOLOR(1);
+
+ if (SEGENV.call == 0 || strip.now - SEGMENT.step > 3000) {
+ SEGENV.step = strip.now;
+ SEGENV.aux0 = 0;
+ random16_set_seed(millis()>>2); //seed the random generator
+
+ //give the leds random state and colors (based on intensity, colors from palette or all posible colors are chosen)
+ for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
+ uint8_t state = random8()%2;
+ if (state == 0)
+ SEGMENT.setPixelColorXY(x,y, backgroundColor);
+ else
+ SEGMENT.setPixelColorXY(x,y, SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 255));
+ }
+
+ for (int y = 0; y < rows; y++) for (int x = 0; x < cols; x++) prevLeds[XY(x,y)] = CRGB::Black;
+ memset(crcBuffer, 0, sizeof(uint16_t)*crcBufferLen);
+ } else if (strip.now - SEGENV.step < FRAMETIME_FIXED * (uint32_t)map(SEGMENT.speed,0,255,64,4)) {
+ // update only when appropriate time passes (in 42 FPS slots)
+ return FRAMETIME;
+ }
+
+ //copy previous leds (save previous generation)
+ //NOTE: using lossy getPixelColor() is a benefit as endlessly repeating patterns will eventually fade out causing a reset
+ for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) prevLeds[XY(x,y)] = SEGMENT.getPixelColorXY(x,y);
+
+ //calculate new leds
+ for (int x = 0; x < cols; x++) for (int y = 0; y < rows; y++) {
+
+ colorCount colorsCount[9]; // count the different colors in the 3*3 matrix
+ for (int i=0; i<9; i++) colorsCount[i] = {backgroundColor, 0}; // init colorsCount
+
+ // iterate through neighbors and count them and their different colors
+ int neighbors = 0;
+ for (int i = -1; i <= 1; i++) for (int j = -1; j <= 1; j++) { // iterate through 3*3 matrix
+ if (i==0 && j==0) continue; // ignore itself
+ // wrap around segment
+ int16_t xx = x+i, yy = y+j;
+ if (x+i < 0) xx = cols-1; else if (x+i >= cols) xx = 0;
+ if (y+j < 0) yy = rows-1; else if (y+j >= rows) yy = 0;
+
+ uint16_t xy = XY(xx, yy); // previous cell xy to check
+ // count different neighbours and colors
+ if (prevLeds[xy] != backgroundColor) {
+ neighbors++;
+ bool colorFound = false;
+ int k;
+ for (k=0; k<9 && colorsCount[i].count != 0; k++)
+ if (colorsCount[k].color == prevLeds[xy]) {
+ colorsCount[k].count++;
+ colorFound = true;
+ }
+ if (!colorFound) colorsCount[k] = {prevLeds[xy], 1}; //add new color found in the array
+ }
+ } // i,j
+
+ // Rules of Life
+ uint32_t col = uint32_t(prevLeds[XY(x,y)]) & 0x00FFFFFF; // uint32_t operator returns RGBA, we want RGBW -> cut off "alpha" byte
+ uint32_t bgc = RGBW32(backgroundColor.r, backgroundColor.g, backgroundColor.b, 0);
+ if ((col != bgc) && (neighbors < 2)) SEGMENT.setPixelColorXY(x,y, bgc); // Loneliness
+ else if ((col != bgc) && (neighbors > 3)) SEGMENT.setPixelColorXY(x,y, bgc); // Overpopulation
+ else if ((col == bgc) && (neighbors == 3)) { // Reproduction
+ // find dominant color and assign it to a cell
+ colorCount dominantColorCount = {backgroundColor, 0};
+ for (int i=0; i<9 && colorsCount[i].count != 0; i++)
+ if (colorsCount[i].count > dominantColorCount.count) dominantColorCount = colorsCount[i];
+ // assign the dominant color w/ a bit of randomness to avoid "gliders"
+ if (dominantColorCount.count > 0 && random8(128)) SEGMENT.setPixelColorXY(x,y, dominantColorCount.color);
+ } else if ((col == bgc) && (neighbors == 2) && !random8(128)) { // Mutation
+ SEGMENT.setPixelColorXY(x,y, SEGMENT.color_from_palette(random8(), false, PALETTE_SOLID_WRAP, 255));
+ }
+ // else do nothing!
+ } //x,y
+
+ // calculate CRC16 of leds
+ uint16_t crc = crc16((const unsigned char*)prevLeds, dataSize);
+ // check if we had same CRC and reset if needed
+ bool repetition = false;
+ for (int i=0; i>1)+1);
+
+ for (int x = 0; x < cols; x++) {
+ for (int y = 0; y < rows; y++) {
+ SEGMENT.setPixelColorXY(x, y, SEGMENT.color_from_palette(sin8(cos8(x * SEGMENT.speed/16 + a / 3) + sin8(y * SEGMENT.intensity/16 + a / 4) + a), false, PALETTE_SOLID_WRAP, 0));
+ }
+ }
+
return FRAMETIME;
-}
\ No newline at end of file
+} // mode_2DHiphotic()
+static const char _data_FX_MODE_2DHIPHOTIC[] PROGMEM = "Hiphotic@X scale,Y scale,,,Speed;!;!;2";
+
+
+/////////////////////////
+// 2D Julia //
+/////////////////////////
+// Sliders are:
+// intensity = Maximum number of iterations per pixel.
+// Custom1 = Location of X centerpoint
+// Custom2 = Location of Y centerpoint
+// Custom3 = Size of the area (small value = smaller area)
+typedef struct Julia {
+ float xcen;
+ float ycen;
+ float xymag;
+} julia;
+
+uint16_t mode_2DJulia(void) { // An animated Julia set by Andrew Tuline.
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ if (!SEGENV.allocateData(sizeof(julia))) return mode_static();
+ Julia* julias = reinterpret_cast(SEGENV.data);
+
+ float reAl;
+ float imAg;
+
+ if (SEGENV.call == 0) { // Reset the center if we've just re-started this animation.
+ julias->xcen = 0.;
+ julias->ycen = 0.;
+ julias->xymag = 1.0;
+
+ SEGMENT.custom1 = 128; // Make sure the location widgets are centered to start.
+ SEGMENT.custom2 = 128;
+ SEGMENT.custom3 = 16;
+ SEGMENT.intensity = 24;
+ }
+
+ julias->xcen = julias->xcen + (float)(SEGMENT.custom1 - 128)/100000.f;
+ julias->ycen = julias->ycen + (float)(SEGMENT.custom2 - 128)/100000.f;
+ julias->xymag = julias->xymag + (float)((SEGMENT.custom3 - 16)<<3)/100000.f; // reduced resolution slider
+ if (julias->xymag < 0.01f) julias->xymag = 0.01f;
+ if (julias->xymag > 1.0f) julias->xymag = 1.0f;
+
+ float xmin = julias->xcen - julias->xymag;
+ float xmax = julias->xcen + julias->xymag;
+ float ymin = julias->ycen - julias->xymag;
+ float ymax = julias->ycen + julias->xymag;
+
+ // Whole set should be within -1.2,1.2 to -.8 to 1.
+ xmin = constrain(xmin, -1.2f, 1.2f);
+ xmax = constrain(xmax, -1.2f, 1.2f);
+ ymin = constrain(ymin, -0.8f, 1.0f);
+ ymax = constrain(ymax, -0.8f, 1.0f);
+
+ float dx; // Delta x is mapped to the matrix size.
+ float dy; // Delta y is mapped to the matrix size.
+
+ int maxIterations = 15; // How many iterations per pixel before we give up. Make it 8 bits to match our range of colours.
+ float maxCalc = 16.0; // How big is each calculation allowed to be before we give up.
+
+ maxIterations = SEGMENT.intensity/2;
+
+
+ // Resize section on the fly for some animaton.
+ reAl = -0.94299f; // PixelBlaze example
+ imAg = 0.3162f;
+
+ reAl += sin_t((float)millis()/305.f)/20.f;
+ imAg += sin_t((float)millis()/405.f)/20.f;
+
+ dx = (xmax - xmin) / (cols); // Scale the delta x and y values to our matrix size.
+ dy = (ymax - ymin) / (rows);
+
+ // Start y
+ float y = ymin;
+ for (int j = 0; j < rows; j++) {
+
+ // Start x
+ float x = xmin;
+ for (int i = 0; i < cols; i++) {
+
+ // Now we test, as we iterate z = z^2 + c does z tend towards infinity?
+ float a = x;
+ float b = y;
+ int iter = 0;
+
+ while (iter < maxIterations) { // Here we determine whether or not we're out of bounds.
+ float aa = a * a;
+ float bb = b * b;
+ float len = aa + bb;
+ if (len > maxCalc) { // |z| = sqrt(a^2+b^2) OR z^2 = a^2+b^2 to save on having to perform a square root.
+ break; // Bail
+ }
+
+ // This operation corresponds to z -> z^2+c where z=a+ib c=(x,y). Remember to use 'foil'.
+ b = 2*a*b + imAg;
+ a = aa - bb + reAl;
+ iter++;
+ } // while
+
+ // We color each pixel based on how long it takes to get to infinity, or black if it never gets there.
+ if (iter == maxIterations) {
+ SEGMENT.setPixelColorXY(i, j, 0);
+ } else {
+ SEGMENT.setPixelColorXY(i, j, SEGMENT.color_from_palette(iter*255/maxIterations, false, PALETTE_SOLID_WRAP, 0));
+ }
+ x += dx;
+ }
+ y += dy;
+ }
+// SEGMENT.blur(64);
+
+ return FRAMETIME;
+} // mode_2DJulia()
+static const char _data_FX_MODE_2DJULIA[] PROGMEM = "Julia@,Max iterations per pixel,X center,Y center,Area size;!;!;2;ix=24,c1=128,c2=128,c3=16";
+
+
+//////////////////////////////
+// 2D Lissajous //
+//////////////////////////////
+uint16_t mode_2DLissajous(void) { // By: Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ SEGMENT.fadeToBlackBy(SEGMENT.intensity);
+ uint_fast16_t phase = (millis() * (1 + SEGENV.custom3)) /32; // allow user to control rotation speed
+
+ //for (int i=0; i < 4*(cols+rows); i ++) {
+ for (int i=0; i < 256; i ++) {
+ //float xlocn = float(sin8(now/4+i*(SEGMENT.speed>>5))) / 255.0f;
+ //float ylocn = float(cos8(now/4+i*2)) / 255.0f;
+ uint_fast8_t xlocn = sin8(phase/2 + (i*SEGMENT.speed)/32);
+ uint_fast8_t ylocn = cos8(phase/2 + i*2);
+ xlocn = (cols < 2) ? 1 : (map(2*xlocn, 0,511, 0,2*(cols-1)) +1) /2; // softhack007: "(2* ..... +1) /2" for proper rounding
+ ylocn = (rows < 2) ? 1 : (map(2*ylocn, 0,511, 0,2*(rows-1)) +1) /2; // "rows > 1" is needed to avoid div/0 in map()
+ SEGMENT.setPixelColorXY((uint8_t)xlocn, (uint8_t)ylocn, SEGMENT.color_from_palette(millis()/100+i, false, PALETTE_SOLID_WRAP, 0));
+ }
+
+ return FRAMETIME;
+} // mode_2DLissajous()
+static const char _data_FX_MODE_2DLISSAJOUS[] PROGMEM = "Lissajous@X frequency,Fade rate,,,Speed;!;!;2;;c3=15";
+
+
+///////////////////////
+// 2D Matrix //
+///////////////////////
+uint16_t mode_2Dmatrix(void) { // Matrix2D. By Jeremy Williams. Adapted by Andrew Tuline & improved by merkisoft and ewowi, and softhack007.
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ if (SEGENV.call == 0) {
+ SEGMENT.fill(BLACK);
+ SEGENV.aux0 = SEGENV.aux1 = UINT16_MAX;
+ SEGENV.step = 0;
+ }
+
+ uint8_t fade = map(SEGMENT.custom1, 0, 255, 50, 250); // equals trail size
+ uint8_t speed = (256-SEGMENT.speed) >> map(MIN(rows, 150), 0, 150, 0, 3); // slower speeds for small displays
+
+ CRGB spawnColor;
+ CRGB trailColor;
+ if (SEGMENT.check1) {
+ spawnColor = SEGCOLOR(0);
+ trailColor = SEGCOLOR(1);
+ } else {
+ spawnColor = CRGB(175,255,175);
+ trailColor = CRGB(27,130,39);
+ }
+
+ if (strip.now - SEGENV.step >= speed) {
+ SEGENV.step = strip.now;
+ // find out what color value is returned by gPC for a "falling code" example pixel
+ // the color values returned may differ from the previously set values, due to
+ // - auto brightness limiter (dimming)
+ // - lossy color buffer (when not using global buffer)
+ // - color balance correction
+ // - segment opacity
+ CRGB oldSpawnColor = spawnColor;
+ if ((SEGENV.aux0 < cols) && (SEGENV.aux1 < rows)) { // we have a hint from last run
+ oldSpawnColor = SEGMENT.getPixelColorXY(SEGENV.aux0, SEGENV.aux1); // find color of previous spawns
+ SEGENV.aux1 ++; // our sample pixel will be one row down the next time
+ }
+ if ((oldSpawnColor == CRGB::Black) || (oldSpawnColor == trailColor)) oldSpawnColor = spawnColor; // reject "black", as it would mean that ALL pixels create trails
+
+ // move pixels one row down. Falling codes keep color and add trail pixels; all others pixels are faded
+ for (int row=rows-1; row>=0; row--) {
+ for (int col=0; col= rows); // empty screen means that the last falling code has moved out of screen area
+
+ // spawn new falling code
+ if (random8() <= SEGMENT.intensity || emptyScreen) {
+ uint8_t spawnX = random8(cols);
+ SEGMENT.setPixelColorXY(spawnX, 0, spawnColor);
+ // update hint for next run
+ SEGENV.aux0 = spawnX;
+ SEGENV.aux1 = 0;
+ }
+ } // if millis
+
+ return FRAMETIME;
+} // mode_2Dmatrix()
+static const char _data_FX_MODE_2DMATRIX[] PROGMEM = "Matrix@!,Spawning rate,Trail,,,Custom color;Spawn,Trail;;2";
+
+
+/////////////////////////
+// 2D Metaballs //
+/////////////////////////
+uint16_t mode_2Dmetaballs(void) { // Metaballs by Stefan Petrick. Cannot have one of the dimensions be 2 or less. Adapted by Andrew Tuline.
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ float speed = 0.25f * (1+(SEGMENT.speed>>6));
+
+ // get some 2 random moving points
+ uint8_t x2 = map(inoise8(strip.now * speed, 25355, 685), 0, 255, 0, cols-1);
+ uint8_t y2 = map(inoise8(strip.now * speed, 355, 11685), 0, 255, 0, rows-1);
+
+ uint8_t x3 = map(inoise8(strip.now * speed, 55355, 6685), 0, 255, 0, cols-1);
+ uint8_t y3 = map(inoise8(strip.now * speed, 25355, 22685), 0, 255, 0, rows-1);
+
+ // and one Lissajou function
+ uint8_t x1 = beatsin8(23 * speed, 0, cols-1);
+ uint8_t y1 = beatsin8(28 * speed, 0, rows-1);
+
+ for (int y = 0; y < rows; y++) {
+ for (int x = 0; x < cols; x++) {
+ // calculate distances of the 3 points from actual pixel
+ // and add them together with weightening
+ uint16_t dx = abs(x - x1);
+ uint16_t dy = abs(y - y1);
+ uint16_t dist = 2 * sqrt16((dx * dx) + (dy * dy));
+
+ dx = abs(x - x2);
+ dy = abs(y - y2);
+ dist += sqrt16((dx * dx) + (dy * dy));
+
+ dx = abs(x - x3);
+ dy = abs(y - y3);
+ dist += sqrt16((dx * dx) + (dy * dy));
+
+ // inverse result
+ byte color = dist ? 1000 / dist : 255;
+
+ // map color between thresholds
+ if (color > 0 and color < 60) {
+ SEGMENT.setPixelColorXY(x, y, SEGMENT.color_from_palette(map(color * 9, 9, 531, 0, 255), false, PALETTE_SOLID_WRAP, 0));
+ } else {
+ SEGMENT.setPixelColorXY(x, y, SEGMENT.color_from_palette(0, false, PALETTE_SOLID_WRAP, 0));
+ }
+ // show the 3 points, too
+ SEGMENT.setPixelColorXY(x1, y1, WHITE);
+ SEGMENT.setPixelColorXY(x2, y2, WHITE);
+ SEGMENT.setPixelColorXY(x3, y3, WHITE);
+ }
+ }
+
+ return FRAMETIME;
+} // mode_2Dmetaballs()
+static const char _data_FX_MODE_2DMETABALLS[] PROGMEM = "Metaballs@!;;!;2";
+
+
+//////////////////////
+// 2D Noise //
+//////////////////////
+uint16_t mode_2Dnoise(void) { // By Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ const uint16_t scale = SEGMENT.intensity+2;
+
+ for (int y = 0; y < rows; y++) {
+ for (int x = 0; x < cols; x++) {
+ uint8_t pixelHue8 = inoise8(x * scale, y * scale, millis() / (16 - SEGMENT.speed/16));
+ SEGMENT.setPixelColorXY(x, y, ColorFromPalette(SEGPALETTE, pixelHue8));
+ }
+ }
+
+ return FRAMETIME;
+} // mode_2Dnoise()
+static const char _data_FX_MODE_2DNOISE[] PROGMEM = "Noise2D@!,Scale;;!;2";
+
+
+//////////////////////////////
+// 2D Plasma Ball //
+//////////////////////////////
+uint16_t mode_2DPlasmaball(void) { // By: Stepko https://editor.soulmatelights.com/gallery/659-plasm-ball , Modified by: Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ SEGMENT.fadeToBlackBy(SEGMENT.custom1>>2);
+ uint_fast32_t t = (millis() * 8) / (256 - SEGMENT.speed); // optimized to avoid float
+ for (int i = 0; i < cols; i++) {
+ uint16_t thisVal = inoise8(i * 30, t, t);
+ uint16_t thisMax = map(thisVal, 0, 255, 0, cols-1);
+ for (int j = 0; j < rows; j++) {
+ uint16_t thisVal_ = inoise8(t, j * 30, t);
+ uint16_t thisMax_ = map(thisVal_, 0, 255, 0, rows-1);
+ uint16_t x = (i + thisMax_ - cols / 2);
+ uint16_t y = (j + thisMax - cols / 2);
+ uint16_t cx = (i + thisMax_);
+ uint16_t cy = (j + thisMax);
+
+ SEGMENT.addPixelColorXY(i, j, ((x - y > -2) && (x - y < 2)) ||
+ ((cols - 1 - x - y) > -2 && (cols - 1 - x - y < 2)) ||
+ (cols - cx == 0) ||
+ (cols - 1 - cx == 0) ||
+ ((rows - cy == 0) ||
+ (rows - 1 - cy == 0)) ? ColorFromPalette(SEGPALETTE, beat8(5), thisVal, LINEARBLEND) : CRGB::Black);
+ }
+ }
+ SEGMENT.blur(SEGMENT.custom2>>5);
+
+ return FRAMETIME;
+} // mode_2DPlasmaball()
+static const char _data_FX_MODE_2DPLASMABALL[] PROGMEM = "Plasma Ball@Speed,,Fade,Blur;;!;2";
+
+
+////////////////////////////////
+// 2D Polar Lights //
+////////////////////////////////
+//static float fmap(const float x, const float in_min, const float in_max, const float out_min, const float out_max) {
+// return (out_max - out_min) * (x - in_min) / (in_max - in_min) + out_min;
+//}
+uint16_t mode_2DPolarLights(void) { // By: Kostyantyn Matviyevskyy https://editor.soulmatelights.com/gallery/762-polar-lights , Modified by: Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ CRGBPalette16 auroraPalette = {0x000000, 0x003300, 0x006600, 0x009900, 0x00cc00, 0x00ff00, 0x33ff00, 0x66ff00, 0x99ff00, 0xccff00, 0xffff00, 0xffcc00, 0xff9900, 0xff6600, 0xff3300, 0xff0000};
+
+ if (SEGENV.call == 0) {
+ SEGMENT.fill(BLACK);
+ SEGENV.step = 0;
+ }
+
+ float adjustHeight = (float)map(rows, 8, 32, 28, 12); // maybe use mapf() ???
+ uint16_t adjScale = map(cols, 8, 64, 310, 63);
+/*
+ if (SEGENV.aux1 != SEGMENT.custom1/12) { // Hacky palette rotation. We need that black.
+ SEGENV.aux1 = SEGMENT.custom1/12;
+ for (int i = 0; i < 16; i++) {
+ long ilk;
+ ilk = (long)currentPalette[i].r << 16;
+ ilk += (long)currentPalette[i].g << 8;
+ ilk += (long)currentPalette[i].b;
+ ilk = (ilk << SEGENV.aux1) | (ilk >> (24 - SEGENV.aux1));
+ currentPalette[i].r = ilk >> 16;
+ currentPalette[i].g = ilk >> 8;
+ currentPalette[i].b = ilk;
+ }
+ }
+*/
+ uint16_t _scale = map(SEGMENT.intensity, 0, 255, 30, adjScale);
+ byte _speed = map(SEGMENT.speed, 0, 255, 128, 16);
+
+ for (int x = 0; x < cols; x++) {
+ for (int y = 0; y < rows; y++) {
+ SEGENV.step++;
+ SEGMENT.setPixelColorXY(x, y, ColorFromPalette(auroraPalette,
+ qsub8(
+ inoise8((SEGENV.step%2) + x * _scale, y * 16 + SEGENV.step % 16, SEGENV.step / _speed),
+ fabsf((float)rows / 2.0f - (float)y) * adjustHeight)));
+ }
+ }
+
+ return FRAMETIME;
+} // mode_2DPolarLights()
+static const char _data_FX_MODE_2DPOLARLIGHTS[] PROGMEM = "Polar Lights@!,Scale;;;2";
+
+
+/////////////////////////
+// 2D Pulser //
+/////////////////////////
+uint16_t mode_2DPulser(void) { // By: ldirko https://editor.soulmatelights.com/gallery/878-pulse-test , modifed by: Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ SEGMENT.fadeToBlackBy(8 - (SEGMENT.intensity>>5));
+ uint32_t a = strip.now / (18 - SEGMENT.speed / 16);
+ uint16_t x = (a / 14) % cols;
+ uint16_t y = map((sin8(a * 5) + sin8(a * 4) + sin8(a * 2)), 0, 765, rows-1, 0);
+ SEGMENT.setPixelColorXY(x, y, ColorFromPalette(SEGPALETTE, map(y, 0, rows-1, 0, 255), 255, LINEARBLEND));
+
+ SEGMENT.blur(1 + (SEGMENT.intensity>>4));
+
+ return FRAMETIME;
+} // mode_2DPulser()
+static const char _data_FX_MODE_2DPULSER[] PROGMEM = "Pulser@!,Blur;;!;2";
+
+
+/////////////////////////
+// 2D Sindots //
+/////////////////////////
+uint16_t mode_2DSindots(void) { // By: ldirko https://editor.soulmatelights.com/gallery/597-sin-dots , modified by: Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ if (SEGENV.call == 0) {
+ SEGMENT.fill(BLACK);
+ }
+
+ SEGMENT.fadeToBlackBy(SEGMENT.custom1>>3);
+
+ byte t1 = millis() / (257 - SEGMENT.speed); // 20;
+ byte t2 = sin8(t1) / 4 * 2;
+ for (int i = 0; i < 13; i++) {
+ byte x = sin8(t1 + i * SEGMENT.intensity/8)*(cols-1)/255; // max index now 255x15/255=15!
+ byte y = sin8(t2 + i * SEGMENT.intensity/8)*(rows-1)/255; // max index now 255x15/255=15!
+ SEGMENT.setPixelColorXY(x, y, ColorFromPalette(SEGPALETTE, i * 255 / 13, 255, LINEARBLEND));
+ }
+ SEGMENT.blur(SEGMENT.custom2>>3);
+
+ return FRAMETIME;
+} // mode_2DSindots()
+static const char _data_FX_MODE_2DSINDOTS[] PROGMEM = "Sindots@!,Dot distance,Fade rate,Blur;;!;2";
+
+
+//////////////////////////////
+// 2D Squared Swirl //
+//////////////////////////////
+// custom3 affects the blur amount.
+uint16_t mode_2Dsquaredswirl(void) { // By: Mark Kriegsman. https://gist.github.com/kriegsman/368b316c55221134b160
+ // Modifed by: Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ const uint8_t kBorderWidth = 2;
+
+ SEGMENT.fadeToBlackBy(24);
+ uint8_t blurAmount = SEGMENT.custom3>>1; // reduced resolution slider
+ SEGMENT.blur(blurAmount);
+
+ // Use two out-of-sync sine waves
+ uint8_t i = beatsin8(19, kBorderWidth, cols-kBorderWidth);
+ uint8_t j = beatsin8(22, kBorderWidth, cols-kBorderWidth);
+ uint8_t k = beatsin8(17, kBorderWidth, cols-kBorderWidth);
+ uint8_t m = beatsin8(18, kBorderWidth, rows-kBorderWidth);
+ uint8_t n = beatsin8(15, kBorderWidth, rows-kBorderWidth);
+ uint8_t p = beatsin8(20, kBorderWidth, rows-kBorderWidth);
+
+ uint16_t ms = millis();
+
+ SEGMENT.addPixelColorXY(i, m, ColorFromPalette(SEGPALETTE, ms/29, 255, LINEARBLEND));
+ SEGMENT.addPixelColorXY(j, n, ColorFromPalette(SEGPALETTE, ms/41, 255, LINEARBLEND));
+ SEGMENT.addPixelColorXY(k, p, ColorFromPalette(SEGPALETTE, ms/73, 255, LINEARBLEND));
+
+ return FRAMETIME;
+} // mode_2Dsquaredswirl()
+static const char _data_FX_MODE_2DSQUAREDSWIRL[] PROGMEM = "Squared Swirl@,,,,Blur;;!;2";
+
+
+//////////////////////////////
+// 2D Sun Radiation //
+//////////////////////////////
+uint16_t mode_2DSunradiation(void) { // By: ldirko https://editor.soulmatelights.com/gallery/599-sun-radiation , modified by: Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ if (!SEGENV.allocateData(sizeof(byte)*(cols+2)*(rows+2))) return mode_static(); //allocation failed
+ byte *bump = reinterpret_cast(SEGENV.data);
+
+ if (SEGENV.call == 0) {
+ SEGMENT.fill(BLACK);
+ }
+
+ unsigned long t = millis() / 4;
+ int index = 0;
+ uint8_t someVal = SEGMENT.speed/4; // Was 25.
+ for (int j = 0; j < (rows + 2); j++) {
+ for (int i = 0; i < (cols + 2); i++) {
+ byte col = (inoise8_raw(i * someVal, j * someVal, t)) / 2;
+ bump[index++] = col;
+ }
+ }
+
+ int yindex = cols + 3;
+ int16_t vly = -(rows / 2 + 1);
+ for (int y = 0; y < rows; y++) {
+ ++vly;
+ int16_t vlx = -(cols / 2 + 1);
+ for (int x = 0; x < cols; x++) {
+ ++vlx;
+ int8_t nx = bump[x + yindex + 1] - bump[x + yindex - 1];
+ int8_t ny = bump[x + yindex + (cols + 2)] - bump[x + yindex - (cols + 2)];
+ byte difx = abs8(vlx * 7 - nx);
+ byte dify = abs8(vly * 7 - ny);
+ int temp = difx * difx + dify * dify;
+ int col = 255 - temp / 8; //8 its a size of effect
+ if (col < 0) col = 0;
+ SEGMENT.setPixelColorXY(x, y, HeatColor(col / (3.0f-(float)(SEGMENT.intensity)/128.f)));
+ }
+ yindex += (cols + 2);
+ }
+
+ return FRAMETIME;
+} // mode_2DSunradiation()
+static const char _data_FX_MODE_2DSUNRADIATION[] PROGMEM = "Sun Radiation@Variance,Brightness;;;2";
+
+
+/////////////////////////
+// 2D Tartan //
+/////////////////////////
+uint16_t mode_2Dtartan(void) { // By: Elliott Kember https://editor.soulmatelights.com/gallery/3-tartan , Modified by: Andrew Tuline
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ if (SEGENV.call == 0) {
+ SEGMENT.fill(BLACK);
+ }
+
+ uint8_t hue, bri;
+ size_t intensity;
+ int offsetX = beatsin16(3, -360, 360);
+ int offsetY = beatsin16(2, -360, 360);
+ int sharpness = SEGMENT.custom3 / 8; // 0-3
+
+ for (int x = 0; x < cols; x++) {
+ for (int y = 0; y < rows; y++) {
+ hue = x * beatsin16(10, 1, 10) + offsetY;
+ intensity = bri = sin8(x * SEGMENT.speed/2 + offsetX);
+ for (int i=0; i>= 8*sharpness;
+ SEGMENT.setPixelColorXY(x, y, ColorFromPalette(SEGPALETTE, hue, intensity, LINEARBLEND));
+ hue = y * 3 + offsetX;
+ intensity = bri = sin8(y * SEGMENT.intensity/2 + offsetY);
+ for (int i=0; i>= 8*sharpness;
+ SEGMENT.addPixelColorXY(x, y, ColorFromPalette(SEGPALETTE, hue, intensity, LINEARBLEND));
+ }
+ }
+
+ return FRAMETIME;
+} // mode_2DTartan()
+static const char _data_FX_MODE_2DTARTAN[] PROGMEM = "Tartan@X scale,Y scale,,,Sharpness;;!;2";
+
+
+/////////////////////////
+// 2D spaceships //
+/////////////////////////
+uint16_t mode_2Dspaceships(void) { //// Space ships by stepko (c)05.02.21 [https://editor.soulmatelights.com/gallery/639-space-ships], adapted by Blaz Kristan (AKA blazoncek)
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ uint32_t tb = strip.now >> 12; // every ~4s
+ if (tb > SEGENV.step) {
+ int8_t dir = ++SEGENV.aux0;
+ dir += (int)random8(3)-1;
+ if (dir > 7) SEGENV.aux0 = 0;
+ else if (dir < 0) SEGENV.aux0 = 7;
+ else SEGENV.aux0 = dir;
+ SEGENV.step = tb + random8(4);
+ }
+
+ SEGMENT.fadeToBlackBy(map(SEGMENT.speed, 0, 255, 248, 16));
+ SEGMENT.move(SEGENV.aux0, 1);
+
+ for (size_t i = 0; i < 8; i++) {
+ byte x = beatsin8(12 + i, 2, cols - 3);
+ byte y = beatsin8(15 + i, 2, rows - 3);
+ CRGB color = ColorFromPalette(SEGPALETTE, beatsin8(12 + i, 0, 255), 255);
+ SEGMENT.addPixelColorXY(x, y, color);
+ if (cols > 24 || rows > 24) {
+ SEGMENT.addPixelColorXY(x+1, y, color);
+ SEGMENT.addPixelColorXY(x-1, y, color);
+ SEGMENT.addPixelColorXY(x, y+1, color);
+ SEGMENT.addPixelColorXY(x, y-1, color);
+ }
+ }
+ SEGMENT.blur(SEGMENT.intensity>>3);
+
+ return FRAMETIME;
+}
+static const char _data_FX_MODE_2DSPACESHIPS[] PROGMEM = "Spaceships@!,Blur;;!;2";
+
+
+/////////////////////////
+// 2D Crazy Bees //
+/////////////////////////
+//// Crazy bees by stepko (c)12.02.21 [https://editor.soulmatelights.com/gallery/651-crazy-bees], adapted by Blaz Kristan (AKA blazoncek)
+#define MAX_BEES 5
+uint16_t mode_2Dcrazybees(void) {
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ byte n = MIN(MAX_BEES, (rows * cols) / 256 + 1);
+
+ typedef struct Bee {
+ uint8_t posX, posY, aimX, aimY, hue;
+ int8_t deltaX, deltaY, signX, signY, error;
+ void aimed(uint16_t w, uint16_t h) {
+ random16_set_seed(millis());
+ aimX = random8(0, w);
+ aimY = random8(0, h);
+ hue = random8();
+ deltaX = abs(aimX - posX);
+ deltaY = abs(aimY - posY);
+ signX = posX < aimX ? 1 : -1;
+ signY = posY < aimY ? 1 : -1;
+ error = deltaX - deltaY;
+ };
+ } bee_t;
+
+ if (!SEGENV.allocateData(sizeof(bee_t)*MAX_BEES)) return mode_static(); //allocation failed
+ bee_t *bee = reinterpret_cast(SEGENV.data);
+
+ if (SEGENV.call == 0) {
+ for (size_t i = 0; i < n; i++) {
+ bee[i].posX = random8(0, cols);
+ bee[i].posY = random8(0, rows);
+ bee[i].aimed(cols, rows);
+ }
+ }
+
+ if (millis() > SEGENV.step) {
+ SEGENV.step = millis() + (FRAMETIME * 16 / ((SEGMENT.speed>>4)+1));
+
+ SEGMENT.fadeToBlackBy(32);
+
+ for (size_t i = 0; i < n; i++) {
+ SEGMENT.addPixelColorXY(bee[i].aimX + 1, bee[i].aimY, CHSV(bee[i].hue, 255, 255));
+ SEGMENT.addPixelColorXY(bee[i].aimX, bee[i].aimY + 1, CHSV(bee[i].hue, 255, 255));
+ SEGMENT.addPixelColorXY(bee[i].aimX - 1, bee[i].aimY, CHSV(bee[i].hue, 255, 255));
+ SEGMENT.addPixelColorXY(bee[i].aimX, bee[i].aimY - 1, CHSV(bee[i].hue, 255, 255));
+ if (bee[i].posX != bee[i].aimX || bee[i].posY != bee[i].aimY) {
+ SEGMENT.setPixelColorXY(bee[i].posX, bee[i].posY, CRGB(CHSV(bee[i].hue, 60, 255)));
+ int8_t error2 = bee[i].error * 2;
+ if (error2 > -bee[i].deltaY) {
+ bee[i].error -= bee[i].deltaY;
+ bee[i].posX += bee[i].signX;
+ }
+ if (error2 < bee[i].deltaX) {
+ bee[i].error += bee[i].deltaX;
+ bee[i].posY += bee[i].signY;
+ }
+ } else {
+ bee[i].aimed(cols, rows);
+ }
+ }
+ SEGMENT.blur(SEGMENT.intensity>>4);
+ }
+ return FRAMETIME;
+}
+static const char _data_FX_MODE_2DCRAZYBEES[] PROGMEM = "Crazy Bees@!,Blur;;;2";
+
+
+/////////////////////////
+// 2D Ghost Rider //
+/////////////////////////
+//// Ghost Rider by stepko (c)2021 [https://editor.soulmatelights.com/gallery/716-ghost-rider], adapted by Blaz Kristan (AKA blazoncek)
+#define LIGHTERS_AM 64 // max lighters (adequate for 32x32 matrix)
+uint16_t mode_2Dghostrider(void) {
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ typedef struct Lighter {
+ int16_t gPosX;
+ int16_t gPosY;
+ uint16_t gAngle;
+ int8_t angleSpeed;
+ uint16_t lightersPosX[LIGHTERS_AM];
+ uint16_t lightersPosY[LIGHTERS_AM];
+ uint16_t Angle[LIGHTERS_AM];
+ uint16_t time[LIGHTERS_AM];
+ bool reg[LIGHTERS_AM];
+ int8_t Vspeed;
+ } lighter_t;
+
+ if (!SEGENV.allocateData(sizeof(lighter_t))) return mode_static(); //allocation failed
+ lighter_t *lighter = reinterpret_cast(SEGENV.data);
+
+ const size_t maxLighters = min(cols + rows, LIGHTERS_AM);
+
+ if (SEGENV.aux0 != cols || SEGENV.aux1 != rows) {
+ SEGENV.aux0 = cols;
+ SEGENV.aux1 = rows;
+ random16_set_seed(strip.now);
+ lighter->angleSpeed = random8(0,20) - 10;
+ lighter->gAngle = random16();
+ lighter->Vspeed = 5;
+ lighter->gPosX = (cols/2) * 10;
+ lighter->gPosY = (rows/2) * 10;
+ for (size_t i = 0; i < maxLighters; i++) {
+ lighter->lightersPosX[i] = lighter->gPosX;
+ lighter->lightersPosY[i] = lighter->gPosY + i;
+ lighter->time[i] = i * 2;
+ lighter->reg[i] = false;
+ }
+ }
+
+ if (millis() > SEGENV.step) {
+ SEGENV.step = millis() + 1024 / (cols+rows);
+
+ SEGMENT.fadeToBlackBy((SEGMENT.speed>>2)+64);
+
+ CRGB color = CRGB::White;
+ SEGMENT.wu_pixel(lighter->gPosX * 256 / 10, lighter->gPosY * 256 / 10, color);
+
+ lighter->gPosX += lighter->Vspeed * sin_t(radians(lighter->gAngle));
+ lighter->gPosY += lighter->Vspeed * cos_t(radians(lighter->gAngle));
+ lighter->gAngle += lighter->angleSpeed;
+ if (lighter->gPosX < 0) lighter->gPosX = (cols - 1) * 10;
+ if (lighter->gPosX > (cols - 1) * 10) lighter->gPosX = 0;
+ if (lighter->gPosY < 0) lighter->gPosY = (rows - 1) * 10;
+ if (lighter->gPosY > (rows - 1) * 10) lighter->gPosY = 0;
+ for (size_t i = 0; i < maxLighters; i++) {
+ lighter->time[i] += random8(5, 20);
+ if (lighter->time[i] >= 255 ||
+ (lighter->lightersPosX[i] <= 0) ||
+ (lighter->lightersPosX[i] >= (cols - 1) * 10) ||
+ (lighter->lightersPosY[i] <= 0) ||
+ (lighter->lightersPosY[i] >= (rows - 1) * 10)) {
+ lighter->reg[i] = true;
+ }
+ if (lighter->reg[i]) {
+ lighter->lightersPosY[i] = lighter->gPosY;
+ lighter->lightersPosX[i] = lighter->gPosX;
+ lighter->Angle[i] = lighter->gAngle + random(-10, 10);
+ lighter->time[i] = 0;
+ lighter->reg[i] = false;
+ } else {
+ lighter->lightersPosX[i] += -7 * sin_t(radians(lighter->Angle[i]));
+ lighter->lightersPosY[i] += -7 * cos_t(radians(lighter->Angle[i]));
+ }
+ SEGMENT.wu_pixel(lighter->lightersPosX[i] * 256 / 10, lighter->lightersPosY[i] * 256 / 10, ColorFromPalette(SEGPALETTE, (256 - lighter->time[i])));
+ }
+ SEGMENT.blur(SEGMENT.intensity>>3);
+ }
+
+ return FRAMETIME;
+}
+static const char _data_FX_MODE_2DGHOSTRIDER[] PROGMEM = "Ghost Rider@Fade rate,Blur;;!;2";
+
+
+////////////////////////////
+// 2D Floating Blobs //
+////////////////////////////
+//// Floating Blobs by stepko (c)2021 [https://editor.soulmatelights.com/gallery/573-blobs], adapted by Blaz Kristan (AKA blazoncek)
+#define MAX_BLOBS 8
+uint16_t mode_2Dfloatingblobs(void) {
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ typedef struct Blob {
+ float x[MAX_BLOBS], y[MAX_BLOBS];
+ float sX[MAX_BLOBS], sY[MAX_BLOBS]; // speed
+ float r[MAX_BLOBS];
+ bool grow[MAX_BLOBS];
+ byte color[MAX_BLOBS];
+ } blob_t;
+
+ uint8_t Amount = (SEGMENT.intensity>>5) + 1; // NOTE: be sure to update MAX_BLOBS if you change this
+
+ if (!SEGENV.allocateData(sizeof(blob_t))) return mode_static(); //allocation failed
+ blob_t *blob = reinterpret_cast(SEGENV.data);
+
+ if (SEGENV.aux0 != cols || SEGENV.aux1 != rows) {
+ SEGENV.aux0 = cols; // re-initialise if virtual size changes
+ SEGENV.aux1 = rows;
+ //SEGMENT.fill(BLACK);
+ for (size_t i = 0; i < MAX_BLOBS; i++) {
+ blob->r[i] = random8(1, cols>8 ? (cols/4) : 2);
+ blob->sX[i] = (float) random8(3, cols) / (float)(256 - SEGMENT.speed); // speed x
+ blob->sY[i] = (float) random8(3, rows) / (float)(256 - SEGMENT.speed); // speed y
+ blob->x[i] = random8(0, cols-1);
+ blob->y[i] = random8(0, rows-1);
+ blob->color[i] = random8();
+ blob->grow[i] = (blob->r[i] < 1.f);
+ if (blob->sX[i] == 0) blob->sX[i] = 1;
+ if (blob->sY[i] == 0) blob->sY[i] = 1;
+ }
+ }
+
+ SEGMENT.fadeToBlackBy((SEGMENT.custom2>>3)+1);
+
+ // Bounce balls around
+ for (size_t i = 0; i < Amount; i++) {
+ if (SEGENV.step < millis()) blob->color[i] = add8(blob->color[i], 4); // slowly change color
+ // change radius if needed
+ if (blob->grow[i]) {
+ // enlarge radius until it is >= 4
+ blob->r[i] += (fabsf(blob->sX[i]) > fabsf(blob->sY[i]) ? fabsf(blob->sX[i]) : fabsf(blob->sY[i])) * 0.05f;
+ if (blob->r[i] >= MIN(cols/4.f,2.f)) {
+ blob->grow[i] = false;
+ }
+ } else {
+ // reduce radius until it is < 1
+ blob->r[i] -= (fabsf(blob->sX[i]) > fabsf(blob->sY[i]) ? fabsf(blob->sX[i]) : fabsf(blob->sY[i])) * 0.05f;
+ if (blob->r[i] < 1.f) {
+ blob->grow[i] = true;
+ }
+ }
+ uint32_t c = SEGMENT.color_from_palette(blob->color[i], false, false, 0);
+ if (blob->r[i] > 1.f) SEGMENT.fill_circle(blob->x[i], blob->y[i], roundf(blob->r[i]), c);
+ else SEGMENT.setPixelColorXY(blob->x[i], blob->y[i], c);
+ // move x
+ if (blob->x[i] + blob->r[i] >= cols - 1) blob->x[i] += (blob->sX[i] * ((cols - 1 - blob->x[i]) / blob->r[i] + 0.005f));
+ else if (blob->x[i] - blob->r[i] <= 0) blob->x[i] += (blob->sX[i] * (blob->x[i] / blob->r[i] + 0.005f));
+ else blob->x[i] += blob->sX[i];
+ // move y
+ if (blob->y[i] + blob->r[i] >= rows - 1) blob->y[i] += (blob->sY[i] * ((rows - 1 - blob->y[i]) / blob->r[i] + 0.005f));
+ else if (blob->y[i] - blob->r[i] <= 0) blob->y[i] += (blob->sY[i] * (blob->y[i] / blob->r[i] + 0.005f));
+ else blob->y[i] += blob->sY[i];
+ // bounce x
+ if (blob->x[i] < 0.01f) {
+ blob->sX[i] = (float)random8(3, cols) / (256 - SEGMENT.speed);
+ blob->x[i] = 0.01f;
+ } else if (blob->x[i] > (float)cols - 1.01f) {
+ blob->sX[i] = (float)random8(3, cols) / (256 - SEGMENT.speed);
+ blob->sX[i] = -blob->sX[i];
+ blob->x[i] = (float)cols - 1.01f;
+ }
+ // bounce y
+ if (blob->y[i] < 0.01f) {
+ blob->sY[i] = (float)random8(3, rows) / (256 - SEGMENT.speed);
+ blob->y[i] = 0.01f;
+ } else if (blob->y[i] > (float)rows - 1.01f) {
+ blob->sY[i] = (float)random8(3, rows) / (256 - SEGMENT.speed);
+ blob->sY[i] = -blob->sY[i];
+ blob->y[i] = (float)rows - 1.01f;
+ }
+ }
+ SEGMENT.blur(SEGMENT.custom1>>2);
+
+ if (SEGENV.step < millis()) SEGENV.step = millis() + 2000; // change colors every 2 seconds
+
+ return FRAMETIME;
+}
+#undef MAX_BLOBS
+static const char _data_FX_MODE_2DBLOBS[] PROGMEM = "Blobs@!,# blobs,Blur,Trail;!;!;2;c1=8";
+
+
+////////////////////////////
+// 2D Scrolling text //
+////////////////////////////
+uint16_t mode_2Dscrollingtext(void) {
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ int letterWidth, rotLW;
+ int letterHeight, rotLH;
+ switch (map(SEGMENT.custom2, 0, 255, 1, 5)) {
+ default:
+ case 1: letterWidth = 4; letterHeight = 6; break;
+ case 2: letterWidth = 5; letterHeight = 8; break;
+ case 3: letterWidth = 6; letterHeight = 8; break;
+ case 4: letterWidth = 7; letterHeight = 9; break;
+ case 5: letterWidth = 5; letterHeight = 12; break;
+ }
+ // letters are rotated
+ if (((SEGMENT.custom3+1)>>3) % 2) {
+ rotLH = letterWidth;
+ rotLW = letterHeight;
+ } else {
+ rotLW = letterWidth;
+ rotLH = letterHeight;
+ }
+
+ char text[WLED_MAX_SEGNAME_LEN+1] = {'\0'};
+ if (SEGMENT.name) for (size_t i=0,j=0; i31 && SEGMENT.name[i]<128) text[j++] = SEGMENT.name[i];
+ const bool zero = strchr(text, '0') != nullptr;
+
+ char sec[5];
+ int AmPmHour = hour(localTime);
+ bool isitAM = true;
+ if (useAMPM) {
+ if (AmPmHour > 11) { AmPmHour -= 12; isitAM = false; }
+ if (AmPmHour == 0) { AmPmHour = 12; }
+ sprintf_P(sec, PSTR(" %2s"), (isitAM ? "AM" : "PM"));
+ } else {
+ sprintf_P(sec, PSTR(":%02d"), second(localTime));
+ }
+
+ if (!strlen(text)) { // fallback if empty segment name: display date and time
+ sprintf_P(text, PSTR("%s %d, %d %d:%02d%s"), monthShortStr(month(localTime)), day(localTime), year(localTime), AmPmHour, minute(localTime), sec);
+ } else {
+ if (!strncmp_P(text,PSTR("#DATE"),5)) sprintf_P(text, zero?PSTR("%02d.%02d.%04d"):PSTR("%d.%d.%d"), day(localTime), month(localTime), year(localTime));
+ else if (!strncmp_P(text,PSTR("#DDMM"),5)) sprintf_P(text, zero?PSTR("%02d.%02d") :PSTR("%d.%d"), day(localTime), month(localTime));
+ else if (!strncmp_P(text,PSTR("#MMDD"),5)) sprintf_P(text, zero?PSTR("%02d/%02d") :PSTR("%d/%d"), month(localTime), day(localTime));
+ else if (!strncmp_P(text,PSTR("#TIME"),5)) sprintf_P(text, zero?PSTR("%02d:%02d%s") :PSTR("%2d:%02d%s"), AmPmHour, minute(localTime), sec);
+ else if (!strncmp_P(text,PSTR("#HHMM"),5)) sprintf_P(text, zero?PSTR("%02d:%02d") :PSTR("%d:%02d"), AmPmHour, minute(localTime));
+ else if (!strncmp_P(text,PSTR("#HH"),3)) sprintf_P(text, zero?PSTR("%02d") :PSTR("%d"), AmPmHour);
+ else if (!strncmp_P(text,PSTR("#MM"),3)) sprintf_P(text, zero?PSTR("%02d") :PSTR("%d"), minute(localTime));
+ }
+
+ const int numberOfLetters = strlen(text);
+ const unsigned long now = millis(); // reduce millis() calls
+ int width = (numberOfLetters * rotLW);
+ int yoffset = map(SEGMENT.intensity, 0, 255, -rows/2, rows/2) + (rows-rotLH)/2;
+ if (width <= cols) {
+ // scroll vertically (e.g. ^^ Way out ^^) if it fits
+ int speed = map(SEGMENT.speed, 0, 255, 5000, 1000);
+ int frac = now % speed + 1;
+ if (SEGMENT.intensity == 255) {
+ yoffset = (2 * frac * rows)/speed - rows;
+ } else if (SEGMENT.intensity == 0) {
+ yoffset = rows - (2 * frac * rows)/speed;
+ }
+ }
+
+ if (SEGENV.step < now) {
+ // calculate start offset
+ if (width > cols) {
+ if (SEGMENT.check3) {
+ if (SEGENV.aux0 == 0) SEGENV.aux0 = width + cols - 1;
+ else --SEGENV.aux0;
+ } else ++SEGENV.aux0 %= width + cols;
+ } else SEGENV.aux0 = (cols + width)/2;
+ ++SEGENV.aux1 &= 0xFF; // color shift
+ SEGENV.step = now + map(SEGMENT.speed, 0, 255, 250, 50); // shift letters every ~250ms to ~50ms
+ }
+
+ if (!SEGMENT.check2) SEGMENT.fade_out(255 - (SEGMENT.custom1>>4)); // trail
+
+ for (int i = 0; i < numberOfLetters; i++) {
+ int xoffset = int(cols) - int(SEGENV.aux0) + rotLW*i;
+ if (xoffset + rotLW < 0) continue; // don't draw characters off-screen
+ uint32_t col1 = SEGMENT.color_from_palette(SEGENV.aux1, false, PALETTE_SOLID_WRAP, 0);
+ uint32_t col2 = BLACK;
+ if (SEGMENT.check1 && SEGMENT.palette == 0) {
+ col1 = SEGCOLOR(0);
+ col2 = SEGCOLOR(2);
+ }
+ SEGMENT.drawCharacter(text[i], xoffset, yoffset, letterWidth, letterHeight, col1, col2, map(SEGMENT.custom3, 0, 31, -2, 2));
+ }
+
+ return FRAMETIME;
+}
+static const char _data_FX_MODE_2DSCROLLTEXT[] PROGMEM = "Scrolling Text@!,Y Offset,Trail,Font size,Rotate,Gradient,Overlay,Reverse;!,!,Gradient;!;2;ix=128,c1=0,rev=0,mi=0,rY=0,mY=0";
+
+
+////////////////////////////
+// 2D Drift Rose //
+////////////////////////////
+//// Drift Rose by stepko (c)2021 [https://editor.soulmatelights.com/gallery/1369-drift-rose-pattern], adapted by Blaz Kristan (AKA blazoncek)
+uint16_t mode_2Ddriftrose(void) {
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ const float CX = (cols-cols%2)/2.f - .5f;
+ const float CY = (rows-rows%2)/2.f - .5f;
+ const float L = min(cols, rows) / 2.f;
+
+ SEGMENT.fadeToBlackBy(32+(SEGMENT.speed>>3));
+ for (size_t i = 1; i < 37; i++) {
+ uint32_t x = (CX + (sin_t(radians(i * 10)) * (beatsin8(i, 0, L*2)-L))) * 255.f;
+ uint32_t y = (CY + (cos_t(radians(i * 10)) * (beatsin8(i, 0, L*2)-L))) * 255.f;
+ SEGMENT.wu_pixel(x, y, CHSV(i * 10, 255, 255));
+ }
+ SEGMENT.blur((SEGMENT.intensity>>4)+1);
+
+ return FRAMETIME;
+}
+static const char _data_FX_MODE_2DDRIFTROSE[] PROGMEM = "Drift Rose@Fade,Blur;;;2";
+
+#endif // WLED_DISABLE_2D
+
+
+///////////////////////////////////////////////////////////////////////////////
+/******************** audio enhanced routines ************************/
+///////////////////////////////////////////////////////////////////////////////
+
+
+/* use the following code to pass AudioReactive usermod variables to effect
+
+ uint8_t *binNum = (uint8_t*)&SEGENV.aux1, *maxVol = (uint8_t*)(&SEGENV.aux1+1); // just in case assignment
+ bool samplePeak = false;
+ float FFT_MajorPeak = 1.0;
+ uint8_t *fftResult = nullptr;
+ float *fftBin = nullptr;
+ um_data_t *um_data;
+ if (usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
+ volumeSmth = *(float*) um_data->u_data[0];
+ volumeRaw = *(float*) um_data->u_data[1];
+ fftResult = (uint8_t*) um_data->u_data[2];
+ samplePeak = *(uint8_t*) um_data->u_data[3];
+ FFT_MajorPeak = *(float*) um_data->u_data[4];
+ my_magnitude = *(float*) um_data->u_data[5];
+ maxVol = (uint8_t*) um_data->u_data[6]; // requires UI element (SEGMENT.customX?), changes source element
+ binNum = (uint8_t*) um_data->u_data[7]; // requires UI element (SEGMENT.customX?), changes source element
+ fftBin = (float*) um_data->u_data[8];
+ } else {
+ // add support for no audio data
+ um_data = simulateSound(SEGMENT.soundSim);
+ }
+*/
+
+
+// a few constants needed for AudioReactive effects
+
+// for 22Khz sampling
+#define MAX_FREQUENCY 11025 // sample frequency / 2 (as per Nyquist criterion)
+#define MAX_FREQ_LOG10 4.04238f // log10(MAX_FREQUENCY)
+
+// for 20Khz sampling
+//#define MAX_FREQUENCY 10240
+//#define MAX_FREQ_LOG10 4.0103f
+
+// for 10Khz sampling
+//#define MAX_FREQUENCY 5120
+//#define MAX_FREQ_LOG10 3.71f
+
+
+/////////////////////////////////
+// * Ripple Peak //
+/////////////////////////////////
+uint16_t mode_ripplepeak(void) { // * Ripple peak. By Andrew Tuline.
+ // This currently has no controls.
+ #define maxsteps 16 // Case statement wouldn't allow a variable.
+
+ uint16_t maxRipples = 16;
+ uint16_t dataSize = sizeof(Ripple) * maxRipples;
+ if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
+ Ripple* ripples = reinterpret_cast(SEGENV.data);
+
+ um_data_t *um_data;
+ if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
+ // add support for no audio
+ um_data = simulateSound(SEGMENT.soundSim);
+ }
+ uint8_t samplePeak = *(uint8_t*)um_data->u_data[3];
+ #ifdef ESP32
+ float FFT_MajorPeak = *(float*) um_data->u_data[4];
+ #endif
+ uint8_t *maxVol = (uint8_t*)um_data->u_data[6];
+ uint8_t *binNum = (uint8_t*)um_data->u_data[7];
+
+ // printUmData();
+
+ if (SEGENV.call == 0) {
+ SEGENV.aux0 = 255;
+ SEGMENT.custom1 = *binNum;
+ SEGMENT.custom2 = *maxVol * 2;
+ }
+
+ *binNum = SEGMENT.custom1; // Select a bin.
+ *maxVol = SEGMENT.custom2 / 2; // Our volume comparator.
+
+ SEGMENT.fade_out(240); // Lower frame rate means less effective fading than FastLED
+ SEGMENT.fade_out(240);
+
+ for (int i = 0; i < SEGMENT.intensity/16; i++) { // Limit the number of ripples.
+ if (samplePeak) ripples[i].state = 255;
+
+ switch (ripples[i].state) {
+ case 254: // Inactive mode
+ break;
+
+ case 255: // Initialize ripple variables.
+ ripples[i].pos = random16(SEGLEN);
+ #ifdef ESP32
+ if (FFT_MajorPeak > 1) // log10(0) is "forbidden" (throws exception)
+ ripples[i].color = (int)(log10f(FFT_MajorPeak)*128);
+ else ripples[i].color = 0;
+ #else
+ ripples[i].color = random8();
+ #endif
+ ripples[i].state = 0;
+ break;
+
+ case 0:
+ SEGMENT.setPixelColor(ripples[i].pos, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(ripples[i].color, false, PALETTE_SOLID_WRAP, 0), SEGENV.aux0));
+ ripples[i].state++;
+ break;
+
+ case maxsteps: // At the end of the ripples. 254 is an inactive mode.
+ ripples[i].state = 254;
+ break;
+
+ default: // Middle of the ripples.
+ SEGMENT.setPixelColor((ripples[i].pos + ripples[i].state + SEGLEN) % SEGLEN, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(ripples[i].color, false, PALETTE_SOLID_WRAP, 0), SEGENV.aux0/ripples[i].state*2));
+ SEGMENT.setPixelColor((ripples[i].pos - ripples[i].state + SEGLEN) % SEGLEN, color_blend(SEGCOLOR(1), SEGMENT.color_from_palette(ripples[i].color, false, PALETTE_SOLID_WRAP, 0), SEGENV.aux0/ripples[i].state*2));
+ ripples[i].state++; // Next step.
+ break;
+ } // switch step
+ } // for i
+
+ return FRAMETIME;
+} // mode_ripplepeak()
+static const char _data_FX_MODE_RIPPLEPEAK[] PROGMEM = "Ripple Peak@Fade rate,Max # of ripples,Select bin,Volume (min);!,!;!;1v;c2=0,m12=0,si=0"; // Pixel, Beatsin
+
+
+#ifndef WLED_DISABLE_2D
+/////////////////////////
+// * 2D Swirl //
+/////////////////////////
+// By: Mark Kriegsman https://gist.github.com/kriegsman/5adca44e14ad025e6d3b , modified by Andrew Tuline
+uint16_t mode_2DSwirl(void) {
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ if (SEGENV.call == 0) {
+ SEGMENT.fill(BLACK);
+ }
+
+ const uint8_t borderWidth = 2;
+
+ SEGMENT.blur(SEGMENT.custom1);
+
+ uint8_t i = beatsin8( 27*SEGMENT.speed/255, borderWidth, cols - borderWidth);
+ uint8_t j = beatsin8( 41*SEGMENT.speed/255, borderWidth, rows - borderWidth);
+ uint8_t ni = (cols - 1) - i;
+ uint8_t nj = (cols - 1) - j;
+ uint16_t ms = millis();
+
+ um_data_t *um_data;
+ if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
+ // add support for no audio
+ um_data = simulateSound(SEGMENT.soundSim);
+ }
+ float volumeSmth = *(float*) um_data->u_data[0]; //ewowi: use instead of sampleAvg???
+ int16_t volumeRaw = *(int16_t*) um_data->u_data[1];
+
+ SEGMENT.addPixelColorXY( i, j, ColorFromPalette(SEGPALETTE, (ms / 11 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 11, 200, 255);
+ SEGMENT.addPixelColorXY( j, i, ColorFromPalette(SEGPALETTE, (ms / 13 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 13, 200, 255);
+ SEGMENT.addPixelColorXY(ni,nj, ColorFromPalette(SEGPALETTE, (ms / 17 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 17, 200, 255);
+ SEGMENT.addPixelColorXY(nj,ni, ColorFromPalette(SEGPALETTE, (ms / 29 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 29, 200, 255);
+ SEGMENT.addPixelColorXY( i,nj, ColorFromPalette(SEGPALETTE, (ms / 37 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 37, 200, 255);
+ SEGMENT.addPixelColorXY(ni, j, ColorFromPalette(SEGPALETTE, (ms / 41 + volumeSmth*4), volumeRaw * SEGMENT.intensity / 64, LINEARBLEND)); //CHSV( ms / 41, 200, 255);
+
+ return FRAMETIME;
+} // mode_2DSwirl()
+static const char _data_FX_MODE_2DSWIRL[] PROGMEM = "Swirl@!,Sensitivity,Blur;,Bg Swirl;!;2v;ix=64,si=0"; // Beatsin // TODO: color 1 unused?
+
+
+/////////////////////////
+// * 2D Waverly //
+/////////////////////////
+// By: Stepko, https://editor.soulmatelights.com/gallery/652-wave , modified by Andrew Tuline
+uint16_t mode_2DWaverly(void) {
+ if (!strip.isMatrix) return mode_static(); // not a 2D set-up
+
+ const uint16_t cols = SEGMENT.virtualWidth();
+ const uint16_t rows = SEGMENT.virtualHeight();
+
+ um_data_t *um_data;
+ if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
+ // add support for no audio
+ um_data = simulateSound(SEGMENT.soundSim);
+ }
+ float volumeSmth = *(float*) um_data->u_data[0];
+
+ SEGMENT.fadeToBlackBy(SEGMENT.speed);
+
+ long t = millis() / 2;
+ for (int i = 0; i < cols; i++) {
+ uint16_t thisVal = (1 + SEGMENT.intensity/64) * inoise8(i * 45 , t , t)/2;
+ // use audio if available
+ if (um_data) {
+ thisVal /= 32; // reduce intensity of inoise8()
+ thisVal *= volumeSmth;
+ }
+ uint16_t thisMax = map(thisVal, 0, 512, 0, rows);
+
+ for (int j = 0; j < thisMax; j++) {
+ SEGMENT.addPixelColorXY(i, j, ColorFromPalette(SEGPALETTE, map(j, 0, thisMax, 250, 0), 255, LINEARBLEND));
+ SEGMENT.addPixelColorXY((cols - 1) - i, (rows - 1) - j, ColorFromPalette(SEGPALETTE, map(j, 0, thisMax, 250, 0), 255, LINEARBLEND));
+ }
+ }
+ SEGMENT.blur(16);
+
+ return FRAMETIME;
+} // mode_2DWaverly()
+static const char _data_FX_MODE_2DWAVERLY[] PROGMEM = "Waverly@Amplification,Sensitivity;;!;2v;ix=64,si=0"; // Beatsin
+
+#endif // WLED_DISABLE_2D
+
+// float version of map()
+static float mapf(float x, float in_min, float in_max, float out_min, float out_max){
+ return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+}
+
+// Gravity struct requited for GRAV* effects
+typedef struct Gravity {
+ int topLED;
+ int gravityCounter;
+} gravity;
+
+///////////////////////
+// * GRAVCENTER //
+///////////////////////
+uint16_t mode_gravcenter(void) { // Gravcenter. By Andrew Tuline.
+ if (SEGLEN == 1) return mode_static();
+
+ const uint16_t dataSize = sizeof(gravity);
+ if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
+ Gravity* gravcen = reinterpret_cast(SEGENV.data);
+
+ um_data_t *um_data;
+ if (!usermods.getUMData(&um_data, USERMOD_ID_AUDIOREACTIVE)) {
+ // add support for no audio
+ um_data = simulateSound(SEGMENT.soundSim);
+ }
+ float volumeSmth = *(float*) um_data->u_data[0];
+
+ //SEGMENT.fade_out(240);
+ SEGMENT.fade_out(251); // 30%
+
+ float segmentSampleAvg = volumeSmth * (float)SEGMENT.intensity / 255.0f;
+ segmentSampleAvg *= 0.125; // divide by 8, to compensate for later "sensitivity" upscaling
+
+ float mySampleAvg = mapf(segmentSampleAvg*2.0, 0, 32, 0, (float)SEGLEN/2.0f); // map to pixels available in current segment
+ uint16_t tempsamp = constrain(mySampleAvg, 0, SEGLEN/2); // Keep the sample from overflowing.
+ uint8_t gravity = 8 - SEGMENT.speed/32;
+
+ for (int i=0; i= gravcen->topLED)
+ gravcen->topLED = tempsamp-1;
+ else if (gravcen->gravityCounter % gravity == 0)
+ gravcen->topLED--;
+
+ if (gravcen->topLED >= 0) {
+ SEGMENT.setPixelColor(gravcen->topLED+SEGLEN/2, SEGMENT.color_from_palette(millis(), false, PALETTE_SOLID_WRAP, 0));
+ SEGMENT.setPixelColor(SEGLEN/2-1-gravcen->topLED, SEGMENT.color_from_palette(millis(), false, PALETTE_SOLID_WRAP, 0));
+ }
+ gravcen->gravityCounter = (gravcen->gravityCounter + 1) % gravity;
+
+ return FRAMETIME;
+} // mode_gravcenter()
+static const char _data_FX_MODE_GRAVCENTER[] PROGMEM = "Gravcenter@Rate of fall,Sensitivity;!,!;!;1v;ix=128,m12=2,si=0"; // Circle, Beatsin
+
+
+///////////////////////
+// * GRAVCENTRIC //
+///////////////////////
+uint16_t mode_gravcentric(void) { // Gravcentric. By Andrew Tuline.
+ if (SEGLEN == 1) return mode_static();
+
+ uint16_t dataSize = sizeof(gravity);
+ if (!SEGENV.allocateData(dataSize)) return mode_static(); //allocation failed
+ Gravity* gravcen = reinterpret_cast