bug fix

README.md

@@ -20,9 +20,9 @@ Das sind die verwendeten Libraries [1]:
 | --- | -----  | ----------- |
 | https://github.com/mcci-catena/Adafruit_BME280_Library.git  | 3dafbe1 | Wed, 13 Dec 2017 13:56:30 -0500  |
 | https://github.com/mcci-catena/Adafruit_Sensor.git  | f2af6f4 | Tue, 1 Sep 2015 15:57:59 +0200  |
-| https://github.com/mcci-catena/arduino-lmic.git  | 6fe04ec | Tue, 12 May 2020 09:16:47 -0400  |
+| https://github.com/mcci-catena/arduino-lmic.git  | 1964dcf | Mon, 22 Jun 2020 10:54:56 -0400  |
 | https://github.com/mcci-catena/arduino-lorawan.git  | 4bc0d48 | Sat, 9 May 2020 12:38:28 -0400  |
-| https://github.com/mcci-catena/Catena-Arduino-Platform.git  | 92019ca | Tue, 12 May 2020 01:34:08 -0400  |
+| https://github.com/mcci-catena/Catena-Arduino-Platform.git  | 478ad23 | Fri, 26 Jun 2020 18:39:01 -0400  |
 | https://github.com/mcci-catena/Catena-mcciadk.git  | a428006 | Sat, 21 Dec 2019 20:45:26 -0500  |
 | https://github.com/mcci-catena/MCCI_FRAM_I2C.git  | f0a5ea5 | Sat, 21 Dec 2019 16:17:01 -0500  |
 | https://github.com/tatobari/Q2-HX711-Arduino-Library.git  | ccda8d8 | Wed, 13 Mar 2019 12:41:44 -0300  |
@@ -31,5 +31,44 @@ Das sind die verwendeten Libraries [1]:
 | https://github.com/mcci-catena/SHT1x.git  | be7042c | Tue, 20 Sep 2011 13:56:23 +1000  |
 
 
+Patch arduino-lmic, so initial SF12 is used initially:
+
+`
+[joerg@cinnamon src]$ git diff
+diff --git a/src/lmic/lmic_bandplan_eu868.h b/src/lmic/lmic_bandplan_eu868.h
+index efff7d5..74efb37 100644
+--- a/src/lmic/lmic_bandplan_eu868.h
++++ b/src/lmic/lmic_bandplan_eu868.h
+@@ -61,7 +61,7 @@ LMICeu868_isValidBeacon1(const uint8_t *d) {
+ #undef LMICbandplan_isFSK
+ #define LMICbandplan_isFSK()    (/* RX datarate */LMIC.dndr == EU868_DR_FSK)
+ 
+-#define LMICbandplan_getInitialDrJoin() (EU868_DR_SF7)
++#define LMICbandplan_getInitialDrJoin() (EU868_DR_SF12)
+ 
+ void LMICeu868_setBcnRxParams(void);
+ #define LMICbandplan_setBcnRxParams()   LMICeu868_setBcnRxParams()
+`
+
 `[1]:
 [joerg@cinnamon libraries]$ for i in Adafruit_BME280_Library Adafruit_Sensor arduino-lmic arduino-lorawan Catena-Arduino-Platform Catena-mcciadk MCCI_FRAM_I2C Q2-HX711-Arduino-Library SparkFun_Qwiic_Scale_NAU7802_Arduino_Library OneWire SHT1x ; do cd $i; echo "| $(git remote -v |grep fetch |awk '{print $2}' |tr '\n' ' ') | $(git log --pretty=format:'%h | %cD ' -n 1) |" ; cd ..; done`
+
+
+## Some Facts about RSSI and SNR
+
+https://lora.readthedocs.io/en/latest/#rssi
+
+RSSI minimum = -120 dBm.
+
+RSSI < -90 dBm: this signal is extremely weak, at the edge of what a receiver can receive.
+RSSI -67dBm: this is a fairly strong signal.
+RSSI > -55dBm: this is a very strong signal.
+RSSI > -30dBm: your sniffer is sitting right next to the transmitter.
+
+https://lora.readthedocs.io/en/latest/#snr
+
+Typical LoRa SNR values are between: -20dB and +10dB
+
+A value closer to +10dB means the received signal is less corrupted.
+
+LoRa can demodulate signals which are -7.5 dB to -20 dB below the noise floor.

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>
 
@@ -60,6 +60,7 @@ cCommandStream::CommandFn cmdGetScaleA;
 cCommandStream::CommandFn cmdGetScaleB;
 cCommandStream::CommandFn cmdCalibrateZeroScaleA;
 cCommandStream::CommandFn cmdCalibrateZeroScaleB;
+cCommandStream::CommandFn cmdCalibrateScales;
 cCommandStream::CommandFn cmdCalibrateScaleA;
 cCommandStream::CommandFn cmdCalibrateScaleB;
 cCommandStream::CommandFn cmdSetDebugLevel;
@@ -72,6 +73,7 @@ static const cCommandStream::cEntry sMyExtraCommmands[] =
   { "hello", cmdHello },
   { "get_calibration_settings", cmdGetCalibrationSettings },
   { "get_sensor_readings", cmdGetSensorReadings },
+  { "calibrate_scales", cmdCalibrateScales },
   { "calibrate_zero_scale_a", cmdCalibrateZeroScaleA },
   { "calibrate_zero_scale_b", cmdCalibrateZeroScaleB },
   { "calibrate_scale_a", cmdCalibrateScaleA },
@@ -110,6 +112,7 @@ long iteration = 0;       // what iteration number do we have, starts with 0
 long package_counter = 0; // sent package counter
 bool send_in_progress = false;
 bool stop_iterations = false;
+bool start_new_iteration = false;
 bool next_package_is_init_package = true;
 uint32_t gRebootMs;
 
@@ -143,24 +146,17 @@ 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;
 
-// the cycle time to use
-unsigned gTxCycle;
-// remaining before we reset to default
-unsigned gTxCycleCount;
-
 void setup(void)
 {
   gCatena.begin();
 
   setup_platform();
   SetupScales(config_data.debug_level);
-  ClearLoraData();
+  ClearLoraData(true);
   setup_bme280();
 
   setup_flash();
@@ -170,7 +166,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 +177,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);
@@ -285,7 +281,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 +296,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 +306,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 +315,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 +330,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,25 +338,28 @@ 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);
 
+  // explicitly enable LinkCheckMode
+  gLoRaWAN.SetLinkCheckMode(true);
+
   /* figure out when to reboot */
   gRebootMs = (CATCFG_T_REBOOT + os_getRndU2() - 32768) * 1000;
 
 
   // 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);
@@ -378,9 +377,12 @@ void setup_uplink(void)
 void loop()
 {
   gCatena.poll();
+  if (start_new_iteration) {
+    StartNewIteration();
+  }
 }
 
-void ClearLoraData(void)
+void ClearLoraData(bool clearLastValues)
 {
   lora_data.version = LORA_DATA_VERSION;
   lora_data.vbat = 0;
@@ -410,18 +412,20 @@ void ClearLoraData(void)
   my_position = 0;
 
   // We initialize last_sensor_reading
-  last_sensor_reading.vbat = 0;
-  last_sensor_reading.weight1 = 0;
-  last_sensor_reading.weight2 = 0;
-  last_sensor_reading.weight = 0;
-  last_sensor_reading.temperature = 0;
-  last_sensor_reading.humidity = 0;
-  last_sensor_reading.pressure = 0;
+  if (clearLastValues) {
+    last_sensor_reading.vbat = 0;
+    last_sensor_reading.weight1 = 0;
+    last_sensor_reading.weight2 = 0;
+    last_sensor_reading.weight = 0;
+    last_sensor_reading.temperature = 0;
+    last_sensor_reading.humidity = 0;
+    last_sensor_reading.pressure = 0;
+  }
 }
 
 void ShowLORAData(bool firstTime)
 {
-  gCatena.SafePrintf("%010d - ShowLORAData\n", millis());
+  gCatena.SafePrintf("ShowLORAData\n");
 
   if (firstTime) {
 
@@ -502,7 +506,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, millis: %d\n", millis());
   }
 
   // Prepare Deep Sleep
@@ -510,23 +514,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, millis: %d\n", millis());
   }
 }
 
@@ -537,11 +534,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 +545,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 +598,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 +616,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);
     }
   }
 
@@ -634,6 +624,7 @@ void ReadSensors(SENSOR_data &sensor_data) {
 }
 
 void StartNewIteration() {
+  start_new_iteration = false;
   uint32_t wait_time;
   wait_time = 0;
 
@@ -647,7 +638,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,38 +681,59 @@ 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)) {
+  bool big_difference = (abs(last_sensor_reading.weight - current_sensor_reading.weight) > SEND_DIFF_THRESHOLD_5GRAMS);
+  if ( (next_package_is_init_package) || (my_position >= MAX_VALUES_TO_SEND) || (big_difference) || ((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, big_difference: %d\n", my_position, iteration, package_counter, big_difference);
     }
-    // the first 12 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));
+    // the first <INIT_PACKETS> packets are "Init-Packets" or each INIT_PACKAGE_INTERVAL ...
+    // send confirmed if big_difference in weight
+    startSendingUplink(next_package_is_init_package, big_difference);
+    next_package_is_init_package = ((iteration < INIT_PACKETS) || ((package_counter % INIT_PACKAGE_INTERVAL) == 0));
 
     if (config_data.debug_level > 1) {
       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 600 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))
+    while (send_in_progress && ((millis() - start_time) < 600000))
     {
       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();
+      // we sleep 10 seconds...
+      start_time = millis();
+      while ((millis() - start_time) < 10000)
+      {
+        gCatena.poll();
+        yield();
+      }
+
+      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);
     }
   }
 
   if (not(next_package_is_init_package)) {
     // we make the current sensor reading to the last one...
     last_sensor_reading = current_sensor_reading;
+  } else {
+    // we only copy the last weight
+    last_sensor_reading.weight = current_sensor_reading.weight;    
   }
 
   uint32_t sleep_time_sec;
@@ -732,17 +744,17 @@ void StartNewIteration() {
     sleep_time_sec = 5;
   }
 
-  // for the first 12 iterations, we set the sleep time to 10 seconds only...
-  if (iteration <= 12) {
-    sleep_time_sec = 10;
+  // for the first <INIT_PACKETS> iterations, we set the sleep time to 120 seconds only...
+  if (iteration <= INIT_PACKETS) {
+    sleep_time_sec = 120;
   }
 
   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) {
@@ -750,25 +762,43 @@ void StartNewIteration() {
     }
   }
 
-  if (!fUsbPower) {
+  // 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);
+    gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
+    gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
+  }
+
+  if (!fUsbPower && !stop_iterations)  {
     DoDeepSleep(sleep_time_sec);
-    os_setTimedCallback(
-      &iterationJob,
-      os_getTime() + sec2osticks(2),
-      startNewIterationCb);
+    if (! stop_iterations) {
+      start_new_iteration = true;
+    }
+
   }
   else {
-    if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("%010d - light sleep; os_setTimedCallback for startNewIterationCb in %d...seconds\n", millis(), sleep_time_sec);
+    if (! stop_iterations) {
+      if (config_data.debug_level > 0) {
+        gCatena.SafePrintf("light sleep; os_setTimedCallback for startNewIterationCb in %d...seconds\n", sleep_time_sec);
+      }
+      os_setTimedCallback(
+        &iterationJob,
+        os_getTime() + sec2osticks(sleep_time_sec),
+        startNewIterationCb);
     }
-    os_setTimedCallback(
-      &iterationJob,
-      os_getTime() + sec2osticks(sleep_time_sec),
-      startNewIterationCb);
   }
 }
 
-void startSendingUplink(bool firstTime)
+void startSendingUplink(bool firstTime, bool confirmed)
 {
   send_in_progress = true;
 
@@ -792,21 +822,50 @@ void startSendingUplink(bool firstTime)
     fConfirmed = true;
   }
 
-  if (firstTime) {
-    if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("%010d - SendBuffer firstTime\n", millis());
-    }
-    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());
-    }
-    gLoRaWAN.SendBuffer((uint8_t*)&lora_data, sizeof(LORA_data), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
-    package_counter++;
+  // we can overwrite fConfirmed
+  if (confirmed) {
+    fConfirmed = true;
   }
 
-  ClearLoraData();
+  if (firstTime) {
+    if (config_data.debug_level > 0) {
+      gCatena.SafePrintf("SendBuffer firstTime\n");
+    }
+    if (gLoRaWAN.SendBuffer((uint8_t*)&lora_data_first, sizeof(LORA_data_first), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort)) {
+      package_counter++;
+      if (config_data.debug_level > 0) {
+        gCatena.SafePrintf("LMIC.opmode just after SendBuffer (successful): %#x\n", LMIC.opmode);
+        gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
+        gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
+      }
+    }
+    else {
+      gCatena.SafePrintf("LMIC.opmode just before SendBuffer (failed): %#x\n", LMIC.opmode);
+      gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
+      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
+    }
+  } else {
+    if (config_data.debug_level > 0) {
+      gCatena.SafePrintf("LMIC.opmode just before SendBuffer: %#x\n", LMIC.opmode);
+      gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
+      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
+      gCatena.SafePrintf("SendBuffer not firstTime\n");
+    }
+    if (gLoRaWAN.SendBuffer((uint8_t*)&lora_data, sizeof(LORA_data), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort)) {
+      package_counter++;
+      if (config_data.debug_level > 0) {
+        gCatena.SafePrintf("LMIC.opmode just after SendBuffer (successful): %#x\n", LMIC.opmode);
+        gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
+        gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
+      }
+    } else {
+      gCatena.SafePrintf("LMIC.opmode just before SendBuffer (failed): %#x\n", LMIC.opmode);
+      gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
+      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
+    }
+  }
+
+  ClearLoraData(false);
 }
 
 static void sendBufferDoneCb(
@@ -817,6 +876,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;
@@ -831,7 +891,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);
     }
   }
 
@@ -855,179 +915,62 @@ 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());
-  }
-
-  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 > 2) {
-      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");
+
+  if (config_data.debug_level > 0) {
+    gCatena.SafePrintf("Now it is safe to go to sleep\n");
   }
+
 }
 
-void updateSleepCounters(void)
+static void settleDoneCb(
+  osjob_t* pSendJob)
 {
-  // update the sleep parameters
-  if (gTxCycleCount > 1)
-  {
-    // values greater than one are decremented and ultimately reset to default.
-    --gTxCycleCount;
+  if (config_data.debug_level > 0) {
+    gCatena.SafePrintf("settleDoneCb - we are at the end of the callback chain!\n");
   }
-  else if (gTxCycleCount == 1)
+
+  const bool fDeepSleep = checkDeepSleep();
+
+  if (uint32_t(millis()) > gRebootMs)
   {
-    // 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;
+    // time to reboot
+    NVIC_SystemReset();
   }
-  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
-                                 );
+  doSleepAlert(fDeepSleep);
 
-  /* 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);
+  send_in_progress = false;
 }
 
 void deepSleepPrepare(void)
 {
   Serial.end();
+  Wire.endTransmission(true);
   Wire.end();
   SPI.end();
   if (fFlash)
@@ -1043,63 +986,21 @@ void deepSleepRecovery(void)
     gSPI2.begin();
 }
 
-void doLightSleep(osjob_t *pJob)
-{
-  uint32_t interval = sec2osticks(CATCFG_GetInterval(gTxCycle));
-
-  gLed.Set(LedPattern::Sleeping);
-
-  if (gCatena.GetOperatingFlags() &
-      static_cast<uint32_t>(gCatena.OPERATING_FLAGS::fQuickLightSleep))
-  {
-    interval = 1;
-  }
-
-  gLed.Set(LedPattern::Sleeping);
-  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) {
-    StartNewIteration();
+    start_new_iteration = true;
   }
 }
 
 static void receiveMessage(void *pContext, uint8_t port, const uint8_t *pMessage, size_t nMessage)
 {
+
   long cal_w1_0;
   long cal_w2_0;
   float cal_w1_factor;
@@ -1110,10 +1011,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,20 +1114,20 @@ static void receiveMessage(void *pContext, uint8_t port, const uint8_t *pMessage
       lora_data_first.cal_w2_factor = config_data.cal_w2_factor;
     }
   }
+
 }
 
 /* process "application hello" -- args are ignored */
 // argv[0] is "hello"
 // argv[1..argc-1] are the (ignored) arguments
-cCommandStream::CommandStatus cmdHello(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdHello(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   pThis->printf("Hello, world!\n");
 
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-
-cCommandStream::CommandStatus cmdGetCalibrationSettings(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdGetCalibrationSettings(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   pThis->printf("{\n");
   pThis->printf("  \"cal_w1_0\": \"%d\",\n", config_data.cal_w1_0);
@@ -1240,7 +1139,7 @@ cCommandStream::CommandStatus cmdGetCalibrationSettings(cCommandStream *pThis, v
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdGetSensorReadings(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdGetSensorReadings(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   SENSOR_data temp_sensor_data;
 
@@ -1258,21 +1157,21 @@ cCommandStream::CommandStatus cmdGetSensorReadings(cCommandStream *pThis, void *
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdGetScale1(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdGetScale1(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   pThis->printf("getscale1\n");
 
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdGetScale2(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdGetScale2(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   pThis->printf("getscale2\n");
 
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdCalibrateZeroScaleA(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdCalibrateZeroScaleA(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   setup_scales();
   config_data.cal_w1_0 = (int32_t)ReadScale('A');
@@ -1282,7 +1181,7 @@ cCommandStream::CommandStatus cmdCalibrateZeroScaleA(cCommandStream *pThis, void
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdCalibrateZeroScaleB(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdCalibrateZeroScaleB(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   setup_scales();
   config_data.cal_w2_0 = (int32_t)ReadScale('B');
@@ -1292,7 +1191,26 @@ cCommandStream::CommandStatus cmdCalibrateZeroScaleB(cCommandStream *pThis, void
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdCalibrateScaleA(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdCalibrateScales(cCommandStream * pThis, void *pContext, int argc, char **argv)
+{
+  String s_cal_w1_0(argv[1]);
+  String s_cal_w1_factor(argv[2]);
+  String s_cal_w2_0(argv[3]);
+  String s_cal_w2_factor(argv[4]);
+
+  config_data.cal_w1_0 = s_cal_w1_0.toInt();
+  config_data.cal_w1_factor = s_cal_w1_factor.toFloat();
+  config_data.cal_w2_0 = s_cal_w2_0.toInt();
+  config_data.cal_w2_factor = s_cal_w2_factor.toFloat();
+
+  gCatena.getFram()->saveField(cFramStorage::kAppConf, (const uint8_t *)&config_data, sizeof(config_data));
+
+  pThis->printf("{ \"msg\": \"calibrate_scales was successful\" }\n");
+
+  return cCommandStream::CommandStatus::kSuccess;
+}
+
+cCommandStream::CommandStatus cmdCalibrateScaleA(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   String w1_gramm(argv[1]);
   long weight1;
@@ -1314,7 +1232,7 @@ cCommandStream::CommandStatus cmdCalibrateScaleA(cCommandStream *pThis, void *pC
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdCalibrateScaleB(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdCalibrateScaleB(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   String w2_gramm(argv[1]);
   long weight2;
@@ -1336,18 +1254,20 @@ cCommandStream::CommandStatus cmdCalibrateScaleB(cCommandStream *pThis, void *pC
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdSetDebugLevel(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdSetDebugLevel(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   String s_debug_level(argv[1]);
   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;
 }
 
-cCommandStream::CommandStatus cmdGetDebugLevel(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdGetDebugLevel(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   gCatena.getFram()->saveField(cFramStorage::kAppConf, (const uint8_t *)&config_data, sizeof(config_data));
 
@@ -1356,7 +1276,7 @@ cCommandStream::CommandStatus cmdGetDebugLevel(cCommandStream *pThis, void *pCon
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdStopIterations(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdStopIterations(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   stop_iterations = true;
   return cCommandStream::CommandStatus::kSuccess;

mini_beieli_node.h

@@ -14,11 +14,11 @@ enum {
   // Actual time will be a little longer because have to
   // 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_INITIAL = 30,    // every 30 seconds initially
-  CATCFG_INTERVAL_COUNT_INITIAL = 30,     // repeat for 15 minutes
+  CATCFG_T_CYCLE = 6 * 60,                // every 6 minutes
+  //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 = 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 = 20200629;
 
 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,36 +8,70 @@
 
 #include "SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.h"
 
-#define SAMPLES 10
+#define SAMPLES 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("SetupScales start\n");
+  }
+//  pinMode(interruptPin, INPUT);
 
-  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,46 @@ 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);
+        delay(50);
+        InitializeScales();    
         if (debug_level > 0) {
           gCatena.SafePrintf("Timeout while reading scale...\n");
         }
-        return 0;
+        break;
       }
-      delay(1);
+      delay(50);
     }
-    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(50);
   }
 
   long duration = millis() - startTime;
@@ -80,20 +131,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");
+  }
 }