Skip to content

Commit df776b4

Browse files
authored
Merge pull request #248 from dbambus/main
Removed Features (Deprecated 11x11 Frame and Legacy LDR config)
2 parents 58d80c3 + 0f29749 commit df776b4

File tree

12 files changed

+7
-436
lines changed

12 files changed

+7
-436
lines changed

include/EEPROMAnything.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ void read() {
6060
Serial.printf("H18 : %u\n", G.h18);
6161
Serial.printf("H22 : %u\n", G.h22);
6262
Serial.printf("H24 : %u\n", G.h24);
63-
Serial.printf("LDR : %u\n", G.ldr);
64-
Serial.printf("LDRCal : %u\n", G.ldrCal);
6563
Serial.printf("Uhrtype : %u\n", G.UhrtypeDef);
6664

6765
Serial.printf("MQTT_State : %u\n", G.mqtt.state);

include/Uhr.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ struct GLOBAL {
110110
char timeserver[PAYLOAD_LENGTH];
111111
char hostname[PAYLOAD_LENGTH];
112112
char scrollingText[PAYLOAD_LENGTH];
113-
uint16_t ldr;
114-
uint16_t ldrCal;
115113
bool state;
116114
uint8_t h6;
117115
uint8_t h8;
@@ -219,12 +217,10 @@ enum CommandWords {
219217

220218
COMMAND_SET_LANGUAGE_VARIANT = 84,
221219
COMMAND_SET_MQTT = 85,
222-
COMMAND_SET_TIME_MANUAL = 86,
223-
COMMAND_SET_WPS_MODE = 87,
220+
COMMAND_SET_TIME_MANUAL = 86, /* 87 is unused */
224221
COMMAND_SET_COLORTYPE = 88,
225222
COMMAND_SET_UHRTYPE = 89,
226223
COMMAND_SET_WEATHER_DATA = 90,
227-
COMMAND_SET_LDR = 91,
228224
COMMAND_SET_HOSTNAME = 92,
229225
COMMAND_SET_SETTING_SECOND = 93,
230226
COMMAND_SET_MINUTE = 94,
@@ -253,13 +249,12 @@ enum ClockType {
253249
Eng10x11 = 10,
254250
Ger10x11 = 1,
255251
Ger10x11Alternative = 2,
256-
Ger10x11AlternativeFrame = 12,
257-
Ger10x11Vertical = 13,
252+
Ger10x11AlternativeFrame = 4,
253+
Ger10x11Vertical = 12,
258254
Ger10x11Clock = 6,
259255
Ger10x11Nero = 11,
260256
Ger11x11 = 3,
261257
Ger11x11V2 = 8,
262-
Ger11x11Frame = 4,
263258
Ger22x11Weather = 5,
264259
Ger16x18 = 7,
265260
Nl10x11 = 9,

include/Uhrtypes/DE11x11.frame.hpp

Lines changed: 0 additions & 317 deletions
This file was deleted.

0 commit comments

Comments
 (0)