From 954687fe61c1543331618866874ff421d26bc68e Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Mon, 28 Jan 2019 11:46:18 +0100
Subject: [PATCH] fixed timezone compile error (issue #256)

---
 include/globals.h | 5 +++++
 include/gpsread.h | 1 -
 include/lorawan.h | 1 -
 include/rtctime.h | 3 ---
 src/cyclic.cpp    | 2 +-
 src/lorawan.cpp   | 2 +-
 src/main.cpp      | 5 +++++
 src/rtctime.cpp   | 5 -----
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/globals.h b/include/globals.h
index 890e93cc..daff28ea 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -4,6 +4,10 @@
 // The mother of all embedded development...
 #include <Arduino.h>
 
+// Time functions
+#include <Time.h>
+#include <Timezone.h>
+
 // std::set for unified array functions
 #include <set>
 #include <array>
@@ -102,6 +106,7 @@ extern std::array<uint64_t, 0xff>::iterator it;
 extern std::array<uint64_t, 0xff> beacons;
 
 extern TaskHandle_t irqHandlerTask, wifiSwitchTask;
+extern Timezone myTZ; // make Timezone myTZ globally available
 
 // application includes
 #include "led.h"
diff --git a/include/gpsread.h b/include/gpsread.h
index f98e4d62..affde231 100644
--- a/include/gpsread.h
+++ b/include/gpsread.h
@@ -2,7 +2,6 @@
 #define _GPSREAD_H
 
 #include <TinyGPS++.h> // library for parsing NMEA data
-#include <Time.h>
 
 #ifdef GPS_I2C // Needed for reading from I2C Bus
 #include <Wire.h>
diff --git a/include/lorawan.h b/include/lorawan.h
index 2bd1b55b..05aba7cd 100644
--- a/include/lorawan.h
+++ b/include/lorawan.h
@@ -3,7 +3,6 @@
 
 #include "globals.h"
 #include "rcommand.h"
-#include <TimeLib.h>
 
 // LMIC-Arduino LoRaWAN Stack
 #include <lmic.h>
diff --git a/include/rtctime.h b/include/rtctime.h
index e308ec20..d47ae19c 100644
--- a/include/rtctime.h
+++ b/include/rtctime.h
@@ -2,8 +2,6 @@
 #define _RTCTIME_H
 
 #include "globals.h"
-#include <Time.h>
-#include <Timezone.h>
 #include <Wire.h> // must be included here so that Arduino library object file references work
 #include <RtcDS3231.h>
 
@@ -20,7 +18,6 @@ typedef enum {
 } clock_state_t;
 
 extern RtcDS3231<TwoWire> Rtc; // make RTC instance globally available
-extern Timezone myTZ; // make Timezone myTZ globally available
 
 int rtc_init(void);
 int set_rtctime(uint32_t UTCTime);
diff --git a/src/cyclic.cpp b/src/cyclic.cpp
index 4a1c2599..dc9fe12f 100644
--- a/src/cyclic.cpp
+++ b/src/cyclic.cpp
@@ -132,10 +132,10 @@ void do_timesync() {
 #ifdef HAS_RTC
     if (!set_rtctime(RtcDateTime(now())))
       ESP_LOGE(TAG, "RTC set time failure");
+#endif
     time_t tt = myTZ.toLocal(now());
     ESP_LOGI(TAG, "GPS has set system time to %02d/%02d/%d %02d:%02d:%02d",
              month(tt), day(tt), year(tt), hour(tt), minute(tt), second(tt));
-#endif
     return;
   } else {
     ESP_LOGI(TAG, "No valid GPS time");
diff --git a/src/lorawan.cpp b/src/lorawan.cpp
index 31827bbc..dcf8e3a4 100644
--- a/src/lorawan.cpp
+++ b/src/lorawan.cpp
@@ -458,9 +458,9 @@ void user_request_network_time_callback(void *pVoidUserUTCTime,
 #ifdef HAS_RTC
   if (!set_rtctime(*pUserUTCTime))
     ESP_LOGE(TAG, "RTC set time failure");
+#endif
   time_t t = myTZ.toLocal(now());
   ESP_LOGI(TAG,
            "LORA Network has set system time to %02d/%02d/%d %02d:%02d:%02d",
            month(t), day(t), year(t), hour(t), minute(t), second(t));
-#endif
 }
diff --git a/src/main.cpp b/src/main.cpp
index 57350e70..c671f4d0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -77,6 +77,11 @@ std::set<uint16_t, std::less<uint16_t>, Mallocator<uint16_t>> macs;
 // initialize payload encoder
 PayloadConvert payload(PAYLOAD_BUFFER_SIZE);
 
+// set Time Zone, fetch user setting from paxcounter.conf
+TimeChangeRule myDST = DAYLIGHT_TIME;
+TimeChangeRule mySTD = STANDARD_TIME;
+Timezone myTZ(myDST, mySTD);
+
 // local Tag for logging
 static const char TAG[] = "main";
 
diff --git a/src/rtctime.cpp b/src/rtctime.cpp
index 4262b25e..d0a7b403 100644
--- a/src/rtctime.cpp
+++ b/src/rtctime.cpp
@@ -7,11 +7,6 @@ static const char TAG[] = "main";
 
 RtcDS3231<TwoWire> Rtc(Wire); // RTC hardware i2c interface
 
-// set Time Zone, fetch user setting from paxcounter.conf
-TimeChangeRule myDST = DAYLIGHT_TIME;
-TimeChangeRule mySTD = STANDARD_TIME;
-Timezone myTZ(myDST, mySTD);
-
 // initialize RTC
 int rtc_init(void) {