refactor

mini-beieli-node.ino

@@ -677,7 +677,7 @@ void StartNewIteration() {
   // we send data the first time the system is started, when the array is full
   // or when the weight has fallen more than threshold or the first measurement is
   // more than one hour old (which should not happen :-) )
-  if ( (next_package_is_init_package) || (my_position >= MAX_VALUES_TO_SEND) || ((last_sensor_reading.weight - current_sensor_reading.weight) > SEND_DIFF_THRESHOLD_5GRAMS) || ((millis() - timer_pos0) > 3600000)) {
+  if ( (next_package_is_init_package) || (my_position >= MAX_VALUES_TO_SEND) || (abs(last_sensor_reading.weight - current_sensor_reading.weight) > SEND_DIFF_THRESHOLD_5GRAMS) || ((millis() - timer_pos0) > 3600000)) {
     lora_data.offset_last_reading = (uint8_t)((millis() - timer_pos0) / 1000 / 60);
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("startSendingUplink(), my_position: %d, iteration: %d, package_counter: %d\n", my_position, iteration, package_counter);
@@ -697,8 +697,15 @@ void StartNewIteration() {
     }
     while (send_in_progress && ((millis() - start_time) < 300000))
     {
-      gCatena.poll();
-      yield();
+      os_runloop_once();
+      delay(10);
+    }
+    // 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);
+      }
+      send_in_progress = false;
     }
     wait_time = (uint32_t)((millis() - start_time) / 1000);
     if (config_data.debug_level > 0) {
@@ -724,6 +731,28 @@ void StartNewIteration() {
     sleep_time_sec = 10;
   }
 
+  // Before we go to sleep, we'd like to be sure that this is safe!
+  if (config_data.debug_level > 0) {
+    gCatena.SafePrintf("We wait until is is safe to go to sleep...\n");
+  }
+  long loopCount = 0;
+  long prevPrint;
+  while(os_queryTimeCriticalJobs(ms2osticks(8000)) != 0)
+  {
+    loopCount++;
+    os_runloop_once();
+    if(millis() - prevPrint > 1000) {
+      prevPrint = millis();
+      if (config_data.debug_level > 0) {
+        gCatena.SafePrintf("LMIC.opmode: %#x\n", LMIC.opmode);
+      }
+    }
+  }
+  if (config_data.debug_level > 0) {
+    gCatena.SafePrintf("Now it is safe to go to sleep\n");
+  }
+  delay(10);
+
   if (config_data.debug_level > 0) {
     gCatena.SafePrintf("now going to sleep for %d seconds...\n", sleep_time_sec);
     if (fUsbPower) {
@@ -737,16 +766,23 @@ 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 (!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,6 +819,9 @@ void startSendingUplink(bool firstTime)
     fConfirmed = true;
   }
 
+  os_runloop_once();
+  //gCatena.poll();
+
   if (firstTime) {
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("SendBuffer firstTime\n");
@@ -791,6 +830,7 @@ void startSendingUplink(bool firstTime)
     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");
     }
     gLoRaWAN.SendBuffer((uint8_t*)&lora_data, sizeof(LORA_data), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
@@ -806,8 +846,11 @@ static void sendBufferDoneCb(
 {
   osjobcb_t pFn;
 
+  send_in_progress = false;
+
   if (config_data.debug_level > 1) {
     gLed.Set(LedPattern::Settling);
+    gCatena.SafePrintf("LMIC.opmode in sendBufferDoneCb: %#x\n", LMIC.opmode);
   }
 
   pFn = settleDoneCb;
@@ -822,7 +865,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);
     }
   }
 
@@ -850,179 +893,15 @@ static void txNotProvisionedCb(
 static void settleDoneCb(
   osjob_t* pSendJob)
 {
-  const bool fDeepSleep = checkDeepSleep();
-
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("settleDoneCb\n");
+    gCatena.SafePrintf("settleDoneCb - we are at the end of the callback chain!\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;
-}
-
-void doSleepAlert(const bool fDeepSleep)
-{
-  g_fPrintedSleeping = true;
-
-  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)
-    {
-      gCatena.poll();
-      yield();
-    }
-  }
-  else if (config_data.debug_level > 2) {
-    gCatena.SafePrintf("using light sleep\n");
-  }
-}
-
-void updateSleepCounters(void)
-{
-  // update the sleep parameters
-  if (gTxCycleCount > 1)
-  {
-    // values greater than one are decremented and ultimately reset to default.
-    --gTxCycleCount;
-  }
-  else if (gTxCycleCount == 1)
-  {
-    // it's now one (otherwise we couldn't be here.)
-    if (config_data.debug_level > 2) {
-      gCatena.SafePrintf("resetting tx cycle to default: %u\n", CATCFG_T_CYCLE);
-    }
-
-    gTxCycleCount = 0;
-    gTxCycle = CATCFG_T_CYCLE;
-  }
-  else
-  {
-    // it's zero. Leave it alone.
-  }
-}
-
-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
-                                 );
-
-  if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("doDeepSleep, sleepInterval: %d...\n", sleepInterval);
-  }
-
-  /* ok... now it's time for a deep sleep */
-  gLed.Set(LedPattern::Off);
-  deepSleepPrepare();
-
-  /* sleep */
-  gCatena.Sleep(sleepInterval);
-
-  /* recover from sleep */
-  deepSleepRecovery();
-
-  /* and now... we're awake again. trigger another measurement */
-  sleepDoneCb(pJob);
 }
 
 void deepSleepPrepare(void)
 {
   Serial.end();
+  Wire.endTransmission(true);
   Wire.end();
   SPI.end();
   if (fFlash)
@@ -1038,53 +917,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)
 {
@@ -1112,8 +944,6 @@ static void receiveMessage(void *pContext, uint8_t port, const uint8_t *pMessage
     float fval;
   } u;
 
-  SENSOR_data temp_sensor_data;
-
   if (config_data.debug_level > 0) {
     gCatena.SafePrintf("receiveMessage was called!!!\n");
   }

mini_beieli_node.h

@@ -56,7 +56,7 @@ enum {
   |
   \****************************************************************************/
 
-static const int32_t fwVersion = 20200525;
+static const int32_t fwVersion = 20200530;
 
 static const byte INIT_PACKAGE_INTERVAL = 100;  // send an init package every 100 packages;
 static const byte MAX_VALUES_TO_SEND = 8;
@@ -64,7 +64,7 @@ static const byte MAX_VALUES_TO_SEND = 8;
 static const uint8_t LORA_DATA_VERSION = 1;
 static const uint8_t LORA_DATA_VERSION_FIRST_PACKAGE = 128;
 static const uint32_t PRESSURE_OFFSET = 825;
-static const uint16_t SEND_DIFF_THRESHOLD_5GRAMS = 10;   // when weight value drops by 50g, then send data
+static const uint16_t SEND_DIFF_THRESHOLD_5GRAMS = 20;   // when weight changes by 100g, then send data
 static const long NOT_ATTACHED = -2147483648;
 static const byte INIT_PACKETS = 5;
 

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)
 {
@@ -24,7 +24,7 @@ void SetScalesDebugLevel(byte dbg_level)
 bool InitializeScales()
 {
   bool result;
-  result &= myScale.reset(); //Reset all registers
+  result = myScale.reset(); //Reset all registers
   result &= myScale.powerUp(); //Power on analog and digital sections of the scale
 
   result &= myScale.setIntPolarityHigh();
@@ -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))
   {
@@ -96,9 +96,12 @@ 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();
     while (! myScale.available()) {
-      // we set a timeout of 60 seconds for the measurement...
-      if ((millis() - startTime) > 60000) {
+      // we set a timeout of 10 seconds for the measurement...
+      if ((millis() - mytimer) > 10000) {
+        // Timeout reading scale...
+        Wire.endTransmission(true);
         if (debug_level > 0) {
           gCatena.SafePrintf("Timeout while reading scale...\n");
         }
@@ -106,11 +109,14 @@ long ReadScale(char channel)
       }
       delay(1);
     }
-    long reading = myScale.getReading();
+    long reading;
+    if (myScale.available()) {
+      reading = myScale.getReading();  
+      readings[i] = reading;  
+    }
     if (debug_level > 0) {
       gCatena.SafePrintf("Reading: %d\n", reading);
     }
-    readings[i] = reading;  // fill the array with instantaneous readings from the scale
     delay(10);
   }