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

A few fixes #396

Merged
merged 13 commits into from
Apr 21, 2024
Merged

A few fixes #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2fc57b3
Updated WifiManager Lib
dbambus Apr 18, 2024
81941cd
Added new icons based on @mrschloemp
dbambus Apr 18, 2024
5b0a2e7
Additional Reset for Powercycle Counter
dbambus Apr 18, 2024
b421e7d
Fix for MinuteLEDs are not updated
dbambus Apr 21, 2024
2e18daa
Clang formatted Uhr.h
dbambus Apr 21, 2024
d4a1294
Fixed Black Clock after just saving MQTT Credentials
dbambus Apr 21, 2024
3e77019
Revised "Split" function in webpageadapter.h
dbambus Apr 21, 2024
85427d7
Removed Debugging code
dbambus Apr 21, 2024
b49fa09
Refactored functionname
dbambus Apr 21, 2024
b1e3a98
Added anonymus login for MQTT
dbambus Apr 21, 2024
edd0e2b
Added descriptions to Mqtt.hpp
dbambus Apr 21, 2024
38cca95
Clang formated MQTT.hpp
dbambus Apr 21, 2024
0d394b7
Enhancement for MQTT callback
dbambus Apr 21, 2024
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
4 changes: 4 additions & 0 deletions include/Uhr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,4 +289,8 @@ enum Icons {
SMILEY = 10,
NOTE = 11,
SNOW = 12,
MAIL = 13,
BELL = 14,
STOP = 15,
STBY = 16,
};
7 changes: 6 additions & 1 deletion include/clockWork.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,7 @@ void ClockWork::loop(struct tm &tm) {
}
delay(100);

if (G.mqtt.state && !mqtt.getConnected()) {
if (G.mqtt.state && !mqtt.isConnected()) {
mqtt.reInit();
}

Expand Down Expand Up @@ -1335,6 +1335,11 @@ void ClockWork::loop(struct tm &tm) {
calcClockface();

switch (changesInClockface()) {
case WordclockChanges::Minute:
lastMinuteArray = minuteArray;
memcpy(&lastFrontMatrix, &frontMatrix, sizeof lastFrontMatrix);
led.set(WordclockChanges::Minute);
break;
case WordclockChanges::Words:
lastMinuteArray = minuteArray;
memcpy(&lastFrontMatrix, &frontMatrix, sizeof lastFrontMatrix);
Expand Down
44 changes: 44 additions & 0 deletions include/icons.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,48 @@ const uint16_t grafik_11x10[][11] PROGMEM = {
0b00110101100, // 7 87: . . 0 0 . 0 . 0 0 . . : 77
0b00110101100, // 8 88: . . 0 0 . 0 . 0 0 . . : 98
0b00000100000}, // 9 109: . . . . . 0 . . . . . : 99

{0b00000000000, // 0 MAIL 0: . . . . . . . . . . . : 10
0b11111111111, // 1 21: 0 0 0 0 0 0 0 0 0 0 0 : 11
0b11000000011, // 2 22: 0 0 . . . . . . . 0 0 : 32
0b10100000101, // 3 43: 0 . 0 . . . . . 0 . 0 : 33
0b10011111001, // 4 44: 0 . . 0 0 0 0 0 . . 0 : 54
0b10000100001, // 5 65: 0 . . . . 0 . . . . 0 : 55
0b10000000001, // 6 66: 0 . . . . . . . . . 0 : 76
0b10000000001, // 7 87: 0 . . . . . . . . . 0 : 77
0b11111111111, // 8 88: 0 0 0 0 0 0 0 0 0 0 0 : 98
0b00000000000}, // 9 109: . . . . . . . . . . . : 99

{0b00000100000, // 0 BELL 0: . . . . . 0 . . . . . : 10
0b00001110000, // 1 21: . . . . 0 0 0 . . . . : 11
0b00010001000, // 2 22: . . . 0 . . . 0 . . . : 32
0b00100000100, // 3 43: . . 0 . . . . . 0 . . : 33
0b00100000100, // 4 44: . . 0 . . . . . 0 . . : 54
0b01100000110, // 5 65: . 0 0 . . . . . 0 0 . : 55
0b01100000011, // 6 66: 0 0 . . . . . . . 0 0 : 76
0b01111111110, // 7 87: . 0 0 0 0 0 0 0 0 0 . : 77
0b00001110000, // 8 88: . . . . 0 0 0 . . . . : 98
0b00000100000}, // 9 109: . . . . . 0 . . . . . : 99

{0b00001110000, // 0 STOP 0: . . . . 0 0 0 . . . . : 10
0b00111111100, // 1 21: . . 0 0 0 0 0 0 0 . . : 11
0b01110001110, // 2 22: . 0 0 0 . . . 0 0 0 . : 32
0b11001010011, // 3 43: 0 0 . . 0 . 0 . . 0 0 : 33
0b11000100011, // 4 44: 0 0 . . . 0 . . . 0 0 : 54
0b11001010011, // 5 65: 0 0 . . 0 . 0 . . 0 0 : 55
0b11010001011, // 6 66: 0 0 . 0 . . . 0 . 0 0 : 76
0b01100000110, // 7 87: . 0 0 . . . . . 0 0 . : 77
0b00111111100, // 8 88: . . 0 0 0 0 0 0 0 . . : 98
0b00001110000}, // 9 109: . . . . 0 0 0 . . . . : 99

{0b00001110000, // 0 STBY 0: . . . . 0 0 0 . . . . : 10
0b00001110000, // 1 21: . . . . 0 0 0 . . . . : 11
0b00111111100, // 2 22: . . 0 0 0 0 0 0 0 . . : 32
0b01101110110, // 3 43: . 0 0 . 0 0 0 . 0 0 . : 33
0b11001110011, // 4 44: 0 0 . . 0 0 0 . . 0 0 : 54
0b11001110011, // 5 65: 0 0 . . 0 0 0 . . 0 0 : 55
0b11000000011, // 6 66: 0 0 . . . . . . . 0 0 : 76
0b11000000011, // 7 87: 0 0 . . . . . . . 0 0 : 77
0b01100000110, // 8 88: . 0 0 . . . . . 0 0 . : 98
0b00111111100}, // 9 109: . . 0 0 0 0 0 0 0 . . : 99
};
2 changes: 1 addition & 1 deletion include/mqtt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ class Mqtt {
void sendState();
void sendDiscovery();

bool getConnected();
bool isConnected();
};
Loading
Loading