new version 20200522

README.md

@@ -20,16 +20,16 @@ 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  | f67121c | Mon, 10 Feb 2020 10:57:04 -0500  |
+| https://github.com/mcci-catena/arduino-lmic.git  | 6fe04ec | Tue, 12 May 2020 09:16:47 -0400  |
-| https://github.com/mcci-catena/arduino-lorawan.git  | a0577e1 | Mon, 10 Feb 2020 13:21:30 -0500  |
+| 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  | 85c010c | Tue, 11 Feb 2020 19:58:25 -0500  |
+| https://github.com/mcci-catena/Catena-Arduino-Platform.git  | 92019ca | Tue, 12 May 2020 01:34:08 -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  |
+| https://github.com/sparkfun/SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.git  | 688f255 | Fri, 3 Jan 2020 12:35:22 -0700  |
 | https://github.com/mcci-catena/OneWire.git  | d814a7b | Thu, 26 Apr 2018 03:45:27 +0800  |
 | https://github.com/mcci-catena/SHT1x.git  | be7042c | Tue, 20 Sep 2011 13:56:23 +1000  |
 
 
-
 `[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 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`
+[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`

helper.h

@@ -0,0 +1,78 @@
+#ifndef _HELPER_H_
+#define _HELPER_H
+
+#pragma once
+
+#ifndef _CATENA_H_
+#include <Catena.h>
+#endif
+
+using namespace McciCatena;
+
+// the primary object
+Catena gCatena;
+
+
+//Following functions are based on "https://github.com/dndubins/QuickStats", by David Dubins
+
+void bubbleSort(long A[], int len) {
+  unsigned long newn;
+  unsigned long n = len;
+  long temp = 0;
+  do {
+    newn = 1;
+    for (int p = 1; p < len; p++) {
+      if (A[p - 1] > A[p]) {
+        temp = A[p];         //swap places in array
+        A[p] = A[p - 1];
+        A[p - 1] = temp;
+        newn = p;
+      } //end if
+    } //end for
+    n = newn;
+  } while (n > 1);
+}
+
+long median(long samples[], int m) //calculate the median
+{
+  //First bubble sort the values: https://en.wikipedia.org/wiki/Bubble_sort
+  long sorted[m];   // Define and initialize sorted array.
+  long temp = 0;    // Temporary float for swapping elements
+
+  for (int i = 0; i < m; i++) {
+    sorted[i] = samples[i];
+  }
+  bubbleSort(sorted, m); // Sort the values
+
+  if (bitRead(m, 0) == 1) { //If the last bit of a number is 1, it's odd. This is equivalent to "TRUE". Also use if m%2!=0.
+    return sorted[m / 2]; //If the number of data points is odd, return middle number.
+  } else {
+    return (sorted[(m / 2) - 1] + sorted[m / 2]) / 2; //If the number of data points is even, return avg of the middle two numbers.
+  }
+}
+
+// Joergs STDDEV
+float stddev(long samples[], int m) //calculate the stdandard deviation
+{
+  float sum_x;
+  float sum_x2;
+  float mean;
+
+  float stdev;
+  sum_x = 0;
+  sum_x2 = 0;
+
+  for (int i = 0; i < m; i++) {
+    sum_x = sum_x + samples[i];
+  }
+  mean = sum_x / m;
+
+  for (int i = 0; i < m; i++) {
+    sum_x2 = sum_x2 + ((samples[i] - mean) * (samples[i] - mean));
+  }
+
+  stdev = sqrt(sum_x2 / m);
+
+  return stdev;
+}
+#endif

mini-beieli-node.ino

@@ -8,6 +8,9 @@
 
 */
 
+// HX711: 0 => compile for hx711, 1 => compile for NAU7802
+#define HX711 0
+
 #include <Catena.h>
 
 #include <Catena_Led.h>
@@ -25,9 +28,18 @@
 #include <cmath>
 #include <type_traits>
 
-#include <Q2HX711.h>
 #include "mini_beieli_node.h"
 
+#if (HX711)
+#include "mini_beieli_node_hx711.h"
+#else
+#include "mini_beieli_node_nau7802.h"
+#endif
+
+#ifndef _HELPER_H_
+#include "helper.h"
+#endif
+
 using namespace McciCatena;
 
 // forwards
@@ -104,10 +116,6 @@ uint32_t gRebootMs;
 // generic timer
 long t_cur;
 
-// the primary object
-Catena gCatena;
-
-//
 // the LoRaWAN backhaul.  Note that we use the
 // Catena version so it can provide hardware-specific
 // information to the base class.
@@ -131,9 +139,6 @@ SPIClass gSPI2(
 Catena_Mx25v8035f gFlash;
 bool fFlash;
 
-// Scales
-Q2HX711 hx711(A1, A0);
-
 //  USB power
 bool fUsbPower;
 
@@ -153,13 +158,10 @@ void setup(void)
 {
   gCatena.begin();
 
-  // Use D10 to regulate power
-  pinMode(D10, OUTPUT);
-
   setup_platform();
+  SetupScales(config_data.debug_level);
   ClearLoraData();
   setup_bme280();
-  //setup_scales();
 
   setup_flash();
   setup_uplink();
@@ -251,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 */
@@ -305,10 +308,7 @@ bool setup_scales(void)
   res = true;
 
   // Enable Power
-  digitalWrite(D10, HIGH);
+  PowerupScale();
-
-  // we wait 400ms (settling time according HX711 datasheet @ 10 SPS
-  delay(400);
 
   if (config_data.debug_level > 0) {
     gCatena.SafePrintf("%010d - setup_scale done\n", millis());
@@ -503,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("%010d - DoDeepSleep, now going to deep sleep\n", millis());
   }
 
   // Prepare Deep Sleep
@@ -511,90 +511,19 @@ void DoDeepSleep(uint32_t sleep_time)
     gLed.Set(LedPattern::Off);
   }
 
-  Serial.end();
+  deepSleepPrepare();
-  Wire.end();
-  SPI.end();
-  if (fFlash)
-    gSPI2.end();
 
   // Now sleeping...
   gCatena.Sleep(sleep_time);
 
   // Recover from wakeup...
-  Serial.begin();
+  deepSleepRecovery();
-  Wire.begin();
+
-  SPI.begin();
-  if (fFlash)
-    gSPI2.begin();
   if (config_data.debug_level > 0) {
     gCatena.SafePrintf("%010d - done with deep sleep\n", millis());
   }
 }
 
-//Following functions are based on "https://github.com/dndubins/QuickStats", by David Dubins
-
-long median(long samples[], int m) //calculate the median
-{
-  //First bubble sort the values: https://en.wikipedia.org/wiki/Bubble_sort
-  long sorted[m];   // Define and initialize sorted array.
-  long temp = 0;    // Temporary float for swapping elements
-
-  for (int i = 0; i < m; i++) {
-    sorted[i] = samples[i];
-  }
-  bubbleSort(sorted, m); // Sort the values
-
-  if (bitRead(m, 0) == 1) { //If the last bit of a number is 1, it's odd. This is equivalent to "TRUE". Also use if m%2!=0.
-    return sorted[m / 2]; //If the number of data points is odd, return middle number.
-  } else {
-    return (sorted[(m / 2) - 1] + sorted[m / 2]) / 2; //If the number of data points is even, return avg of the middle two numbers.
-  }
-}
-
-void bubbleSort(long A[], int len) {
-  unsigned long newn;
-  unsigned long n = len;
-  long temp = 0;
-  do {
-    newn = 1;
-    for (int p = 1; p < len; p++) {
-      if (A[p - 1] > A[p]) {
-        temp = A[p];         //swap places in array
-        A[p] = A[p - 1];
-        A[p - 1] = temp;
-        newn = p;
-      } //end if
-    } //end for
-    n = newn;
-  } while (n > 1);
-}
-
-long my_read_average(byte gain, byte times) {
-  long res;
-  int const num_scale_readings = 25; // 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
-
-  if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - my_read_average, measurements: ", millis());
-  }
-
-  hx711.setGain(gain);
-
-  for (int i = 0; i < num_scale_readings; i++) {
-    readings[i] = hx711.read();  // fill the array with instantaneous readings from the scale
-  }
-
-  res = median(readings, num_scale_readings); // calculate median
-
-  if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("; median of %d samples: %d\n", num_scale_readings, res);
-  }
-
-  return res;
-}
-
 void ReadSensors(SENSOR_data &sensor_data) {
   SENSOR_data res;
   int32_t weight_current32;
@@ -602,7 +531,6 @@ 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) {
@@ -614,11 +542,10 @@ 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 - HX711 LoadCell is ready.\n", millis());
+      gCatena.SafePrintf("%010d - LoadCell is ready.\n", millis());
     }
-    gCatena.poll();
     if (config_data.cal_w1_0 != NOT_ATTACHED) {
-      res.weight1 = (int32_t)my_read_average(32, 7);
+      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);
       }
@@ -629,9 +556,8 @@ void ReadSensors(SENSOR_data &sensor_data) {
         gCatena.SafePrintf("%010d - Load_cell 1 is disabled\n", millis());
       }
     }
-    gCatena.poll();
     if (config_data.cal_w2_0 != NOT_ATTACHED) {
-      res.weight2 = (int32_t)my_read_average(128, 7);
+      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);
       }
@@ -645,13 +571,12 @@ void ReadSensors(SENSOR_data &sensor_data) {
   }
   else {
     if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("%010d - HX711 LoadCell not ready.\n", millis());
+      gCatena.SafePrintf("%010d - LoadCell not ready.\n", millis());
     }
   }
 
   // Disable Power
-  gCatena.poll();
+  PowerdownScale();
-  digitalWrite(D10, LOW);
 
   // Gewicht berechnen
   weight_current32 = (int32_t)((((res.weight1 - w1_0_real) / config_data.cal_w1_factor) + ((res.weight2 - w2_0_real) / config_data.cal_w2_factor)) / 5.0);
@@ -670,11 +595,9 @@ 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.
@@ -760,9 +683,9 @@ void StartNewIteration() {
     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);
     }
-    // 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);
@@ -797,8 +720,8 @@ void StartNewIteration() {
     sleep_time_sec = 5;
   }
 
-  // for the first 12 iterations, we set the sleep time to 10 seconds only...
+  // for the first <INIT_PACKETS> iterations, we set the sleep time to 10 seconds only...
-  if (iteration <= 12) {
+  if (iteration <= INIT_PACKETS) {
     sleep_time_sec = 10;
   }
 
@@ -817,10 +740,14 @@ void StartNewIteration() {
 
   if (!fUsbPower) {
     DoDeepSleep(sleep_time_sec);
-    os_setTimedCallback(
+    if (! stop_iterations) {
-      &iterationJob,
+      StartNewIteration();
-      os_getTime() + sec2osticks(2),
+    }
-      startNewIterationCb);
+
+    //os_setTimedCallback(
+    //  &iterationJob,
+    //  os_getTime() + sec2osticks(2),
+    //  startNewIterationCb);
   }
   else {
     if (config_data.debug_level > 0) {
@@ -1012,7 +939,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);
     }
 
@@ -1076,6 +1003,10 @@ void doDeepSleep(osjob_t *pJob)
                                    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();
@@ -1112,7 +1043,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("%010d - doLightSleep\n", millis());
+  }
 
   if (gCatena.GetOperatingFlags() &
       static_cast<uint32_t>(gCatena.OPERATING_FLAGS::fQuickLightSleep))
@@ -1120,12 +1055,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)
@@ -1165,6 +1100,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;
@@ -1280,12 +1218,64 @@ 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
-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");
 
@@ -1293,7 +1283,7 @@ cCommandStream::CommandStatus cmdHello(cCommandStream *pThis, void *pContext, in
 }
 
 
-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);
@@ -1305,7 +1295,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;
 
@@ -1323,41 +1313,41 @@ 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)my_read_average(32, 10);
+  config_data.cal_w1_0 = (int32_t)ReadScale('A');
   gCatena.getFram()->saveField(cFramStorage::kAppConf, (const uint8_t *)&config_data, sizeof(config_data));
   pThis->printf("{ \"msg\": \"calibrate_zero_scale_a was successful\" }\n");
 
   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)my_read_average(128, 10);
+  config_data.cal_w2_0 = (int32_t)ReadScale('B');
   gCatena.getFram()->saveField(cFramStorage::kAppConf, (const uint8_t *)&config_data, sizeof(config_data));
   pThis->printf("{ \"msg\": \"calibrate_zero_scale_b was successful\" }\n");
 
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdCalibrateScaleA(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdCalibrateScaleA(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   String w1_gramm(argv[1]);
   long weight1;
@@ -1368,7 +1358,7 @@ cCommandStream::CommandStatus cmdCalibrateScaleA(cCommandStream *pThis, void *pC
     config_data.cal_w1_0 = NOT_ATTACHED;
   } else {
     setup_scales();
-    weight1 = my_read_average(32, 10);
+    weight1 = ReadScale('A');
     config_data.cal_w1_factor = (float)((weight1 - config_data.cal_w1_0) / w1_gramm.toFloat());
   }
 
@@ -1379,7 +1369,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;
@@ -1390,7 +1380,7 @@ cCommandStream::CommandStatus cmdCalibrateScaleB(cCommandStream *pThis, void *pC
     config_data.cal_w2_0 = NOT_ATTACHED;
   } else {
     setup_scales();
-    weight2 = my_read_average(128, 10);
+    weight2 = ReadScale('B');
     config_data.cal_w2_factor = (float)((weight2 - config_data.cal_w2_0) / w2_gramm.toFloat());
   }
 
@@ -1401,18 +1391,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));
 
@@ -1421,7 +1413,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

@@ -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 = 30,                  // for Testing (Swisscom Compliance)
-  CATCFG_T_CYCLE_TEST = 30, // every 10 seconds
+  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 = 20200229;
+static const int32_t fwVersion = 20200522;
 
 static const byte INIT_PACKAGE_INTERVAL = 100;  // send an init package every 100 packages;
 static const byte MAX_VALUES_TO_SEND = 8;
@@ -66,6 +66,7 @@ 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 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

@@ -0,0 +1,94 @@
+#define SAMPLES 10
+
+#include <Q2HX711.h>
+
+#ifndef _HELPER_H_
+#include "helper.h"
+#endif
+
+// Scales
+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());
+  }
+
+  bool res;
+  res = true;
+
+  // Use D10 to regulate power
+  pinMode(D10, OUTPUT);
+
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - setup_scale done\n", millis());
+  }
+
+  return res;
+}
+
+long ReadScale(char channel)
+{
+  if (channel == 'B') {
+    hx711.setGain(128);
+  } else {
+    hx711.setGain(32);
+  }
+  delay(500);
+
+  long res;
+  int const num_scale_readings = 25; // 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
+
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - my_read_average, measurements:\n", millis());
+  }
+
+  for (int i = 0; i < num_scale_readings; i++) {
+    readings[i] = hx711.read();  // fill the array with instantaneous readings from the scale
+    if (debug_level > 1) {
+      gCatena.SafePrintf("Reading %d: %d\n", i, readings[i]);
+    }
+  }
+
+  res = median(readings, num_scale_readings); // calculate median
+
+  if (debug_level > 0) {
+    gCatena.SafePrintf("Median of %d samples: %d\n", num_scale_readings, res);
+    float sdev;
+    sdev = stddev(readings, num_scale_readings);
+    gCatena.SafePrintf("Standard Deviation: %d.%03d\n", (int)sdev, (int)abs(sdev * 1000) % 1000);
+  }
+
+  return res;
+}
+
+void PowerdownScale()
+{
+  // Disable Power
+  digitalWrite(D10, LOW);
+}
+
+void PowerupScale()
+{
+  // Enable Power
+  digitalWrite(D10, HIGH);
+
+  // we wait 400ms (settling time according HX711 datasheet @ 10 SPS
+  delay(400);
+
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - setup_scale done\n", millis());
+  }
+}

mini_beieli_node_nau7802.h

@@ -0,0 +1,149 @@
+#include <Wire.h>
+
+#ifndef _HELPER_H_
+#include "helper.h"
+#endif
+
+#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;
+
+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 - SetupScales start\n", millis());
+  }
+  pinMode(interruptPin, INPUT);
+  Wire.begin();
+
+  if (!myScale.begin())
+  {
+    gCatena.SafePrintf("Scale not detected. Please check wiring. Freezing...\n");
+    return false;
+  }
+  gCatena.SafePrintf("Scale detected!\n");
+
+  myScale.setIntPolarityHigh();
+
+  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());
+  }
+
+  return true;
+}
+
+long ReadScale(char channel)
+{
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - ReadScale Start\n", millis());
+  }
+
+  uint8_t channelNumber;
+  if (channel == 'B') {
+    channelNumber = NAU7802_CHANNEL_1;
+  } else {
+    channelNumber = NAU7802_CHANNEL_2;
+  }
+  long startTime = millis();
+  myScale.setChannel(channelNumber);
+  myScale.calibrateAFE();
+
+  long res;
+  long dummy;
+  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();
+  }
+
+  // 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(! myScale.available()) {
+      // we set a timeout of 60 seconds for the measurement...
+      if ((millis() - startTime) > 60000) {
+        if (debug_level > 0) {
+          gCatena.SafePrintf("Timeout while reading scale...\n");
+        }
+        return 0;
+      }
+      delay(1);
+    }
+    readings[i] = myScale.getReading();  // fill the array with instantaneous readings from the scale
+  }
+
+  long duration = millis() - startTime;
+  res = median(readings, num_scale_readings); // calculate median
+
+  if (debug_level > 0) {
+    gCatena.SafePrintf("Median of %d samples: %d\n", num_scale_readings, res);
+    float sdev;
+    sdev = stddev(readings, num_scale_readings);
+    float sdev_proc;
+    sdev_proc = 100 * (sdev / float(res));
+    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());
+  }
+
+  return res;
+}
+
+void PowerdownScale()
+{
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - PowerdownScale Start\n", millis());
+  }
+  myScale.powerDown();
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - PowerdownScale Done\n", millis());
+  }
+}
+
+void PowerupScale()
+{
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - PowerupScale Start\n", millis());
+  }
+  myScale.powerUp(); //Power up scale. This scale takes ~600ms to boot and take reading.
+
+  // we wait 100 ms to give it time to stabilze
+  delay(100);
+
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - PowerupScale Done\n", millis());
+  }
+}