Merge pull request #258 from cyberman54/master

sync dev with master

src/lorawan.cpp

@@ -463,4 +463,4 @@ void user_request_network_time_callback(void *pVoidUserUTCTime,
   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));
-}
+}

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

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