From 92e613f540d4f6335aaa3eb0c8ae1383339c776c Mon Sep 17 00:00:00 2001
From: Verkehrsrot <cyberman@obh.snafu.de>
Date: Thu, 15 Jun 2023 12:49:29 +0200
Subject: [PATCH 1/4] Update platformio_orig.ini

Update makuna rtc lib
---
 platformio_orig.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platformio_orig.ini b/platformio_orig.ini
index 34f685e5..9e5ad5b8 100644
--- a/platformio_orig.ini
+++ b/platformio_orig.ini
@@ -80,7 +80,7 @@ lib_deps_basic =
     greyrook/libpax @ ^1.1.0
     https://github.com/SukkoPera/Arduino-Rokkit-Hash.git
     bblanchon/ArduinoJson @ ^6.21.2
-    makuna/RTC @ ^2.3.7
+    makuna/RTC @ ^2.4.0
     mathertel/OneButton @ ^2.0.3
     lewisxhe/XPowersLib @ ^0.1.7
     256dpi/MQTT @ ^2.5.1
@@ -140,4 +140,4 @@ platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/
 build_flags =
     -include "src/hal/${sysenv.CI_HALFILE}" ; set by CI
     ${common.build_flags_all}
-upload_protocol = esptool
\ No newline at end of file
+upload_protocol = esptool

From 6c2c067e7cd5024cc16bdda599110be0ee301bc4 Mon Sep 17 00:00:00 2001
From: Tom <tom.rottler@gmx.de>
Date: Sun, 2 Jul 2023 18:12:11 +0200
Subject: [PATCH 2/4] Update globals.h

As mentioned by Makuna of RTC library project.
---
 include/globals.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/globals.h b/include/globals.h
index dc7316b9..1e8a0675 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -6,8 +6,7 @@
 
 // Time functions
 #ifdef HAS_RTC
-#include <RtcUtility.h>
-#include <RtcDateTime.h>
+#include <RtcDS3231.h>
 #endif
 #include <Ticker.h>
 
@@ -114,4 +113,4 @@ typedef struct {
 
 extern char clientId[20]; // unique clientID
 
-#endif
\ No newline at end of file
+#endif

From 67b44922205292cbc1440eb4087b57866aa8f52c Mon Sep 17 00:00:00 2001
From: Tom <tom.rottler@gmx.de>
Date: Sun, 2 Jul 2023 18:13:07 +0200
Subject: [PATCH 3/4] Update rtctime.h

As mentioned by Makuna of RTC library
---
 include/rtctime.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/rtctime.h b/include/rtctime.h
index 802b06ee..cf915bda 100644
--- a/include/rtctime.h
+++ b/include/rtctime.h
@@ -4,7 +4,6 @@
 #ifdef HAS_RTC
 
 #include <Wire.h> // must be included here so that Arduino library object file references work
-#include <RtcDS3231.h>
 
 #include "globals.h"
 #include "timekeeper.h"
@@ -19,4 +18,4 @@ float get_rtctemp(void);
 
 #endif
 
-#endif // _RTCTIME_H
\ No newline at end of file
+#endif // _RTCTIME_H

From f76b9e1392555cd820361bef484da2ac5cb71a5c Mon Sep 17 00:00:00 2001
From: cyberman54 <cyberman@obh.snafu.de>
Date: Sun, 2 Jul 2023 21:14:19 +0200
Subject: [PATCH 4/4] rtctime.cpp: remove white space

---
 src/rtctime.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/rtctime.cpp b/src/rtctime.cpp
index 5906f1b7..48116c9a 100644
--- a/src/rtctime.cpp
+++ b/src/rtctime.cpp
@@ -2,7 +2,6 @@
 
 #include "rtctime.h"
 
-
 RtcDS3231<TwoWire> Rtc(Wire); // RTC hardware i2c interface
 
 // initialize RTC