-## 💾 Compatible LED Strips
-Type | Voltage | Comments
-|---|---|---|
-WS2812B | 5v |
-WS2813 | 5v |
-SK6812 | 5v | RGBW
-APA102 | 5v | C/D
-WS2801 | 5v | C/D
-LPD8806 | 5v | C/D
-TM1814 | 12v | RGBW
-WS2811 | 12v | 3-LED segments
-WS2815 | 12v |
-GS8208 | 12v |
-Analog/non-addressable | any | Requires additional circuitry
-
-## 🧊 Compatible PC RGB Fans and ARGB accessories
-Brand | Model | Comments
-|---|---|---|
-Corsair | HD120 Fan | Uses WS2812B, data-in only
-PCCOOLER | Moonlight 5-pack Fans | Uses WS2812B, includes Data-out connector to keep each fan uniquely addressable if wired in series like traditional LED strips
-Any | 5v 3-pin ARGB for PC | Any PC RGB device that supports the 5v 3-pin ARGB motherboard header should work fine with WLED. All the major motherboard vendors support the Corsair HD120 and PCCOOLER fans listed, so we can safely assume any device that supports motherboard ARGB 5V 3-Pin standard will work with WLED.
+## 💾 Compatible hardware
+See [here](https://kno.wled.ge/basics/compatible-hardware)!
## ✌️ Other
Licensed under the MIT license
-Credits [here](https://github.com/Aircoookie/WLED/wiki/Contributors-&-About)!
-
-Uses Linearicons by Perxis!
+Credits [here](https://kno.wled.ge/about/contributors/)!
Join the Discord server to discuss everything about WLED!
diff --git a/tools/cdata.js b/tools/cdata.js
index 05dbd84621..13994bc801 100644
--- a/tools/cdata.js
+++ b/tools/cdata.js
@@ -217,7 +217,7 @@ writeChunks(
mangle: (str) =>
str
.replace("%", "%%")
- .replace(/User Interface\<\/button\>\<\/form\>/gms, "User Interface\<\/button\>\<\/form\>%DMXMENU%"),
+ .replace(/Usermods\<\/button\>\<\/form\>/gms, "Usermods\<\/button\>\<\/form\>%DMXMENU%"),
},
{
file: "settings_wifi.htm",
diff --git a/usermods/Animated_Staircase/Animated_Staircase.h b/usermods/Animated_Staircase/Animated_Staircase.h
index 707b60da1c..35ea0d7a4a 100644
--- a/usermods/Animated_Staircase/Animated_Staircase.h
+++ b/usermods/Animated_Staircase/Animated_Staircase.h
@@ -111,17 +111,17 @@ class Animated_Staircase : public Usermod {
}
if (i >= onIndex && i < offIndex) {
- segments->setOption(SEG_OPTION_ON, 1, 1);
+ segments->setOption(SEG_OPTION_ON, 1, i);
// We may need to copy mode and colors from segment 0 to make sure
// changes are propagated even when the config is changed during a wipe
// segments->mode = mainsegment.mode;
// segments->colors[0] = mainsegment.colors[0];
} else {
- segments->setOption(SEG_OPTION_ON, 0, 1);
+ segments->setOption(SEG_OPTION_ON, 0, i);
}
// Always mark segments as "transitional", we are animating the staircase
- segments->setOption(SEG_OPTION_TRANSITIONAL, 1, 1);
+ segments->setOption(SEG_OPTION_TRANSITIONAL, 1, i);
}
colorUpdated(CALL_MODE_DIRECT_CHANGE);
}
@@ -296,7 +296,7 @@ class Animated_Staircase : public Usermod {
maxSegmentId = i - 1;
break;
}
- segments->setOption(SEG_OPTION_ON, 1, 1);
+ segments->setOption(SEG_OPTION_ON, 1, i);
}
colorUpdated(CALL_MODE_DIRECT_CHANGE);
DEBUG_PRINTLN(F("Animated Staircase disabled."));
@@ -508,10 +508,10 @@ class Animated_Staircase : public Usermod {
JsonArray usermodEnabled = staircase.createNestedArray(F("Staircase")); // name
String btn = F("");
diff --git a/usermods/Artemis_reciever/usermod.cpp b/usermods/Artemis_reciever/usermod.cpp
index 2273685255..5f230dfd88 100644
--- a/usermods/Artemis_reciever/usermod.cpp
+++ b/usermods/Artemis_reciever/usermod.cpp
@@ -24,7 +24,7 @@ void RGBNET_readValues() {
int channel = UDP.read();
//channel data is not used we only supports one channel
- int len = UDP.read(RGBNET_packet, ledCount*3);
+ int len = UDP.read(RGBNET_packet, strip.getLengthTotal()*3);
if(len==0){
return;
}
@@ -50,7 +50,7 @@ void handleConfig(AsyncWebServerRequest *request)
\"channels\": [\
{\
\"channel\": 1,\
- \"leds\": " + ledCount + "\
+ \"leds\": " + strip.getLengthTotal() + "\
},\
{\
\"channel\": 2,\
diff --git a/usermods/BH1750_v2/readme.md b/usermods/BH1750_v2/readme.md
index 9496dc0260..a350777009 100644
--- a/usermods/BH1750_v2/readme.md
+++ b/usermods/BH1750_v2/readme.md
@@ -9,11 +9,11 @@ Copy the example `platformio_override.ini` to the root directory. This file sho
### Define Your Options
-* `USERMOD_BH1750` - define this to have this user mod included wled00\usermods_list.cpp
-* `USERMOD_BH1750_MAX_MEASUREMENT_INTERVAL` - the max number of milliseconds between measurements, defaults to 10000ms
-* `USERMOD_BH1750_MIN_MEASUREMENT_INTERVAL` - the min number of milliseconds between measurements, defaults to 500ms
-* `USERMOD_BH1750_FIRST_MEASUREMENT_AT` - the number of milliseconds after boot to take first measurement, defaults to 10 seconds
-* `USERMOD_BH1750_OFFSET_VALUE` - the offset value to report on, defaults to 1
+* `USERMOD_BH1750` - define this to have this user mod included wled00\usermods_list.cpp
+* `USERMOD_BH1750_MAX_MEASUREMENT_INTERVAL` - the max number of milliseconds between measurements, defaults to 10000ms
+* `USERMOD_BH1750_MIN_MEASUREMENT_INTERVAL` - the min number of milliseconds between measurements, defaults to 500ms
+* `USERMOD_BH1750_FIRST_MEASUREMENT_AT` - the number of milliseconds after boot to take first measurement, defaults to 10 seconds
+* `USERMOD_BH1750_OFFSET_VALUE` - the offset value to report on, defaults to 1
All parameters can be configured at runtime using Usermods settings page.
diff --git a/usermods/Cronixie/readme.md b/usermods/Cronixie/readme.md
new file mode 100644
index 0000000000..1eeac8ed03
--- /dev/null
+++ b/usermods/Cronixie/readme.md
@@ -0,0 +1,8 @@
+# Cronixie clock usermod
+
+This usermod supports driving the Cronixie M and L clock kits by Diamex.
+
+## Installation
+
+Compile and upload after adding `-D USERMOD_CRONIXIE` to `build_flags` of your PlatformIO environment.
+Make sure the Auto Brightness Limiter is enabled at 420mA (!) and configure 60 WS281x LEDs.
\ No newline at end of file
diff --git a/usermods/Cronixie/usermod_cronixie.h b/usermods/Cronixie/usermod_cronixie.h
new file mode 100644
index 0000000000..5e4255f438
--- /dev/null
+++ b/usermods/Cronixie/usermod_cronixie.h
@@ -0,0 +1,301 @@
+#pragma once
+
+#include "wled.h"
+
+class UsermodCronixie : public Usermod {
+ private:
+ unsigned long lastTime = 0;
+ char cronixieDisplay[7] = "HHMMSS";
+ byte _digitOut[6] = {10,10,10,10,10,10};
+ byte dP[6] = {255, 255, 255, 255, 255, 255};
+
+ // set your config variables to their boot default value (this can also be done in readFromConfig() or a constructor if you prefer)
+ bool backlight = true;
+
+ public:
+ void initCronixie()
+ {
+ if (dP[0] == 255) // if dP[0] is 255, cronixie is not yet init'ed
+ {
+ setCronixie();
+ strip.getSegment(0).grouping = 10; // 10 LEDs per digit
+ }
+ }
+
+ void setup() {
+
+ }
+
+ void loop() {
+ if (!toki.isTick()) return;
+ initCronixie();
+ _overlayCronixie();
+ strip.trigger();
+ }
+
+ byte getSameCodeLength(char code, int index, char const cronixieDisplay[])
+ {
+ byte counter = 0;
+
+ for (int i = index+1; i < 6; i++)
+ {
+ if (cronixieDisplay[i] == code)
+ {
+ counter++;
+ } else {
+ return counter;
+ }
+ }
+ return counter;
+ }
+
+ void setCronixie()
+ {
+ /*
+ * digit purpose index
+ * 0-9 | 0-9 (incl. random)
+ * 10 | blank
+ * 11 | blank, bg off
+ * 12 | test upw.
+ * 13 | test dnw.
+ * 14 | binary AM/PM
+ * 15 | BB upper +50 for no trailing 0
+ * 16 | BBB
+ * 17 | BBBB
+ * 18 | BBBBB
+ * 19 | BBBBBB
+ * 20 | H
+ * 21 | HH
+ * 22 | HHH
+ * 23 | HHHH
+ * 24 | M
+ * 25 | MM
+ * 26 | MMM
+ * 27 | MMMM
+ * 28 | MMMMM
+ * 29 | MMMMMM
+ * 30 | S
+ * 31 | SS
+ * 32 | SSS
+ * 33 | SSSS
+ * 34 | SSSSS
+ * 35 | SSSSSS
+ * 36 | Y
+ * 37 | YY
+ * 38 | YYYY
+ * 39 | I
+ * 40 | II
+ * 41 | W
+ * 42 | WW
+ * 43 | D
+ * 44 | DD
+ * 45 | DDD
+ * 46 | V
+ * 47 | VV
+ * 48 | VVV
+ * 49 | VVVV
+ * 50 | VVVVV
+ * 51 | VVVVVV
+ * 52 | v
+ * 53 | vv
+ * 54 | vvv
+ * 55 | vvvv
+ * 56 | vvvvv
+ * 57 | vvvvvv
+ */
+
+ //H HourLower | HH - Hour 24. | AH - Hour 12. | HHH Hour of Month | HHHH Hour of Year
+ //M MinuteUpper | MM Minute of Hour | MMM Minute of 12h | MMMM Minute of Day | MMMMM Minute of Month | MMMMMM Minute of Year
+ //S SecondUpper | SS Second of Minute | SSS Second of 10 Minute | SSSS Second of Hour | SSSSS Second of Day | SSSSSS Second of Week
+ //B AM/PM | BB 0-6/6-12/12-18/18-24 | BBB 0-3... | BBBB 0-1.5... | BBBBB 0-1 | BBBBBB 0-0.5
+
+ //Y YearLower | YY - Year LU | YYYY - Std.
+ //I MonthLower | II - Month of Year
+ //W Week of Month | WW Week of Year
+ //D Day of Week | DD Day Of Month | DDD Day Of Year
+
+ DEBUG_PRINT("cset ");
+ DEBUG_PRINTLN(cronixieDisplay);
+
+ for (int i = 0; i < 6; i++)
+ {
+ dP[i] = 10;
+ switch (cronixieDisplay[i])
+ {
+ case '_': dP[i] = 10; break;
+ case '-': dP[i] = 11; break;
+ case 'r': dP[i] = random(1,7); break; //random btw. 1-6
+ case 'R': dP[i] = random(0,10); break; //random btw. 0-9
+ //case 't': break; //Test upw.
+ //case 'T': break; //Test dnw.
+ case 'b': dP[i] = 14 + getSameCodeLength('b',i,cronixieDisplay); i = i+dP[i]-14; break;
+ case 'B': dP[i] = 14 + getSameCodeLength('B',i,cronixieDisplay); i = i+dP[i]-14; break;
+ case 'h': dP[i] = 70 + getSameCodeLength('h',i,cronixieDisplay); i = i+dP[i]-70; break;
+ case 'H': dP[i] = 20 + getSameCodeLength('H',i,cronixieDisplay); i = i+dP[i]-20; break;
+ case 'A': dP[i] = 108; i++; break;
+ case 'a': dP[i] = 58; i++; break;
+ case 'm': dP[i] = 74 + getSameCodeLength('m',i,cronixieDisplay); i = i+dP[i]-74; break;
+ case 'M': dP[i] = 24 + getSameCodeLength('M',i,cronixieDisplay); i = i+dP[i]-24; break;
+ case 's': dP[i] = 80 + getSameCodeLength('s',i,cronixieDisplay); i = i+dP[i]-80; break; //refresh more often bc. of secs
+ case 'S': dP[i] = 30 + getSameCodeLength('S',i,cronixieDisplay); i = i+dP[i]-30; break;
+ case 'Y': dP[i] = 36 + getSameCodeLength('Y',i,cronixieDisplay); i = i+dP[i]-36; break;
+ case 'y': dP[i] = 86 + getSameCodeLength('y',i,cronixieDisplay); i = i+dP[i]-86; break;
+ case 'I': dP[i] = 39 + getSameCodeLength('I',i,cronixieDisplay); i = i+dP[i]-39; break; //Month. Don't ask me why month and minute both start with M.
+ case 'i': dP[i] = 89 + getSameCodeLength('i',i,cronixieDisplay); i = i+dP[i]-89; break;
+ //case 'W': break;
+ //case 'w': break;
+ case 'D': dP[i] = 43 + getSameCodeLength('D',i,cronixieDisplay); i = i+dP[i]-43; break;
+ case 'd': dP[i] = 93 + getSameCodeLength('d',i,cronixieDisplay); i = i+dP[i]-93; break;
+ case '0': dP[i] = 0; break;
+ case '1': dP[i] = 1; break;
+ case '2': dP[i] = 2; break;
+ case '3': dP[i] = 3; break;
+ case '4': dP[i] = 4; break;
+ case '5': dP[i] = 5; break;
+ case '6': dP[i] = 6; break;
+ case '7': dP[i] = 7; break;
+ case '8': dP[i] = 8; break;
+ case '9': dP[i] = 9; break;
+ //case 'V': break; //user var0
+ //case 'v': break; //user var1
+ }
+ }
+ DEBUG_PRINT("result ");
+ for (int i = 0; i < 5; i++)
+ {
+ DEBUG_PRINT((int)dP[i]);
+ DEBUG_PRINT(" ");
+ }
+ DEBUG_PRINTLN((int)dP[5]);
+
+ _overlayCronixie(); // refresh
+ }
+
+ void _overlayCronixie()
+ {
+ byte h = hour(localTime);
+ byte h0 = h;
+ byte m = minute(localTime);
+ byte s = second(localTime);
+ byte d = day(localTime);
+ byte mi = month(localTime);
+ int y = year(localTime);
+ //this has to be changed in time for 22nd century
+ y -= 2000; if (y<0) y += 30; //makes countdown work
+
+ if (useAMPM && !countdownMode)
+ {
+ if (h>12) h-=12;
+ else if (h==0) h+=12;
+ }
+ for (int i = 0; i < 6; i++)
+ {
+ if (dP[i] < 12) _digitOut[i] = dP[i];
+ else {
+ if (dP[i] < 65)
+ {
+ switch(dP[i])
+ {
+ case 21: _digitOut[i] = h/10; _digitOut[i+1] = h- _digitOut[i]*10; i++; break; //HH
+ case 25: _digitOut[i] = m/10; _digitOut[i+1] = m- _digitOut[i]*10; i++; break; //MM
+ case 31: _digitOut[i] = s/10; _digitOut[i+1] = s- _digitOut[i]*10; i++; break; //SS
+
+ case 20: _digitOut[i] = h- (h/10)*10; break; //H
+ case 24: _digitOut[i] = m/10; break; //M
+ case 30: _digitOut[i] = s/10; break; //S
+
+ case 43: _digitOut[i] = weekday(localTime); _digitOut[i]--; if (_digitOut[i]<1) _digitOut[i]= 7; break; //D
+ case 44: _digitOut[i] = d/10; _digitOut[i+1] = d- _digitOut[i]*10; i++; break; //DD
+ case 40: _digitOut[i] = mi/10; _digitOut[i+1] = mi- _digitOut[i]*10; i++; break; //II
+ case 37: _digitOut[i] = y/10; _digitOut[i+1] = y- _digitOut[i]*10; i++; break; //YY
+ case 39: _digitOut[i] = 2; _digitOut[i+1] = 0; _digitOut[i+2] = y/10; _digitOut[i+3] = y- _digitOut[i+2]*10; i+=3; break; //YYYY
+
+ //case 16: _digitOut[i+2] = ((h0/3)&1)?1:0; i++; //BBB (BBBB NI)
+ //case 15: _digitOut[i+1] = (h0>17 || (h0>5 && h0<12))?1:0; i++; //BB
+ case 14: _digitOut[i] = (h0>11)?1:0; break; //B
+ }
+ } else
+ {
+ switch(dP[i])
+ {
+ case 71: _digitOut[i] = h/10; _digitOut[i+1] = h- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //hh
+ case 75: _digitOut[i] = m/10; _digitOut[i+1] = m- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //mm
+ case 81: _digitOut[i] = s/10; _digitOut[i+1] = s- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //ss
+ //case 66: _digitOut[i+2] = ((h0/3)&1)?1:10; i++; //bbb (bbbb NI)
+ //case 65: _digitOut[i+1] = (h0>17 || (h0>5 && h0<12))?1:10; i++; //bb
+ case 64: _digitOut[i] = (h0>11)?1:10; break; //b
+
+ case 93: _digitOut[i] = weekday(localTime); _digitOut[i]--; if (_digitOut[i]<1) _digitOut[i]= 7; break; //d
+ case 94: _digitOut[i] = d/10; _digitOut[i+1] = d- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //dd
+ case 90: _digitOut[i] = mi/10; _digitOut[i+1] = mi- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //ii
+ case 87: _digitOut[i] = y/10; _digitOut[i+1] = y- _digitOut[i]*10; i++; break; //yy
+ case 89: _digitOut[i] = 2; _digitOut[i+1] = 0; _digitOut[i+2] = y/10; _digitOut[i+3] = y- _digitOut[i+2]*10; i+=3; break; //yyyy
+ }
+ }
+ }
+ }
+ }
+
+ void handleOverlayDraw()
+ {
+ byte offsets[] = {5, 0, 6, 1, 7, 2, 8, 3, 9, 4};
+
+ for (uint16_t i = 0; i < 6; i++)
+ {
+ byte o = 10*i;
+ byte excl = 10;
+ if(_digitOut[i] < 10) excl = offsets[_digitOut[i]];
+ excl += o;
+
+ if (backlight && _digitOut[i] <11)
+ {
+ uint32_t col = strip.gamma32(strip.getSegment(0).colors[1]);
+ for (uint16_t j=o; j< o+10; j++) {
+ if (j != excl) strip.setPixelColor(j, col);
+ }
+ } else
+ {
+ for (uint16_t j=o; j< o+10; j++) {
+ if (j != excl) strip.setPixelColor(j, 0);
+ }
+ }
+ }
+ }
+
+ void addToJsonState(JsonObject& root)
+ {
+ root["nx"] = cronixieDisplay;
+ }
+
+ void readFromJsonState(JsonObject& root)
+ {
+ if (root["nx"].ishr) { - isDayTime = true; + return true; } else { if (hour(sunrise)==hr && minute(sunrise)
+
+
+
+
+
+
\ No newline at end of file
diff --git a/usermods/RelayBlinds/presets.json b/usermods/RelayBlinds/presets.json
new file mode 100644
index 0000000000..95b5871537
--- /dev/null
+++ b/usermods/RelayBlinds/presets.json
@@ -0,0 +1 @@
+{"0":{},"2":{"n":"▲","win":"U0=2"},"1":{"n":"▼","win":"U0=1"}}
\ No newline at end of file
diff --git a/usermods/RelayBlinds/readme.md b/usermods/RelayBlinds/readme.md
new file mode 100644
index 0000000000..0c3d2a0ba5
--- /dev/null
+++ b/usermods/RelayBlinds/readme.md
@@ -0,0 +1,8 @@
+# RelayBlinds usermod
+
+This simple usermod toggles two relay pins momentarily (default for 500ms) when `userVar0` is set.
+This can be used to e.g. "push" the buttons of a window blinds motor controller.
+
+v1 usermod. Please replace usermod.cpp in the `wled00` directory with the one in this file.
+You may upload `index.htm` to `[WLED-IP]/edit` to replace the default lighting UI with a simple Up/Down button one.
+Also, a simple `presets.json` file is available, this makes the relay actions controllable via two presets to facilitate control e.g. via the default UI or Alexa.
\ No newline at end of file
diff --git a/usermods/RelayBlinds/usermod.cpp b/usermods/RelayBlinds/usermod.cpp
new file mode 100644
index 0000000000..ee61b0cce3
--- /dev/null
+++ b/usermods/RelayBlinds/usermod.cpp
@@ -0,0 +1,83 @@
+#include "wled.h"
+
+//Use userVar0 and userVar1 (API calls &U0=,&U1=, uint16_t)
+
+//gets called once at boot. Do all initialization that doesn't depend on network here
+void userSetup()
+{
+
+}
+
+//gets called every time WiFi is (re-)connected. Initialize own network interfaces here
+void userConnected()
+{
+
+}
+
+/*
+ * Physical IO
+ */
+#define PIN_UP_RELAY 4
+#define PIN_DN_RELAY 5
+#define PIN_ON_TIME 500
+bool upActive = false, upActiveBefore = false, downActive = false, downActiveBefore = false;
+unsigned long upStartTime = 0, downStartTime = 0;
+
+void handleRelay()
+{
+ //up and down relays
+ if (userVar0) {
+ upActive = true;
+ if (userVar0 == 1) {
+ upActive = false;
+ downActive = true;
+ }
+ userVar0 = 0;
+ }
+
+ if (upActive)
+ {
+ if(!upActiveBefore)
+ {
+ pinMode(PIN_UP_RELAY, OUTPUT);
+ digitalWrite(PIN_UP_RELAY, LOW);
+ upActiveBefore = true;
+ upStartTime = millis();
+ DEBUG_PRINTLN("UPA");
+ }
+ if (millis()- upStartTime > PIN_ON_TIME)
+ {
+ upActive = false;
+ DEBUG_PRINTLN("UPN");
+ }
+ } else if (upActiveBefore)
+ {
+ pinMode(PIN_UP_RELAY, INPUT);
+ upActiveBefore = false;
+ }
+
+ if (downActive)
+ {
+ if(!downActiveBefore)
+ {
+ pinMode(PIN_DN_RELAY, OUTPUT);
+ digitalWrite(PIN_DN_RELAY, LOW);
+ downActiveBefore = true;
+ downStartTime = millis();
+ }
+ if (millis()- downStartTime > PIN_ON_TIME)
+ {
+ downActive = false;
+ }
+ } else if (downActiveBefore)
+ {
+ pinMode(PIN_DN_RELAY, INPUT);
+ downActiveBefore = false;
+ }
+}
+
+//loop. You can use "if (WLED_CONNECTED)" to check for successful connection
+void userLoop()
+{
+ handleRelay();
+}
\ No newline at end of file
diff --git a/usermods/SN_Photoresistor/usermod_sn_photoresistor.h b/usermods/SN_Photoresistor/usermod_sn_photoresistor.h
index 3b785fada0..9c3be7cc28 100644
--- a/usermods/SN_Photoresistor/usermod_sn_photoresistor.h
+++ b/usermods/SN_Photoresistor/usermod_sn_photoresistor.h
@@ -22,12 +22,12 @@
// 10 bits
#ifndef USERMOD_SN_PHOTORESISTOR_ADC_PRECISION
-#define USERMOD_SN_PHOTORESISTOR_ADC_PRECISION 1024.0
+#define USERMOD_SN_PHOTORESISTOR_ADC_PRECISION 1024.0f
#endif
// resistor size 10K hms
#ifndef USERMOD_SN_PHOTORESISTOR_RESISTOR_VALUE
-#define USERMOD_SN_PHOTORESISTOR_RESISTOR_VALUE 10000.0
+#define USERMOD_SN_PHOTORESISTOR_RESISTOR_VALUE 10000.0f
#endif
// only report if differance grater than offset value
@@ -123,6 +123,11 @@ class Usermod_SN_Photoresistor : public Usermod
}
}
+ uint16_t getLastLDRValue()
+ {
+ return lastLDRValue;
+ }
+
void addToJsonInfo(JsonObject &root)
{
JsonObject user = root[F("u")];
diff --git a/usermods/ST7789_display/README.md b/usermods/ST7789_display/README.md
index 653fdd752b..b98d5be002 100644
--- a/usermods/ST7789_display/README.md
+++ b/usermods/ST7789_display/README.md
@@ -12,7 +12,7 @@ This usermod allow to use 240x240 display to display following:
## Hardware
***
-
+
## Library used
diff --git a/usermods/ST7789_display/ST7789_display.h b/usermods/ST7789_display/ST7789_display.h
index bd501d08f0..19ad5790ae 100644
--- a/usermods/ST7789_display/ST7789_display.h
+++ b/usermods/ST7789_display/ST7789_display.h
@@ -118,11 +118,11 @@ class St7789DisplayUsermod : public Usermod {
{
needRedraw = true;
}
- else if (knownMode != strip.getMode())
+ else if (knownMode != strip.getMainSegment().mode)
{
needRedraw = true;
}
- else if (knownPalette != strip.getSegment(0).palette)
+ else if (knownPalette != strip.getMainSegment().palette)
{
needRedraw = true;
}
@@ -148,8 +148,8 @@ class St7789DisplayUsermod : public Usermod {
#endif
knownIp = apActive ? IPAddress(4, 3, 2, 1) : WiFi.localIP();
knownBrightness = bri;
- knownMode = strip.getMode();
- knownPalette = strip.getSegment(0).palette;
+ knownMode = strip.getMainSegment().mode;
+ knownPalette = strip.getMainSegment().palette;
tft.fillScreen(TFT_BLACK);
tft.setTextSize(2);
diff --git a/usermods/TTGO-T-Display/usermod.cpp b/usermods/TTGO-T-Display/usermod.cpp
index 75e90b1ebe..9e08a001a1 100644
--- a/usermods/TTGO-T-Display/usermod.cpp
+++ b/usermods/TTGO-T-Display/usermod.cpp
@@ -110,9 +110,9 @@ void userLoop() {
needRedraw = true;
} else if (knownBrightness != bri) {
needRedraw = true;
- } else if (knownMode != strip.getMode()) {
+ } else if (knownMode != strip.getMainSegment().mode) {
needRedraw = true;
- } else if (knownPalette != strip.getSegment(0).palette) {
+ } else if (knownPalette != strip.getMainSegment().palette) {
needRedraw = true;
}
@@ -136,8 +136,8 @@ void userLoop() {
#endif
knownIp = apActive ? IPAddress(4, 3, 2, 1) : WiFi.localIP();
knownBrightness = bri;
- knownMode = strip.getMode();
- knownPalette = strip.getSegment(0).palette;
+ knownMode = strip.getMainSegment().mode;
+ knownPalette = strip.getMainSegment().palette;
tft.fillScreen(TFT_BLACK);
tft.setTextSize(2);
diff --git a/usermods/Temperature/usermod_temperature.h b/usermods/Temperature/usermod_temperature.h
index 7c209f4754..40df0e5333 100644
--- a/usermods/Temperature/usermod_temperature.h
+++ b/usermods/Temperature/usermod_temperature.h
@@ -37,12 +37,12 @@ class UsermodTemperature : public Usermod {
// used to determine when we can read the sensors temperature
// we have to wait at least 93.75 ms after requestTemperatures() is called
unsigned long lastTemperaturesRequest;
- float temperature = -100; // default to -100, DS18B20 only goes down to -50C
+ float temperature;
// indicates requestTemperatures has been called but the sensor measurement is not complete
bool waitingForConversion = false;
// flag set at startup if DS18B20 sensor not found, avoids trying to keep getting
// temperature if flashed to a board without a sensor attached
- bool sensorFound = false;
+ byte sensorFound;
bool enabled = true;
@@ -54,27 +54,47 @@ class UsermodTemperature : public Usermod {
//Dallas sensor quick (& dirty) reading. Credit to - Author: Peter Scargill, August 17th, 2013
float readDallas() {
- byte i;
- byte data[2];
+ byte data[9];
int16_t result; // raw data from sensor
- if (!oneWire->reset()) return -127.0f; // send reset command and fail fast
- oneWire->skip(); // skip ROM
- oneWire->write(0xBE); // read (temperature) from EEPROM
- for (i=0; i < 2; i++) data[i] = oneWire->read(); // first 2 bytes contain temperature
- for (i=2; i < 8; i++) oneWire->read(); // read unused bytes
- result = (data[1]<<4) | (data[0]>>4); // we only need whole part, we will add fraction when returning
- if (data[1]&0x80) result |= 0xFF00; // fix negative value
- oneWire->reset();
- oneWire->skip(); // skip ROM
- oneWire->write(0x44,parasite); // request new temperature reading (without parasite power)
- return (float)result + ((data[0]&0x0008) ? 0.5f : 0.0f);
+ float retVal = -127.0f;
+ if (oneWire->reset()) { // if reset() fails there are no OneWire devices
+ oneWire->skip(); // skip ROM
+ oneWire->write(0xBE); // read (temperature) from EEPROM
+ oneWire->read_bytes(data, 9); // first 2 bytes contain temperature
+ #ifdef WLED_DEBUG
+ if (OneWire::crc8(data,8) != data[8]) {
+ DEBUG_PRINTLN(F("CRC error reading temperature."));
+ for (byte i=0; i < 9; i++) DEBUG_PRINTF("0x%02X ", data[i]);
+ DEBUG_PRINT(F(" => "));
+ DEBUG_PRINTF("0x%02X\n", OneWire::crc8(data,8));
+ }
+ #endif
+ switch(sensorFound) {
+ case 0x10: // DS18S20 has 9-bit precision
+ result = (data[1] << 8) | data[0];
+ retVal = float(result) * 0.5f;
+ break;
+ case 0x22: // DS18B20
+ case 0x28: // DS1822
+ case 0x3B: // DS1825
+ case 0x42: // DS28EA00
+ result = (data[1]<<4) | (data[0]>>4); // we only need whole part, we will add fraction when returning
+ if (data[1] & 0x80) result |= 0xF000; // fix negative value
+ retVal = float(result) + ((data[0] & 0x08) ? 0.5f : 0.0f);
+ break;
+ }
+ }
+ for (byte i=1; i<9; i++) data[0] &= data[i];
+ return data[0]==0xFF ? -127.0f : retVal;
}
void requestTemperatures() {
- readDallas();
+ DEBUG_PRINTLN(F("Requesting temperature."));
+ oneWire->reset();
+ oneWire->skip(); // skip ROM
+ oneWire->write(0x44,parasite); // request new temperature reading (TODO: parasite would need special handling)
lastTemperaturesRequest = millis();
waitingForConversion = true;
- DEBUG_PRINTLN(F("Requested temperature."));
}
void readTemperature() {
@@ -102,10 +122,13 @@ class UsermodTemperature : public Usermod {
case 0x3B: // DS1825
case 0x42: // DS28EA00
DEBUG_PRINTLN(F("Sensor found."));
+ sensorFound = deviceAddress[0];
+ DEBUG_PRINTF("0x%02X\n", sensorFound);
return true;
}
}
}
+ DEBUG_PRINTLN(F("Sensor NOT found."));
return false;
}
@@ -113,16 +136,16 @@ class UsermodTemperature : public Usermod {
void setup() {
int retries = 10;
+ sensorFound = 0;
+ temperature = -127.0f; // default to -127, DS18B20 only goes down to -50C
if (enabled) {
// config says we are enabled
DEBUG_PRINTLN(F("Allocating temperature pin..."));
// pin retrieved from cfg.json (readFromConfig()) prior to running setup()
if (temperaturePin >= 0 && pinManager.allocatePin(temperaturePin, true, PinOwner::UM_Temperature)) {
oneWire = new OneWire(temperaturePin);
- if (!oneWire->reset()) {
- sensorFound = false; // resetting 1-Wire bus yielded an error
- } else {
- while ((sensorFound=findSensor()) && retries--) {
+ if (oneWire->reset()) {
+ while (!findSensor() && retries--) {
delay(25); // try to find sensor
}
}
@@ -131,7 +154,6 @@ class UsermodTemperature : public Usermod {
DEBUG_PRINTLN(F("Temperature pin allocation failed."));
}
temperaturePin = -1; // allocation failed
- sensorFound = false;
}
}
lastMeasurement = millis() - readingInterval + 10000;
@@ -139,8 +161,9 @@ class UsermodTemperature : public Usermod {
}
void loop() {
- if (!enabled || strip.isUpdating()) return;
+ if (!enabled || !sensorFound || strip.isUpdating()) return;
+ static uint8_t errorCount = 0;
unsigned long now = millis();
// check to see if we are due for taking a measurement
@@ -156,20 +179,26 @@ class UsermodTemperature : public Usermod {
}
// we were waiting for a conversion to complete, have we waited log enough?
- if (now - lastTemperaturesRequest >= 100 /* 93.75ms per the datasheet but can be up to 750ms */) {
+ if (now - lastTemperaturesRequest >= 750 /* 93.75ms per the datasheet but can be up to 750ms */) {
readTemperature();
+ if (getTemperatureC() < -100.0f) {
+ if (++errorCount > 10) sensorFound = 0;
+ lastMeasurement = now - readingInterval + 300; // force new measurement in 300ms
+ return;
+ }
+ errorCount = 0;
if (WLED_MQTT_CONNECTED) {
char subuf[64];
strcpy(subuf, mqttDeviceTopic);
- if (-100 <= temperature) {
+ if (temperature > -100.0f) {
// dont publish super low temperature as the graph will get messed up
// the DallasTemperature library returns -127C or -196.6F when problem
// reading the sensor
strcat_P(subuf, PSTR("/temperature"));
- mqtt->publish(subuf, 0, false, String(temperature).c_str());
+ mqtt->publish(subuf, 0, false, String(getTemperatureC()).c_str());
strcat_P(subuf, PSTR("_f"));
- mqtt->publish(subuf, 0, false, String((float)temperature * 1.8f + 32).c_str());
+ mqtt->publish(subuf, 0, false, String(getTemperatureF()).c_str());
} else {
// publish something else to indicate status?
}
@@ -202,13 +231,13 @@ class UsermodTemperature : public Usermod {
JsonArray temp = user.createNestedArray(FPSTR(_name));
//temp.add(F("Loaded."));
- if (temperature <= -100.0 || (!sensorFound && temperature == -1.0)) {
+ if (temperature <= -100.0f) {
temp.add(0);
temp.add(F(" Sensor Error!"));
return;
}
- temp.add(degC ? temperature : (float)temperature * 1.8f + 32);
+ temp.add(degC ? getTemperatureC() : getTemperatureF());
if (degC) temp.add(F("°C"));
else temp.add(F("°F"));
}
@@ -252,23 +281,21 @@ class UsermodTemperature : public Usermod {
bool readFromConfig(JsonObject &root) {
// we look for JSON object: {"Temperature": {"pin": 0, "degC": true}}
int8_t newTemperaturePin = temperaturePin;
+ DEBUG_PRINT(FPSTR(_name));
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;
newTemperaturePin = top["pin"] | newTemperaturePin;
-// newTemperaturePin = min(33,max(-1,(int)newTemperaturePin)); // bounds check
degC = top["degC"] | degC;
readingInterval = top[FPSTR(_readInterval)] | readingInterval/1000;
readingInterval = min(120,max(10,(int)readingInterval)) * 1000; // convert to ms
parasite = top[FPSTR(_parasite)] | parasite;
- DEBUG_PRINT(FPSTR(_name));
if (!initDone) {
// first run: reading from cfg.json
temperaturePin = newTemperaturePin;
diff --git a/usermods/VL53L0X_gestures/usermod_vl53l0x_gestures.h b/usermods/VL53L0X_gestures/usermod_vl53l0x_gestures.h
index 83f26e084d..210ec3f585 100644
--- a/usermods/VL53L0X_gestures/usermod_vl53l0x_gestures.h
+++ b/usermods/VL53L0X_gestures/usermod_vl53l0x_gestures.h
@@ -21,6 +21,14 @@
#include 
-
-1. Edit this file from the root directory as needed:
-
- 
-
- * `PIXEL_COUNTS` may need to be adjusted for your set-up. E.g. I have lots of LEDs in Channel 1, but that's probably unusual for most
- * `DATA_PINS` may need to be changed to "16,3,1,26" instead of "16,1,3,26" apparently depending on the board revision or some such
-
-1. Build the mod (e.g. click `Build` from the project task circled above) and update your firmware using the `QL-DigQuad-Pre-v0.1` file, e.g. using _Manual OTA_ from the Config menu. Based on the video and my own experience, you might need to build twice 🤷♂️.
-
-## Observing Temperature
-
-Hopefully you can now see the Temperature listed in the Info page. If not, use Chrome Developer Tools to find the current temperature
-
-1. Open the Developer Tools Console
-2. Enter `lastinfo.u.Temperature` to view the Temperature array
-
- 
-
diff --git a/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/json-temp.png b/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/json-temp.png
deleted file mode 100644
index 66e5011233..0000000000
Binary files a/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/json-temp.png and /dev/null differ
diff --git a/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/params.png b/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/params.png
deleted file mode 100644
index 64233f86bf..0000000000
Binary files a/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/params.png and /dev/null differ
diff --git a/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/pio-screenshot.png b/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/pio-screenshot.png
deleted file mode 100644
index e178ed1601..0000000000
Binary files a/usermods/quinled_digquad_preassembled_unofficial_v0.1/images/pio-screenshot.png and /dev/null differ
diff --git a/usermods/quinled_digquad_preassembled_unofficial_v0.1/platformio_override.ini b/usermods/quinled_digquad_preassembled_unofficial_v0.1/platformio_override.ini
deleted file mode 100644
index 6f416668fa..0000000000
--- a/usermods/quinled_digquad_preassembled_unofficial_v0.1/platformio_override.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-; QuinLED-Dig-Quad Preassembled Unofficial
-
-[env:QL-DigQuad-Pre-v0.1]
-extends = env:esp32dev
-build_flags = ${common.build_flags_esp32}
- -D ESP32_MULTISTRIP
- -D NUM_STRIPS=4
- -D PIXEL_COUNTS="600, 300, 300, 300"
- -D DATA_PINS="16,1,3,26"
- -D RLYPIN=19
- -D BTNPIN=17
- -D USERMOD_DALLASTEMPERATURE
- -D USERMOD_DALLASTEMPERATURE_MEASUREMENT_INTERVAL=10000
-lib_deps = ${env.lib_deps}
- milesburton/DallasTemperature@^3.9.0
- OneWire@~2.3.5
\ No newline at end of file
diff --git a/usermods/seven_segment_display_reloaded/readme.md b/usermods/seven_segment_display_reloaded/readme.md
new file mode 100644
index 0000000000..09479754c1
--- /dev/null
+++ b/usermods/seven_segment_display_reloaded/readme.md
@@ -0,0 +1,129 @@
+# Seven Segment Display Reloaded
+
+Usermod that 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".
+
+
+## Installation
+
+Add the compile-time option `-D USERMOD_SSDR` to your `platformio.ini` (or `platformio_override.ini`) or use `#define USERMOD_SSDR` in `my_config.h`.
+
+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.
+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
+
+### inverted
+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
+
+### enable-auto-brightness
+Enables the auto brightness feature. Can be only used with the usermod SN_Photoresistor 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 mA current protection of WLED will override the calculated value if it is too high.
+
+### Display-Mask
+Defines the type of the time/date display.
+For example "H:m" (default)
+- H - 00-23 hours
+- h - 01-12 hours
+- k - 01-24 hours
+- m - 00-59 minutes
+- s - 00-59 seconds
+- d - 01-31 day of month
+- M - 01-12 month
+- y - 21 last two positions of year
+- Y - 2021 year
+- : for a colon
+
+### LED-Numbers
+- LED-Numbers-Hours
+- LED-Numbers-Minutes
+- LED-Numbers-Seconds
+- LED-Numbers-Colons
+- LED-Numbers-Day
+- LED-Numbers-Month
+- LED-Numbers-Year
+
+See following example for usage.
+
+
+## Example
+
+Example for Leds definition
+```
+ < A >
+/\ /\
+F B
+\/ \/
+ < G >
+/\ /\
+E C
+\/ \/
+ < D >
+```
+
+Leds or Range of Leds are seperated by a comma ","
+
+Segments are seperated 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
+
+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
+
+- 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"
+
+- minute "37-38;39-40;42-43;44,31;32-33;35-36;34,41:21-22;23-24;26-27;28,15;16-17;19-20;18,25"
+
+or
+
+- hour "6,7;8,9;11,12;13,0;1,2;4,5;3,10:52,53;54,55;57,58;59,46;47,48;50,51;49,56"
+
+- minute "15,28;16,17;19,20;21,22;23,24;26,27;18,25:31,44;32,33;35,36;37,38;39,40;42,43;34,41"
+
+depending on the orientation.
+
+# The example detailed:
+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 ":"
+
+- 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 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
+- Segment B: 47, 48
+- Segment C: 50, 51
+- Segment D: 52, 53
+- Segment E: 54, 55
+- Segment F: 57, 58
+- Segment G: 49, 56
+
+### second digit of the hour
+
+- Segment A: 0, 13
+- Segment B: 1, 2
+- Segment C: 4, 5
+- Segment D: 6, 7
+- Segment E: 8, 9
+- Segment F: 11, 12
+- Segment G: 3, 10
\ No newline at end of file
diff --git a/usermods/seven_segment_display_reloaded/usermod_seven_segment_reloaded.h b/usermods/seven_segment_display_reloaded/usermod_seven_segment_reloaded.h
new file mode 100644
index 0000000000..6274abceec
--- /dev/null
+++ b/usermods/seven_segment_display_reloaded/usermod_seven_segment_reloaded.h
@@ -0,0 +1,555 @@
+#pragma once
+
+#include "wled.h"
+
+class UsermodSSDR : public Usermod {
+
+//#define REFRESHTIME 497
+
+private:
+ //Runtime variables.
+ unsigned long umSSDRLastRefresh = 0;
+ unsigned long umSSDRResfreshTime = 3000;
+ bool umSSDRDisplayTime = false;
+ bool umSSDRInverted = false;
+ bool umSSDRColonblink = true;
+ bool umSSDREnableLDR = false;
+ String umSSDRHours = "";
+ String umSSDRMinutes = "";
+ String umSSDRSeconds = "";
+ String umSSDRColons = "";
+ String umSSDRDays = "";
+ String umSSDRMonths = "";
+ String umSSDRYears = "";
+ uint16_t umSSDRLength = 0;
+ uint16_t umSSDRBrightnessMin = 0;
+ uint16_t umSSDRBrightnessMax = 255;
+
+ bool* umSSDRMask = 0;
+
+ /*// H - 00-23 hours
+ // h - 01-12 hours
+ // k - 01-24 hours
+ // m - 00-59 minutes
+ // s - 00-59 seconds
+ // d - 01-31 day of month
+ // M - 01-12 month
+ // y - 21 last two positions of year
+ // Y - 2021 year
+ // : for a colon
+ */
+ String umSSDRDisplayMask = "H:m"; //This should reflect physical equipment.
+
+ /* Segment order, seen from the front:
+
+ < A >
+ /\ /\
+ F B
+ \/ \/
+ < G >
+ /\ /\
+ E C
+ \/ \/
+ < D >
+
+ */
+
+ uint8_t umSSDRNumbers[11][7] = {
+ // A B C D E F G
+ { 1, 1, 1, 1, 1, 1, 0 }, // 0
+ { 0, 1, 1, 0, 0, 0, 0 }, // 1
+ { 1, 1, 0, 1, 1, 0, 1 }, // 2
+ { 1, 1, 1, 1, 0, 0, 1 }, // 3
+ { 0, 1, 1, 0, 0, 1, 1 }, // 4
+ { 1, 0, 1, 1, 0, 1, 1 }, // 5
+ { 1, 0, 1, 1, 1, 1, 1 }, // 6
+ { 1, 1, 1, 0, 0, 0, 0 }, // 7
+ { 1, 1, 1, 1, 1, 1, 1 }, // 8
+ { 1, 1, 1, 1, 0, 1, 1 }, // 9
+ { 0, 0, 0, 0, 0, 0, 0 } // blank
+ };
+
+ //String to reduce flash memory usage
+ static const char _str_name[];
+ static const char _str_ldrEnabled[];
+ static const char _str_timeEnabled[];
+ static const char _str_inverted[];
+ static const char _str_colonblink[];
+ static const char _str_displayMask[];
+ static const char _str_hours[];
+ static const char _str_minutes[];
+ static const char _str_seconds[];
+ static const char _str_colons[];
+ static const char _str_days[];
+ static const char _str_months[];
+ static const char _str_years[];
+ static const char _str_minBrightness[];
+ static const char _str_maxBrightness[];
+
+#ifdef USERMOD_SN_PHOTORESISTOR
+ Usermod_SN_Photoresistor *ptr;
+#else
+ void* ptr = nullptr;
+#endif
+
+ void _overlaySevenSegmentDraw() {
+ int displayMaskLen = static_cast
-
-
-
-
-
-
-
- -
-
-
-
White channel
-