Merge pull request #258 from cyberman54/master

sync dev with master

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"

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>

include/lorawan.h

@@ -3,7 +3,6 @@
 
 #include "globals.h"
 #include "rcommand.h"
-#include <TimeLib.h>
 
 // LMIC-Arduino LoRaWAN Stack
 #include <lmic.h>

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);