From 5be2c03bc46eb19dcf2a4486ddd6310014d50c9b Mon Sep 17 00:00:00 2001 From: David Panusch Date: Thu, 19 Dec 2024 09:52:19 -0500 Subject: [PATCH 1/9] Removed necessary file --- docs/~$leitung-Wort-Uhr.docx | Bin 162 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 docs/~$leitung-Wort-Uhr.docx diff --git a/docs/~$leitung-Wort-Uhr.docx b/docs/~$leitung-Wort-Uhr.docx deleted file mode 100644 index 1215360c558324f168a348f977b46d5a160ee437..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmWgj%}g%JFV0UZQSeVo%S=vH2rW)6VjuuS8GIQs8Il=_81fm4fjEt!gh7G9A4sQx Q#Z!U2P@qgIPz9v`0A Date: Thu, 19 Dec 2024 09:52:41 -0500 Subject: [PATCH 2/9] Updated esp32c3env --- platformio.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platformio.ini b/platformio.ini index 42c6cb4..18fe607 100644 --- a/platformio.ini +++ b/platformio.ini @@ -52,11 +52,11 @@ lib_deps = extra_scripts = pre:extra_scripts.py [env:esp32c3dev] -platform = espressif32 +platform = espressif32 @ 6.9.0 board = esp32-c3-devkitc-02 board_build.partitions = partitions_singleapp_large.csv framework = arduino -upload_speed = 921600 +upload_speed = 115200 monitor_speed = 460800 build_flags = -Os @@ -66,7 +66,7 @@ build_flags = lib_deps = makuna/NeoPixelBus@^2.7.6 bblanchon/ArduinoJson@^6.17.2 - links2004/WebSockets@2.4.1 + links2004/WebSockets@^2.4.1 adafruit/RTClib@^1.11.2 knolleary/PubSubClient@^2.8.0 https://github.com/tzapu/WiFiManager#v2.0.17 From 24962603d382426d93a8a98fa1b28196dbab555a Mon Sep 17 00:00:00 2001 From: David Panusch Date: Thu, 19 Dec 2024 10:04:58 -0500 Subject: [PATCH 3/9] Added Swissgerman layout option with "Gsi" --- include/Uhr.h | 1 + include/Uhrtypes/CH10x11v2.hpp | 130 +++++++++++++++++++++++++++++++++ include/clockWork.hpp | 2 + include/config.h | 4 + webpage/index.html | 1 + webpage/language/de.js | 1 + webpage/language/en.js | 1 + webpage/language/es.js | 1 + webpage/language/hu.js | 1 + webpage/language/it.js | 1 + webpage/language/nl.js | 1 + webpage/language/ru.js | 1 + 12 files changed, 145 insertions(+) create mode 100644 include/Uhrtypes/CH10x11v2.hpp diff --git a/include/Uhr.h b/include/Uhr.h index f96e30d..9c6a21a 100644 --- a/include/Uhr.h +++ b/include/Uhr.h @@ -285,6 +285,7 @@ enum ClockType { Fr10x11 = 21, Se10x11 = 22, Ru10x11 = 23, + Ch10x11V2 = 24, }; enum Icons { diff --git a/include/Uhrtypes/CH10x11v2.hpp b/include/Uhrtypes/CH10x11v2.hpp new file mode 100644 index 0000000..dda861b --- /dev/null +++ b/include/Uhrtypes/CH10x11v2.hpp @@ -0,0 +1,130 @@ +#pragma once + +#include "CH10x11.hpp" + +/* + * Layout Front + * COL + * X 9 8 7 6 5 4 3 2 1 0 + * ROW + - - - - - - - - - - - + * 0 | E S K I S C H U F Ü F + * 1 | V I E R T U N F Z Ä Ä + * 2 | Z W Ä N Z G S E V O R + * 3 | A B C H A U B I E C M + * 4 | E I S Z W Ö I S D R Ü + * 5 | V I E R I F Ü F I S T + * 6 | S Ä C H S I S I B N I + * 7 | A C H T I N Ü N I E L + * 8 | Z Ä N I E C H E U F I + * 9 | Z W Ö U F I E N G S I + */ + +class Ch10x11V2_t : public Ch10x11_t { +public: + virtual LanguageAbbreviation usedLang() override { + return LanguageAbbreviation::DE; + }; + + //------------------------------------------------------------------------------ + + void show(FrontWord word) override { + switch (word) { + + case FrontWord::es_ist: + setFrontMatrixWord(0, 9, 10); + setFrontMatrixWord(0, 4, 7); + break; + + case FrontWord::nach: + case FrontWord::v_nach: + setFrontMatrixWord(3, 9, 10); + break; + + case FrontWord::vor: + case FrontWord::v_vor: + setFrontMatrixWord(2, 0, 2); + break; + + case FrontWord::viertel: + setFrontMatrixWord(1, 5, 10); + break; + + case FrontWord::min_5: + setFrontMatrixWord(0, 0, 2); + break; + + case FrontWord::min_10: + setFrontMatrixWord(1, 0, 2); + break; + + case FrontWord::min_20: + setFrontMatrixWord(2, 5, 10); + break; + + case FrontWord::halb: + setFrontMatrixWord(3, 3, 7); + break; + + case FrontWord::eins: + setFrontMatrixWord(4, 8, 10); + break; + + case FrontWord::hour_1: + setFrontMatrixWord(4, 8, 10); + break; + + case FrontWord::hour_2: + setFrontMatrixWord(4, 4, 7); + break; + + case FrontWord::hour_3: + setFrontMatrixWord(4, 0, 2); + break; + + case FrontWord::hour_4: + setFrontMatrixWord(5, 6, 10); + break; + + case FrontWord::hour_5: + setFrontMatrixWord(5, 2, 5); + break; + + case FrontWord::hour_6: + setFrontMatrixWord(6, 5, 10); + break; + + case FrontWord::hour_7: + setFrontMatrixWord(6, 0, 4); + break; + + case FrontWord::hour_8: + setFrontMatrixWord(7, 6, 10); + break; + + case FrontWord::hour_9: + setFrontMatrixWord(7, 2, 5); + break; + + case FrontWord::hour_10: + setFrontMatrixWord(8, 7, 10); + break; + + case FrontWord::hour_11: + setFrontMatrixWord(8, 0, 3); + break; + + case FrontWord::hour_12: + setFrontMatrixWord(9, 5, 10); + break; + + case FrontWord::gewesen: + setFrontMatrixWord(9, 0, 2); + break; + + default: + break; + }; + }; +}; + +Ch10x11_t _ch10x11V2; \ No newline at end of file diff --git a/include/clockWork.hpp b/include/clockWork.hpp index 2a71bda..4410228 100644 --- a/include/clockWork.hpp +++ b/include/clockWork.hpp @@ -143,6 +143,8 @@ iUhrType *ClockWork::getPointer(uint8_t type) { return &_se10x11; case Ru10x11: return &_ru10x11; + case Ch10x11V2: + return &_ch10x11V2; default: return nullptr; } diff --git a/include/config.h b/include/config.h index 427ec30..74584e5 100644 --- a/include/config.h +++ b/include/config.h @@ -107,6 +107,10 @@ // #define DEFAULT_LAYOUT Ch10x11 // 10 rows, 11 LED's per row + 4 LED's for minutes, with modified // layout for the Swiss German language +// +// #define DEFAULT_LAYOUT Ch10x11V2 +// 10 rows, 11 LED's per row + 4 LED's for minutes, with modified +// layout for the Swiss German language with "Gsi" option /**********************/ /* Romanian */ diff --git a/webpage/index.html b/webpage/index.html index 9769ffc..3e3499e 100644 --- a/webpage/index.html +++ b/webpage/index.html @@ -332,6 +332,7 @@

+ diff --git a/webpage/language/de.js b/webpage/language/de.js index 19d2dc2..e694c8a 100644 --- a/webpage/language/de.js +++ b/webpage/language/de.js @@ -139,6 +139,7 @@ let TRANSLATION_DE_DE = { "fr-10-11": "🇫🇷 10 x 11", "se-10-11": "🇸🇪 10 × 11", "ru-10-11": "🇷🇺 10 × 11", + "ch-10-11-v2": "🇨🇭 10 x 11 Version 2", "invert-min-dir": "Minutenzählrichtung invertieren", "mirror-vertically": "Wortuhr vertikal spiegeln", "mirror-horizontally": "Wortuhr horizontal spiegeln", diff --git a/webpage/language/en.js b/webpage/language/en.js index edca4db..576df24 100644 --- a/webpage/language/en.js +++ b/webpage/language/en.js @@ -139,6 +139,7 @@ let TRANSLATION_EN_US = { "fr-10-11": "🇫🇷 10 x 11", "se-10-11": "🇸🇪 10 × 11", "ru-10-11": "🇷🇺 10 × 11", + "ch-10-11-v2": "🇨🇭 10 x 11 Version 2", "invert-min-dir": "Invert Minute Counting Direction", "mirror-vertically": "Mirror Word Clock Vertically", "mirror-horizontally": "Mirror Word Clock Horizontally", diff --git a/webpage/language/es.js b/webpage/language/es.js index 8e4ade5..dc6d3f3 100644 --- a/webpage/language/es.js +++ b/webpage/language/es.js @@ -115,6 +115,7 @@ let TRANSLATION_ES = { "fr-10-11": "🇫🇷 10 x 11", "se-10-11": "🇸🇪 10 × 11", "ru-10-11": "🇷🇺 10 × 11", + "ch-10-11-v2": "🇨🇭 10 x 11 Version 2", "invert-min-dir": "Invertir la dirección de conteo de minutos", "mirror-vertically": "Voltear el reloj verticalmente", "mirror-horizontally": "Voltear el reloj horizontalmente", diff --git a/webpage/language/hu.js b/webpage/language/hu.js index ad9a25c..ef22702 100644 --- a/webpage/language/hu.js +++ b/webpage/language/hu.js @@ -112,6 +112,7 @@ let TRANSLATION_HU = { "hu-10-10": "🇭🇺 10 x 10", "se-10-11": "🇸🇪 10 × 11", "ru-10-11": "🇷🇺 10 × 11", + "ch-10-11-v2": "🇨🇭 10 x 11 verzió 2", "invert-min-dir": "Percszámláló-irány megfordítása", "mirror-vertically": "Szövegóra függőleges tükrözése", "mirror-horizontally": "Szövegóra vízszintes tükrözése", diff --git a/webpage/language/it.js b/webpage/language/it.js index da47bbb..dfde978 100644 --- a/webpage/language/it.js +++ b/webpage/language/it.js @@ -115,6 +115,7 @@ let TRANSLATION_IT = { "fr-10-11": "🇫🇷 10 x 11", "se-10-11": "🇸🇪 10 × 11", "ru-10-11": "🇷🇺 10 × 11", + "ch-10-11-v2": "🇨🇭 10 x 11 Version 2", "invert-min-dir": "Invertire la direzione del conteggio dei minuti", "mirror-vertically": "Capovolgi l'orologio verticalmente", "mirror-horizontally": "Capovolgi l'orologio orizzontalmente", diff --git a/webpage/language/nl.js b/webpage/language/nl.js index 206be88..a3f26e5 100644 --- a/webpage/language/nl.js +++ b/webpage/language/nl.js @@ -115,6 +115,7 @@ let TRANSLATION_NL = { "fr-10-11": "🇫🇷 10 x 11", "se-10-11": "🇸🇪 10 × 11", "ru-10-11": "🇷🇺 10 × 11", + "ch-10-11-v2": "🇨🇭 10 x 11 Versie 2", "invert-min-dir": "Draai minuutrichting om", "mirror-vertically": "Spiegel Woordklok verticaal", "mirror-horizontally": "Spiegel Woordklok horizontaal", diff --git a/webpage/language/ru.js b/webpage/language/ru.js index 3684840..8fac7ac 100755 --- a/webpage/language/ru.js +++ b/webpage/language/ru.js @@ -103,6 +103,7 @@ let TRANSLATION_RU = { "fr-10-11": "🇫🇷 10 x 11", "se-10-11": "🇸🇪 10 × 11", "ru-10-11": "🇷🇺 10 × 11", + "ch-10-11-v2": "🇨🇭 10 x 11 V 2", "invert-min-dir": "Обратное направление отсчета минут", "mirror-vertically": "Переверните часы вертикально", "mirror-horizontally": "Переверните часы горизонтально", From ae4f53f9b43c20270e579a8d0d96d4bf3e21273e Mon Sep 17 00:00:00 2001 From: David Panusch Date: Tue, 14 Jan 2025 10:13:03 +0100 Subject: [PATCH 4/9] Fixed hour_9 in Ger_16x8 Layout --- include/Uhrtypes/DE16x8.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Uhrtypes/DE16x8.hpp b/include/Uhrtypes/DE16x8.hpp index c85c0c6..4b22ad3 100644 --- a/include/Uhrtypes/DE16x8.hpp +++ b/include/Uhrtypes/DE16x8.hpp @@ -164,7 +164,7 @@ class De16x8_t : public iUhrType { break; case FrontWord::hour_9: - setFrontMatrixWord(4, 7, 10); + setFrontMatrixWord(4, 4, 7); break; case FrontWord::hour_10: From e35abab16a6e960870409d4681080f34828d81e9 Mon Sep 17 00:00:00 2001 From: David Panusch Date: Tue, 14 Jan 2025 23:30:08 +0100 Subject: [PATCH 5/9] Fixed Twenty usage --- include/clockWork.h | 1 + include/clockWork.hpp | 9 ++++++++- webpage/index.html | 8 ++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/include/clockWork.h b/include/clockWork.h index 8553f52..239f1b3 100644 --- a/include/clockWork.h +++ b/include/clockWork.h @@ -42,6 +42,7 @@ class ClockWork { void showMinute(uint8_t min); void resetMinVariantIfNotAvailable(); FrontWord getFrontWordForNum(uint8_t min); + bool checkTwentyUsage(); bool hasTwentyAndCheckForUsage(); bool hasDreiviertelAndCheckForUsage(); void setMinute(uint8_t min, uint8_t &offsetHour, bool &fullHour); diff --git a/include/clockWork.hpp b/include/clockWork.hpp index 4410228..2150b12 100644 --- a/include/clockWork.hpp +++ b/include/clockWork.hpp @@ -515,8 +515,15 @@ FrontWord ClockWork::getFrontWordForNum(uint8_t min) { //------------------------------------------------------------------------------ +bool ClockWork::checkTwentyUsage() { + return G.languageVariant[ItIs20] || G.languageVariant[ItIs40]; +} + +//------------------------------------------------------------------------------ + bool ClockWork::hasTwentyAndCheckForUsage() { - return usedUhrType->hasZwanzig() || G.languageVariant[ItIs40]; + // ToDo: Is this true for every supoorted language variant? + return usedUhrType->hasZwanzig() && checkTwentyUsage(); } //------------------------------------------------------------------------------ diff --git a/webpage/index.html b/webpage/index.html index 3e3499e..f8e4eec 100644 --- a/webpage/index.html +++ b/webpage/index.html @@ -389,14 +389,14 @@

From d9bc09fa977ed33f65482663e61a08438b1c2266 Mon Sep 17 00:00:00 2001 From: David Panusch Date: Thu, 16 Jan 2025 22:00:28 +0100 Subject: [PATCH 6/9] Added Feature to show select when It Is is shown. --- include/Uhr.h | 12 ++++++++++-- include/clockWork.h | 2 ++ include/clockWork.hpp | 38 ++++++++++++++++++++++++++++++++++---- include/webPageAdapter.h | 2 +- webpage/index.html | 14 +++++++++----- webpage/language/de.js | 12 +++++++++++- webpage/language/en.js | 7 ++++++- webpage/language/es.js | 7 ++++++- webpage/language/hu.js | 7 ++++++- webpage/language/it.js | 7 ++++++- webpage/language/nl.js | 7 ++++++- webpage/language/ru.js | 7 ++++++- webpage/script.js | 2 +- 13 files changed, 104 insertions(+), 20 deletions(-) diff --git a/include/Uhr.h b/include/Uhr.h index 9c6a21a..a639d8e 100644 --- a/include/Uhr.h +++ b/include/Uhr.h @@ -91,6 +91,14 @@ enum class WordclockChanges { Words, }; +enum class ItIsVariant { + Permanent = 0, + Quarterly = 1, + HalfHourly = 2, + Hourly = 3, + Off = 4, +}; + struct GLOBAL { uint16_t sernr; uint16_t prog; @@ -103,6 +111,7 @@ struct GLOBAL { uint8_t client_nr; SecondVariant secondVariant; MinuteVariant minuteVariant; + ItIsVariant itIsVariant; bool languageVariant[6]; bool layoutVariant[3]; char timeserver[PAYLOAD_LENGTH]; @@ -190,8 +199,7 @@ enum LanguageDialects { ItIs20 = 1, ItIs40 = 2, ItIs45 = 3, - NotShowItIs = 4, - EN_ShowAQuarter = 5, + EN_ShowAQuarter = 4, }; enum LayoutVariants { diff --git a/include/clockWork.h b/include/clockWork.h index 239f1b3..527b347 100644 --- a/include/clockWork.h +++ b/include/clockWork.h @@ -60,6 +60,8 @@ class ClockWork { WordclockChanges changesInClockface(); void calcClockface(); void setClock(); + void setItIs(uint8_t min, const uint8_t offsetHour); + bool DetermineIfItIsIsShown(const uint8_t min); void DetermineWhichItIsToShow(uint8_t offsetHour); void clearClockByProgInit(); diff --git a/include/clockWork.hpp b/include/clockWork.hpp index 2150b12..5572068 100644 --- a/include/clockWork.hpp +++ b/include/clockWork.hpp @@ -918,16 +918,46 @@ WordclockChanges ClockWork::changesInClockface() { //------------------------------------------------------------------------------ +bool ClockWork::DetermineIfItIsIsShown(const uint8_t min) { + switch (G.itIsVariant) { + case ItIsVariant::Permanent: + return true; + break; + case ItIsVariant::Hourly: + return !min; + break; + case ItIsVariant::HalfHourly: + return !(min % 30); + break; + case ItIsVariant::Quarterly: + return !(min % 15); + break; + case ItIsVariant::Off: + default: + return false; + break; + } +} + +//------------------------------------------------------------------------------ +void ClockWork::setItIs(uint8_t min, const uint8_t offsetHour) { + min /= 5; + min *= 5; + + if (DetermineIfItIsIsShown(min)) { + DetermineWhichItIsToShow(_hour + offsetHour); + } +} + +//------------------------------------------------------------------------------ + void ClockWork::setClock() { uint8_t offsetHour = 0; bool fullHour = 0; setMinute(_minute, offsetHour, fullHour); setHour(_hour + offsetHour, fullHour); - - if (!G.languageVariant[NotShowItIs]) { - DetermineWhichItIsToShow(_hour + offsetHour); - } + setItIs(_minute, offsetHour); } //------------------------------------------------------------------------------ diff --git a/include/webPageAdapter.h b/include/webPageAdapter.h index bcca4c6..6b46e55 100644 --- a/include/webPageAdapter.h +++ b/include/webPageAdapter.h @@ -374,7 +374,7 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t *payload, G.languageVariant[ItIs20] = split(payload, 6); G.languageVariant[ItIs40] = split(payload, 9); G.languageVariant[ItIs45] = split(payload, 12); - G.languageVariant[NotShowItIs] = split(payload, 15); + G.itIsVariant = static_cast(split(payload, 15)); G.languageVariant[EN_ShowAQuarter] = split(payload, 18); break; } diff --git a/webpage/index.html b/webpage/index.html index f8e4eec..08347fb 100644 --- a/webpage/index.html +++ b/webpage/index.html @@ -374,11 +374,15 @@

- - +
+ +
diff --git a/webpage/language/de.js b/webpage/language/de.js index e694c8a..0df9872 100644 --- a/webpage/language/de.js +++ b/webpage/language/de.js @@ -28,6 +28,11 @@ let TRANSLATION_DE_DE = { "functions": { "h1": "Funktionen", + "color": { + "foreground": "Vordergrund", + "background": "Hintergrund", + "frame": "Rahmen" + }, "mode": { "h2": "Modus", "wordclock": "Wortuhr", @@ -150,7 +155,12 @@ let TRANSLATION_DE_DE = { }, "language": { "h2": "Sprache", - "hide-it-is": "„Es ist“ ausblenden", + "hide-it-is": "„'Es ist' Anzeige“", + "it-is-off": "Aus", + "it-is-hourly": "Stündlich", + "it-is-half-hourly": "Halbstündlich", + "it-is-quarterly": "Viertelstündlich", + "it-is-permanent": "Permanent", "at-nine-fifteen": "Um 9:15 ist es ...", "quarter-past-nine": "viertel nach neun", "quarter-nine": "viertel zehn", diff --git a/webpage/language/en.js b/webpage/language/en.js index 576df24..9d00734 100644 --- a/webpage/language/en.js +++ b/webpage/language/en.js @@ -150,7 +150,12 @@ let TRANSLATION_EN_US = { }, "language": { "h2": "Language", - "hide-it-is": "Hide “It Is”", + "hide-it-is": "„Display 'It is'“", + "it-is-off": "Off", + "it-is-hourly": "Hourly", + "it-is-half-hourly": "Half-hourly", + "it-is-quarterly": "Quarterly", + "it-is-permanent": "Permanent", "at-nine-fifteen": "On 9:15 It Is ...", "quarter-past-nine": "Quarter Past Nine", // German: viertel nach neun "quarter-nine": "Quarter Ten", // German: viertel zehn diff --git a/webpage/language/es.js b/webpage/language/es.js index dc6d3f3..8695cf6 100644 --- a/webpage/language/es.js +++ b/webpage/language/es.js @@ -126,7 +126,12 @@ let TRANSLATION_ES = { }, "language": { "h2": "Idioma", - "hide-it-is": "„Son las“ esconderse", + "hide-it-is": "Mostrar 'Son Las'“", + "it-is-off": "Apagado", + "it-is-hourly": "Por hora", + "it-is-half-hourly": "Media hora", + "it-is-quarterly": "Trimestral", + "it-is-permanent": "Permanente", "at-nine-fifteen": "Son las 9:15 ...", "quarter-past-nine": "las nueve y cuarto", "quarter-nine": "un cuarto de diez", diff --git a/webpage/language/hu.js b/webpage/language/hu.js index ef22702..05e4f10 100644 --- a/webpage/language/hu.js +++ b/webpage/language/hu.js @@ -123,7 +123,12 @@ let TRANSLATION_HU = { }, "language": { "h2": "Nyelv", - "hide-it-is": "„Es ist“ kikapcsolása", + "hide-it-is": "„Mutasd meg a 'Ez a'“", + "it-is-off": "Off", + "it-is-hourly": "Óránként", + "it-is-half-hourly": "Félóránként", + "it-is-quarterly": "Negyedéves", + "it-is-permanent": "Állandó", "at-nine-fifteen": "9:15-kor van...", "quarter-past-nine": "kilenc óra tizenöt perc", "quarter-nine": "negyed tíz", diff --git a/webpage/language/it.js b/webpage/language/it.js index dfde978..c2f1de5 100644 --- a/webpage/language/it.js +++ b/webpage/language/it.js @@ -126,7 +126,12 @@ let TRANSLATION_IT = { }, "language": { "h2": "Lingua", - "hide-it-is": "„Sono le“ nascondi", + "hide-it-is": "Visualizza 'Sono le'“", + "it-is-off": "Spento", + "it-is-hourly": "Oario", + "it-is-half-hourly": "Mezz'ora", + "it-is-quarterly": "Trimestrale", + "it-is-permanent": "Permanente", "at-nine-fifteen": "Sono le 9:15 ...", "quarter-past-nine": "las nueve y quarto", "quarter-nine": "un quarto di diez", diff --git a/webpage/language/nl.js b/webpage/language/nl.js index a3f26e5..b862c07 100644 --- a/webpage/language/nl.js +++ b/webpage/language/nl.js @@ -126,7 +126,12 @@ let TRANSLATION_NL = { }, "language": { "h2": "Taal", - "hide-it-is": "Verberg “Het is”", + "hide-it-is": "„Display 'Het is'“", + "it-is-off": "Uit", + "it-is-hourly": "Per uur", + "it-is-half-hourly": "Per half uur", + "it-is-quarterly": "Per kwartier", + "it-is-permanent": "Permanent", "at-nine-fifteen": "Om 9:15 is het...", "quarter-past-nine": "Kwart over negen", "quarter-nine": "Kwart tien", diff --git a/webpage/language/ru.js b/webpage/language/ru.js index 8fac7ac..2b6c96f 100755 --- a/webpage/language/ru.js +++ b/webpage/language/ru.js @@ -114,7 +114,12 @@ let TRANSLATION_RU = { }, "language": { "h2": "Язык", - "hide-it-is": "„ЧАС, ЧАСA, ЧАСОВ“ скрывать", + "hide-it-is": "Отображение 'ЧАС, ЧАСA, ЧАСОВ'“", + "it-is-off": "Выключено", + "it-is-hourly": "Почасовая", + "it-is-half-hourly": "Half-hourly", + "it-is-quarterly": "Ежеквартально", + "it-is-permanent": "Постоянный", "at-nine-fifteen": "ЧАСОВ 9:15 ...", "quarter-past-nine": "четверть десятого", "quarter-nine": "четверть десяти", diff --git a/webpage/script.js b/webpage/script.js index 56167ca..61902e5 100644 --- a/webpage/script.js +++ b/webpage/script.js @@ -984,7 +984,7 @@ $.ready(function() { dialect[1] = $("#dialect-1").get("value"); dialect[2] = $("#dialect-2").get("value"); dialect[3] = $("#dialect-3").get("value"); - dialect[4] = $("#dialect-4").get("checked") | 0; + dialect[4] = $("#dialect-4").get("value"); dialect[5] = $("#dialect-5").get("value"); sendCmd(COMMAND_SET_LANGUAGE_VARIANT, nstr(dialect[0]) + nstr(dialect[1]) + nstr(dialect[2]) + nstr(dialect[3]) + nstr(dialect[4]) + nstr(dialect[5])); From 7840f2529788c4a071ef00116f81ac5c763a10be Mon Sep 17 00:00:00 2001 From: David Panusch Date: Thu, 16 Jan 2025 22:01:09 +0100 Subject: [PATCH 7/9] Added Script to erase before flash --- erase_before_upload.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 erase_before_upload.py diff --git a/erase_before_upload.py b/erase_before_upload.py new file mode 100644 index 0000000..7f9bf75 --- /dev/null +++ b/erase_before_upload.py @@ -0,0 +1,11 @@ +Import("env") + +old_uploaderflags = env["UPLOADERFLAGS"] +#print("Old uploaderflags: " + str(old_uploaderflags)) + +index_write_flash = old_uploaderflags.index("write_flash") +if index_write_flash != -1: + new_uploaderflags = old_uploaderflags[::] + new_uploaderflags.insert(index_write_flash + 1, "--erase-all") + #print("Replaced with: " + str(new_uploaderflags)) + env.Replace(UPLOADERFLAGS=new_uploaderflags) \ No newline at end of file From 20ee7ce311769874d9b41b82be983323f9720060 Mon Sep 17 00:00:00 2001 From: David Panusch Date: Thu, 16 Jan 2025 22:01:26 +0100 Subject: [PATCH 8/9] Added Svg data for lasercutter --- .../Layout_400x400_Foam.svg | 948 +++++++----------- 1 file changed, 363 insertions(+), 585 deletions(-) diff --git a/svg/Front_400x400/SVG_DoubleResM1_layout/Layout_400x400_Foam.svg b/svg/Front_400x400/SVG_DoubleResM1_layout/Layout_400x400_Foam.svg index dc71837..5134982 100644 --- a/svg/Front_400x400/SVG_DoubleResM1_layout/Layout_400x400_Foam.svg +++ b/svg/Front_400x400/SVG_DoubleResM1_layout/Layout_400x400_Foam.svg @@ -1,588 +1,366 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + viewBox="0 0 2834.6 1700.8" style="enable-background:new 0 0 2834.6 1700.8;" xml:space="preserve"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 269ffeaa642f0588e7da90552777842e1e24e737 Mon Sep 17 00:00:00 2001 From: David Panusch Date: Fri, 17 Jan 2025 09:48:17 +0100 Subject: [PATCH 9/9] Adressed Bug with background color picker. --- include/Transitiontypes/Transition.hpp | 2 +- include/clockWork.hpp | 1 + webpage/icons/color_bg.svg | 13 ++++ webpage/icons/color_fr.svg | 29 +++++++++ webpage/index.html | 30 ++++++++- webpage/script.js | 85 +++++++++++--------------- webpage/style.css | 7 +++ 7 files changed, 112 insertions(+), 55 deletions(-) create mode 100644 webpage/icons/color_bg.svg create mode 100644 webpage/icons/color_fr.svg diff --git a/include/Transitiontypes/Transition.hpp b/include/Transitiontypes/Transition.hpp index ce241b6..b9e7753 100644 --- a/include/Transitiontypes/Transition.hpp +++ b/include/Transitiontypes/Transition.hpp @@ -1137,7 +1137,7 @@ void Transition::loop(struct tm &tm) { setMinute(); if (G.secondVariant != SecondVariant::Off) { led.setbySecondArray(); - // Workaround: setbySecoundArray not in 'work' + // Workaround: setbySecondArray not in 'work' } } led.show(); diff --git a/include/clockWork.hpp b/include/clockWork.hpp index 5572068..3319a8a 100644 --- a/include/clockWork.hpp +++ b/include/clockWork.hpp @@ -1207,6 +1207,7 @@ void ClockWork::loop(struct tm &tm) { config["effectSpeed"] = G.effectSpeed; config["colortype"] = G.Colortype; config["hasHappyBirthday"] = usedUhrType->hasHappyBirthday(); + config["hasSecondsFrame"] = usedUhrType->hasSecondsFrame(); config["prog"] = G.prog; serializeJson(config, str); webSocket.sendTXT(G.client_nr, str, strlen(str)); diff --git a/webpage/icons/color_bg.svg b/webpage/icons/color_bg.svg new file mode 100644 index 0000000..a5b4c63 --- /dev/null +++ b/webpage/icons/color_bg.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/webpage/icons/color_fr.svg b/webpage/icons/color_fr.svg new file mode 100644 index 0000000..401f320 --- /dev/null +++ b/webpage/icons/color_fr.svg @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/webpage/index.html b/webpage/index.html index 08347fb..25152cd 100644 --- a/webpage/index.html +++ b/webpage/index.html @@ -68,6 +68,14 @@ + + + + + + + +