Skip to content

Commit

Permalink
Added new Layout DE10x11 Nero
Browse files Browse the repository at this point in the history
  • Loading branch information
@dbambus
dbambus committed Feb 10, 2023
1 parent 66b0e3c commit e4776b3
Show file tree
Hide file tree
Showing 5 changed files with 233 additions and 3 deletions.
5 changes: 3 additions & 2 deletions include/Uhr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,16 +211,17 @@ enum CommandWords {
};

enum ClockType {
Eng10x11 = 10,
Ger10x11 = 1,
Ger10x11Alternative = 2,
Ger10x11Clock = 6,
Nl10x11 = 9,
Ger10x11Nero = 11,
Ger11x11 = 3,
Ger11x11V2 = 8,
Ger11x11Frame = 4,
Ger21x11Weather = 5,
Ger17x17 = 7,
Eng10x11 = 10,
Nl10x11 = 9,
};

enum Icons {
Expand Down
222 changes: 222 additions & 0 deletions include/Uhrtypes/DE10x11.nero.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
#pragma once

#include "Uhrtype.hpp"

/*
* Layout Front
*
* E S J I S T L F Ü N F
* Z E H N Z W A N Z I G
* D R E I V I E R T E L
* T F N A C H V O R J M
* H A L B X Z W Ö L F T
* Z W E I N S I E B E N
* L D R E I C I F Ü N F
* E L F N E U N V I E R
* U A C H T Z E H N S I
* C S E C H S T L U H R
*/

class De10x11Nero_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:
// Es
setLetter(0);
setLetter(1);

// Ist
setLetter(3);
setLetter(4);
setLetter(5);
break;

case FrontWord::nach:
case FrontWord::v_nach:
setLetter(38);
setLetter(39);
setLetter(40);
setLetter(41);
break;

case FrontWord::vor:
case FrontWord::v_vor:
setLetter(35);
setLetter(36);
setLetter(37);
break;

case FrontWord::viertel:
setLetter(26);
setLetter(27);
setLetter(28);
setLetter(29);
setLetter(30);
setLetter(31);
setLetter(32);
break;

case FrontWord::dreiviertel:
setLetter(22);
setLetter(23);
setLetter(24);
setLetter(25);
setLetter(26);
setLetter(27);
setLetter(28);
setLetter(29);
setLetter(30);
setLetter(31);
setLetter(32);
break;

case FrontWord::fuenf:
setLetter(7);
setLetter(8);
setLetter(9);
setLetter(10);
break;

case FrontWord::zehn:
setLetter(18);
setLetter(19);
setLetter(20);
setLetter(21);
break;

case FrontWord::zwanzig:
setLetter(11);
setLetter(12);
setLetter(13);
setLetter(14);
setLetter(15);
setLetter(16);
setLetter(17);
break;

case FrontWord::halb:
setLetter(44);
setLetter(45);
setLetter(46);
setLetter(47);
break;

case FrontWord::eins:
setLetter(60);
setLetter(61);
setLetter(62);
setLetter(63);
break;

case FrontWord::uhr:
setLetter(99);
setLetter(100);
setLetter(101);
break;

case FrontWord::h_ein:
setLetter(61);
setLetter(62);
setLetter(63);
break;

case FrontWord::h_zwei:
setLetter(62);
setLetter(63);
setLetter(64);
setLetter(65);
break;

case FrontWord::h_drei:
setLetter(67);
setLetter(68);
setLetter(69);
setLetter(70);
break;

case FrontWord::h_vier:
setLetter(77);
setLetter(78);
setLetter(79);
setLetter(80);
break;

case FrontWord::h_fuenf:
setLetter(73);
setLetter(74);
setLetter(75);
setLetter(76);
break;

case FrontWord::h_sechs:
setLetter(104);
setLetter(105);
setLetter(106);
setLetter(107);
setLetter(108);
break;

case FrontWord::h_sieben:
setLetter(55);
setLetter(56);
setLetter(57);
setLetter(58);
setLetter(59);
setLetter(60);
break;

case FrontWord::h_acht:
setLetter(89);
setLetter(90);
setLetter(91);
setLetter(92);
break;

case FrontWord::h_neun:
setLetter(81);
setLetter(82);
setLetter(83);
setLetter(84);
break;

case FrontWord::h_zehn:
setLetter(93);
setLetter(94);
setLetter(95);
setLetter(96);
break;

case FrontWord::h_elf:
setLetter(85);
setLetter(86);
setLetter(87);
break;

case FrontWord::h_zwoelf:

setLetter(49);
setLetter(50);
setLetter(51);
setLetter(52);
setLetter(53);
break;

default:
break;
};
};
};

De10x11Nero_t _de10x11Nero;
2 changes: 2 additions & 0 deletions include/clockWork.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,8 @@ iUhrType *ClockWork::getPointer(uint8_t type) {
return &_de10x11Alternative;
case Ger10x11Clock:
return &_de10x11Clock;
case Ger10x11Nero:
return &_de10x11Nero;
case Nl10x11:
return &_nl10x11;
case Ger11x11:
Expand Down
6 changes: 5 additions & 1 deletion include/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,16 @@
//
// #define DEFAULT_LAYOUT Ger10x11Alternative
// 10 rows, each 11 LED's per row + 4 LED's for minutes, with modified
// layout for extra words in the matrix
// layout for extra words in the matrix from the Github user @dbambus
//
// #define DEFAULT_LAYOUT Ger10x11Clock
// 10 rows, each 11 LED's per row + 4 LED's for minutes, with the layout
// from the original manufacturer
//
// #define DEFAULT_LAYOUT Ger10x11Nero
// 10 rows, each 11 LED's per row + 4 LED's for minutes, with the layout
// from the Github user @n3roGit
//
// #define DEFAULT_LAYOUT Ger11x11
// 11 rows, each 11 LED's per row + 4 LED's for minutes
//
Expand Down
1 change: 1 addition & 0 deletions webpage/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ <h2>Frontoptionen</h2>
<option value="1" selected>DE 10x11</option>
<option value="2">DE 10x11 Alternative</option>
<option value="6">DE 10x11 Clock</option>
<option value="11">DE 10x11 Nero</option>
<option value="3">DE 11x11</option>
<option value="8">DE 11x11 v2</option>
<option value="4">DE 11x11 Frame</option>
Expand Down

0 comments on commit e4776b3

Please sign in to comment.