ranse/wordclock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Add "Mitternacht" when it's spooky time.

Browse Source
This commit is contained in:
Markus Ransberger
2023-09-23 22:44:29 +02:00
parent d8f903ae66
commit 9427532189
3 changed files with 2907 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
log.txt Normal file
View File

@@ -0,0 +1,40 @@
Sep-07-2023_023719: Wordclock 2.0: Current state: Hearts, counter: 28, on-time: 0.01h
Sep-07-2023_023720: Wordclock 2.0: Current state: Hearts, counter: 29, on-time: 0.01h
Sep-07-2023_023721: Wordclock 2.0: Current state: Hearts, counter: 30, on-time: 0.01h
Sep-07-2023_023722: Wordclock 2.0: Current state: Hearts, counter: 31, on-time: 0.01h
Sep-07-2023_023723: Wordclock 2.0: Current state: Hearts, counter: 32, on-time: 0.01h
Sep-07-2023_023724: Wordclock 2.0: Current state: Hearts, counter: 33, on-time: 0.01h
Sep-07-2023_023725: Wordclock 2.0: Current state: Hearts, counter: 34, on-time: 0.01h
Sep-07-2023_023726: Wordclock 2.0: Current state: Hearts, counter: 35, on-time: 0.01h
Sep-07-2023_023727: Wordclock 2.0: Current state: Hearts, counter: 36, on-time: 0.01h
Sep-07-2023_023728: Wordclock 2.0: Current state: Hearts, counter: 37, on-time: 0.01h
Sep-07-2023_023729: Wordclock 2.0: Current state: Hearts, counter: 38, on-time: 0.01h
Sep-07-2023_023730: Wordclock 2.0: Current state: Hearts, counter: 39, on-time: 0.01h
Sep-07-2023_023731: Wordclock 2.0: Current state: Hearts, counter: 40, on-time: 0.01h
Sep-07-2023_023732: Wordclock 2.0: Current state: Hearts, counter: 41, on-time: 0.01h
Sep-07-2023_023733: Wordclock 2.0: Current state: Hearts, counter: 42, on-time: 0.01h
Sep-07-2023_023734: Wordclock 2.0: Current state: Hearts, counter: 43, on-time: 0.01h
Sep-07-2023_023735: Wordclock 2.0: Current state: Hearts, counter: 44, on-time: 0.01h
Sep-07-2023_023736: Wordclock 2.0: Current state: Hearts, counter: 45, on-time: 0.01h
Sep-07-2023_023810: Wordclock 2.0: Start program
Sep-07-2023_023810: Wordclock 2.0: Start program
Sep-07-2023_023810: Wordclock 2.0: Sketchname: wordclock_esp8266.cpp
Sep-07-2023_023810: Wordclock 2.0: Build: Wed Sep 06 23:25:18 2023
Sep-07-2023_023810: Wordclock 2.0: IP: 192.168.178.39
Sep-07-2023_023810: Wordclock 2.0: Reset Reason: Power On
Sep-07-2023_023814: Wordclock 2.0: NTP running
Sep-07-2023_023814: Wordclock 2.0: Time: 02:38:12
Sep-07-2023_023814: Wordclock 2.0: TimeOffset (seconds): 7200
Sep-07-2023_023814: Wordclock 2.0: Init Spiral with empty=0
Sep-07-2023_023814: Wordclock 2.0: Init Tetris: init=1, gameover=0
Sep-07-2023_023814: Wordclock 2.0: Nightmode starts at: 23:0
Sep-07-2023_023814: Wordclock 2.0: Nightmode ends at: 7:0
Sep-07-2023_023814: Wordclock 2.0: Brightness: 51
Sep-07-2023_023814: Wordclock 2.0: Current state: Clock, counter: 0, on-time: 0.00h
Sep-07-2023_023815: Wordclock 2.0: Current state: Clock, counter: 1, on-time: 0.00h
Sep-07-2023_023816: Wordclock 2.0: Current state: Clock, counter: 2, on-time: 0.00h
Sep-07-2023_023817: Wordclock 2.0: Current state: Clock, counter: 3, on-time: 0.00h
Sep-07-2023_023818: Wordclock 2.0: Current state: Clock, counter: 4, on-time: 0.00h
Sep-07-2023_023819: Wordclock 2.0: Current state: Clock, counter: 5, on-time: 0.00h
Sep-07-2023_023820: Wordclock 2.0: Current state: Clock, counter: 6, on-time: 0.00h

2854
scripts/log.txt Normal file
View File

File diff suppressed because it is too large Load Diff

20
src/matrix/render_functions.cpp
View File

@@ -165,24 +165,27 @@ String time_to_string(uint8_t hours, uint8_t minutes)
}
// convert hours to 12h format
if (hours >= 12)
{
hours -= 12;
}
if (minutes >= 20)
{
hours++;
}
if (hours == 12)
if (hours > 12) // 24h -> 12h, except 12h
{
hours = 0;
hours -= 12;
}
// show hours
switch (hours)
{
case 0:
message += "ZWOLF ";
if (minutes >= 0 && minutes < 5)
{
message += "MITTERNACHT ";
}
else
{
message += "ZWOLF ";
}
break;
case 1:
message += "EIN";
@@ -223,6 +226,9 @@ String time_to_string(uint8_t hours, uint8_t minutes)
case 11:
message += "ELF ";
break;
case 12:
message += "ZWOLF ";
break;
}
if (minutes < 5)
{