diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index a65d04346f..a8aec9aa36 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -343,6 +343,9 @@ bool deserializeConfig(JsonObject doc, bool fromFS) { CJSON(analogClock5MinuteMarks, ol[F("o5m")]); CJSON(analogClockSecondsTrail, ol[F("osec")]); + CJSON(digitalLedPerSegment, ol[F("lps")]); + CJSON(digitalColon, ol[F("dc")]); + //timed macro rules JsonObject tm = doc[F("timers")]; JsonObject cntdwn = tm[F("cntdwn")]; diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index 5c00c82714..f12d7a257a 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -1,408 +1,408 @@ - - - - - - LED Settings - - - - -
-
-
-

LED & Hardware setup

- Total LED count:
- Recommended power supply for brightest white:
- ?
-
-
- Enable automatic brightness limiter:
-
- Maximum Current: mA
- - Automatically limits brightness to stay close to the limit.
- Keep at <1A if powering LEDs directly from the ESP 5V pin!
- If you are using an external power supply, enter its rating.
- (Current estimated usage: unknown)

- LED voltage (Max. current for a single LED):
-
- - Keep at default if you are unsure about your type of LEDs.
-
-

Hardware setup

-
LED outputs:
- -
- LED Memory Usage: 0 / ? B
-

-
-
- Touch threshold:
- IR pin:   ×
- IR info
- Relay pin: Invert  ×
-
-

Defaults

- Turn LEDs on after power up/reset:
- Default brightness: (0-255)

- Apply preset at boot (0 uses defaults) -
- or -
- Set current preset cycle setting as boot default:

- Use Gamma correction for color: (strongly recommended)
- Use Gamma correction for brightness: (not recommended)

- Brightness factor: % -

Transitions

- Crossfade:
- Transition Time: ms
- Enable Palette transitions: -

Timed light

- Default Duration: min
- Default Target brightness:
- Mode: - -

Advanced

- Palette blending: -
- - Auto-calculate white channel from RGB:
- -
- -
- - + + + + + + LED Settings + + + + +
+
+
+

LED & Hardware setup

+ Total LED count:
+ Recommended power supply for brightest white:
+ ?
+
+
+ Enable automatic brightness limiter:
+
+ Maximum Current: mA
+ + Automatically limits brightness to stay close to the limit.
+ Keep at <1A if powering LEDs directly from the ESP 5V pin!
+ If you are using an external power supply, enter its rating.
+ (Current estimated usage: unknown)

+ LED voltage (Max. current for a single LED):
+
+ + Keep at default if you are unsure about your type of LEDs.
+
+

Hardware setup

+
LED outputs:
+ +
+ LED Memory Usage: 0 / ? B
+

+
+
+ Touch threshold:
+ IR pin:   ×
+ IR info
+ Relay pin: Invert  ×
+
+

Defaults

+ Turn LEDs on after power up/reset:
+ Default brightness: (0-255)

+ Apply preset at boot (0 uses defaults) +
- or -
+ Set current preset cycle setting as boot default:

+ Use Gamma correction for color: (strongly recommended)
+ Use Gamma correction for brightness: (not recommended)

+ Brightness factor: % +

Transitions

+ Crossfade:
+ Transition Time: ms
+ Enable Palette transitions: +

Timed light

+ Default Duration: min
+ Default Target brightness:
+ Mode: + +

Advanced

+ Palette blending: +
+ + Auto-calculate white channel from RGB:
+ +
+ +
+ + diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm index b9a3967779..e436ee4ed8 100644 --- a/wled00/data/settings_time.htm +++ b/wled00/data/settings_time.htm @@ -22,11 +22,17 @@ { return d.getElementById(s); } + function gId(s) + { + return d.getElementById(s); + } function Cs() { gId("cac").style.display="none"; gId("coc").style.display="block"; gId("ccc").style.display="none"; + gId("cdc").style.display="none"; + if (gId("ca").selected) { gId("cac").style.display="block"; @@ -36,6 +42,11 @@ gId("coc").style.display="none"; gId("ccc").style.display="block"; } + if (gId("cd").selected) + { + gId("coc").style.display="none"; + gId("cdc").style.display="block"; + } if (gId("cn").selected) { gId("coc").style.display="none"; @@ -141,6 +152,7 @@

Clock

+
First LED: Last LED:
@@ -153,6 +165,10 @@

Clock

Cronixie Display:
Cronixie Backlight:
+
+ LED per segment:
+ Colon led's between hours and minutes:
+ Countdown Mode:
Countdown Goal:
Year: 20 Month: Day:
diff --git a/wled00/html_settings.h b/wled00/html_settings.h index a02d1aea9e..f47eaade91 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -300,7 +300,7 @@ type="submit">Save)====="; // Autogenerated from wled00/data/settings_time.htm, do not edit!! const char PAGE_settings_time[] PROGMEM = R"=====( Time Settings