Skip to content

Commit 31d4883

Browse files
dbambusdbambus
authored
Merge pull request #325 from dbambus/main
Version Upgrade to 3.2 with added languages (Spanish and Italian)
2 parents ff22681 + bf45ca9 commit 31d4883

File tree

17 files changed

+965
-46
lines changed

17 files changed

+965
-46
lines changed

‎eslintrc.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,8 @@
265265
"TRANSLATION_DE_DE": "readonly",
266266
"TRANSLATION_EN_US": "readonly",
267267
"TRANSLATION_NL": "readonly",
268+
"TRANSLATION_IT": "readonly",
269+
"TRANSLATION_ES": "readonly",
268270
"i18next": "readonly",
269271
"isLocalEnvironment": "readonly"
270272
}

‎include/Uhr.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@ enum ClockType {
252252
Ger16x8 = 13,
253253
Ger16x18 = 7,
254254
Nl10x11 = 9,
255+
Es10x11 = 15,
256+
It10x11 = 16,
255257
};
256258

257259
enum Icons {

‎include/Uhrtypes/ES10x11.hpp

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
#pragma once
2+
3+
#include "Uhrtype.hpp"
4+
5+
/*
6+
* Layout Front
7+
* COL
8+
* X 9 8 7 6 5 4 3 2 1 0
9+
* ROW + - - - - - - - - - - -
10+
* 0 | E S O N E L A S U N A
11+
* 1 | D O S I T R E S O R E
12+
* 2 | C U A T R O C I N C O
13+
* 3 | S E I S A S I E T E N
14+
* 4 | O C H O N U E V E Y O
15+
* 5 | L A D I E Z S O N C E
16+
* 6 | D O C E L Y M E N O S
17+
* 7 | O V E I N T E D I E Z
18+
* 8 | V E I N T I C I N C O
19+
* 9 | M E D I A C U A R T O
20+
*/
21+
22+
class Es10x11_t : public iUhrType {
23+
public:
24+
virtual LanguageAbbreviation usedLang() override {
25+
return LanguageAbbreviation::ES;
26+
};
27+
28+
//------------------------------------------------------------------------------
29+
30+
virtual const bool hasZwanzig() override { return true; }
31+
32+
//------------------------------------------------------------------------------
33+
34+
virtual const bool hasTwentyfive() override { return true; }
35+
36+
//------------------------------------------------------------------------------
37+
38+
void show(FrontWord word) override {
39+
switch (word) {
40+
41+
case FrontWord::es_ist:
42+
// SON LAS
43+
setFrontMatrixWord(0, 7, 9);
44+
setFrontMatrixWord(0, 3, 5);
45+
46+
case FrontWord::es_ist___plural___:
47+
// ES LA
48+
setFrontMatrixWord(0, 9, 10);
49+
setFrontMatrixWord(0, 4, 5);
50+
break;
51+
52+
case FrontWord::h_ein:
53+
// UNA
54+
setFrontMatrixWord(0, 0, 2);
55+
break;
56+
57+
case FrontWord::h_zwei:
58+
// DOS
59+
setFrontMatrixWord(1, 8, 10);
60+
break;
61+
62+
case FrontWord::h_drei:
63+
// TRES
64+
setFrontMatrixWord(1, 3, 6);
65+
break;
66+
67+
case FrontWord::h_vier:
68+
// CUATRO
69+
setFrontMatrixWord(2, 5, 10);
70+
break;
71+
72+
case FrontWord::h_fuenf:
73+
// CINCO
74+
setFrontMatrixWord(2, 0, 4);
75+
break;
76+
77+
case FrontWord::h_sechs:
78+
// SEIS
79+
setFrontMatrixWord(3, 7, 10);
80+
break;
81+
82+
case FrontWord::h_sieben:
83+
// SIETE
84+
setFrontMatrixWord(3, 1, 5);
85+
break;
86+
87+
case FrontWord::h_acht:
88+
// OCHO
89+
setFrontMatrixWord(4, 7, 10);
90+
break;
91+
92+
case FrontWord::h_neun:
93+
// NUEVE
94+
setFrontMatrixWord(4, 2, 6);
95+
break;
96+
97+
case FrontWord::h_zehn:
98+
// DIEZ
99+
setFrontMatrixWord(5, 5, 8);
100+
break;
101+
102+
case FrontWord::h_elf:
103+
// ONCE
104+
setFrontMatrixWord(5, 0, 3);
105+
break;
106+
107+
case FrontWord::h_zwoelf:
108+
// DOCE
109+
setFrontMatrixWord(6, 7, 10);
110+
break;
111+
112+
case FrontWord::m_fuenf:
113+
// CINCO
114+
setFrontMatrixWord(8, 0, 4);
115+
break;
116+
117+
case FrontWord::m_zehn:
118+
// DIEZ
119+
setFrontMatrixWord(7, 0, 3);
120+
break;
121+
122+
case FrontWord::viertel:
123+
// CUARTO
124+
setFrontMatrixWord(9, 0, 5);
125+
break;
126+
127+
case FrontWord::m_zwanzig:
128+
// VEINTE
129+
setFrontMatrixWord(7, 4, 9);
130+
break;
131+
132+
case FrontWord::m_twentyfive:
133+
// VEINTICINCO
134+
setFrontMatrixWord(8, 0, 10);
135+
break;
136+
137+
case FrontWord::halb:
138+
// MEDIA
139+
setFrontMatrixWord(9, 6, 10);
140+
break;
141+
142+
case FrontWord::nach:
143+
case FrontWord::v_nach:
144+
// Y ("UND")
145+
setFrontMatrixWord(6, 5, 5);
146+
break;
147+
148+
case FrontWord::vor:
149+
case FrontWord::v_vor:
150+
// MENOS ("Minus")
151+
setFrontMatrixWord(6, 0, 4);
152+
break;
153+
154+
default:
155+
break;
156+
};
157+
};
158+
};
159+
160+
Es10x11_t _es10x11;

‎include/Uhrtypes/IT10x11.hpp

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
#pragma once
2+
3+
#include "Uhrtype.hpp"
4+
5+
/*
6+
* Layout Front
7+
* COL
8+
* X 9 8 7 6 5 4 3 2 1 0
9+
* ROW + - - - - - - - - - - -
10+
* 0 | S O N O R L E B O R E
11+
* 1 | È R Ľ U N A S D U E Z
12+
* 2 | T R E O T T O N O V E
13+
* 3 | D I E C I U N D I C I
14+
* 4 | D O D I C I S E T T E
15+
* 5 | Q U A T T R O C S E I
16+
* 6 | C I N Q U E A M E N O
17+
* 7 | E C U N O Q U A R T O
18+
* 8 | V E N T I C I N Q U E
19+
* 9 | D I E C I P M E Z Z A
20+
*/
21+
22+
class It10x11_t : public iUhrType {
23+
public:
24+
virtual LanguageAbbreviation usedLang() override {
25+
return LanguageAbbreviation::IT;
26+
};
27+
28+
//------------------------------------------------------------------------------
29+
30+
virtual const bool hasZwanzig() override { return true; }
31+
32+
//------------------------------------------------------------------------------
33+
34+
virtual const bool hasTwentyfive() override { return true; }
35+
36+
//------------------------------------------------------------------------------
37+
38+
void show(FrontWord word) override {
39+
switch (word) {
40+
41+
case FrontWord::es_ist:
42+
// Sono Le
43+
setFrontMatrixWord(0, 7, 10);
44+
setFrontMatrixWord(0, 4, 5);
45+
break;
46+
47+
case FrontWord::h_ein:
48+
// È ĽUNA
49+
setFrontMatrixWord(1, 10, 10);
50+
setFrontMatrixWord(1, 5, 8);
51+
break;
52+
53+
case FrontWord::h_zwei:
54+
// Due
55+
setFrontMatrixWord(1, 1, 3);
56+
break;
57+
58+
case FrontWord::h_drei:
59+
// Tre
60+
setFrontMatrixWord(2, 8, 10);
61+
break;
62+
63+
case FrontWord::h_vier:
64+
// Quattro
65+
setFrontMatrixWord(5, 4, 10);
66+
break;
67+
68+
case FrontWord::h_fuenf:
69+
// Cinque
70+
setFrontMatrixWord(6, 5, 10);
71+
break;
72+
73+
case FrontWord::h_sechs:
74+
// Sei
75+
setFrontMatrixWord(5, 0, 2);
76+
break;
77+
78+
case FrontWord::h_sieben:
79+
// Sette
80+
setFrontMatrixWord(4, 0, 4);
81+
break;
82+
83+
case FrontWord::h_acht:
84+
// Otto
85+
setFrontMatrixWord(2, 4, 7);
86+
break;
87+
88+
case FrontWord::h_neun:
89+
// Nove
90+
setFrontMatrixWord(2, 0, 3);
91+
break;
92+
93+
case FrontWord::h_zehn:
94+
// Dieci
95+
setFrontMatrixWord(3, 6, 10);
96+
break;
97+
98+
case FrontWord::h_elf:
99+
// Undici
100+
setFrontMatrixWord(3, 0, 5);
101+
break;
102+
103+
case FrontWord::h_zwoelf:
104+
// Dodici
105+
setFrontMatrixWord(4, 5, 10);
106+
break;
107+
108+
case FrontWord::m_fuenf:
109+
// Cinque
110+
setFrontMatrixWord(8, 0, 5);
111+
break;
112+
113+
case FrontWord::m_zehn:
114+
// Dieci
115+
setFrontMatrixWord(9, 6, 10);
116+
break;
117+
118+
case FrontWord::a_quarter:
119+
case FrontWord::viertel:
120+
// Un quarto
121+
setFrontMatrixWord(7, 7, 8);
122+
setFrontMatrixWord(7, 0, 5);
123+
break;
124+
125+
case FrontWord::m_zwanzig:
126+
// Venti
127+
setFrontMatrixWord(8, 6, 10);
128+
break;
129+
130+
case FrontWord::m_twentyfive:
131+
// Venticinque
132+
setFrontMatrixWord(8, 0, 10);
133+
break;
134+
135+
case FrontWord::halb:
136+
// Mezza
137+
setFrontMatrixWord(9, 0, 4);
138+
break;
139+
140+
case FrontWord::nach:
141+
case FrontWord::v_nach:
142+
// e
143+
setFrontMatrixWord(7, 10, 10);
144+
break;
145+
146+
case FrontWord::vor:
147+
case FrontWord::v_vor:
148+
// Meno
149+
setFrontMatrixWord(6, 0, 3);
150+
break;
151+
152+
case FrontWord::uhr:
153+
// Ore = Stunde(n)
154+
setFrontMatrixWord(0, 0, 2);
155+
break;
156+
157+
default:
158+
break;
159+
};
160+
};
161+
};
162+
163+
It10x11_t _it10x11;

‎include/Uhrtypes/Uhrtype.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
enum class LanguageAbbreviation { EN, DE, NL };
3+
enum class LanguageAbbreviation { DE, EN, ES, IT, NL };
44

55
enum class FrontWord {
66
error,
@@ -30,6 +30,7 @@ enum class FrontWord {
3030
m_num4,
3131

3232
es_ist,
33+
es_ist___plural___,
3334
nach,
3435
vor,
3536
viertel,

‎include/clockWork.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class ClockWork {
1313
//------------------------------------------------------------------------------
1414
void loopLdrLogic();
1515
uint32_t num32BitWithOnesAccordingToColumns();
16+
bool isRomanLanguage();
1617

1718
//------------------------------------------------------------------------------
1819
// Front Effect Functions

0 commit comments

Comments
 (0)