Skip to content

Commit fc08547

Browse files
dbambusdbambus
authored
Merge pull request #296 from ThxAndBye/main
panbachi/wordclock Layout
2 parents ce3305c + 63bf8f4 commit fc08547

File tree

8 files changed

+140
-0
lines changed

8 files changed

+140
-0
lines changed

‎include/Uhr.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ enum ClockType {
247247
Ger10x11Nero = 11,
248248
Ger11x11 = 3,
249249
Ger11x11V2 = 8,
250+
Ger11x11V3 = 14,
250251
Ger22x11Weather = 5,
251252
Ger16x8 = 13,
252253
Ger16x18 = 7,

‎include/Uhrtypes/DE11x11.v3.hpp‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
#pragma once
2+
3+
#include "DE11x11.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 K I S T L F Ü N F
11+
* 1 | Z E H N Z W A N Z I G
12+
* 2 | D R E I V I E R T E L
13+
* 3 | T G N A C H V O R J M
14+
* 4 | H A L B X Z W Ö L F P
15+
* 5 | Z W E I N S I E B E N
16+
* 6 | K D R E I R H F Ü N F
17+
* 7 | E L F N E U N V I E R
18+
* 8 | W A C H T Z E H N R S
19+
* 9 | B S E C H S F M U H R
20+
* X | E V F X R N Z S L P I
21+
*/
22+
23+
class De11x11V3_t : public De11x11_t {
24+
public:
25+
void show(FrontWord word) override {
26+
switch (word) {
27+
28+
case FrontWord::es_ist:
29+
setFrontMatrixWord(0, 9, 10);
30+
setFrontMatrixWord(0, 5, 7);
31+
break;
32+
33+
case FrontWord::viertel:
34+
setFrontMatrixWord(2, 0, 6);
35+
break;
36+
37+
case FrontWord::dreiviertel:
38+
setFrontMatrixWord(2, 0, 10);
39+
break;
40+
41+
case FrontWord::m_fuenf:
42+
setFrontMatrixWord(0, 0, 3);
43+
break;
44+
45+
case FrontWord::m_zehn:
46+
setFrontMatrixWord(1, 7, 10);
47+
break;
48+
49+
case FrontWord::m_zwanzig:
50+
setFrontMatrixWord(1, 0, 6);
51+
break;
52+
53+
case FrontWord::halb:
54+
setFrontMatrixWord(4, 7, 10);
55+
break;
56+
57+
case FrontWord::eins:
58+
setFrontMatrixWord(5, 5, 8);
59+
break;
60+
61+
case FrontWord::nach:
62+
case FrontWord::v_nach:
63+
setFrontMatrixWord(3, 5, 8);
64+
break;
65+
66+
case FrontWord::vor:
67+
case FrontWord::v_vor:
68+
setFrontMatrixWord(3, 2, 4);
69+
case FrontWord::uhr:
70+
setFrontMatrixWord(9, 0, 2);
71+
break;
72+
73+
case FrontWord::h_ein:
74+
setFrontMatrixWord(5, 6, 8);
75+
break;
76+
77+
case FrontWord::h_zwei:
78+
setFrontMatrixWord(5, 7, 10);
79+
break;
80+
81+
case FrontWord::h_drei:
82+
setFrontMatrixWord(6, 6, 9);
83+
break;
84+
85+
case FrontWord::h_vier:
86+
setFrontMatrixWord(7, 0, 3);
87+
break;
88+
89+
case FrontWord::h_fuenf:
90+
setFrontMatrixWord(6, 0, 3);
91+
break;
92+
93+
case FrontWord::h_sechs:
94+
setFrontMatrixWord(9, 5, 9);
95+
break;
96+
97+
case FrontWord::h_sieben:
98+
setFrontMatrixWord(5, 0, 5);
99+
break;
100+
101+
case FrontWord::h_acht:
102+
setFrontMatrixWord(8, 6, 9);
103+
break;
104+
105+
case FrontWord::h_neun:
106+
setFrontMatrixWord(7, 4, 7);
107+
break;
108+
109+
case FrontWord::h_zehn:
110+
setFrontMatrixWord(8, 2, 5);
111+
break;
112+
113+
case FrontWord::h_elf:
114+
setFrontMatrixWord(7, 8, 10);
115+
break;
116+
117+
case FrontWord::h_zwoelf:
118+
setFrontMatrixWord(4, 1, 5);
119+
break;
120+
121+
case FrontWord::funk:
122+
break;
123+
124+
default:
125+
break;
126+
};
127+
};
128+
};
129+
130+
De11x11V3_t _de11x11V3;

‎include/clockWork.hpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ iUhrType *ClockWork::getPointer(uint8_t type) {
5858
return &_de11x11;
5959
case Ger11x11V2:
6060
return &_de11x11V2;
61+
case Ger11x11V3:
62+
return &_de11x11V3;
6163
case Ger22x11Weather:
6264
return &_de22x11Weather;
6365
case Ger16x8:

‎include/config.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
// #define DEFAULT_LAYOUT Ger11x11V2
3737
// 11 rows, each 11 LED's per row + 4 LED's for minutes plus twenty word
3838
//
39+
// #define DEFAULT_LAYOUT Ger11x11V3
40+
// 11 rows, each 11 LED's per row. Layout for panbachi/wordclock plate design
41+
//
3942
// #define DEFAULT_LAYOUT Ger11x11Frame
4043
// Same Layout as Ger11x11, but with additional LED's to illuminate the frame
4144
// from the side

‎webpage/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ <h2 data-i18next="view.front.h2"></h2>
216216
<option value="11" data-i18next="view.front.de-10-11-nero"></option>
217217
<option value="3" data-i18next="view.front.de-11-11"></option>
218218
<option value="8" data-i18next="view.front.de-11-11-v2"></option>
219+
<option value="14" data-i18next="view.front.de-11-11-v3"></option>
219220
<option value="5" data-i18next="view.front.de-22-11-weather"></option>
220221
<option value="13" data-i18next="view.front.de-16-8"></option>
221222
<option value="7" data-i18next="view.front.de-16-18"></option>

‎webpage/language/de.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ let TRANSLATION_DE_DE = {
8484
"de-10-11-nero": "Deutsch 10 × 11 Nero",
8585
"de-11-11": "Deutsch 11 × 11",
8686
"de-11-11-v2": "Deutsch 11 × 11 Version 2",
87+
"de-11-11-v3": "Deutsch 11 × 11 (panbachi)",
8788
"de-22-11-weather": "Deutsch 10 × 11 Wetter",
8889
"de-16-8": "Deutsch 16 × 8",
8990
"de-16-18": "Deutsch 16 × 18",

‎webpage/language/en.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ let TRANSLATION_EN_US = {
8484
"de-10-11-nero": "German 10 × 11 Nero",
8585
"de-11-11": "German 11 × 11",
8686
"de-11-11-v2": "German 11 × 11 Version 2",
87+
"de-11-11-v3": "German 11 × 11 (panbachi)",
8788
"de-22-11-weather": "German 10 × 11 Weather",
8889
"de-16-8": "German 16 × 8",
8990
"de-16-18": "German 16 × 18",

‎webpage/language/nl.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ let TRANSLATION_NL = {
8484
"de-10-11-nero": "Duits 10 × 11 Nero",
8585
"de-11-11": "Duits 11 × 11",
8686
"de-11-11-v2": "Duits 11 × 11 Versie 2",
87+
"de-11-11-v3": "Duits 11 × 11 (panbachi)",
8788
"de-22-11-weather": "Duits 10 × 11 Weer",
8889
"de-16-8": "Duits 16 × 8",
8990
"de-16-18": "Duits 16 × 18",

0 commit comments

Comments
 (0)