Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Verschiedene Sprachen hinzugefügt #347

Merged
merged 12 commits into from
Jan 31, 2024
Merged

Verschiedene Sprachen hinzugefügt #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2c60350
Verschiedene Sprachen hinzugefügt
clingner Dec 31, 2023
d09bf1f
Merge branch 'main' into Worduhr-v3_CLi
dbambus Dec 31, 2023
cc48f8c
Updated de.js
dbambus Dec 31, 2023
4443016
Updated en.js
dbambus Dec 31, 2023
b255342
Clang formatted Uhr.h
dbambus Dec 31, 2023
3b1502b
Clang formatted clockWork.hpp
dbambus Dec 31, 2023
61b3cc8
Clang formatted clockWork.hpp
dbambus Dec 31, 2023
21ea608
Finally formatted clockWork.hpp
dbambus Dec 31, 2023
b370e06
Formatted FR10x11.hpp
dbambus Dec 31, 2023
16d3d42
Finally formatted FR10x11.hpp
dbambus Dec 31, 2023
58e63ff
Formatted RO10x11.hpp
dbambus Dec 31, 2023
5c78b0d
Finally formatted RO10x11.hpp
dbambus Dec 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion include/Uhr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ enum ClockWords {
H_NEUN = 18,
H_ZEHN = 19,
H_ELF = 20,
H_ZWOELF = 21
H_ZWOELF = 21,
H_MITTERNACHT = 23
};

struct MqttData {
Expand Down Expand Up @@ -245,6 +246,7 @@ enum ClockType {
Ger10x11AlternativeFrame = 4,
Ger10x11Vertical = 12,
Ger10x11Clock = 6,
Ger10x11schwaebisch = 20,
Ger10x11Nero = 11,
Ger11x11 = 3,
Ger11x11V2 = 8,
Expand All @@ -256,6 +258,9 @@ enum ClockType {
Es10x11 = 15,
It10x11 = 16,
Hu10x10 = 17,
Ch10x11 = 18,
Ro10x11 = 19,
Fr10x11 = 21,
};

enum Icons {
Expand Down
130 changes: 130 additions & 0 deletions include/Uhrtypes/CH10x11.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
#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 C H U F Ü F
* 1 | V I E R T U N F Z Ä Ä
* 2 | Z W Ä N Z G S E V O R
* 3 | A B C H A U B I E C M
* 4 | E I S Z W Ö I S D R Ü
* 5 | V I E R I F Ü F I S T
* 6 | S Ä C H S I S I B N I
* 7 | A C H T I N Ü N I E L
* 8 | Z Ä N I E C H E U F I
* 9 | Z W Ö U F I E N U H R
*/

class Ch10x11_t : public iUhrType {
public:
virtual LanguageAbbreviation usedLang() override {
return LanguageAbbreviation::DE;
};

//------------------------------------------------------------------------------

virtual const bool hasZwanzig() override { return true; }

//------------------------------------------------------------------------------

void show(FrontWord word) override {
switch (word) {

case FrontWord::es_ist:
setFrontMatrixWord(0, 9, 10);
setFrontMatrixWord(0, 4, 7);
break;

case FrontWord::nach:
case FrontWord::v_nach:
setFrontMatrixWord(3, 9, 10);
break;

case FrontWord::vor:
case FrontWord::v_vor:
setFrontMatrixWord(2, 0, 2);
break;

case FrontWord::viertel:
setFrontMatrixWord(1, 5, 10);
break;

case FrontWord::m_fuenf:
setFrontMatrixWord(0, 0, 2);
break;

case FrontWord::m_zehn:
setFrontMatrixWord(1, 0, 2);
break;

case FrontWord::m_zwanzig:
setFrontMatrixWord(2, 5, 10);
break;

case FrontWord::halb:
setFrontMatrixWord(3, 3, 7);
break;

case FrontWord::eins:
setFrontMatrixWord(4, 8, 10);
break;

case FrontWord::h_ein:
setFrontMatrixWord(4, 8, 10);
break;

case FrontWord::h_zwei:
setFrontMatrixWord(4, 4, 7);
break;

case FrontWord::h_drei:
setFrontMatrixWord(4, 0, 2);
break;

case FrontWord::h_vier:
setFrontMatrixWord(5, 6, 10);
break;

case FrontWord::h_fuenf:
setFrontMatrixWord(5, 2, 5);
break;

case FrontWord::h_sechs:
setFrontMatrixWord(6, 5, 10);
break;

case FrontWord::h_sieben:
setFrontMatrixWord(6, 0, 4);
break;

case FrontWord::h_acht:
setFrontMatrixWord(7, 6, 10);
break;

case FrontWord::h_neun:
setFrontMatrixWord(7, 2, 5);
break;

case FrontWord::h_zehn:
setFrontMatrixWord(8, 7, 10);
break;

case FrontWord::h_elf:
setFrontMatrixWord(8, 0, 3);
break;

case FrontWord::h_zwoelf:
setFrontMatrixWord(9, 5, 10);
break;

default:
break;
};
};
};

Ch10x11_t _ch10x11;
130 changes: 130 additions & 0 deletions include/Uhrtypes/DE10x11.schwaebisch.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
#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 C H F U N K
* 1 | D R E I V I E R T L A
* 2 | Z E H N B I E F Ü N F
* 3 | N A C H G E R T V O R
* 4 | H A L B X F Ü N F E I
* 5 | O I S E C H S E L F E
* 6 | Z W O I E A C H T E D
* 7 | D R E I E Z W Ö L F E
* 8 | Z E H N E U N E U H L
* 9 | S I E B N E V I E R E
*/

class De10x11schwaebisch_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, 4, 7);
break;

case FrontWord::nach:
case FrontWord::v_nach:
setFrontMatrixWord(3, 7, 10);
break;

case FrontWord::vor:
case FrontWord::v_vor:
setFrontMatrixWord(3, 0, 2);
break;

case FrontWord::viertel:
setFrontMatrixWord(1, 1, 6);
break;

case FrontWord::dreiviertel:
setFrontMatrixWord(1, 1, 10);
break;

case FrontWord::m_fuenf:
setFrontMatrixWord(2, 0, 3);
break;

case FrontWord::m_zehn:
setFrontMatrixWord(2, 7, 10);
break;

case FrontWord::halb:
setFrontMatrixWord(4, 7, 10);
break;

case FrontWord::eins:
setFrontMatrixWord(5, 7, 10);
break;

case FrontWord::h_ein:
setFrontMatrixWord(5, 7, 10);
break;

case FrontWord::h_zwei:
setFrontMatrixWord(6, 6, 10);
break;

case FrontWord::h_drei:
setFrontMatrixWord(7, 6, 10);
break;

case FrontWord::h_vier:
setFrontMatrixWord(9, 0, 4);
break;

case FrontWord::h_fuenf:
setFrontMatrixWord(4, 1, 5);
break;

case FrontWord::h_sechs:
setFrontMatrixWord(5, 3, 8);
break;

case FrontWord::h_sieben:
setFrontMatrixWord(9, 5, 10);
break;

case FrontWord::h_acht:
setFrontMatrixWord(6, 1, 5);
break;

case FrontWord::h_neun:
setFrontMatrixWord(8, 3, 7);
break;

case FrontWord::h_zehn:
setFrontMatrixWord(8, 6, 10);
break;

case FrontWord::h_elf:
setFrontMatrixWord(5, 0, 3);
break;

case FrontWord::h_zwoelf:
setFrontMatrixWord(7, 0, 5);
break;

default:
break;
};
};
};

De10x11schwaebisch_t _de10x11schwaebisch;
Loading
Loading