print LMIC.opmode before sleep

mini-beieli-node.ino

@@ -143,8 +143,6 @@ bool fFlash;
 bool fUsbPower;
 
 // have we printed the sleep info?
-bool g_fPrintedSleeping = false;
-
 //  the job that's used to synchronize us with the LMIC code
 static osjob_t iterationJob;
 static osjob_t sendJob;
@@ -690,7 +688,7 @@ void StartNewIteration() {
       gLed.Set(LedPattern::TwoShort);
     }
 
-    // Loop while sending is in progress, timeout just in case after 300 seconds
+    // Loop sending is in progress, timeout just in case after 300 seconds
     long start_time = millis();
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("waiting while send is in progress\n");
@@ -700,6 +698,14 @@ void StartNewIteration() {
       gCatena.poll();
       yield();
     }
+    // handle timeout...
+    if (send_in_progress) {
+      if (config_data.debug_level > 0) {
+        gCatena.SafePrintf("looks like we timed out waiting for sending to finish...\n", wait_time);
+      }
+      LMIC_clrTxData();
+      send_in_progress = false;
+    }
     wait_time = (uint32_t)((millis() - start_time) / 1000);
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("end waiting, wait time was %d seconds\n", wait_time);
@@ -719,9 +725,9 @@ void StartNewIteration() {
     sleep_time_sec = 5;
   }
 
-  // for the first <INIT_PACKETS> iterations, we set the sleep time to 10 seconds only...
+  // for the first <INIT_PACKETS> iterations, we set the sleep time to 120 seconds only...
   if (iteration <= INIT_PACKETS) {
-    sleep_time_sec = 10;
+    sleep_time_sec = 120;
   }
 
   if (config_data.debug_level > 0) {
@@ -737,16 +743,26 @@ void StartNewIteration() {
     }
   }
 
+  // if we need to periodically reboot, we can do it now...
+  if (uint32_t(millis()) > gRebootMs) {
+    // time to reboot
+    if (config_data.debug_level > 0) {
+      gCatena.SafePrintf("Reached threshold to reboot...\n");
+      Serial.flush();
+    }
+    NVIC_SystemReset();
+  }
+
+  if (config_data.debug_level > 0) {
+    gCatena.SafePrintf("LMIC.opmode just before Sleeping: %#x\n", LMIC.opmode);
+  }
+
   if (!fUsbPower) {
     DoDeepSleep(sleep_time_sec);
     if (! stop_iterations) {
       StartNewIteration();
     }
 
-    //os_setTimedCallback(
-    //  &iterationJob,
-    //  os_getTime() + sec2osticks(2),
-    //  startNewIterationCb);
   }
   else {
     if (config_data.debug_level > 0) {
@@ -783,37 +799,18 @@ void startSendingUplink(bool firstTime)
     fConfirmed = true;
   }
 
-  gCatena.poll();
-
   if (firstTime) {
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("SendBuffer firstTime\n");
     }
-    bool success = gLoRaWAN.SendBuffer((uint8_t*)&lora_data_first, sizeof(LORA_data_first), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
-    // we try a second time if not successful...
-    if (! success) {
-      if (config_data.debug_level > 0) {
-        gCatena.SafePrintf("SendBuffer was not successful, we try a second time...\n");
-      }
-      gCatena.poll();
-      delay(500);
-      gLoRaWAN.SendBuffer((uint8_t*)&lora_data_first, sizeof(LORA_data_first), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
-    }
+    gLoRaWAN.SendBuffer((uint8_t*)&lora_data_first, sizeof(LORA_data_first), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
     package_counter++;
   } else {
     if (config_data.debug_level > 0) {
+      gCatena.SafePrintf("LMIC.opmode just before SendBuffer: %#x\n", LMIC.opmode);
       gCatena.SafePrintf("SendBuffer not firstTime\n");
     }
-    bool success = gLoRaWAN.SendBuffer((uint8_t*)&lora_data, sizeof(LORA_data), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
-    // we try a second time if not successful...
-    if (! success) {
-      if (config_data.debug_level > 0) {
-        gCatena.SafePrintf("SendBuffer was not successful, we try a second time...\n");
-      }
-      gCatena.poll();
-      delay(500);
-      gLoRaWAN.SendBuffer((uint8_t*)&lora_data, sizeof(LORA_data), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
-    }
+    gLoRaWAN.SendBuffer((uint8_t*)&lora_data, sizeof(LORA_data), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
     package_counter++;
   }
 
@@ -828,6 +825,7 @@ static void sendBufferDoneCb(
 
   if (config_data.debug_level > 1) {
     gLed.Set(LedPattern::Settling);
+    gCatena.SafePrintf("LMIC.opmode in sendBufferDoneCb: %#x\n", LMIC.opmode);
   }
 
   pFn = settleDoneCb;
@@ -842,7 +840,7 @@ static void sendBufferDoneCb(
       gLoRaWAN.Shutdown();
     }
     else if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("send buffer failed\n");
+      gCatena.SafePrintf("send buffer failed, LMIC.opmode: %#x\n", LMIC.opmode);
     }
   }
 
@@ -866,128 +864,45 @@ static void txNotProvisionedCb(
   }
 }
 
-
-static void settleDoneCb(
-  osjob_t* pSendJob)
-{
-  const bool fDeepSleep = checkDeepSleep();
-
-  if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("settleDoneCb\n");
-  }
-
-  if (config_data.debug_level > 2) {
-    // Terry vv
-    gCatena.SafePrintf("LMIC.rxDelay: %i\n", LMIC.rxDelay);
-    gCatena.SafePrintf("LMIC.dn2Dr: %i\n", LMIC.dn2Dr);
-    gCatena.SafePrintf("LMIC.dn2Freq: %i\n", LMIC.dn2Freq);
-    gCatena.SafePrintf("LMIC.rx1DrOffset: %i\n", LMIC.rx1DrOffset);
-    gCatena.SafePrintf("LMIC.adrAckReq: %i\n", LMIC.adrAckReq);
-    gCatena.SafePrintf("LMIC.adrEnabled: %i\n", LMIC.adrEnabled);
-    // Terry ^^
-  }
-
-  if (uint32_t(millis()) > gRebootMs) {
-    // time to reboot
-    NVIC_SystemReset();
-  }
-
-  if (! g_fPrintedSleeping)
-    doSleepAlert(fDeepSleep);
-
-  /* count what we're up to */
-  updateSleepCounters();
-
-  if (fDeepSleep)
-    doDeepSleep(pSendJob);
-  else
-    doLightSleep(pSendJob);
-}
-
 bool checkDeepSleep(void)
 {
-  bool const fDeepSleepTest = gCatena.GetOperatingFlags() &
-                              static_cast<uint32_t>(gCatena.OPERATING_FLAGS::fDeepSleepTest);
-  bool fDeepSleep;
-
-  if (fDeepSleepTest)
-  {
-    fDeepSleep = true;
-  }
-#ifdef USBCON
-  else if (Serial.dtr())
-  {
-    fDeepSleep = false;
-  }
-#endif
-  else if (gCatena.GetOperatingFlags() &
-           static_cast<uint32_t>(gCatena.OPERATING_FLAGS::fDisableDeepSleep))
-  {
-    fDeepSleep = false;
-  }
-  else if ((gCatena.GetOperatingFlags() &
-            static_cast<uint32_t>(gCatena.OPERATING_FLAGS::fUnattended)) != 0)
-  {
-    fDeepSleep = true;
-  }
-  else
-  {
-    fDeepSleep = false;
-  }
-
-  return fDeepSleep;
+  return !fUsbPower;
 }
 
 void doSleepAlert(const bool fDeepSleep)
 {
-  g_fPrintedSleeping = true;
+  if (config_data.debug_level > 0) {
+    gCatena.SafePrintf("We wait until is is safe to go to sleep...\n");
+  }
 
-  if (fDeepSleep)
-  {
-    bool const fDeepSleepTest = gCatena.GetOperatingFlags() &
-                                static_cast<uint32_t>(gCatena.OPERATING_FLAGS::fDeepSleepTest);
-    const uint32_t deepSleepDelay = fDeepSleepTest ? 10 : 30;
-    if (config_data.debug_level > 2) {
-      gCatena.SafePrintf("using deep sleep in %u secs"
-#ifdef USBCON
-                         " (USB will disconnect while asleep)"
-#endif
-                         ": ",
-                         deepSleepDelay
-                        );
-
-    }
-    // sleep and print
-    if (config_data.debug_level > 1) {
-      gLed.Set(LedPattern::TwoShort);
-    }
-
-    for (auto n = deepSleepDelay; n > 0; --n)
-    {
-      uint32_t tNow = millis();
-
-      while (uint32_t(millis() - tNow) < 1000)
-      {
-        gCatena.poll();
-        yield();
-      }
-      if (config_data.debug_level > 2) {
-        gCatena.SafePrintf(".");
-      }
-    }
-    if (config_data.debug_level > 2) {
-      gCatena.SafePrintf("\nStarting deep sleep.\n");
-    }
-    uint32_t tNow = millis();
-    while (uint32_t(millis() - tNow) < 100)
+  for (int i = 0; i <= 15; i++) {
+    long prevPrint = millis();
+    while (os_queryTimeCriticalJobs(ms2osticks(2000)) != 0)
     {
       gCatena.poll();
       yield();
+      if (millis() - prevPrint > 1000) {
+        prevPrint = millis();
+        if (config_data.debug_level > 0) {
+          gCatena.SafePrintf("LMIC.opmode: %#x in loop %d\n", LMIC.opmode, i);
+        }
+      }
     }
   }
-  else if (config_data.debug_level > 2) {
-    gCatena.SafePrintf("using light sleep\n");
+
+  // we wait an extra five seconds...
+  //uint32_t tNow = millis();
+  //while (uint32_t(millis() - tNow) < 5000)
+  //{
+  //  gCatena.poll();
+  //  yield();
+  //}
+
+
+  if (config_data.debug_level > 0) {
+    gCatena.SafePrintf("Now it is safe to go to sleep\n");
   }
+
 }
 
 void updateSleepCounters(void)
@@ -1001,10 +916,9 @@ void updateSleepCounters(void)
   else if (gTxCycleCount == 1)
   {
     // it's now one (otherwise we couldn't be here.)
-    if (config_data.debug_level > 2) {
+    if (config_data.debug_level > 0) {
       gCatena.SafePrintf("resetting tx cycle to default: %u\n", CATCFG_T_CYCLE);
     }
-
     gTxCycleCount = 0;
     gTxCycle = CATCFG_T_CYCLE;
   }
@@ -1014,30 +928,28 @@ void updateSleepCounters(void)
   }
 }
 
-void doDeepSleep(osjob_t *pJob)
-{
-  bool const fDeepSleepTest = gCatena.GetOperatingFlags() &
-                              static_cast<uint32_t>(gCatena.OPERATING_FLAGS::fDeepSleepTest);
-  uint32_t const sleepInterval = CATCFG_GetInterval(
-                                   fDeepSleepTest ? CATCFG_T_CYCLE_TEST : gTxCycle
-                                 );
 
+static void settleDoneCb(
+  osjob_t* pSendJob)
+{
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("doDeepSleep, sleepInterval: %d...\n", sleepInterval);
+    gCatena.SafePrintf("settleDoneCb - we are at the end of the callback chain!\n");
   }
 
-  /* ok... now it's time for a deep sleep */
-  gLed.Set(LedPattern::Off);
-  deepSleepPrepare();
+  const bool fDeepSleep = checkDeepSleep();
 
-  /* sleep */
-  gCatena.Sleep(sleepInterval);
+  if (uint32_t(millis()) > gRebootMs)
+  {
+    // time to reboot
+    NVIC_SystemReset();
+  }
 
-  /* recover from sleep */
-  deepSleepRecovery();
+  doSleepAlert(fDeepSleep);
 
-  /* and now... we're awake again. trigger another measurement */
-  sleepDoneCb(pJob);
+  /* count what we're up to */
+  updateSleepCounters();
+
+  send_in_progress = false;
 }
 
 void deepSleepPrepare(void)
@@ -1059,53 +971,6 @@ void deepSleepRecovery(void)
     gSPI2.begin();
 }
 
-void doLightSleep(osjob_t *pJob)
-{
-  uint32_t interval = sec2osticks(CATCFG_GetInterval(gTxCycle));
-
-
-  if (config_data.debug_level > 1) {
-    gLed.Set(LedPattern::Sleeping);
-    gCatena.SafePrintf("doLightSleep\n");
-  }
-
-  if (gCatena.GetOperatingFlags() &
-      static_cast<uint32_t>(gCatena.OPERATING_FLAGS::fQuickLightSleep))
-  {
-    interval = 1;
-  }
-
-  os_setTimedCallback(
-    &iterationJob,
-    os_getTime() + interval,
-    sleepDoneCb
-  );
-
-}
-
-static void sleepDoneCb(osjob_t* pJob)
-{
-  if (config_data.debug_level > 1) {
-    gLed.Set(LedPattern::WarmingUp);
-  }
-
-  if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("sleepDoneCb\n");
-  }
-
-  os_setTimedCallback(
-    pJob,
-    os_getTime() + sec2osticks(CATCFG_T_WARMUP),
-    warmupDoneCb);
-}
-
-static void warmupDoneCb(osjob_t* pJob)
-{
-  if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("warmupDoneCb\n");
-  }
-  send_in_progress = false;
-}
 
 static void startNewIterationCb(osjob_t* pJob)
 {

mini_beieli_node.h

@@ -56,7 +56,7 @@ enum {
   |
   \****************************************************************************/
 
-static const int32_t fwVersion = 20200528;
+static const int32_t fwVersion = 20200601;
 
 static const byte INIT_PACKAGE_INTERVAL = 100;  // send an init package every 100 packages;
 static const byte MAX_VALUES_TO_SEND = 8;

mini_beieli_node_nau7802.h

@@ -14,7 +14,7 @@ NAU7802 myScale; //Create instance of the NAU7802 class
 
 byte debug_level;
 
-byte interruptPin = A0;
+//byte interruptPin = A0;
 
 void SetScalesDebugLevel(byte dbg_level)
 {
@@ -47,7 +47,7 @@ bool SetupScales(byte dbg_level)
   if (debug_level > 0) {
     gCatena.SafePrintf("SetupScales start\n");
   }
-  pinMode(interruptPin, INPUT);
+//  pinMode(interruptPin, INPUT);
 
   if (!myScale.begin(Wire, false))
   {