Merge branch 'feature/new-mode-minutes' of github.com:Wandmalfarbe/Wo…

…rtuhr into MinutesDigitalClock
ESPWortuhr · Apr 24, 2023 · 17d0cb0 · 17d0cb0
2 parents 9cd9811 + 1980e7a
commit 17d0cb0
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/include/Uhr.h b/include/Uhr.h
@@ -211,7 +211,7 @@ enum CommandWords {
     COMMAND_MODE_RAINBOWCYCLE = 4,
     COMMAND_MODE_RAINBOW = 5,
     COMMAND_MODE_COLOR = 6,
-    COMMAND_MODE_DIGITALCLOCK = 7,
+    COMMAND_MODE_DIGITAL_CLOCK = 7,
 
     COMMAND_MODE_ANIMATION = 10,
     COMMAND_SET_INITIAL_VALUES = 20,
@@ -278,4 +278,4 @@ enum Icons {
     FIRE_4 = 9,
     FIRE_5 = 10,
     FIRE_6 = 11,
-};
+};
diff --git a/include/clockWork.hpp b/include/clockWork.hpp
@@ -1076,7 +1076,7 @@ void ClockWork::loop(struct tm &tm) {
         break;
     }
 
-    case COMMAND_MODE_DIGITALCLOCK: {
+    case COMMAND_MODE_DIGITAL_CLOCK: {
         if (G.progInit) {
             led.clear();
             G.progInit = false;

diff --git a/include/mqtt.hpp b/include/mqtt.hpp
@@ -86,7 +86,7 @@ void Mqtt::callback(char *topic, byte *payload, unsigned int length) {
         } else if (!strcmp("Seconds", doc["effect"])) {
             G.prog = COMMAND_MODE_SECONDS;
         } else if (!strcmp("Digitalclock", doc["effect"])) {
-            G.prog = COMMAND_MODE_DIGITALCLOCK;
+            G.prog = COMMAND_MODE_DIGITAL_CLOCK;
         } else if (!strcmp("Scrollingtext", doc["effect"])) {
             G.prog = COMMAND_MODE_SCROLLINGTEXT;
         } else if (!strcmp("Rainbowcycle", doc["effect"])) {

diff --git a/include/webPageAdapter.h b/include/webPageAdapter.h
@@ -211,8 +211,8 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t *payload,
 
             //------------------------------------------------------------------------------
 
-        case COMMAND_MODE_DIGITALCLOCK: {
-            G.prog = COMMAND_MODE_DIGITALCLOCK;
+        case COMMAND_MODE_DIGITAL_CLOCK: {
+            G.prog = COMMAND_MODE_DIGITAL_CLOCK;
             G.progInit = true;
 
             parseMainColor(payload, Effect);

diff --git a/webpage/index.html b/webpage/index.html
@@ -114,7 +114,7 @@ <h2 data-i18next="functions.mode.h2"></h2>
 
                         <span class="radio-wrapper"><input id="mode-seconds" type="radio" name="mode" value="seconds"><label for="mode-seconds" class="pure-radio" data-i18next="functions.mode.seconds"></label></span>
 
-                        <span class="radio-wrapper"><input id="mode-digitalclock" type="radio" name="mode" value="seconds"><label for="mode-digitalclock" class="pure-radio" data-i18next="functions.mode.minutes"></label></span>
+                        <span class="radio-wrapper"><input id="mode-digital-clock" type="radio" name="mode" value="seconds"><label for="mode-digital-clock" class="pure-radio" data-i18next="functions.mode.digital-clock"></label></span>
 
                         <span class="radio-wrapper"><input id="mode-marquee" type="radio" name="mode" value="marquee"><label for="mode-marquee" class="pure-radio" data-i18next="functions.mode.marquee"></label></span>
 

diff --git a/webpage/language/de.js b/webpage/language/de.js
@@ -27,7 +27,7 @@ let TRANSLATION_DE_DE = {
 			"wordclock": "Wortuhr",
 			"color": "Farbe",
 			"seconds": "Sekunden",
-			"digitalclock": "Digitaluhr",
+			"digital-clock": "Digitaluhr",
 			"marquee": "Laufschrift",
 			"rainbow": "Regenbogen",
 			"color-change": "Farbwechsel"

diff --git a/webpage/language/en.js b/webpage/language/en.js
@@ -27,7 +27,7 @@ let TRANSLATION_EN_US = {
 			"wordclock": "Word Clock",
 			"color": "Color",
 			"seconds": "Seconds",
-			"digitalclock": "Digitalclock",
+			"digital-clock": "Digital Clock",
 			"marquee": "Marquee",
 			"rainbow": "Rainbow",
 			"color-change": "Color Change"

diff --git a/webpage/language/nl.js b/webpage/language/nl.js
@@ -27,7 +27,7 @@ let TRANSLATION_NL = {
 			"wordclock": "Woordklok",
 			"color": "Kleur",
 			"seconds": "Seconden",
-			"digitalclock": "Digitalklok",
+			"digital-clock": "Digitale klok",
 			"marquee": "Tekst",
 			"rainbow": "Regenboog",
 			"color-change": "Kleurverandering"

diff --git a/webpage/script.js b/webpage/script.js
@@ -89,7 +89,7 @@ var COMMAND_MODE_SCROLLINGTEXT = 3;
 var COMMAND_MODE_RAINBOWCYCLE = 4;
 var COMMAND_MODE_RAINBOW = 5;
 var COMMAND_MODE_COLOR = 6;
-var COMMAND_MODE_DIGITALCLOCK = 7;
+var COMMAND_MODE_DIGITAL_CLOCK = 7;
 var COMMAND_MODE_ANIMATION = 10;
 
 /**
@@ -105,7 +105,7 @@ MODE_TO_INPUT_ID.set(COMMAND_MODE_SCROLLINGTEXT, "mode-marquee");
 MODE_TO_INPUT_ID.set(COMMAND_MODE_RAINBOWCYCLE, "mode-rainbow");
 MODE_TO_INPUT_ID.set(COMMAND_MODE_RAINBOW, "mode-change"); // Color change
 MODE_TO_INPUT_ID.set(COMMAND_MODE_COLOR, "mode-color");
-MODE_TO_INPUT_ID.set(COMMAND_MODE_DIGITALCLOCK, "mode-digitalclock");
+MODE_TO_INPUT_ID.set(COMMAND_MODE_DIGITAL_CLOCK, "mode-digital-clock");
 MODE_TO_INPUT_ID.set(COMMAND_MODE_ANIMATION, "mode-wordclock");
 
 // other commands
@@ -735,8 +735,8 @@ $.ready(function() {
 		if (id === "mode-seconds") {
 			command = COMMAND_MODE_SECONDS;
 		}
-		if (id === "mode-digitalclock") {
-			command = COMMAND_MODE_DIGITALCLOCK;
+		if (id === "mode-digital-clock") {
+			command = COMMAND_MODE_DIGITAL_CLOCK;
 		}
 		if (id === "mode-marquee") {
 			hasSpeed = true;