Skip to content

Commit

Permalink
Merge branch 'main' into BH1750-Ambient-Light-Sensor
Browse files Browse the repository at this point in the history
  • Loading branch information
STT65 committed Jun 2, 2024
2 parents 3866dff + 429de28 commit 452652f
Show file tree
Hide file tree
Showing 32 changed files with 1,190 additions and 164 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ English description further below.
Dies ist ein Projekt für eine mehrsprachige Wortuhr auf Grundlage eines ESP8266-Mikrocontrollers und einer programmierbaren LED-Leiste (WS2812 oder SK6812). Eine Wortuhr ist ein wunderschönes DIY-Projekt für Anfänger, das Technologie und Design kombiniert, um eine funktionale und ästhetisch ansprechende Uhr zu schaffen.
Egal, ob Sie ein Anfänger oder ein erfahrener Bastler sind, dieses Projekt ist eine großartige Möglichkeit, Ihre Fähigkeiten unter Beweis zu stellen und etwas wirklich Besonderes zu schaffen.
Die Software hat viele Funktionen:
- Mehrsprachig (🇬🇧, 🇩🇪, 🇪🇸, 🇮🇹, 🇳🇱, 🇭🇺)
- Mehrsprachig (🇬🇧, 🇩🇪, 🇪🇸, 🇮🇹, 🇳🇱, 🇭🇺, 🇷🇴, 🇨🇭, 🇷🇺, 🇸🇪, 🇫🇷)
- Unterstützung für mehrere Layouts und LED-Abstände
- Farbwechsel der Displayfarbe möglich (RGB oder RGBW)
- Digitale Uhranzeige
Expand Down Expand Up @@ -105,7 +105,7 @@ Die einzige Bedingung ist, dass der Copyright-Hinweis des Originalprogramms nich
This is a project for a multilingual word clock based on an ESP8266 microcontroller and a programmable LED strip (WS2812 or SK6812). A word clock is a beautiful DIY project for beginners that combines technology and design to create a functional and aesthetically pleasing clock.
Whether you're a beginner or an experienced hobbyist, this project is a great way to show off your skills and create something truly special.
The software has many features:
- Multilingual (🇬🇧, 🇩🇪, 🇪🇸, 🇮🇹, 🇳🇱, 🇭🇺)
- Multilingual (🇬🇧, 🇩🇪, 🇪🇸, 🇮🇹, 🇳🇱, 🇭🇺, 🇷🇴, 🇨🇭, 🇷🇺, 🇸🇪, 🇫🇷)
- Support for multiple layouts and LED spacing
- Colour change of the display colour possible (RGB or RGBW)
- Digital clock display
Expand Down
1 change: 1 addition & 0 deletions eslintrc.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@
"TRANSLATION_IT": "readonly",
"TRANSLATION_ES": "readonly",
"TRANSLATION_HU": "readonly",
"TRANSLATION_RU": "readonly",
"i18next": "readonly",
"isLocalEnvironment": "readonly"
}
Expand Down
3 changes: 3 additions & 0 deletions include/EEPROMAnything.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ void read() {
Serial.printf("BgCol.H : %f\n", G.color[Background].H);
Serial.printf("BgCol.S : %f\n", G.color[Background].S);
Serial.printf("BgCol.V : %f\n", G.color[Background].B);
Serial.printf("FrCol.H : %f\n", G.color[Frame].H);
Serial.printf("FrCol.S : %f\n", G.color[Frame].S);
Serial.printf("FrCol.V : %f\n", G.color[Frame].B);
Serial.printf("Zeitserver: %s\n", G.timeserver);
Serial.printf("Lauftext : %s\n", G.scrollingText);
Serial.printf("H6 : %u\n", G.h6);
Expand Down
14 changes: 7 additions & 7 deletions include/Transitiontypes/Transition.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -953,15 +953,15 @@ bool Transition::isOverwrittenByTransition(WordclockChanges changesInWordMatrix,
//------------------------------------------------------------------------------

void Transition::loop(struct tm &tm) {
if (matrixChanged) {
matrixChanged = false;
saveMatrix();
copyMatrix(work, act);
}

if (G.prog == COMMAND_IDLE || G.prog == COMMAND_MODE_WORD_CLOCK) {
if (!isSilvester(transitionType, tm, hasMinuteChanged())) {
transitionType = getTransitionType(hasMinuteChanged());
transitionType = getTransitionType(matrixChanged);
}

if (matrixChanged) {
matrixChanged = false;
saveMatrix();
copyMatrix(work, act);
}

if (transitionType == NO_TRANSITION) {
Expand Down
7 changes: 7 additions & 0 deletions include/Uhr.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ bool externalRTC = false;
enum ColorPosition {
Foreground = 0,
Background = 1,
Frame = 2,
};

enum LedColorVariants {
Expand Down Expand Up @@ -270,6 +271,8 @@ enum ClockType {
Ch10x11 = 18,
Ro10x11 = 19,
Fr10x11 = 21,
Se10x11 = 22,
Ru10x11 = 23,
};

enum Icons {
Expand All @@ -286,4 +289,8 @@ enum Icons {
SMILEY = 10,
NOTE = 11,
SNOW = 12,
MAIL = 13,
BELL = 14,
STOP = 15,
STBY = 16,
};
4 changes: 2 additions & 2 deletions include/Uhrtypes/HU10x10.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
/*
* Layout Front
* COL
* X 9 8 7 6 5 4 3 2 1 0
* ROW + - - - - - - - - - - -
* 9 8 7 6 5 4 3 2 1 0
* ROW + - - - - - - - - - -
* 0 | Ö T B T Í Z J A S U
* 1 | P E R C C E L E W O
* 2 | M Ú L T A M Ú L V A
Expand Down
227 changes: 227 additions & 0 deletions include/Uhrtypes/RU10x11.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,227 @@
#pragma once

#include "Uhrtype.hpp"

/*
* Layout Front by Ragman
* COL
* X 9 8 7 6 5 4 3 2 1 0
* ROW + - - - - - - - - - - -
* 0 | О Д И Н П Я Т Ь Д В А
* 1 | Д Е Ш Е С Т Ь В Я Т Ь
* 2 | В О Ч Е C E M Ь Т Р И
* 3 | Т Ы Д В Е Р Е С Я Т Ь
* 4 | Н А Д Ц А Т Ь Ч А С А
* 5 | Ч А С О В Д С О Р О К
* 6 | Т Р И Д В А Д П Я Т Ь
* 7 | П Я Т Н А Д Е Ц А Т Ь
* 8 | A M Д Е С Я Т С Я Т Ь
* 9 | П Я Т Ь Я Р М И Н У Т
*/

class Ru10x11_t : public iUhrType {
public:
virtual LanguageAbbreviation usedLang() override {
return LanguageAbbreviation::RU;
};

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

case FrontWord::es_ist:
// Ч А С О В (5 ... 12)
setFrontMatrixWord(5, 6, 10);
break;

case FrontWord::es_ist___plural___:
// Ч А С A (2 ...4)
setFrontMatrixWord(4, 0, 3);
break;

case FrontWord::es_ist__singular__:
// Ч А С (1)
setFrontMatrixWord(4, 1, 3);
break;

case FrontWord::hour_1:
// О Д И Н
setFrontMatrixWord(0, 7, 10);
break;

case FrontWord::hour_2:
// Д В А
setFrontMatrixWord(0, 0, 2);
break;

case FrontWord::hour_3:
// Т Р И
setFrontMatrixWord(2, 0, 2);
break;

case FrontWord::hour_4:
// Ч Е Т Ы Р Е
setFrontMatrixWord(2, 7, 8);
setFrontMatrixWord(3, 9, 10);
setFrontMatrixWord(3, 4, 5);
break;

case FrontWord::hour_5:
// П Я Т Ь
setFrontMatrixWord(0, 3, 6);
break;

case FrontWord::hour_6:
// Ш Е С Т Ь
setFrontMatrixWord(1, 4, 8);
break;

case FrontWord::hour_7:
// C E M Ь
setFrontMatrixWord(2, 3, 6);
break;

case FrontWord::hour_8:
// B O C E M Ь
setFrontMatrixWord(2, 9, 10);
setFrontMatrixWord(2, 3, 6);
break;

case FrontWord::hour_9:
// Д Е В Я Т Ь
setFrontMatrixWord(1, 9, 10);
setFrontMatrixWord(1, 0, 3);
break;

case FrontWord::hour_10:
// Д Е С Я Т Ь
setFrontMatrixWord(1, 9, 10);
setFrontMatrixWord(3, 0, 3);
break;

case FrontWord::hour_11:
// О Д И Н Н А Д Ц А Т Ь
setFrontMatrixWord(0, 7, 10);
setFrontMatrixWord(4, 4, 10);
break;

case FrontWord::hour_12:
// Д В Е Н А Д Ц А Т Ь
setFrontMatrixWord(3, 6, 8);
setFrontMatrixWord(4, 4, 10);
break;

case FrontWord::min_5:
// П Я Т Ь М И Н У Т
setFrontMatrixWord(9, 7, 10);
setFrontMatrixWord(9, 0, 4);
break;

case FrontWord::min_10:
// Д Е С Я Т Ь М И Н У Т
setFrontMatrixWord(8, 7, 8);
setFrontMatrixWord(8, 0, 3);
setFrontMatrixWord(9, 0, 4);
break;

case FrontWord::viertel:
// П Я Т Н А Д Ц А Т Ь М И Н У Т
setFrontMatrixWord(7, 5, 10);
setFrontMatrixWord(7, 0, 3);
setFrontMatrixWord(9, 0, 4);
break;

case FrontWord::min_20:
// Д В А Д Ц А Т Ь М И Н У Т
setFrontMatrixWord(6, 4, 7);
setFrontMatrixWord(7, 0, 3);
setFrontMatrixWord(9, 0, 4);
break;

case FrontWord::min_25:
// Д В А Д Ц А Т Ь П Я Т Ь М И Н У Т
setFrontMatrixWord(6, 4, 7);
setFrontMatrixWord(7, 0, 3);
setFrontMatrixWord(9, 7, 10);
setFrontMatrixWord(9, 0, 4);
break;

case FrontWord::halb:
// Т Р И Д Ц А Т Ь М И Н У Т
setFrontMatrixWord(6, 7, 10);
setFrontMatrixWord(7, 0, 3);
setFrontMatrixWord(9, 0, 4);
break;

case FrontWord::min_35:
// Т Р И Д Ц А Т Ь П Я Т Ь М И Н У Т
setFrontMatrixWord(6, 7, 10);
setFrontMatrixWord(7, 0, 3);
setFrontMatrixWord(9, 7, 10);
setFrontMatrixWord(9, 0, 4);
break;

case FrontWord::min_40:
// C O P O K М И Н У Т
setFrontMatrixWord(5, 0, 4);
setFrontMatrixWord(9, 0, 4);
break;

case FrontWord::dreiviertel:
// C O P O K П Я Т Ь М И Н У Т
setFrontMatrixWord(5, 0, 4);
setFrontMatrixWord(9, 7, 10);
setFrontMatrixWord(9, 0, 4);
break;

case FrontWord::min_50:
// П Я Т Ь Д Е С Я Т М И Н У Т
setFrontMatrixWord(6, 0, 3);
setFrontMatrixWord(8, 4, 8);
setFrontMatrixWord(9, 0, 4);
break;

case FrontWord::min_55:
// П Я Т Ь Д Е С Я Т П Я Т Ь М И Н У Т
setFrontMatrixWord(6, 0, 3);
setFrontMatrixWord(8, 4, 8);
setFrontMatrixWord(9, 7, 10);
setFrontMatrixWord(9, 0, 4);
break;

default:
break;
};
};
};

Ru10x11_t _ru10x11;
Loading

0 comments on commit 452652f

Please sign in to comment.