Merge pull request #984 from cyberman54/development

Development

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
+#endif

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
+#endif // _RTCTIME_H

src/rtctime.cpp

@@ -2,7 +2,6 @@
 
 #include "rtctime.h"
 
-
 RtcDS3231<TwoWire> Rtc(Wire); // RTC hardware i2c interface
 
 // initialize RTC