V1.1.2
This commit is contained in:
coelner
parent
e5a35d2685
commit
4dfdb86421
@ -61,6 +61,12 @@ RgbwColor darkred(HtmlColor(0x800000));
|
||||
RgbwColor darkgreen(HtmlColor(0x006400));
|
||||
RgbwColor lightgreen(HtmlColor(0x90ee90));
|
||||
RgbwColor temp;
|
||||
RgbwColor secondsColor = white;
|
||||
RgbwColor minuteColor = darkred;
|
||||
RgbwColor hourColor = gold;
|
||||
RgbwColor highnoonColor = white12;
|
||||
RgbwColor backlightColor = white;
|
||||
RgbwColor hourMarkingColor = whiter;
|
||||
#else
|
||||
#define MINIMAL_BRIGHTNESS 20
|
||||
#define LDR_SCALE 16
|
||||
@ -82,6 +88,12 @@ RgbColor darkred(HtmlColor(0x800000));
|
||||
RgbColor darkgreen(HtmlColor(0x006400));
|
||||
RgbColor lightgreen(HtmlColor(0x90ee90));
|
||||
RgbColor temp;
|
||||
RgbColor secondsColor = white;
|
||||
RgbColor minuteColor = darkred;
|
||||
RgbColor hourColor = gold;
|
||||
RgbColor highnoonColor = white12;
|
||||
RgbColor backlightColor = white;
|
||||
RgbColor hourMarkingColor = whiter;
|
||||
#endif
|
||||
|
||||
//NTP handler
|
||||
@ -100,45 +112,66 @@ volatile int MAX_BRIGHTNESS = 200;
|
||||
// WebPortal
|
||||
const char thingName[] = "NTP-Clock-RGBLED";
|
||||
const char wifiInitialApPassword[] = "12345678";
|
||||
//ToDo add internal LED and check visibility
|
||||
#define STRING_LEN 63
|
||||
#define NUMBER_LEN 4
|
||||
// -- Maximal length the input-range attributes can have.
|
||||
#define COLOR_ATTR_LENGTH 60
|
||||
// -- Configuration specific key. The value should be modified if config structure was changed.
|
||||
#define CONFIG_VERSION "V1.0.0"
|
||||
#define CONFIG_VERSION "V1.1.2"
|
||||
|
||||
// -- Javascript block will be added to the header. 🔒 🔓
|
||||
const char CUSTOMHTML_SCRIPT_INNER[] PROGMEM = "\n\
|
||||
document.addEventListener('DOMContentLoaded', function(event) {\n\
|
||||
let elements = document.querySelectorAll('input[type=\"password\"]');\n\
|
||||
for (let p of elements) {\n\
|
||||
let btn = document.createElement('INPUT'); btn.type = 'button'; btn.value = '🔓'; btn.style.width = 'auto'; p.style.width = '83%'; p.parentNode.insertBefore(btn,p.nextSibling);\n\
|
||||
btn.onclick = function() { if (p.type === 'password') { p.type = 'text'; btn.value = '🔒'; } else { p.type = 'password'; btn.value = '🔓'; } }\n\
|
||||
};\n\
|
||||
});\n";
|
||||
//const char CUSTOMHTML_BODY_INNER[] PROGMEM = " <link rel='icon' src='data:image/png;base64,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'/>";
|
||||
DNSServer dnsServer;
|
||||
WebServer server(80);
|
||||
#ifdef ESP8266
|
||||
ESP8266HTTPUpdateServer httpUpdater;
|
||||
#elif defined(ESP32)
|
||||
HTTPUpdateServer httpUpdater;
|
||||
#endif
|
||||
function colorCh(id)\n\
|
||||
{\n\
|
||||
var x=document.getElementById(id);\n\
|
||||
var s=document.getElementById(id + 'Val');\n\
|
||||
s.innerHTML = x.value;\n\
|
||||
}\n\n\
|
||||
document.addEventListener('DOMContentLoaded', function(event) {\n\
|
||||
let elements = document.querySelectorAll('input[type=\"password\"]');\n\
|
||||
for (let p of elements) {\n\
|
||||
let btn = document.createElement('INPUT'); btn.type = 'button'; btn.value = '🔓'; btn.style.width = 'auto'; p.style.width = '80%'; p.parentNode.insertBefore(btn,p.nextSibling);\n\
|
||||
btn.onclick = function() { if (p.type === 'password') { p.type = 'text'; btn.value = '🔒'; } else { p.type = 'password'; btn.value = '🔓'; } }\n\
|
||||
};\n\
|
||||
});\n";
|
||||
const char IOTWEBCONF_HTML_FORM_COLOR_PARAM[] PROGMEM =
|
||||
"<div class='{s}' '><label for='{i}'>{b}</label> (<span id='{i}Val'>{v}</span>)"
|
||||
"<input type='{t}' id='{i}' "
|
||||
"name='{i}' style=\"padding: unset\" maxlength={l} placeholder='{p}' value='{v}' {c}/>"
|
||||
"<div class='em'>{e}</div></div>\n";
|
||||
|
||||
char ntpServerParamValue[STRING_LEN];
|
||||
char maxBrightnessParamValue[NUMBER_LEN];
|
||||
char singleSecondParamValue[STRING_LEN];
|
||||
char allDotsOnParamValue[STRING_LEN];
|
||||
char followingHourParamValue[STRING_LEN];
|
||||
// -- Our custom class declaration. You should move it to a .h fine in your project.
|
||||
class ColorWithValueParameter : public iotwebconf::NumberParameter
|
||||
{
|
||||
public:
|
||||
ColorWithValueParameter(
|
||||
const char* label, const char* id, char* valueBuffer, int length,
|
||||
const char* defaultValue
|
||||
) : iotwebconf::NumberParameter(
|
||||
label, id, valueBuffer, length, defaultValue)
|
||||
{
|
||||
snprintf(
|
||||
this->_colorAttr, COLOR_ATTR_LENGTH,
|
||||
"oninput='colorCh(this.id)'");
|
||||
|
||||
IotWebConf iotWebConf(thingName, &dnsServer, &server, wifiInitialApPassword, CONFIG_VERSION);
|
||||
IotWebConfParameterGroup timeGroup = IotWebConfParameterGroup("Time", "Time settings");
|
||||
IotWebConfTextParameter ntpServerParam = IotWebConfTextParameter("NTP Server", "ntpServer", ntpServerParamValue, STRING_LEN, "pool.ntp.org");
|
||||
IotWebConfParameterGroup ledGroup = IotWebConfParameterGroup("LED", "LED settings");
|
||||
IotWebConfNumberParameter maxBrightnessParam = IotWebConfNumberParameter("Max BRIGHTNESS", "max brightness", maxBrightnessParamValue, NUMBER_LEN, "200", "20..254", "min='20' max='254' step='1'");
|
||||
IotWebConfCheckboxParameter singleSecondParam = IotWebConfCheckboxParameter("Show Seconds", "singleSecond", singleSecondParamValue, STRING_LEN, true);
|
||||
IotWebConfCheckboxParameter allDotsOnParam = IotWebConfCheckboxParameter("all Dots lighten on", "allDotsOn", allDotsOnParamValue, STRING_LEN, true);
|
||||
IotWebConfCheckboxParameter followingHourParam = IotWebConfCheckboxParameter("following Hour", "followingHour", followingHourParamValue, STRING_LEN, true);
|
||||
this->customHtml = this->_colorAttr;
|
||||
};
|
||||
protected:
|
||||
// Overrides
|
||||
virtual String renderHtml(
|
||||
bool dataArrived, bool hasValueFromPost, String valueFromPost) override
|
||||
{
|
||||
return TextParameter::renderHtml("color", hasValueFromPost, valueFromPost);
|
||||
};
|
||||
virtual String getHtmlTemplate()
|
||||
{
|
||||
return FPSTR(IOTWEBCONF_HTML_FORM_COLOR_PARAM);
|
||||
};
|
||||
|
||||
private:
|
||||
char _colorAttr[COLOR_ATTR_LENGTH];
|
||||
};
|
||||
|
||||
// -- We need to create our custom HtmlFormatProvider to add some javasripts.
|
||||
class CustomHtmlFormatProvider : public iotwebconf::HtmlFormatProvider
|
||||
{
|
||||
protected:
|
||||
@ -157,12 +190,57 @@ class CustomHtmlFormatProvider : public iotwebconf::HtmlFormatProvider
|
||||
}
|
||||
*/
|
||||
};
|
||||
// -- Javascript block will be added to the header.
|
||||
/*
|
||||
const char CUSTOMHTML_SCRIPT_INNER[] PROGMEM = "\n\
|
||||
document.addEventListener('DOMContentLoaded', function(event) {\n\
|
||||
let elements = document.querySelectorAll('input[type=\"password\"]');\n\
|
||||
for (let p of elements) {\n\
|
||||
let btn = document.createElement('INPUT'); btn.type = 'button'; btn.value = '🔓'; btn.style.width = 'auto'; p.style.width = '83%'; p.parentNode.insertBefore(btn,p.nextSibling);\n\
|
||||
btn.onclick = function() { if (p.type === 'password') { p.type = 'text'; btn.value = '🔒'; } else { p.type = 'password'; btn.value = '🔓'; } }\n\
|
||||
};\n\
|
||||
});\n";
|
||||
*/
|
||||
//const char CUSTOMHTML_BODY_INNER[] PROGMEM = " <link rel='icon' src='data:image/png;base64,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'/>";
|
||||
DNSServer dnsServer;
|
||||
WebServer server(80);
|
||||
#ifdef ESP8266
|
||||
ESP8266HTTPUpdateServer httpUpdater;
|
||||
#elif defined(ESP32)
|
||||
HTTPUpdateServer httpUpdater;
|
||||
#endif
|
||||
|
||||
char ntpServerParamValue[STRING_LEN];
|
||||
char maxBrightnessParamValue[NUMBER_LEN];
|
||||
char singleSecondParamValue[STRING_LEN];
|
||||
char allDotsOnParamValue[STRING_LEN];
|
||||
char followingHourParamValue[STRING_LEN];
|
||||
char hourColorParamValue[COLOR_ATTR_LENGTH];
|
||||
char minuteColorParamValue[COLOR_ATTR_LENGTH];
|
||||
char secondsColorParamValue[COLOR_ATTR_LENGTH];
|
||||
char highnoonColorParamValue[COLOR_ATTR_LENGTH];
|
||||
char backlightColorParamValue[COLOR_ATTR_LENGTH];
|
||||
char hourMarkingColorParamValue[COLOR_ATTR_LENGTH];
|
||||
|
||||
IotWebConf iotWebConf(thingName, &dnsServer, &server, wifiInitialApPassword, CONFIG_VERSION);
|
||||
IotWebConfParameterGroup timeGroup = IotWebConfParameterGroup("Time", "Time settings");
|
||||
IotWebConfTextParameter ntpServerParam = IotWebConfTextParameter("NTP Server", "ntpServer", ntpServerParamValue, STRING_LEN, "pool.ntp.org");
|
||||
IotWebConfParameterGroup ledGroup = IotWebConfParameterGroup("LED", "LED settings");
|
||||
IotWebConfNumberParameter maxBrightnessParam = IotWebConfNumberParameter("Max BRIGHTNESS", "max brightness", maxBrightnessParamValue, NUMBER_LEN, "200", "20..254", "min='20' max='254' step='1'");
|
||||
IotWebConfCheckboxParameter singleSecondParam = IotWebConfCheckboxParameter("Show Seconds", "singleSecond", singleSecondParamValue, STRING_LEN, true);
|
||||
IotWebConfCheckboxParameter allDotsOnParam = IotWebConfCheckboxParameter("all Dots lighten on", "allDotsOn", allDotsOnParamValue, STRING_LEN, true);
|
||||
IotWebConfCheckboxParameter followingHourParam = IotWebConfCheckboxParameter("following Hour", "followingHour", followingHourParamValue, STRING_LEN, true);
|
||||
ColorWithValueParameter hourColorParam = ColorWithValueParameter("Stundenfarbe", "hourColorParam", hourColorParamValue, COLOR_ATTR_LENGTH, "#FFD700");
|
||||
ColorWithValueParameter minuteColorParam = ColorWithValueParameter("Minutenfarbe", "minuteColorParam", minuteColorParamValue, COLOR_ATTR_LENGTH, "#800000");
|
||||
ColorWithValueParameter secondsColorParam = ColorWithValueParameter("Sekundenfarbe", "secondsColorParam", secondsColorParamValue, COLOR_ATTR_LENGTH, "#ffffff");
|
||||
ColorWithValueParameter highnoonColorParam = ColorWithValueParameter("12Uhr Farbe", "highnoonColorParam", highnoonColorParamValue, COLOR_ATTR_LENGTH, "#1E2823");
|
||||
ColorWithValueParameter backlightColorParam = ColorWithValueParameter("Hintergrundfarbe", "backlightColorParam", backlightColorParamValue, COLOR_ATTR_LENGTH, "#1E2823");
|
||||
ColorWithValueParameter hourMarkingColorParam = ColorWithValueParameter("Stundenmarkierung", "hourMarkingColorParam", hourMarkingColorParamValue, COLOR_ATTR_LENGTH, "#787878");
|
||||
|
||||
|
||||
// -- An instance must be created from the class defined above.
|
||||
CustomHtmlFormatProvider customHtmlFormatProvider;
|
||||
|
||||
//ToDo color Picker Second, 12Clock, Minute, Hour
|
||||
|
||||
|
||||
Task bootAnim(200, TASK_FOREVER, &bootAnimCallback);
|
||||
Task clockTick(1000, TASK_FOREVER, &clockTickCallback);
|
||||
Task ledRefresh(200, TASK_FOREVER, &ledRefreshCallback);
|
||||
@ -194,7 +272,7 @@ void iotWebConfHandleRoot() {
|
||||
// -- Captive portal request were already served.
|
||||
return;
|
||||
}
|
||||
|
||||
char sTemp[12];
|
||||
String s = "<!DOCTYPE html><html lang=\"en\"><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=no\"/>";
|
||||
s += "<meta http-equiv=\"refresh\" content=\"30\">";
|
||||
//s += CUSTOMHTML_BODY_INNER;
|
||||
@ -204,7 +282,7 @@ void iotWebConfHandleRoot() {
|
||||
s += "<table>";
|
||||
s += "<tr><td>Current Time:</td><td>";
|
||||
s += printLocalTime();
|
||||
s += "</td></tr><tr></tr><tr><td>NTP Server:</td><td>";
|
||||
s += "</td></tr> <tr></tr><tr><td>NTP Server:</td><td>";
|
||||
s += ntpServerParamValue;
|
||||
s += "</td><tr><tr><td>Current Brightness value: </td><td>";
|
||||
s += String(strip.GetBrightness());
|
||||
@ -216,7 +294,37 @@ void iotWebConfHandleRoot() {
|
||||
s += (allDotsOn ? "Yes" : "No");
|
||||
s += "</td></tr><tr><td>Following Hour: </td><td>";
|
||||
s += (followingHour ? "Yes" : "No");
|
||||
s += "<td></tr></table>";
|
||||
s += "</td></tr><tr><td>";
|
||||
s += "<tr><td>High noon: </td><td style=\"border: 1px solid #000000; background-color:";
|
||||
HtmlColor(RgbColor(highnoonColor.R , highnoonColor.G, highnoonColor.B)).ToNumericalString(sTemp, 11);
|
||||
//HtmlColor(highnoonColor).ToNumericalString(sTemp, 11);
|
||||
s += sTemp;
|
||||
s += ";\"><td></tr>";
|
||||
s += "<tr><td>Hour color: </td><td style=\"border: 1px solid #000000; background-color:";
|
||||
HtmlColor(RgbColor(hourColor.R , hourColor.G, hourColor.B)).ToNumericalString(sTemp, 11);
|
||||
//HtmlColor(hourColor).ToNumericalString(sTemp, 11);
|
||||
s += sTemp;
|
||||
s += ";\"><td></tr>";
|
||||
s += "<tr><td>Minute color: </td><td style=\"border: 1px solid #000000; background-color:";
|
||||
HtmlColor(RgbColor(minuteColor.R , minuteColor.G, minuteColor.B)).ToNumericalString(sTemp, 11);
|
||||
//HtmlColor(minuteColor).ToNumericalString(sTemp, 11);
|
||||
s += sTemp;
|
||||
s += ";\"><td></tr>";
|
||||
s += "<tr><td>Seconds Color: </td><td style=\"border: 1px solid #000000; background-color:";
|
||||
HtmlColor(RgbColor(secondsColor.R , secondsColor.G, secondsColor.B)).ToNumericalString(sTemp, 11);
|
||||
//HtmlColor(secondsColor).ToNumericalString(sTemp, 11);
|
||||
s += sTemp;
|
||||
s += ";\"><td></tr>";
|
||||
s += "<tr><td>Backlight: </td><td style=\"border: 1px solid #000000; background-color:";
|
||||
HtmlColor(RgbColor(backlightColor.R , backlightColor.G, backlightColor.B)).ToNumericalString(sTemp, 11);
|
||||
//HtmlColor(backlightColor).ToNumericalString(sTemp, 11);
|
||||
s += sTemp;
|
||||
s += ";\"><td></tr>";
|
||||
s += "<tr><td>Hour Marking: </td><td style=\"border: 1px solid #000000; background-color:";
|
||||
HtmlColor(RgbColor(hourMarkingColor.R , hourMarkingColor.G, hourMarkingColor.B)).ToNumericalString(sTemp, 11);
|
||||
//HtmlColor(hourMarkingColor).ToNumericalString(sTemp, 11);
|
||||
s += sTemp;
|
||||
s += ";\"><td></tr></table>";
|
||||
s += "<p>";
|
||||
s += "Go to <a href='config'>configure page</a> to change values.";
|
||||
s += "</body></html>\n";
|
||||
@ -234,30 +342,23 @@ void iotWebConfConfigSaved()
|
||||
//Serial.println(allDotsOnParam.isChecked() ? "true" : "false");
|
||||
followingHour = followingHourParam.isChecked() ? true : false;
|
||||
//Serial.println(followingHourParam.isChecked() ? "true" : "false");
|
||||
HtmlColor htmlTemp;
|
||||
htmlTemp.Parse<HtmlColorNames>( highnoonColorParamValue );
|
||||
highnoonColor = htmlTemp ;
|
||||
htmlTemp.Parse<HtmlColorNames>( hourColorParamValue );
|
||||
hourColor = htmlTemp;
|
||||
htmlTemp.Parse<HtmlColorNames>( minuteColorParamValue );
|
||||
minuteColor = htmlTemp;
|
||||
htmlTemp.Parse<HtmlColorNames>( secondsColorParamValue );
|
||||
secondsColor = htmlTemp;
|
||||
htmlTemp.Parse<HtmlColorNames>( backlightColorParamValue );
|
||||
backlightColor = htmlTemp;
|
||||
htmlTemp.Parse<HtmlColorNames>( hourMarkingColorParamValue);
|
||||
hourMarkingColor = htmlTemp;
|
||||
|
||||
Serial.println("Configuration was updated.");
|
||||
|
||||
}
|
||||
/*
|
||||
bool iotWebConfFormValidator(iotwebconf::WebRequestWrapper* webRequestWrapper)
|
||||
{
|
||||
|
||||
Serial.println("Validating form.");
|
||||
boolean valid = true;
|
||||
|
||||
int l = server.arg(ntpServerParam.getId()).length();
|
||||
if (l < 3)
|
||||
{
|
||||
ntpServerParam.errorMessage = "Please provide at least 3 characters for this test!";
|
||||
valid = false;
|
||||
}
|
||||
int b = atoi(maxBrightnessParamValue);
|
||||
if (b < MINIMAL_BRIGHTNESS || b > 254)
|
||||
{
|
||||
valid = false;
|
||||
}
|
||||
return valid;
|
||||
}
|
||||
*/
|
||||
|
||||
void iotWebConf_Setup() {
|
||||
|
||||
@ -267,6 +368,12 @@ void iotWebConf_Setup() {
|
||||
ledGroup.addItem(&singleSecondParam);
|
||||
ledGroup.addItem(&allDotsOnParam);
|
||||
ledGroup.addItem(&followingHourParam);
|
||||
ledGroup.addItem(&hourColorParam);
|
||||
ledGroup.addItem(&minuteColorParam);
|
||||
ledGroup.addItem(&secondsColorParam);
|
||||
ledGroup.addItem(&highnoonColorParam);
|
||||
ledGroup.addItem(&backlightColorParam);
|
||||
ledGroup.addItem(&hourMarkingColorParam);
|
||||
|
||||
iotWebConf.addParameterGroup(&timeGroup);
|
||||
iotWebConf.addParameterGroup(&ledGroup);
|
||||
@ -332,6 +439,7 @@ void setup() {
|
||||
Serial.printf("Lighten up all LEDs: \t%s\n", allDotsOn ? "yes" : "no");
|
||||
Serial.printf("Following Hour: \t%s\n\n", followingHour ? "yes" : "no");
|
||||
|
||||
|
||||
strip.Begin();
|
||||
strip.SetBrightness( MINIMAL_BRIGHTNESS );
|
||||
strip.ClearTo(white);
|
||||
@ -359,25 +467,25 @@ void loop()
|
||||
}
|
||||
|
||||
void ledRefreshCallback() {
|
||||
temp = allDotsOn ? white : black;
|
||||
temp = allDotsOn ? backlightColor : black;
|
||||
strip.ClearTo(temp);
|
||||
//1 dot hour marking
|
||||
for (int dot = 0; dot < NUM_LEDS; dot++) {
|
||||
if (MOD(dot, 5) == 0) {
|
||||
strip.SetPixelColor(dot, whiter);
|
||||
strip.SetPixelColor(dot, hourMarkingColor);
|
||||
}
|
||||
}
|
||||
//3 dots hour
|
||||
strip.SetPixelColor(MOD((currentHour * 5 - 1 + hourOffset), NUM_LEDS), gold);
|
||||
strip.SetPixelColor(MOD((currentHour * 5 + 0 + hourOffset), NUM_LEDS), gold);
|
||||
strip.SetPixelColor(MOD((currentHour * 5 + 1 + hourOffset), NUM_LEDS), gold);
|
||||
strip.SetPixelColor(MOD((currentHour * 5 - 1 + hourOffset), NUM_LEDS), hourColor);
|
||||
strip.SetPixelColor(MOD((currentHour * 5 + 0 + hourOffset), NUM_LEDS), hourColor);
|
||||
strip.SetPixelColor(MOD((currentHour * 5 + 1 + hourOffset), NUM_LEDS), hourColor);
|
||||
|
||||
strip.SetPixelColor(0, white12); //define high noon
|
||||
strip.SetPixelColor(0, highnoonColor); //define high noon
|
||||
|
||||
if (singleSecond) {
|
||||
strip.SetPixelColor(MOD((currentSec + 0), NUM_LEDS), (allDotsOn ? black : white));
|
||||
strip.SetPixelColor(MOD((currentSec + 0), NUM_LEDS), (allDotsOn ? black : secondsColor));
|
||||
}
|
||||
strip.SetPixelColor(MOD((currentMin + 0), NUM_LEDS), darkred);
|
||||
strip.SetPixelColor(MOD((currentMin + 0), NUM_LEDS), minuteColor);
|
||||
strip.Show();
|
||||
}
|
||||
|
||||
|
||||
BIN
60LED_WS2812B_NTP_Clock.ino.lolin32.v1.1.2.bin
Normal file
BIN
60LED_WS2812B_NTP_Clock.ino.lolin32.v1.1.2.bin
Normal file
Binary file not shown.
16
README.md
16
README.md
@ -17,6 +17,12 @@ Ab sofort ist die Uhr unter einer neuen IP erreichbar, sodass dort weitere Einst
|
||||
- Anzeige der einzelnen Sekunden
|
||||
- Aufleuchten aller LEDs
|
||||
- Folgende Stunde (wie auf einer analogen Uhr)
|
||||
- Farbwahl der 12Uhr Markierung
|
||||
- Farbwahl der aktuelle Stunde (3LED)
|
||||
- Farbwahl der aktuellen Minute (1LED)
|
||||
- Farbwahl der aktuellen Sekunde (1LED)
|
||||
- Farbwahl der übrigen LEDs
|
||||
- Farbwahl der restlichen Stunden (10 LEDs)
|
||||
|
||||
Unten auf der Statusseite gibt es einen Link zur Konfigurationsseite, eine Möglichkeit für den Upload einer neuen Firmware sowie die aktuelle Firmwareversion wird angezeigt.
|
||||
|
||||
@ -44,13 +50,15 @@ Unten auf der Statusseite gibt es einen Link zur Konfigurationsseite, eine Mögl
|
||||
- Show Seconds
|
||||
- all Dots lighten up
|
||||
- following Hour
|
||||
- hourColor
|
||||
- fminuteColor
|
||||
- fsecondsColor
|
||||
- fhighnoonColor
|
||||
- fbacklightColor
|
||||
- fhourMarkingColor
|
||||
|
||||
- firmware update link
|
||||
- Firmware config version 'xxxx'
|
||||
|
||||
## ausstehende Verbesserungen
|
||||
- [ ] RGB Auswahl Sekunden
|
||||
- [ ] RGB Auswahl Minuten
|
||||
- [ ] RGB Auswahl Stunden
|
||||
- [ ] RGB Auswahl 12 Uhr
|
||||
- [ ] flüssige Helligkeitsadaptierung
|
||||
|
||||
Loading…
Reference in New Issue
Block a user