From 889ffe3a511db3a0d726c074d58cdedf2d8dd617 Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Fri, 16 Nov 2018 09:52:26 +0100
Subject: [PATCH] cyclic.cpp, lorawan.cpp: code sanitization

---
 src/cyclic.cpp  |  3 ++-
 src/lorawan.cpp | 19 +++++--------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/cyclic.cpp b/src/cyclic.cpp
index c727b30e..b95f176d 100644
--- a/src/cyclic.cpp
+++ b/src/cyclic.cpp
@@ -21,12 +21,13 @@ void doHousekeeping() {
     do_reset();
 
   spi_housekeeping();
+  lora_housekeeping();
 
 // time sync once per TIME_SYNC_INTERVAL_MIN
 #ifdef TIME_SYNC
   if (millis() >= nextTimeSync) {
     nextTimeSync = millis() + TIME_SYNC_INTERVAL_MIN *
-                                  60000; // set up  next time sync period
+                                  60000; // set up next time sync period
     do_timesync();
   }
 #endif
diff --git a/src/lorawan.cpp b/src/lorawan.cpp
index ad2b3d18..f1787c66 100644
--- a/src/lorawan.cpp
+++ b/src/lorawan.cpp
@@ -419,13 +419,6 @@ void user_request_network_time_callback(void *pVoidUserUTCTime,
                                         int flagSuccess) {
   // Explicit conversion from void* to uint32_t* to avoid compiler errors
   uint32_t *pUserUTCTime = (uint32_t *)pVoidUserUTCTime;
-
-  // A struct that will be populated by LMIC_getNetworkTimeReference.
-  // It contains the following fields:
-  //  - tLocal: the value returned by os_GetTime() when the time
-  //            request was sent to the gateway, and
-  //  - tNetwork: the seconds between the GPS epoch and the time
-  //              the gateway received the time request
   lmic_time_reference_t lmicTimeReference;
 
   if (flagSuccess != 1) {
@@ -433,7 +426,7 @@ void user_request_network_time_callback(void *pVoidUserUTCTime,
     return;
   }
 
-  // Populate "lmic_time_reference"
+  // Populate lmic_time_reference
   flagSuccess = LMIC_getNetworkTimeReference(&lmicTimeReference);
   if (flagSuccess != 1) {
     ESP_LOGW(TAG, "Network time request failed");
@@ -443,19 +436,17 @@ void user_request_network_time_callback(void *pVoidUserUTCTime,
   // Update userUTCTime, considering the difference between the GPS and UTC
   // epoch, and the leap seconds
   *pUserUTCTime = lmicTimeReference.tNetwork + 315964800;
-
-  // Add the delay between the instant the time was transmitted and
-  // the current time
-
   // Current time, in ticks
   ostime_t ticksNow = os_getTime();
   // Time when the request was sent, in ticks
   ostime_t ticksRequestSent = lmicTimeReference.tLocal;
+  // Add the delay between the instant the time was transmitted and
+  // the current time
   uint32_t requestDelaySec = osticks2ms(ticksNow - ticksRequestSent) / 1000;
   *pUserUTCTime += requestDelaySec;
 
-  // Update the system time with the time read from the network
+  // Update system time with  time read from the network
   setTime(*pUserUTCTime);
   ESP_LOGI(TAG, "Time synced by LoRa network to %02d:%02d:%02d", hour(),
            minute(), second());
-}
+}
\ No newline at end of file