refactor

mini-beieli-node.ino

@@ -170,7 +170,7 @@ void setup(void)
 void setup_platform(void)
 {
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - setup_platform\n", millis());
+    gCatena.SafePrintf("Setup_platform\n");
   }
 
   /* add our application-specific commands */
@@ -181,12 +181,12 @@ void setup_platform(void)
 
   // read config_data from fram...
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - Reading Calibration Config from FRAM...\n", millis());
+    gCatena.SafePrintf("Reading Calibration Config from FRAM...\n");
   }
   gCatena.getFram()->getField(cFramStorage::kAppConf, (uint8_t *)&config_data, sizeof(config_data));
 
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - setup_platform, this is the configuration\n", millis());
+    gCatena.SafePrintf("Setup_platform, this is the configuration\n");
     gCatena.SafePrintf("cal_w1_0: %d\n", config_data.cal_w1_0);
     gCatena.SafePrintf("cal_w2_0: %d\n", config_data.cal_w2_0);
     gCatena.SafePrintf("cal_w1_factor: %d.%03d\n", (int)config_data.cal_w1_factor, (int)abs(config_data.cal_w1_factor * 1000) % 1000);
@@ -286,7 +286,7 @@ void setup_platform(void)
 void setup_bme280(void)
 {
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - setup_bme280\n", millis());
+    gCatena.SafePrintf("Setup_bme280\n");
   }
 
   if (gBME280.begin(BME280_ADDRESS, Adafruit_BME280::OPERATING_MODE::Sleep)) {
@@ -301,7 +301,7 @@ void setup_bme280(void)
 bool setup_scales(void)
 {
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - setup_scales\n", millis());
+    gCatena.SafePrintf("Setup_scales\n");
   }
 
   bool res;
@@ -311,7 +311,7 @@ bool setup_scales(void)
   PowerupScale();
 
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - setup_scale done\n", millis());
+    gCatena.SafePrintf("Setup_scale done\n");
   }
 
   return res;
@@ -320,14 +320,14 @@ bool setup_scales(void)
 void setup_flash(void)
 {
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - setup_flash\n", millis());
+    gCatena.SafePrintf("setup_flash\n");
   }
 
   if (gFlash.begin(&gSPI2, Catena::PIN_SPI2_FLASH_SS)) {
     fFlash = true;
     gFlash.powerDown();
     if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("%010d - FLASH found, but power down\n", millis());
+      gCatena.SafePrintf("FLASH found, but power down\n");
     }
   }
   else {
@@ -335,7 +335,7 @@ void setup_flash(void)
     gFlash.end();
     gSPI2.end();
     if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("%010d - No FLASH found: check hardware\n", millis());
+      gCatena.SafePrintf("FLASH found: check hardware\n");
     }
   }
 }
@@ -343,7 +343,7 @@ void setup_flash(void)
 void setup_uplink(void)
 {
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - setup_uplink\n", millis());
+    gCatena.SafePrintf("setup_uplink\n");
   }
 
   LMIC_setClockError(1 * 65536 / 100);
@@ -354,14 +354,14 @@ void setup_uplink(void)
 
   // Do an unjoin, so every reboot will trigger a join
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - do an unjoin...\n", millis());
+    gCatena.SafePrintf("do an unjoin...\n");
   }
   LMIC_unjoin();
 
   /* trigger a join by sending the first packet */
   if (!(gCatena.GetOperatingFlags() & static_cast<uint32_t>(gCatena.OPERATING_FLAGS::fManufacturingTest))) {
     if (!gLoRaWAN.IsProvisioned())
-      gCatena.SafePrintf("%010d - LoRaWAN not provisioned yet. Use the commands to set it up.\n");
+      gCatena.SafePrintf("LoRaWAN not provisioned yet. Use the commands to set it up.\n");
     else {
       if (config_data.debug_level > 1) {
         gLed.Set(LedPattern::Joining);
@@ -422,7 +422,7 @@ void ClearLoraData(void)
 
 void ShowLORAData(bool firstTime)
 {
-  gCatena.SafePrintf("%010d - ShowLORAData\n", millis());
+  gCatena.SafePrintf("ShowLORAData\n");
 
   if (firstTime) {
 
@@ -503,7 +503,7 @@ uint8_t GetVBatValue(int millivolts)
 void DoDeepSleep(uint32_t sleep_time)
 {
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - DoDeepSleep, now going to deep sleep\n", millis());
+    gCatena.SafePrintf("DoDeepSleep, now going to deep sleep\n");
   }
 
   // Prepare Deep Sleep
@@ -520,7 +520,7 @@ void DoDeepSleep(uint32_t sleep_time)
   deepSleepRecovery();
 
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - done with deep sleep\n", millis());
+    gCatena.SafePrintf("done with deep sleep\n");
   }
 }
 
@@ -534,7 +534,7 @@ void ReadSensors(SENSOR_data &sensor_data) {
   int vbat_mv = (int)(gCatena.ReadVbat() * 1000.0f);
   res.vbat = GetVBatValue(vbat_mv);
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - vBat:    %d mV\n", millis(), vbat_mv);
+    gCatena.SafePrintf("vBat:    %d mV\n", vbat_mv);
   }
 
   // Read Scales
@@ -542,36 +542,36 @@ void ReadSensors(SENSOR_data &sensor_data) {
   w2_0_real = config_data.cal_w2_0;
   if (setup_scales()) {
     if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("%010d - LoadCell is ready.\n", millis());
+      gCatena.SafePrintf("LoadCell is ready.\n");
     }
     if (config_data.cal_w1_0 != NOT_ATTACHED) {
       res.weight1 = (int32_t)ReadScale('A');
       if (config_data.debug_level > 0) {
-        gCatena.SafePrintf("%010d - Load_cell 1 weight1_current: %ld\n", millis(), res.weight1);
+        gCatena.SafePrintf("Load_cell 1 weight1_current: %ld\n", res.weight1);
       }
     } else {
       res.weight1 = 0;
       w1_0_real = 0;
       if (config_data.debug_level > 0) {
-        gCatena.SafePrintf("%010d - Load_cell 1 is disabled\n", millis());
+        gCatena.SafePrintf("Load_cell 1 is disabled\n");
       }
     }
     if (config_data.cal_w2_0 != NOT_ATTACHED) {
       res.weight2 = (int32_t)ReadScale('B');
       if (config_data.debug_level > 0) {
-        gCatena.SafePrintf("%010d - Load_cell 2 weight2_current: %ld\n", millis(), res.weight2);
+        gCatena.SafePrintf("Load_cell 2 weight2_current: %ld\n", res.weight2);
       }
     } else {
       res.weight2 = 0;
       w2_0_real = 0;
       if (config_data.debug_level > 0) {
-        gCatena.SafePrintf("%010d - Load_cell 2 is disabled\n", millis());
+        gCatena.SafePrintf("Load_cell 2 is disabled\n");
       }
     }
   }
   else {
     if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("%010d - LoadCell not ready.\n", millis());
+      gCatena.SafePrintf("LoadCell not ready.\n");
     }
   }
 
@@ -604,8 +604,7 @@ void ReadSensors(SENSOR_data &sensor_data) {
     // humidity is one byte, where 0 == 0/256 and 0xFF == 255/256.
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf(
-        "%010d - BME280:  T: %d P: %d RH: %d\n",
+        "BME280:  T: %d P: %d RH: %d\n",
-        millis(),
         (int)m.Temperature,
         (int)m.Pressure,
         (int)m.Humidity);
@@ -614,7 +613,7 @@ void ReadSensors(SENSOR_data &sensor_data) {
     res.humidity = (uint8_t)m.Humidity;
     res.pressure = (uint8_t)((m.Pressure / 100) - PRESSURE_OFFSET);
     if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("%010d - pressure_current: %d\n", millis(), res.pressure);
+      gCatena.SafePrintf("pressure_current: %d\n", res.pressure);
     }
   }
 
@@ -635,7 +634,7 @@ void StartNewIteration() {
   // vBus
   float vBus = gCatena.ReadVbus();
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - vBus:    %d mV\n", millis(), (int)(vBus * 1000.0f));
+    gCatena.SafePrintf("vBus:    %d mV\n", (int)(vBus * 1000.0f));
   }
   fUsbPower = (vBus > 4.3) ? true : false;
 
@@ -678,10 +677,10 @@ 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("%010d - startSendingUplink(), my_position: %d, iteration: %d, package_counter: %d\n", millis(), my_position, iteration, package_counter);
+      gCatena.SafePrintf("startSendingUplink(), my_position: %d, iteration: %d, package_counter: %d\n", my_position, iteration, package_counter);
     }
     // the first <INIT_PACKETS> packets are "Init-Packets" or each INIT_PACKAGE_INTERVAL ...
     startSendingUplink(next_package_is_init_package);
@@ -694,16 +693,23 @@ void StartNewIteration() {
     // Loop while sending is in progress, timeout just in case after 300 seconds
     long start_time = millis();
     if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("%010d - waiting while send is in progress\n", millis());
+      gCatena.SafePrintf("waiting while send is in progress\n");
     }
     while (send_in_progress && ((millis() - start_time) < 300000))
     {
-      gCatena.poll();
+      os_runloop_once();
-      yield();
+      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) {
-      gCatena.SafePrintf("%010d - end waiting, wait time was %d seconds\n", millis(), wait_time);
+      gCatena.SafePrintf("end waiting, wait time was %d seconds\n", wait_time);
     }
   }
 
@@ -725,12 +731,34 @@ 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("%010d - now going to sleep for %d seconds...\n", millis(), sleep_time_sec);
+    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) {
-      gCatena.SafePrintf("%010d - USB Power is on\n", millis());
+      gCatena.SafePrintf("USB Power is on\n");
     } else {
-      gCatena.SafePrintf("%010d - USB Power is off\n", millis());
+      gCatena.SafePrintf("USB Power is off\n");
     }
     //Serial.flush();
     if (config_data.debug_level > 1) {
@@ -738,20 +766,27 @@ 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) {
-      gCatena.SafePrintf("%010d - light sleep; os_setTimedCallback for startNewIterationCb in %d...seconds\n", millis(), sleep_time_sec);
+      gCatena.SafePrintf("light sleep; os_setTimedCallback for startNewIterationCb in %d...seconds\n", sleep_time_sec);
     }
     os_setTimedCallback(
       &iterationJob,
@@ -784,15 +819,19 @@ void startSendingUplink(bool firstTime)
     fConfirmed = true;
   }
 
+  os_runloop_once();
+  //gCatena.poll();
+
   if (firstTime) {
     if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("%010d - SendBuffer firstTime\n", millis());
+      gCatena.SafePrintf("SendBuffer firstTime\n");
     }
     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("%010d - SendBuffer not firstTime\n", millis());
+      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);
     package_counter++;
@@ -807,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;
@@ -823,7 +865,7 @@ static void sendBufferDoneCb(
       gLoRaWAN.Shutdown();
     }
     else if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("%010d - send buffer failed\n", millis());
+      gCatena.SafePrintf("send buffer failed, LMIC.opmode: %#x\n", LMIC.opmode);
     }
   }
 
@@ -851,179 +893,15 @@ static void txNotProvisionedCb(
 static void settleDoneCb(
   osjob_t* pSendJob)
 {
-  const bool fDeepSleep = checkDeepSleep();
-
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - settleDoneCb\n", millis());
+    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("%010d - doDeepSleep, sleepInterval: %d...\n", millis(), 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)
@@ -1039,58 +917,11 @@ 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("%010d - doLightSleep\n", millis());
-  }
-
-  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("%010d - sleepDoneCb\n", millis());
-  }
-
-  os_setTimedCallback(
-    pJob,
-    os_getTime() + sec2osticks(CATCFG_T_WARMUP),
-    warmupDoneCb);
-}
-
-static void warmupDoneCb(osjob_t* pJob)
-{
-  if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - warmupDoneCb\n", millis());
-  }
-  send_in_progress = false;
-}
 
 static void startNewIterationCb(osjob_t* pJob)
 {
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - startNewIterationCb\n", millis());
+    gCatena.SafePrintf("startNewIterationCb\n");
   }
 
   if (! stop_iterations) {
@@ -1113,10 +944,8 @@ 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("%010d - receiveMessage was called!!!\n", millis());
+    gCatena.SafePrintf("receiveMessage was called!!!\n");
   }
 
   if (config_data.debug_level > 2) {

mini_beieli_node.h

@@ -56,7 +56,7 @@ enum {
   |
   \****************************************************************************/
 
-static const int32_t fwVersion = 20200522;
+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_hx711.h

@@ -20,7 +20,7 @@ bool SetupScales(byte dbg_level)
 {
   debug_level = dbg_level;
   if (debug_level > 0) {
-    gCatena.SafePrintf("%010d - setup_scales\n", millis());
+    gCatena.SafePrintf("setup_scales\n");
   }
 
   bool res;
@@ -30,7 +30,7 @@ bool SetupScales(byte dbg_level)
   pinMode(D10, OUTPUT);
 
   if (debug_level > 0) {
-    gCatena.SafePrintf("%010d - setup_scale done\n", millis());
+    gCatena.SafePrintf("setup_scale done\n");
   }
 
   return res;
@@ -52,7 +52,7 @@ long ReadScale(char channel)
   long readings[num_scale_readings];  // create arry to hold readings
 
   if (debug_level > 0) {
-    gCatena.SafePrintf("%010d - my_read_average, measurements:\n", millis());
+    gCatena.SafePrintf("my_read_average, measurements:\n");
   }
 
   for (int i = 0; i < num_scale_readings; i++) {
@@ -89,6 +89,6 @@ void PowerupScale()
   delay(400);
 
   if (debug_level > 0) {
-    gCatena.SafePrintf("%010d - setup_scale done\n", millis());
+    gCatena.SafePrintf("setup_scale done\n");
   }
 }

mini_beieli_node_nau7802.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #include <Wire.h>
 
 #ifndef _HELPER_H_
@@ -7,52 +9,67 @@
 #include "SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.h"
 
 #define SAMPLES 5
-#define IGNORE_READINGS 5
 
 NAU7802 myScale; //Create instance of the NAU7802 class
 
 byte debug_level;
 
-byte interruptPin = A0;
+//byte interruptPin = A0;
 
 void SetScalesDebugLevel(byte dbg_level)
 {
   debug_level = dbg_level;
 }
 
+bool InitializeScales()
+{
+  bool result;
+  result = myScale.reset(); //Reset all registers
+  result &= myScale.powerUp(); //Power on analog and digital sections of the scale
+
+  result &= myScale.setIntPolarityHigh();
+  result &= myScale.setLDO(NAU7802_LDO_3V3); //Set LDO to 3.3V
+  result &= myScale.setGain(NAU7802_GAIN_128); //Set gain to 128
+  result &= myScale.setSampleRate(NAU7802_SPS_40); //Set samples per second to 40
+  result &= myScale.setRegister(NAU7802_ADC, 0x30); //Turn off CLK_CHP. From 9.1 power on sequencing.
+  result &= myScale.clearBit(NAU7802_PGA_PWR_PGA_CAP_EN, NAU7802_PGA_PWR);
+  //result &= myScale.setRegister(NAU7802_OTP_B1, 0x30);
+  //result &= myScale.setRegister(NAU7802_PGA, NAU7802_PGA_OUT_EN | NAU7802_PGA_CHP_DIS);
+
+  result &= myScale.calibrateAFE(); //Re-cal analog front end when we change gain, sample rate, or channel
+
+  return result;
+}
+
 bool SetupScales(byte dbg_level)
 {
   debug_level = dbg_level;
   if (debug_level > 0) {
-    gCatena.SafePrintf("%010d - SetupScales start\n", millis());
+    gCatena.SafePrintf("SetupScales start\n");
   }
-  pinMode(interruptPin, INPUT);
+//  pinMode(interruptPin, INPUT);
-  Wire.begin();
 
-  if (!myScale.begin())
+  if (!myScale.begin(Wire, false))
   {
     gCatena.SafePrintf("Scale not detected. Please check wiring. Freezing...\n");
     return false;
   }
   gCatena.SafePrintf("Scale detected!\n");
 
-  myScale.setIntPolarityHigh();
+  bool result = InitializeScales();
-
-  myScale.clearBit(NAU7802_PGA_PWR_PGA_CAP_EN, NAU7802_PGA_PWR);
-  myScale.setSampleRate(NAU7802_SPS_80);
-  myScale.setLDO(NAU7802_LDO_3V3);
-
   if (debug_level > 0) {
-    gCatena.SafePrintf("%010d - SetupScales done\n", millis());
+    gCatena.SafePrintf("SetupScales done, result: %d\n", result);
   }
 
-  return true;
+  return result;
 }
 
 long ReadScale(char channel)
 {
+  long res;
+
   if (debug_level > 0) {
-    gCatena.SafePrintf("%010d - ReadScale Start\n", millis());
+    gCatena.SafePrintf("ReadScale Start, Channel %c\n",  channel);
   }
 
   uint8_t channelNumber;
@@ -63,42 +80,44 @@ long ReadScale(char channel)
   }
   long startTime = millis();
   myScale.setChannel(channelNumber);
-  myScale.calibrateAFE();
+  bool calibrate_success = myScale.calibrateAFE();
-
+  if (! calibrate_success) {
-  long res;
+    if (debug_level > 0) {
-  long dummy;
+      gCatena.SafePrintf("Error: Calibration not successful!\n");
-  int const ignore_readings = IGNORE_READINGS; // number of first <n> readings to ignore
-  int const num_scale_readings = SAMPLES; // number of instantaneous scale readings to calculate the median
-
-  for (int i = 0; i < ignore_readings; i++) {
-    while (digitalRead(interruptPin) == LOW) {
-      if ((millis() - startTime) > 60000) {
-        if (debug_level > 0) {
-          gCatena.SafePrintf("Timeout while reading scale (dummy values)...\n");
-        }
-        return 0;
-      }
-      delay(1);
     }
-    dummy = myScale.getReading();
   }
 
+  if (myScale.available()) {
+    long dummy = myScale.getReading();
+  }
+  int const num_scale_readings = SAMPLES; // number of instantaneous scale readings to calculate the median
+
   // we use the median, not the average, see https://community.particle.io/t/boron-gpio-provides-less-current-than-electrons-gpio/46647/13
-  startTime = millis();
   long readings[num_scale_readings];  // create arry to hold readings
   for (int i = 0; i < num_scale_readings; i++) {
-    while (digitalRead(interruptPin) == LOW) {
+    //while (digitalRead(interruptPin) == LOW) {
-      //while(! myScale.available()) {
+    long mytimer = millis();
-      // we set a timeout of 60 seconds for the measurement...
+    while (! myScale.available()) {
-      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");
         }
-        return 0;
+        break;
       }
       delay(1);
     }
-    readings[i] = myScale.getReading();  // fill the array with instantaneous readings from the scale
+    long reading;
+    if (myScale.available()) {
+      reading = myScale.getReading();  
+      readings[i] = reading;  
+    }
+    if (debug_level > 0) {
+      gCatena.SafePrintf("Reading: %d\n", reading);
+    }
+    delay(10);
   }
 
   long duration = millis() - startTime;
@@ -110,13 +129,23 @@ long ReadScale(char channel)
     sdev = stddev(readings, num_scale_readings);
     float sdev_proc;
     sdev_proc = 100 * (sdev / float(res));
+    gCatena.SafePrintf("Measurements: [");
+    for (int i = 0; i < num_scale_readings; i++) {
+      gCatena.SafePrintf("%d", readings[i]);
+      if (i < (SAMPLES - 1)) {
+        gCatena.SafePrintf(",");
+      }
+
+    }
+    gCatena.SafePrintf("]\n");
+
     gCatena.SafePrintf("Standard Deviation: %d.%03d\n", (int)sdev, (int)abs(sdev * 1000) % 1000);
     gCatena.SafePrintf("Standard Deviation / Median (Percent): %d.%03d\n", (int)sdev_proc, (int)abs(sdev_proc * 1000) % 1000);
     gCatena.SafePrintf("Duration (ms): %d\n", duration);
   }
 
   if (debug_level > 0) {
-    gCatena.SafePrintf("%010d - ReadScale Done\n", millis());
+    gCatena.SafePrintf("ReadScale Done\n");
   }
 
   return res;
@@ -125,25 +154,23 @@ long ReadScale(char channel)
 void PowerdownScale()
 {
   if (debug_level > 0) {
-    gCatena.SafePrintf("%010d - PowerdownScale Start\n", millis());
+    gCatena.SafePrintf("PowerdownScale Start\n");
   }
   myScale.powerDown();
   if (debug_level > 0) {
-    gCatena.SafePrintf("%010d - PowerdownScale Done\n", millis());
+    gCatena.SafePrintf("PowerdownScale Done\n");
   }
 }
 
 void PowerupScale()
 {
   if (debug_level > 0) {
-    gCatena.SafePrintf("%010d - PowerupScale Start\n", millis());
+    gCatena.SafePrintf("PowerupScale Start\n");
   }
-  myScale.powerUp(); //Power up scale. This scale takes ~600ms to boot and take reading.
 
-  // we wait 100 ms to give it time to stabilze
+  InitializeScales();
-  delay(100);
 
   if (debug_level > 0) {
-    gCatena.SafePrintf("%010d - PowerupScale Done\n", millis());
+    gCatena.SafePrintf("PowerupScale Done\n");
   }
 }