try second time if first try fails (SendBuffer)

mini-beieli-node.ino

@@ -9,7 +9,7 @@
 */
 
 // HX711: 0 => compile for hx711, 1 => compile for NAU7802
-#define HX711 1
+#define HX711 0
 
 #include <Catena.h>
 
@@ -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);
@@ -253,6 +253,7 @@ void setup_platform(void)
   }
 
   gLoRaWAN.SetReceiveBufferBufferCb(receiveMessage);
+  setTxCycleTime(CATCFG_T_CYCLE_INITIAL, CATCFG_INTERVAL_COUNT_INITIAL);
   gCatena.registerObject(&gLoRaWAN);
 
   /* find the platform */
@@ -285,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)) {
@@ -300,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;
@@ -310,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;
@@ -319,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 {
@@ -334,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");
     }
   }
 }
@@ -342,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);
@@ -353,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);
@@ -421,7 +422,7 @@ void ClearLoraData(void)
 
 void ShowLORAData(bool firstTime)
 {
-  gCatena.SafePrintf("%010d - ShowLORAData\n", millis());
+  gCatena.SafePrintf("ShowLORAData\n");
 
   if (firstTime) {
 
@@ -502,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("DoDeepSleep, now going to deep sleep\n");
   }
 
   // Prepare Deep Sleep
@@ -510,23 +511,16 @@ 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());
+    gCatena.SafePrintf("done with deep sleep\n");
   }
 }
 
@@ -537,11 +531,10 @@ void ReadSensors(SENSOR_data &sensor_data) {
   long w2_0_real;
 
   // vBat
-  gCatena.poll();
   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
@@ -549,43 +542,40 @@ 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");
     }
-    gCatena.poll();
     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");
       }
     }
-    gCatena.poll();
     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");
     }
   }
 
   // Disable Power
-  gCatena.poll();
   PowerdownScale();
 
   // Gewicht berechnen
@@ -605,19 +595,16 @@ void ReadSensors(SENSOR_data &sensor_data) {
   res.weight = (uint16_t)weight_current32;
 
   if (fBme) {
-    gCatena.poll();
     /* warm up the BME280 by discarding a measurement */
     (void)gBME280.readTemperature();
 
-    gCatena.poll();
     Adafruit_BME280::Measurements m = gBME280.readTemperaturePressureHumidity();
     // temperature is 2 bytes from -0x80.00 to +0x7F.FF degrees C
     // pressure is 2 bytes, hPa * 10.
     // 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",
-        millis(),
+        "BME280:  T: %d P: %d RH: %d\n",
         (int)m.Temperature,
         (int)m.Pressure,
         (int)m.Humidity);
@@ -626,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);
     }
   }
 
@@ -647,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;
 
@@ -690,14 +677,14 @@ 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 12 packets are "Init-Packets" or each INIT_PACKAGE_INTERVAL ...
+    // the first <INIT_PACKETS> packets are "Init-Packets" or each INIT_PACKAGE_INTERVAL ...
     startSendingUplink(next_package_is_init_package);
-    next_package_is_init_package = ((iteration < 12) || ((package_counter % INIT_PACKAGE_INTERVAL) == 0));
+    next_package_is_init_package = ((iteration < INIT_PACKETS) || ((package_counter % INIT_PACKAGE_INTERVAL) == 0));
 
     if (config_data.debug_level > 1) {
       gLed.Set(LedPattern::TwoShort);
@@ -706,7 +693,7 @@ 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))
     {
@@ -715,7 +702,7 @@ void StartNewIteration() {
     }
     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);
     }
   }
 
@@ -732,17 +719,17 @@ void StartNewIteration() {
     sleep_time_sec = 5;
   }
 
-  // for the first 12 iterations, we set the sleep time to 10 seconds only...
-  if (iteration <= 12) {
+  // for the first <INIT_PACKETS> iterations, we set the sleep time to 10 seconds only...
+  if (iteration <= INIT_PACKETS) {
     sleep_time_sec = 10;
   }
 
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - now going to sleep for %d seconds...\n", millis(), sleep_time_sec);
+    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) {
@@ -752,14 +739,18 @@ void StartNewIteration() {
 
   if (!fUsbPower) {
     DoDeepSleep(sleep_time_sec);
-    os_setTimedCallback(
-      &iterationJob,
-      os_getTime() + sec2osticks(2),
-      startNewIterationCb);
+    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,
@@ -792,17 +783,37 @@ void startSendingUplink(bool firstTime)
     fConfirmed = true;
   }
 
+  gCatena.poll();
+
   if (firstTime) {
     if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("%010d - SendBuffer firstTime\n", millis());
+      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);
+    }
     package_counter++;
   } else {
     if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("%010d - SendBuffer not firstTime\n", millis());
+      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);
+    }
     package_counter++;
   }
 
@@ -831,7 +842,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\n");
     }
   }
 
@@ -862,7 +873,7 @@ static void settleDoneCb(
   const bool fDeepSleep = checkDeepSleep();
 
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - settleDoneCb\n", millis());
+    gCatena.SafePrintf("settleDoneCb\n");
   }
 
   if (config_data.debug_level > 2) {
@@ -947,7 +958,7 @@ void doSleepAlert(const bool fDeepSleep)
 
     }
     // sleep and print
-    if (config_data.debug_level > 2) {
+    if (config_data.debug_level > 1) {
       gLed.Set(LedPattern::TwoShort);
     }
 
@@ -1011,6 +1022,10 @@ void doDeepSleep(osjob_t *pJob)
                                    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();
@@ -1028,6 +1043,7 @@ void doDeepSleep(osjob_t *pJob)
 void deepSleepPrepare(void)
 {
   Serial.end();
+  Wire.endTransmission(true);
   Wire.end();
   SPI.end();
   if (fFlash)
@@ -1047,7 +1063,11 @@ 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))
@@ -1055,12 +1075,12 @@ void doLightSleep(osjob_t *pJob)
     interval = 1;
   }
 
-  gLed.Set(LedPattern::Sleeping);
   os_setTimedCallback(
     &iterationJob,
     os_getTime() + interval,
     sleepDoneCb
   );
+
 }
 
 static void sleepDoneCb(osjob_t* pJob)
@@ -1070,7 +1090,7 @@ static void sleepDoneCb(osjob_t* pJob)
   }
 
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - sleepDoneCb\n", millis());
+    gCatena.SafePrintf("sleepDoneCb\n");
   }
 
   os_setTimedCallback(
@@ -1082,7 +1102,7 @@ static void sleepDoneCb(osjob_t* pJob)
 static void warmupDoneCb(osjob_t* pJob)
 {
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - warmupDoneCb\n", millis());
+    gCatena.SafePrintf("warmupDoneCb\n");
   }
   send_in_progress = false;
 }
@@ -1090,7 +1110,7 @@ static void warmupDoneCb(osjob_t* pJob)
 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) {
@@ -1100,6 +1120,9 @@ static void startNewIterationCb(osjob_t* pJob)
 
 static void receiveMessage(void *pContext, uint8_t port, const uint8_t *pMessage, size_t nMessage)
 {
+  unsigned txCycle;
+  unsigned txCount;
+
   long cal_w1_0;
   long cal_w2_0;
   float cal_w1_factor;
@@ -1110,10 +1133,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) {
@@ -1215,8 +1236,60 @@ static void receiveMessage(void *pContext, uint8_t port, const uint8_t *pMessage
       lora_data_first.cal_w2_factor = config_data.cal_w2_factor;
     }
   }
+
+  if (port == 0)
+  {
+    return;
   }
 
+  else if (! (port == 1 && 2 <= nMessage && nMessage <= 3))
+  {
+    if (config_data.debug_level > 0) {
+      gCatena.SafePrintf("invalid message port(%02x)/length(%x)\n",
+                         port, nMessage
+                        );
+    }
+    return;
+  }
+
+  txCycle = (pMessage[0] << 8) | pMessage[1];
+
+  if (txCycle < CATCFG_T_MIN || txCycle > CATCFG_T_MAX)
+  {
+    if (config_data.debug_level > 0) {
+      gCatena.SafePrintf("tx cycle time out of range: %u\n", txCycle);
+    }
+    return;
+  }
+
+  // byte [2], if present, is the repeat count.
+  // explicitly sending zero causes it to stick.
+  txCount = CATCFG_INTERVAL_COUNT;
+  if (nMessage >= 3)
+  {
+    txCount = pMessage[2];
+  }
+
+  setTxCycleTime(txCycle, txCount);
+
+}
+
+void setTxCycleTime(unsigned txCycle, unsigned txCount)
+{
+  if (txCount > 0) {
+    if (config_data.debug_level > 0) {
+      gCatena.SafePrintf("message cycle time %u seconds for %u messages\n", txCycle, txCount);
+    }
+  }
+  else if (config_data.debug_level > 0) {
+    gCatena.SafePrintf("message cycle time %u seconds indefinitely\n", txCycle);
+  }
+
+  gTxCycle = txCycle;
+  gTxCycleCount = txCount;
+}
+
+
 /* process "application hello" -- args are ignored */
 // argv[0] is "hello"
 // argv[1..argc-1] are the (ignored) arguments
@@ -1342,6 +1415,8 @@ cCommandStream::CommandStatus cmdSetDebugLevel(cCommandStream *pThis, void *pCon
   config_data.debug_level = s_debug_level.toInt();
   gCatena.getFram()->saveField(cFramStorage::kAppConf, (const uint8_t *)&config_data, sizeof(config_data));
 
+  SetScalesDebugLevel(config_data.debug_level);
+
   pThis->printf("{ \"msg\": \"set_debug_level was successful\" }\n");
 
   return cCommandStream::CommandStatus::kSuccess;

mini_beieli_node.h

@@ -15,10 +15,10 @@ enum {
   // add measurement and broadcast time, but we attempt
   // to compensate for the gross effects below.
   CATCFG_T_CYCLE = 6 * 60,                // every 6 minutes
-  //CATCFG_T_CYCLE = 30, // for Testing
-  CATCFG_T_CYCLE_TEST = 30, // every 10 seconds
+  //CATCFG_T_CYCLE = 30,                  // for Testing (Swisscom Compliance)
+  CATCFG_T_CYCLE_TEST = 30,               // every 30 seconds
   CATCFG_T_CYCLE_INITIAL = 30,            // every 30 seconds initially
-  CATCFG_INTERVAL_COUNT_INITIAL = 30,     // repeat for 15 minutes
+  CATCFG_INTERVAL_COUNT_INITIAL = 10,     // repeat for 5 minutes
   CATCFG_T_REBOOT = 30 * 24 * 60 * 60,    // reboot every 30 days
 };
 
@@ -26,7 +26,7 @@ enum {
 enum {
   CATCFG_T_WARMUP = 1,
   CATCFG_T_SETTLE = 5,
-  CATCFG_T_OVERHEAD = (CATCFG_T_WARMUP + CATCFG_T_SETTLE),
+  CATCFG_T_OVERHEAD = (CATCFG_T_WARMUP + CATCFG_T_SETTLE + 4),
   CATCFG_T_MIN = CATCFG_T_OVERHEAD,
   CATCFG_T_MAX = CATCFG_T_CYCLE < 60 * 60 ? 60 * 60 : CATCFG_T_CYCLE,     // normally one hour max.
   CATCFG_INTERVAL_COUNT = 30,
@@ -56,7 +56,7 @@ enum {
   |
   \****************************************************************************/
 
-static const int32_t fwVersion = 20200513;
+static const int32_t fwVersion = 20200528;
 
 static const byte INIT_PACKAGE_INTERVAL = 100;  // send an init package every 100 packages;
 static const byte MAX_VALUES_TO_SEND = 8;
@@ -64,8 +64,9 @@ 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;
 
 // must be 64 bytes long (size of kAppConf)
 typedef struct {

mini_beieli_node_hx711.h

@@ -11,11 +11,16 @@ Q2HX711 hx711(A1, A0);
 
 byte debug_level;
 
+void SetScalesDebugLevel(byte dbg_level)
+{
+  debug_level = dbg_level;
+}
+
 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;
@@ -25,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;
@@ -47,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++) {
@@ -84,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_
@@ -6,7 +8,7 @@
 
 #include "SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.h"
 
-#define SAMPLES 10
+#define SAMPLES 5
 
 NAU7802 myScale; //Create instance of the NAU7802 class
 
@@ -14,28 +16,62 @@ byte debug_level;
 
 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("SetupScales start\n");
+  }
   pinMode(interruptPin, INPUT);
-  Wire.begin();
 
-  if (!myScale.begin())
+  if (!myScale.begin(Wire, false))
   {
-    Serial.println("Scale not detected. Please check wiring. Freezing...");
+    gCatena.SafePrintf("Scale not detected. Please check wiring. Freezing...\n");
     return false;
   }
-  Serial.println("Scale detected!");
+  gCatena.SafePrintf("Scale detected!\n");
 
-  myScale.setIntPolarityHigh();
-  delay(500);
+  bool result = InitializeScales();
+  if (debug_level > 0) {
+    gCatena.SafePrintf("SetupScales done, result: %d\n", result);
+  }
 
-  return true;
+  return result;
 }
 
 long ReadScale(char channel)
 {
+  long res;
+
+  if (debug_level > 0) {
+    gCatena.SafePrintf("ReadScale Start, Channel %c\n",  channel);
+  }
+
   uint8_t channelNumber;
   if (channel == 'B') {
     channelNumber = NAU7802_CHANNEL_1;
@@ -44,31 +80,44 @@ long ReadScale(char channel)
   }
   long startTime = millis();
   myScale.setChannel(channelNumber);
-  myScale.clearBit(NAU7802_PGA_PWR_PGA_CAP_EN, NAU7802_PGA_PWR);
-  myScale.setSampleRate(NAU7802_SPS_10);
-  myScale.setLDO(NAU7802_LDO_2V7);
-  myScale.calibrateAFE();
-  //delay(500);
+  bool calibrate_success = myScale.calibrateAFE();
+  if (! calibrate_success) {
+    if (debug_level > 0) {
+      gCatena.SafePrintf("Error: Calibration not successful!\n");
+    }
+  }
 
-  long res;
+  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
   long readings[num_scale_readings];  // create arry to hold readings
-
   for (int i = 0; i < num_scale_readings; i++) {
-    while (digitalRead(interruptPin) == LOW) {
-      //while(! myScale.available()) {
-      // we set a timeout of 60 seconds for the measurement...
-      if ((millis() - startTime) > 60000) {
+    //while (digitalRead(interruptPin) == LOW) {
+    long mytimer = millis();
+    while (! myScale.available()) {
+      // 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;
@@ -80,20 +129,48 @@ 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("ReadScale Done\n");
+  }
+
   return res;
 }
 
 void PowerdownScale()
 {
+  if (debug_level > 0) {
+    gCatena.SafePrintf("PowerdownScale Start\n");
+  }
   myScale.powerDown();
+  if (debug_level > 0) {
+    gCatena.SafePrintf("PowerdownScale Done\n");
+  }
 }
 
 void PowerupScale()
 {
-  myScale.powerUp(); //Power up scale. This scale takes ~600ms to boot and take reading.
+  if (debug_level > 0) {
+    gCatena.SafePrintf("PowerupScale Start\n");
+  }
+
+  InitializeScales();
+
+  if (debug_level > 0) {
+    gCatena.SafePrintf("PowerupScale Done\n");
+  }
 }