From 1f0072797f35ddbe162a9ca452d1c4777e616515 Mon Sep 17 00:00:00 2001
From: Joerg Lehmann <joerg.lehmann@nbit.ch>
Date: Tue, 14 Jul 2020 19:45:25 +0200
Subject: [PATCH] millis() is unsigned long

---
 README.md                  | 3 ++-
 mini-beieli-node.ino       | 6 +++---
 mini_beieli_node.h         | 2 +-
 mini_beieli_node_nau7802.h | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 2fcec8f..3b9ddf6 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Das sind die verwendeten Libraries [1]:
 | --- | -----  | ----------- |
 | https://github.com/mcci-catena/Adafruit_BME280_Library.git  | 3dafbe1 | Wed, 13 Dec 2017 13:56:30 -0500  |
 | https://github.com/mcci-catena/Adafruit_Sensor.git  | f2af6f4 | Tue, 1 Sep 2015 15:57:59 +0200  |
-| https://github.com/mcci-catena/arduino-lmic.git  | 1964dcf | Mon, 22 Jun 2020 10:54:56 -0400  |
+| https://github.com/mcci-catena/arduino-lmic.git  | 9191f0c | Tue, 30 Jun 2020 09:56:19 -0400  |
 | https://github.com/mcci-catena/arduino-lorawan.git  | 4bc0d48 | Sat, 9 May 2020 12:38:28 -0400  |
 | https://github.com/mcci-catena/Catena-Arduino-Platform.git  | 478ad23 | Fri, 26 Jun 2020 18:39:01 -0400  |
 | https://github.com/mcci-catena/Catena-mcciadk.git  | a428006 | Sat, 21 Dec 2019 20:45:26 -0500  |
@@ -31,6 +31,7 @@ Das sind die verwendeten Libraries [1]:
 | https://github.com/mcci-catena/SHT1x.git  | be7042c | Tue, 20 Sep 2011 13:56:23 +1000  |
 
 
+
 Patch arduino-lmic, so initial SF12 is used initially:
 
 `
diff --git a/mini-beieli-node.ino b/mini-beieli-node.ino
index 7fb20ab..1f03ef8 100644
--- a/mini-beieli-node.ino
+++ b/mini-beieli-node.ino
@@ -101,7 +101,7 @@ sMyExtraCommands_top(
   \****************************************************************************/
 
 byte my_position = 0;    // what is our actual measurement, starts with 0
-long timer_pos0;
+unsigned long timer_pos0;
 
 // Global Variables
 LORA_data lora_data;
@@ -713,7 +713,7 @@ void StartNewIteration() {
     }
 
     // Loop sending is in progress, timeout just in case after 600 seconds
-    long start_time = millis();
+    unsigned long start_time = millis();
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("waiting while send is in progress\n");
     }
@@ -943,7 +943,7 @@ void doSleepAlert(const bool fDeepSleep)
   }
 
   for (int i = 0; i <= 15; i++) {
-    long prevPrint = millis();
+    unsigned long prevPrint = millis();
     while (os_queryTimeCriticalJobs(ms2osticks(2000)) != 0)
     {
       gCatena.poll();
diff --git a/mini_beieli_node.h b/mini_beieli_node.h
index 9d0672e..811066f 100644
--- a/mini_beieli_node.h
+++ b/mini_beieli_node.h
@@ -56,7 +56,7 @@ enum {
   |
   \****************************************************************************/
 
-static const int32_t fwVersion = 20200701;
+static const int32_t fwVersion = 20200714;
 
 static const byte INIT_PACKAGE_INTERVAL = 100;  // send an init package every 100 packages;
 static const byte MAX_VALUES_TO_SEND = 8;
diff --git a/mini_beieli_node_nau7802.h b/mini_beieli_node_nau7802.h
index 1f4574a..f6039f8 100644
--- a/mini_beieli_node_nau7802.h
+++ b/mini_beieli_node_nau7802.h
@@ -78,7 +78,7 @@ long ReadScale(char channel)
   } else {
     channelNumber = NAU7802_CHANNEL_2;
   }
-  long startTime = millis();
+  unsigned long startTime = millis();
   myScale.setChannel(channelNumber);
   bool calibrate_success = myScale.calibrateAFE();
   if (! calibrate_success) {
@@ -96,7 +96,7 @@ long ReadScale(char channel)
   long readings[num_scale_readings];  // create arry to hold readings
   for (int i = 0; i < num_scale_readings; i++) {
     //while (digitalRead(interruptPin) == LOW) {
-    long mytimer = millis();
+    unsigned long mytimer = millis();
     int timeouts = 0;
     while (! myScale.available() && (timeouts < 3)) {
       // we set a timeout of 10 seconds for the measurement...
@@ -123,7 +123,7 @@ long ReadScale(char channel)
     delay(50);
   }
 
-  long duration = millis() - startTime;
+  unsigned long duration = millis() - startTime;
   res = median(readings, num_scale_readings); // calculate median
 
   if (debug_level > 0) {