From a08bb8f2a5b3e9d63b84c314fb23e3f4ced00e04 Mon Sep 17 00:00:00 2001 From: rxf Date: Sun, 26 Oct 2025 09:24:41 +0100 Subject: [PATCH] V 2.0.1: DST nun evtl. richtig --- platformio.ini | 2 +- src/grafik.cpp | 2 +- src/version.h | 9 ++++++--- src/weifi.cpp | 4 +++- src/weifi.h | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/platformio.ini b/platformio.ini index 7ac175b..27c75d9 100644 --- a/platformio.ini +++ b/platformio.ini @@ -16,8 +16,8 @@ lib_compat_mode = strict lib_deps = bblanchon/ArduinoJson@^7.1.0 adafruit/Adafruit BME280 Library@^2.2.4 - lvgl/lvgl@^9.1.0 bodmer/TFT_eSPI@^2.5.43 knolleary/PubSubClient@^2.8 ayushsharma82/ElegantOTA@^3.1.5 + lvgl/lvgl@9.1.0 monitor_speed = 115200 diff --git a/src/grafik.cpp b/src/grafik.cpp index 2893ad1..000fbd3 100644 --- a/src/grafik.cpp +++ b/src/grafik.cpp @@ -378,7 +378,7 @@ void setAussenDataValues(float val, bool what, struct tm t) { if (what) { - lv_label_set_text_fmt(ta_label,"Ta:\n%.1f °C", val); + lv_label_set_text_fmt(ta_label,"Taussen:\n%.1f °C", val); lv_obj_align(ta_label, LV_ALIGN_TOP_LEFT, 10, 10); lv_label_set_text_fmt(tta_label,"%02d:%02d\n", t.tm_hour, t.tm_min); lv_obj_align(tta_label, LV_ALIGN_TOP_LEFT, 10, 45); diff --git a/src/version.h b/src/version.h index 2c93992..e8533d8 100644 --- a/src/version.h +++ b/src/version.h @@ -1,11 +1,14 @@ // Versionsgeschichte -#define VERSION "2.0.0" -#define VDATE "2025-06-09" -#define VTIME "09:00 UTC" +#define VERSION "2.0.1" +#define VDATE "2025-10-26" +#define VTIME "08:00 UTC" /* Version Date Author +2.0.1 2025-10-26 rxf + - DST jetzt hoffentlich richtig mit dem TZ-String + 2.0.0 2025-06-09 rxf - Messwerte werden nun vom ZigBee-Sensor per MQTT empfangen, d.h. der BME280 wird nicht mehr verwendet diff --git a/src/weifi.cpp b/src/weifi.cpp index 0d8cdea..15a3a87 100644 --- a/src/weifi.cpp +++ b/src/weifi.cpp @@ -55,7 +55,9 @@ void connectToWifi() { Serial.print("Connected to the WiFi with IP: "); Serial.println(WiFi.localIP()); - configTime(gmtOffset_sec, daylightOffset_sec, ntpServer); + configTime(0, 0 , ntpServer); + setenv("TZ","CET-1CEST,M3.5.0,M10.5.0/3",1); + tzset(); printLocalTime(); server.on("/", []() { diff --git a/src/weifi.h b/src/weifi.h index 0ef611c..0f0c860 100644 --- a/src/weifi.h +++ b/src/weifi.h @@ -17,7 +17,7 @@ #ifdef WEIFI const char *ntpServer = "pool.ntp.org"; const long gmtOffset_sec = 3600; -const int daylightOffset_sec = 3600; +const int daylightOffset_sec = 0; WebServer server(80);