Refactor of Uhrtype names and added language Front

include/Uhr.h

@@ -64,7 +64,7 @@ struct GLOBAL {
     uint8_t client_nr;
     uint8_t secondVariant;
     uint8_t minuteVariant;
-    bool languageVariant[5];
+    bool languageVariant[6];
     char timeserver[PAYLOAD_LENGTH];
     char hostname[PAYLOAD_LENGTH];
     char scrollingText[PAYLOAD_LENGTH];
@@ -143,6 +143,7 @@ enum LanguageDialects {
     ItIs40 = 2,
     ItIs45 = 3,
     NotShowItIs = 4,
+    ENG_Aquarter = 5,
 };
 
 enum CommandWords {
@@ -190,15 +191,16 @@ enum CommandWords {
 };
 
 enum ClockType {
-    Uhr_114 = 1,
-    Uhr_114_Alternative = 2,
-    Uhr_114_2Clock = 6,
-    Uhr_114_Dutch = 9,
-    Uhr_125 = 3,
-    Uhr_125_Type2 = 8,
-    Uhr_169 = 4,
-    Uhr_242 = 5,
-    Uhr_291 = 7,
+    Ger10x11 = 1,
+    Ger10x11Alternative = 2,
+    Ger10x11Clock = 6,
+    Nl10x11 = 9,
+    Ger11x11 = 3,
+    Ger11x11V2 = 8,
+    Ger10x11Frame = 4,
+    Ger21x11Weather = 5,
+    Ger17x17 = 7,
+    Eng10x11 = 10,
 };
 
 enum Icons {

include/Uhrtypes/uhr_func_114_2Clock.hpp → include/Uhrtypes/DE10x11.2clock.hpp

@@ -16,7 +16,7 @@
  *
  */
 
-class UHR_114_2Clock_t : public iUhrType {
+class De10x11Clock_t : public iUhrType {
 public:
     virtual const bool hasDreiviertel() override { return true; }
 
@@ -214,4 +214,4 @@ class UHR_114_2Clock_t : public iUhrType {
     };
 };
 
-UHR_114_2Clock_t Uhr_114_2Clock_type;
+De10x11Clock_t _de10x11Clock;

include/Uhrtypes/uhr_func_114_Alternative.hpp → include/Uhrtypes/DE10x11.alternative.hpp

@@ -18,7 +18,7 @@
 
 #define USE_DREIVIERTEL
 
-class UHR_114_Alternative_t : public iUhrType {
+class De10x11Alternative_t : public iUhrType {
 public:
     virtual const bool hasDreiviertel() override { return true; }
 
@@ -240,4 +240,4 @@ class UHR_114_Alternative_t : public iUhrType {
     };
 };
 
-UHR_114_Alternative_t Uhr_114_Alternative_type;
+De10x11Alternative_t _de10x11Alternative;

include/Uhrtypes/uhr_func_169.hpp → include/Uhrtypes/DE10x11.frame.hpp

@@ -16,7 +16,7 @@
 156,157,158,159,160,161,162,163,164,165,166,167,168
 */
 
-class UHR_169_t : public iUhrType {
+class De10x11frame_t : public iUhrType {
 public:
     const uint16_t rmatrix[48] = {
         0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,
@@ -257,4 +257,4 @@ class UHR_169_t : public iUhrType {
     };
 };
 
-UHR_169_t Uhr_169_type;
+De10x11frame_t _de10x11frame;

include/Uhrtypes/uhr_func_114.hpp → include/Uhrtypes/DE10x11.hpp

@@ -19,7 +19,7 @@
 
 #define LED_MAP(x) (x)
 
-class UHR_114_t : public iUhrType {
+class De10x11_t : public iUhrType {
 public:
 #if (LED_LAYOUT_REVERSE)
 
@@ -314,4 +314,4 @@ class UHR_114_t : public iUhrType {
     };
 };
 
-UHR_114_t Uhr_114_type;
+De10x11_t _de10x11;

include/Uhrtypes/uhr_func_125.hpp → include/Uhrtypes/DE11x11.hpp

@@ -17,7 +17,7 @@
  * + + + +
  */
 
-class UHR_125_t : public iUhrType {
+class De11x11_t : public iUhrType {
 public:
     const uint16_t min_arr[2][4] = {
         {110, 111, 112, 113}, // LED für Minuten Anzeige Zeile
@@ -218,4 +218,4 @@ class UHR_125_t : public iUhrType {
     };
 };
 
-UHR_125_t Uhr_125_type;
+De11x11_t _de11x11;

include/Uhrtypes/uhr_func_125_Type2.hpp → include/Uhrtypes/DE11x11.v2.hpp

@@ -17,7 +17,7 @@
  * + + + +
  */
 
-class UHR_125_Type2_t : public iUhrType {
+class De11x11V2_t : public iUhrType {
 public:
     virtual const uint16_t NUM_PIXELS() override { return 125; };
 
@@ -268,4 +268,4 @@ class UHR_125_Type2_t : public iUhrType {
     };
 };
 
-UHR_125_Type2_t Uhr_125_type2_type;
+De11x11V2_t _de11x11V2;

include/Uhrtypes/uhr_func_291.hpp → include/Uhrtypes/DE17x17.hpp

@@ -22,7 +22,7 @@
  *
  */
 
-class UHR_291_t : public iUhrType {
+class De17x17_t : public iUhrType {
 public:
     virtual const uint16_t NUM_PIXELS() override { return 291; };
 
@@ -480,4 +480,4 @@ class UHR_291_t : public iUhrType {
     };
 };
 
-UHR_291_t Uhr_291_type;
+De17x17_t _de17x17;

include/Uhrtypes/uhr_func_242.hpp → include/Uhrtypes/DE21x11.weather.hpp

@@ -28,7 +28,7 @@
  * D R E I ẞ I G O ° C X
  */
 
-class UHR_242_t : public iUhrType {
+class De21x11Weather_t : public iUhrType {
 public:
     const uint16_t min_arr[4] = {112, 114, 116, 118}; // Minuten LED´s für Zeile
 
@@ -576,4 +576,4 @@ class UHR_242_t : public iUhrType {
     };
 };
 
-UHR_242_t Uhr_242_type;
+De21x11Weather_t _de21x11Weather;

include/Uhrtypes/EN10x11.hpp

@@ -0,0 +1,219 @@
+#include "Uhrtype.hpp"
+
+/*
+ * Layout Front
+ *
+ * I T L I S A S A M P M
+ * A C Q U A R T E R D C
+ * T W E N T Y F I V E X
+ * H A L F S T E N F T O
+ * P A S T E R U N I N E
+ * O N E S I X T H R E E
+ * F O U R F I V E T W O
+ * E I G H T E L E V E N
+ * S E V E N T W E L V E
+ * T E N S E O'C L O C K
+ *
+ */
+
+#define USE_DREIVIERTEL
+
+class En10x11_t : public iUhrType {
+public:
+    virtual const bool hasZwanzig() override { return true; }
+
+    //------------------------------------------------------------------------------
+
+    virtual const bool hasTwentyfive() override { return true; }
+
+    //------------------------------------------------------------------------------
+
+    void show(uint8_t text) override {
+        switch (text) {
+
+        case es_ist:
+            // Es
+            Letter_set(0); // I
+            Letter_set(1); // T
+            // Ist
+            Letter_set(3); // I
+            Letter_set(4); // S
+            break;
+        case h_ein:
+            // One
+            Letter_set(65); // O
+            Letter_set(64); // N
+            Letter_set(63); // E
+            break;
+        case h_zwei:
+            // Two
+            Letter_set(74); // T
+            Letter_set(75); // W
+            Letter_set(76); // O
+            break;
+        case h_drei:
+            // Three
+            Letter_set(59); // T
+            Letter_set(58); // H
+            Letter_set(57); // R
+            Letter_set(56); // E
+            Letter_set(55); // E
+            break;
+        case h_vier:
+            // Four
+            Letter_set(66); // F
+            Letter_set(67); // O
+            Letter_set(68); // U
+            Letter_set(69); // R
+            break;
+        case h_fuenf:
+            // Five
+            Letter_set(70); // F
+            Letter_set(71); // I
+            Letter_set(72); // V
+            Letter_set(73); // E
+            break;
+        case h_sechs:
+            // Six
+            Letter_set(62); // S
+            Letter_set(61); // I
+            Letter_set(60); // X
+            break;
+        case h_sieben:
+            // Seven
+            Letter_set(88); // S
+            Letter_set(89); // E
+            Letter_set(90); // V
+            Letter_set(91); // E
+            Letter_set(92); // N
+            break;
+        case h_acht:
+            // Eight
+            Letter_set(87); // E
+            Letter_set(86); // I
+            Letter_set(85); // G
+            Letter_set(84); // H
+            Letter_set(83); // T
+            break;
+        case h_neun:
+            // Nine
+            Letter_set(51); // N
+            Letter_set(52); // I
+            Letter_set(53); // N
+            Letter_set(54); // E
+            break;
+        case h_zehn:
+            // Ten
+            Letter_set(109); // T
+            Letter_set(108); // E
+            Letter_set(107); // N
+            break;
+        case h_elf:
+            // Eleven
+            Letter_set(82); // E
+            Letter_set(81); // L
+            Letter_set(80); // E
+            Letter_set(79); // V
+            Letter_set(78); // E
+            Letter_set(77); // N
+            break;
+        case h_zwoelf:
+            // Twelve
+            Letter_set(93); // T
+            Letter_set(94); // W
+            Letter_set(95); // E
+            Letter_set(96); // L
+            Letter_set(97); // V
+            Letter_set(98); // E
+            break;
+        case fuenf:
+            // Five
+            Letter_set(28); // F
+            Letter_set(29); // I
+            Letter_set(30); // V
+            Letter_set(31); // E
+            break;
+        case zehn:
+            // Ten
+            Letter_set(38); // T
+            Letter_set(37); // E
+            Letter_set(36); // N
+            break;
+        case a_quarter:
+            // A Quater
+            Letter_set(21); // A
+            Letter_set(13); // Q
+            Letter_set(14); // U
+            Letter_set(15); // A
+            Letter_set(16); // R
+            Letter_set(17); // T
+            Letter_set(18); // E
+            Letter_set(19); // R
+            break;
+        case viertel:
+            // Quater
+            Letter_set(13); // Q
+            Letter_set(14); // U
+            Letter_set(15); // A
+            Letter_set(16); // R
+            Letter_set(17); // T
+            Letter_set(18); // E
+            Letter_set(19); // R
+            break;
+        case zwanzig:
+            // Twenty
+            Letter_set(22); // T
+            Letter_set(23); // W
+            Letter_set(24); // E
+            Letter_set(25); // N
+            Letter_set(26); // T
+            Letter_set(27); // Y
+            break;
+        case twentyfive:
+            // Twentyfive
+            Letter_set(22); // T
+            Letter_set(23); // W
+            Letter_set(24); // E
+            Letter_set(25); // N
+            Letter_set(26); // T
+            Letter_set(27); // Y
+            Letter_set(28); // F
+            Letter_set(29); // I
+            Letter_set(30); // V
+            Letter_set(31); // E
+            break;
+        case halb:
+            // Half
+            Letter_set(43); // H
+            Letter_set(42); // A
+            Letter_set(41); // L
+            Letter_set(40); // F
+            break;
+        case nach:
+            // Past
+            Letter_set(44); // P
+            Letter_set(45); // A
+            Letter_set(46); // S
+            Letter_set(47); // T
+            break;
+        case vor:
+            // To
+            Letter_set(34); // T
+            Letter_set(33); // O
+            break;
+        case uhr:
+            // O'Clock
+            Letter_set(104); // O'
+            Letter_set(103); // C
+            Letter_set(102); // L
+            Letter_set(101); // O
+            Letter_set(100); // C
+            Letter_set(99);  // K
+            break;
+        default:
+            break;
+        };
+    };
+};
+
+En10x11_t _en10x11;