mrrioes Layout

include/Uhr.h

@@ -284,6 +284,7 @@ enum ClockType {
     Ger10x11schwaebisch = 20,
     Ger10x11Nero = 11,
     Ger10x11NeroFrame = 26,
+    Ger10x11Mrrioes = 33,
     Ger10x11bayerisch = 27,
     Ger11x11 = 3,
     Ger11x11V2 = 8,

include/Uhrtypes/DE10x11.mrrioes.hpp

@@ -0,0 +1,138 @@
+#pragma once
+
+#include "Uhrtype.hpp"
+
+/*
+ *           Layout Front
+ *                COL
+ *       X 9 8 7 6 5 4 3 2 1 0
+ * ROW + - - - - - - - - - - -
+ *  0  | E S K I S T Ä F Ü N F
+ *  1  | Z E H N V I E R T E L
+ *  2  | Z W A N Z I G K V O R
+ *  3  | P N A C H G H A L B M
+ *  4  | E I N S R Z W E I P Y 
+ *  5  | K D R E I Y V I E R F
+ *  6  | F Ü N F Q S E C H S K
+ *  7  | M S I E B E N A C H T
+ *  8  | N E U N Z E H N E L F
+ *  9  | B Z W Ö L F J U H R X
+ */
+
+class De10x11Mrrioes_t : public iUhrType {
+public:
+    virtual LanguageAbbreviation usedLang() override {
+        return LanguageAbbreviation::DE;
+    };
+
+    //------------------------------------------------------------------------------
+
+    virtual const bool hasDreiviertel() override { return true; }
+
+    //------------------------------------------------------------------------------
+
+    void show(FrontWord word) override {
+        switch (word) {
+
+        case FrontWord::es_ist:
+            setFrontMatrixWord(0, 9, 10);
+            setFrontMatrixWord(0, 5, 7);
+            break;
+
+        case FrontWord::nach:
+        case FrontWord::v_nach:
+            setFrontMatrixWord(3, 6, 9);
+            break;
+
+        case FrontWord::vor:
+        case FrontWord::v_vor:
+            setFrontMatrixWord(2, 0, 2);
+            break;
+
+        case FrontWord::viertel:
+            setFrontMatrixWord(1, 0, 6);
+            break;
+
+        case FrontWord::dreiviertel:
+            setFrontMatrixWord(2, 0, 10);
+            break;
+
+        case FrontWord::min_5:
+            setFrontMatrixWord(0, 0, 3);
+            break;
+
+        case FrontWord::min_10:
+            setFrontMatrixWord(1, 7, 10);
+            break;
+
+        case FrontWord::min_20:
+            setFrontMatrixWord(2, 4, 10);
+            break;
+
+        case FrontWord::halb:
+            setFrontMatrixWord(3, 1, 4);
+            break;
+
+        case FrontWord::eins:
+            setFrontMatrixWord(4, 7, 10);
+            break;
+
+        case FrontWord::uhr:
+            setFrontMatrixWord(9, 1, 3);
+            break;
+
+        case FrontWord::hour_1:
+            setFrontMatrixWord(4, 8, 10);
+            break;
+
+        case FrontWord::hour_2:
+            setFrontMatrixWord(4, 2, 5);
+            break;
+
+        case FrontWord::hour_3:
+            setFrontMatrixWord(5, 6, 9);
+            break;
+
+        case FrontWord::hour_4:
+            setFrontMatrixWord(5, 1, 4);
+            break;
+
+        case FrontWord::hour_5:
+            setFrontMatrixWord(6, 7, 10);
+            break;
+
+        case FrontWord::hour_6:
+            setFrontMatrixWord(6, 1, 5);
+            break;
+
+        case FrontWord::hour_7:
+            setFrontMatrixWord(7, 4, 9);
+            break;
+
+        case FrontWord::hour_8:
+            setFrontMatrixWord(7, 0, 3);
+            break;
+
+        case FrontWord::hour_9:
+            setFrontMatrixWord(8, 7, 10);
+            break;
+
+        case FrontWord::hour_10:
+            setFrontMatrixWord(8, 3, 6);
+            break;
+
+        case FrontWord::hour_11:
+            setFrontMatrixWord(8, 0, 2);
+            break;
+
+        case FrontWord::hour_12:
+            setFrontMatrixWord(9, 5, 9);
+            break;
+
+        default:
+            break;
+        };
+    };
+};
+
+De10x11Mrrioes_t _de10x11Mrrioes;

include/clockWork.hpp

@@ -118,6 +118,8 @@ iUhrType *ClockWork::getPointer(uint8_t type) {
         return &_de10x11Nero;
     case Ger10x11NeroFrame:
         return &_de10x11NeroFrame;
+    case Ger10x11Mrrioes:
+        return &_de10x11Mrrioes;
     case Ger10x11bayerisch:
         return &_de10x11bayerisch;
     case Nl10x11:

include/config.h

@@ -41,6 +41,9 @@
 // 10 rows, each 11 LED's per row + 4 LED's for minutes, with the layout
 // from the Github user @n3roGit
 //
+// #define DEFAULT_LAYOUT Ger10x11Mrrioes
+// 10 rows, each 11 LED's per row + 4 LED's for minutes, with the layout
+//
 // #define DEFAULT_LAYOUT Ger11x11
 // 11 rows, each 11 LED's per row + 4 LED's for minutes
 //
@@ -364,4 +367,4 @@
 #define MIRROR_FRONT_HORIZONTAL false
 #define EXTRA_LED_PER_ROW false
 #define FLIP_HORIZONTAL_VERTICAL false
-#define MEANDER_ROWS true
+#define MEANDER_ROWS true

webpage/index.html

@@ -345,6 +345,7 @@ <h2 data-i18next="view.front.h2"></h2>
                                 <option value="20"  data-i18next="view.front.de-10-11-schwaebisch"></option>
                                 <option value="11" data-i18next="view.front.de-10-11-nero"></option>
                                 <option value="26" data-i18next="view.front.de-10-11-nero-frame"></option>
+                                <option value="33"  data-i18next="view.front.de-10-11-mrrioes"></option>    
                                 <option value="27" data-i18next="view.front.de-10-11-bayerisch"></option>
                                 <option value="3"  data-i18next="view.front.de-11-11"></option>
                                 <option value="8"  data-i18next="view.front.de-11-11-v2"></option>

webpage/language/de.js

@@ -128,6 +128,7 @@ let TRANSLATION_DE_DE = {
 			"de-10-11-clock": "🇩🇪 10 × 11 Uhr",
 			"de-10-11-nero": "🇩🇪 10 × 11 Nero",
 			"de-10-11-nero-frame": "🇩🇪 10 × 11 Nero Rahmen",
+			"de-10-11-mrrioes": "🇩🇪 10 × 11 mrrioes",
 			"de-10-11-bayerisch": "🇩🇪 10 × 11 Bayerisch",
 			"de-10-11-schwaebisch": "🇩🇪 10 × 11 Schwäbisch",
 			"de-11-11": "🇩🇪 11 × 11",

webpage/language/en.js

@@ -128,6 +128,7 @@ let TRANSLATION_EN_US = {
 			"de-10-11-clock": "🇩🇪 10 × 11 Clock",
 			"de-10-11-nero": "🇩🇪 10 × 11 Nero",
 			"de-10-11-nero-frame": "🇩🇪 10 × 11 Nero Frame",
+			"de-10-11-mrrioes": "🇩🇪 10 × 11 mrrioes",
 			"de-10-11-bayerisch": "🇩🇪 10 × 11 Bavarian",
 			"de-10-11-schwaebisch": "🇩🇪 10 × 11 Swabian Style",
 			"de-11-11": "🇩🇪 11 × 11",

webpage/language/es.js

@@ -104,6 +104,7 @@ let TRANSLATION_ES = {
 			"de-10-11-clock": "🇩🇪 10 × 11 Uhr",
 			"de-10-11-nero": "🇩🇪 10 × 11 Nero",
 			"de-10-11-nero-frame": "🇩🇪 10 × 11 Nero Rahmen",
+			"de-10-11-mrrioes": "🇩🇪 10 × 11 mrrioes",
 			"de-10-11-bayerisch": "🇩🇪 10 × 11 bávaro",
 			"de-10-11-schwaebisch": "🇩🇪 10 × 11 Estilo suabo",
 			"de-11-11": "🇩🇪 11 × 11",

webpage/language/hu.js

@@ -104,6 +104,7 @@ let TRANSLATION_HU = {
 			"de-10-11-clock": "🇩🇪 10 × 11 óra",
 			"de-10-11-nero": "🇩🇪 10 × 11 Nero",
 			"de-10-11-nero-frame": "🇩🇪 10 × 11 Nero keretek",
+			"de-10-11-mrrioes": "🇩🇪 10 × 11 mrrioes",
 			"de-10-11-bayerisch": "🇩🇪 10 × 11 bajor",
 			"de-10-11-schwaebisch": "🇩🇪 10 × 11 sváb stílus",
 			"de-11-11": "🇩🇪 11 × 11",

webpage/language/it.js

@@ -104,6 +104,7 @@ let TRANSLATION_IT = {
 			"de-10-11-clock": "🇩🇪 10 × 11 Uhr",
 			"de-10-11-nero": "🇩🇪 10 × 11 Nero",
 			"de-10-11-nero-frame": "🇩🇪 10 × 11 Nero Rahmen",
+			"de-10-11-mrrioes": "🇩🇪 10 × 11 mrrioes",
 			"de-10-11-bayerisch": "🇩🇪 10 × 11 bavarese",
 			"de-10-11-schwaebisch": "🇩🇪 10 × 11 Stile svevo",
 			"de-11-11": "🇩🇪 11 × 11",

webpage/language/nl.js

@@ -104,6 +104,7 @@ let TRANSLATION_NL = {
 			"de-10-11-clock": "🇩🇪 10 × 11 Clock",
 			"de-10-11-nero": "🇩🇪 10 × 11 Nero",
 			"de-10-11-nero-frame": "🇩🇪 10 × 11 Nero Frame",
+			"de-10-11-mrrioes": "🇩🇪 10 × 11 mrrioes",
 			"de-10-11-bayerisch": "🇩🇪 10 × 11 Beiers",
 			"de-10-11-schwaebisch": "🇩🇪 10 × 11 Zwabische stijl",
 			"de-11-11": "🇩🇪 11 × 11",

webpage/language/ru.js

@@ -91,6 +91,7 @@ let TRANSLATION_RU = {
 			"de-10-11-clock": "🇩🇪 10 × 11 Часы",
 			"de-10-11-nero": "🇩🇪 10 × 11 Nero",
 			"de-10-11-nero-frame": "🇩🇪 10 × 11 Nero Rahmen",
+			"de-10-11-mrrioes": "🇩🇪 10 × 11 mrrioes",
 			"de-10-11-bayerisch": "🇩🇪 10 × 11 Баварский",
 			"de-10-11-schwaebisch": "🇩🇪 10 × 11 Швабия",
 			"de-11-11": "🇩🇪 11 × 11",