From 760ae035fd2583c8682a06bd01da784a42b24027 Mon Sep 17 00:00:00 2001
From: Joerg Lehmann <joerg.lehmann@nbit.ch>
Date: Fri, 22 May 2020 11:14:51 +0200
Subject: [PATCH] new version 20200522

---
 mini-beieli-node.ino       | 21 ++++++++++-----------
 mini_beieli_node.h         |  2 +-
 mini_beieli_node_nau7802.h |  4 ++--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/mini-beieli-node.ino b/mini-beieli-node.ino
index 86f40e1..f500e34 100644
--- a/mini-beieli-node.ino
+++ b/mini-beieli-node.ino
@@ -503,7 +503,7 @@ uint8_t GetVBatValue(int millivolts)
 void DoDeepSleep(uint32_t sleep_time)
 {
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - now going to deep sleep\n", millis());
+    gCatena.SafePrintf("%010d - DoDeepSleep, now going to deep sleep\n", millis());
   }
 
   // Prepare Deep Sleep
@@ -511,21 +511,14 @@ void DoDeepSleep(uint32_t sleep_time)
     gLed.Set(LedPattern::Off);
   }
 
-  Serial.end();
-  Wire.end();
-  SPI.end();
-  if (fFlash)
-    gSPI2.end();
+  deepSleepPrepare();
 
   // Now sleeping...
   gCatena.Sleep(sleep_time);
 
   // Recover from wakeup...
-  Serial.begin();
-  Wire.begin();
-  SPI.begin();
-  if (fFlash)
-    gSPI2.begin();
+  deepSleepRecovery();
+
   if (config_data.debug_level > 0) {
     gCatena.SafePrintf("%010d - done with deep sleep\n", millis());
   }
@@ -1010,6 +1003,10 @@ void doDeepSleep(osjob_t *pJob)
                                    fDeepSleepTest ? CATCFG_T_CYCLE_TEST : gTxCycle
                                  );
 
+  if (config_data.debug_level > 0) {
+    gCatena.SafePrintf("%010d - doDeepSleep, sleepInterval: %d...\n", millis(), sleepInterval);
+  }
+
   /* ok... now it's time for a deep sleep */
   gLed.Set(LedPattern::Off);
   deepSleepPrepare();
@@ -1049,6 +1046,7 @@ void doLightSleep(osjob_t *pJob)
 
   if (config_data.debug_level > 1) {
     gLed.Set(LedPattern::Sleeping);
+    gCatena.SafePrintf("%010d - doLightSleep\n", millis());
   }
 
   if (gCatena.GetOperatingFlags() &
@@ -1062,6 +1060,7 @@ void doLightSleep(osjob_t *pJob)
     os_getTime() + interval,
     sleepDoneCb
   );
+
 }
 
 static void sleepDoneCb(osjob_t* pJob)
diff --git a/mini_beieli_node.h b/mini_beieli_node.h
index 4cf0c64..9317697 100644
--- a/mini_beieli_node.h
+++ b/mini_beieli_node.h
@@ -56,7 +56,7 @@ enum {
   |
   \****************************************************************************/
 
-static const int32_t fwVersion = 20200514;
+static const int32_t fwVersion = 20200522;
 
 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 9d30e6b..20d45d2 100644
--- a/mini_beieli_node_nau7802.h
+++ b/mini_beieli_node_nau7802.h
@@ -6,8 +6,8 @@
 
 #include "SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.h"
 
-#define SAMPLES 10
-#define IGNORE_READINGS 8
+#define SAMPLES 5
+#define IGNORE_READINGS 5
 
 NAU7802 myScale; //Create instance of the NAU7802 class