From 8fc426fde819031d98802ce2adf1a060753e6f29 Mon Sep 17 00:00:00 2001 From: dinamitemic Date: Thu, 8 Apr 2021 12:23:23 +0200 Subject: [PATCH 1/2] Added Digital Clock implementation and built html files --- package-lock.json | 2 +- wled00/data/settings_time.htm | 8 ++++- wled00/fcn_declare.h | 1 + wled00/html_settings.h | 32 ++++++++--------- wled00/overlay.cpp | 68 +++++++++++++++++++++++++++++++++++ 5 files changed, 93 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index c6b006a935..3c8af6c98e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wled", - "version": "0.11.1", + "version": "0.12.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/wled00/data/settings_time.htm b/wled00/data/settings_time.htm index 9924530f32..e650647ffa 100644 --- a/wled00/data/settings_time.htm +++ b/wled00/data/settings_time.htm @@ -40,6 +40,11 @@ { gId("coc").style.display="none"; } + if (gId("cd").selected) + { + gId("coc").style.display="none"; + gId("ccc").style.display="none"; + } } function BTa() { @@ -119,6 +124,7 @@

Clock

+
First LED: Last LED:
@@ -152,4 +158,4 @@

Time-controlled presets

- + \ No newline at end of file diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h index 28621fd6f1..03a3b08e75 100644 --- a/wled00/fcn_declare.h +++ b/wled00/fcn_declare.h @@ -142,6 +142,7 @@ void handleOverlays(); void handleOverlayDraw(); void _overlayAnalogCountdown(); void _overlayAnalogClock(); +void _overlayDigitalClock(); byte getSameCodeLength(char code, int index, char const cronixieDisplay[]); void setCronixie(); diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 34e5a31800..29c987f5c4 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -303,7 +303,7 @@ type="submit">Save)====="; // Autogenerated from wled00/data/settings_time.htm, do not edit!! const char PAGE_settings_time[] PROGMEM = R"=====( Time Settings