Skip to content

Commit f6c9b9a

Browse files
dbambusdbambus
authored
Merge pull request #589 from lorgan3/en-11-12
Add EN 11x12 layout
2 parents ebc2ac5 + b91b4e9 commit f6c9b9a

12 files changed

Lines changed: 212 additions & 0 deletions

File tree

‎include/Uhr.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ enum CommandWords {
273273
enum ClockType {
274274
Eng10x11 = 10,
275275
Eng08x08 = 29,
276+
Eng11x12 = 32,
276277
Ger10x11 = 1,
277278
Ger10x11Alternative = 2,
278279
Ger10x11AlternativeFrame = 4,

‎include/Uhrtypes/EN11x12.hpp‎

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
#pragma once
2+
3+
#include "Uhrtype.hpp"
4+
5+
/*
6+
* Layout Front
7+
* COL
8+
* 1 X 9 8 7 6 5 4 3 2 1 0
9+
* ROW + - - - - - - - - - - -
10+
* 0 | I T L I S A S T H P M A
11+
* 1 | A C F I F T E E N D C O
12+
* 2 | T W E N T Y F I V E X W
13+
* 3 | T H I R T Y X T E N X W
14+
* 4 | M I N U T E S E T O U R
15+
* 5 | P A S T O R U F O U R T
16+
* 6 | S E V E N X T W E L V E
17+
* 7 | N I N E F I V E C T W O
18+
* 8 | E I G H T F E L E V E N
19+
* 9 | S I X T H R E E O N E G
20+
* X | T E N S E Z O C L O C K
21+
*/
22+
23+
class En11x12_t : public iUhrType {
24+
public:
25+
virtual LanguageAbbreviation usedLang() override {
26+
return LanguageAbbreviation::EN;
27+
};
28+
29+
//------------------------------------------------------------------------------
30+
31+
virtual const uint8_t rowsWordMatrix() override { return 11; };
32+
33+
//------------------------------------------------------------------------------
34+
35+
virtual const uint8_t colsWordMatrix() override { return 12; };
36+
37+
//------------------------------------------------------------------------------
38+
39+
virtual const bool hasZwanzig() override { return true; }
40+
41+
//------------------------------------------------------------------------------
42+
43+
virtual const bool hasTwentyfive() override { return true; }
44+
45+
//------------------------------------------------------------------------------
46+
47+
virtual const bool hasMinuteInWords() { return true; }
48+
49+
//------------------------------------------------------------------------------
50+
51+
void show(FrontWord word) override {
52+
switch (word) {
53+
54+
case FrontWord::es_ist:
55+
// It is
56+
setFrontMatrixWord(0, 10, 11);
57+
setFrontMatrixWord(0, 7, 8);
58+
break;
59+
60+
case FrontWord::hour_1:
61+
// One
62+
setFrontMatrixWord(9, 1, 3);
63+
break;
64+
65+
case FrontWord::hour_2:
66+
// Two
67+
setFrontMatrixWord(7, 0, 2);
68+
break;
69+
70+
case FrontWord::hour_3:
71+
// Three
72+
setFrontMatrixWord(9, 4, 8);
73+
break;
74+
75+
case FrontWord::hour_4:
76+
// Four
77+
setFrontMatrixWord(5, 1, 4);
78+
break;
79+
80+
case FrontWord::hour_5:
81+
// Five
82+
setFrontMatrixWord(7, 4, 7);
83+
break;
84+
85+
case FrontWord::hour_6:
86+
// Six
87+
setFrontMatrixWord(9, 9, 11);
88+
break;
89+
90+
case FrontWord::hour_7:
91+
// Seven
92+
setFrontMatrixWord(6, 7, 11);
93+
break;
94+
95+
case FrontWord::hour_8:
96+
// Eight
97+
setFrontMatrixWord(8, 7, 11);
98+
break;
99+
100+
case FrontWord::hour_9:
101+
// Nine
102+
setFrontMatrixWord(7, 8, 11);
103+
break;
104+
105+
case FrontWord::hour_10:
106+
// Ten
107+
setFrontMatrixWord(10, 9, 11);
108+
break;
109+
110+
case FrontWord::hour_11:
111+
// Eleven
112+
setFrontMatrixWord(8, 0, 5);
113+
break;
114+
115+
case FrontWord::hour_12:
116+
// Twelve
117+
setFrontMatrixWord(6, 0, 5);
118+
break;
119+
120+
case FrontWord::min_5:
121+
// Five
122+
setFrontMatrixWord(2, 2, 5);
123+
// Minutes
124+
setFrontMatrixWord(4, 5, 11);
125+
break;
126+
127+
case FrontWord::min_10:
128+
// Ten
129+
setFrontMatrixWord(3, 2, 4);
130+
// Minutes
131+
setFrontMatrixWord(4, 5, 11);
132+
break;
133+
134+
case FrontWord::a_quarter:
135+
case FrontWord::viertel:
136+
// Fifteen
137+
setFrontMatrixWord(1, 3, 9);
138+
// Minutes
139+
setFrontMatrixWord(4, 5, 11);
140+
break;
141+
142+
case FrontWord::min_20:
143+
// Twenty
144+
setFrontMatrixWord(2, 6, 11);
145+
// Minutes
146+
setFrontMatrixWord(4, 5, 11);
147+
break;
148+
149+
case FrontWord::min_25:
150+
// Twentyfive
151+
setFrontMatrixWord(2, 2, 11);
152+
// Minutes
153+
setFrontMatrixWord(4, 5, 11);
154+
break;
155+
156+
case FrontWord::halb:
157+
// Thirty
158+
setFrontMatrixWord(3, 6, 11);
159+
// Minutes
160+
setFrontMatrixWord(4, 5, 11);
161+
// To
162+
setFrontMatrixWord(4, 2, 3);
163+
break;
164+
165+
case FrontWord::nach:
166+
case FrontWord::v_nach:
167+
// Past
168+
setFrontMatrixWord(5, 8, 11);
169+
break;
170+
171+
case FrontWord::vor:
172+
case FrontWord::v_vor:
173+
// To
174+
setFrontMatrixWord(4, 2, 3);
175+
break;
176+
177+
case FrontWord::uhr:
178+
// O'Clock
179+
setFrontMatrixWord(10, 0, 5);
180+
break;
181+
182+
case FrontWord::minute:
183+
// Minute
184+
setFrontMatrixWord(4, 6, 11);
185+
break;
186+
187+
case FrontWord::minuten:
188+
// Minutes
189+
setFrontMatrixWord(4, 5, 11);
190+
break;
191+
192+
default:
193+
break;
194+
};
195+
};
196+
};
197+
198+
En11x12_t _en11x12;

‎include/clockWork.hpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ iUhrType *ClockWork::getPointer(uint8_t type) {
146146
return &_en08x08;
147147
case Eng10x11:
148148
return &_en10x11;
149+
case Eng11x12:
150+
return &_en11x12;
149151
case Es10x11:
150152
return &_es10x11;
151153
case Es08x08Cuarto:

‎include/config.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@
9494
//
9595
// #define DEFAULT_LAYOUT Eng08x08
9696
// 8 rows, 8 LED's per row with modified layout for the English language
97+
//
98+
// #define DEFAULT_LAYOUT Eng11x12
99+
// 11 rows, 12 LED's per row with modified layout for the English language
97100

98101
/**********************/
99102
/* Italian */

‎webpage/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ <h2 data-i18next="view.front.h2"></h2>
358358
<option value="25" data-i18next="view.front.de-08-08-viertel"></option>
359359
<option value="10" data-i18next="view.front.en-10-11"></option>
360360
<option value="29" data-i18next="view.front.en-08-08"></option>
361+
<option value="32" data-i18next="view.front.en-11-12"></option>
361362
<option value="9" data-i18next="view.front.nl-10-11"></option>
362363
<option value="15" data-i18next="view.front.es-10-11"></option>
363364
<option value="28" data-i18next="view.front.es-08-08-cuarto"></option>

‎webpage/language/de.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ let TRANSLATION_DE_DE = {
142142
"de-08-08-viertel": "🇩🇪 8 × 8 Viertelstunden",
143143
"en-10-11": "🇬🇧 10 × 11",
144144
"en-08-08": "🇬🇧 8 × 8",
145+
"en-11-12": "🇬🇧 11 × 12",
145146
"nl-10-11": "🇳🇱 10 × 11",
146147
"es-10-11": "🇪🇸 10 × 11",
147148
"es-08-08-cuarto": "🇪🇸 8 × 8 Viertelstunden",

‎webpage/language/en.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ let TRANSLATION_EN_US = {
142142
"de-08-08-viertel": "🇩🇪 8 × 8 Quarter hours",
143143
"en-10-11": "🇬🇧 10 × 11",
144144
"en-08-08": "🇬🇧 8 × 8",
145+
"en-11-12": "🇬🇧 11 × 12",
145146
"nl-10-11": "🇳🇱 10 × 11",
146147
"es-10-11": "🇪🇸 10 × 11",
147148
"es-08-08-cuarto": "🇪🇸 8 × 8 Quarter hours",

‎webpage/language/es.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ let TRANSLATION_ES = {
118118
"de-08-08-viertel": "🇩🇪 8 × 8 Cuartos",
119119
"en-10-11": "🇬🇧 10 × 11",
120120
"en-08-08": "🇬🇧 8 × 8",
121+
"en-11-12": "🇬🇧 11 × 12",
121122
"nl-10-11": "🇳🇱 10 × 11",
122123
"es-10-11": "🇪🇸 10 × 11",
123124
"es-08-08-cuarto": "🇪🇸 8 × 8 Cuartos",

‎webpage/language/hu.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ let TRANSLATION_HU = {
118118
"de-08-08-viertel": "🇩🇪 8 × 8 Negyed órák",
119119
"en-10-11": "🇬🇧 10 × 11",
120120
"en-08-08": "🇬🇧 8 × 8",
121+
"en-11-12": "🇬🇧 11 × 12",
121122
"nl-10-11": "🇳🇱 10 × 11",
122123
"es-10-11": "🇪🇸 10 × 11",
123124
"es-08-08-cuarto": "🇪🇸 8 × 8 Negyed órák",

‎webpage/language/it.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ let TRANSLATION_IT = {
118118
"de-08-08-viertel": "🇩🇪 8 × 8 Quarto d'ora",
119119
"en-10-11": "🇬🇧 10 × 11",
120120
"en-08-08": "🇬🇧 8 × 8",
121+
"en-11-12": "🇬🇧 11 × 12",
121122
"nl-10-11": "🇳🇱 10 × 11",
122123
"es-10-11": "🇪🇸 10 × 11",
123124
"es-08-08-cuarto": "🇪🇸 8 × 8 Quarto d'ora",

0 commit comments

Comments
 (0)