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  | 9191f0c | Tue, 30 Jun 2020 09:56:19 -0400  |
+| 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  | 4bc0d48 | Sat, 9 May 2020 12:38:28 -0400  |
-| https://github.com/mcci-catena/Catena-Arduino-Platform.git  | 7620a89 | Fri, 31 Jul 2020 14:14:30 -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-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,45 +31,5 @@ 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.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 (Swisscom Compliance)
+  //CATCFG_T_CYCLE = 30, // for Testing
-  CATCFG_T_CYCLE_TEST = 30,               // every 30 seconds
+  CATCFG_T_CYCLE_TEST = 30, // every 10 seconds
   CATCFG_T_CYCLE_INITIAL = 30,    // every 30 seconds initially
-  CATCFG_INTERVAL_COUNT_INITIAL = 10,     // repeat for 5 minutes
+  CATCFG_INTERVAL_COUNT_INITIAL = 30,     // repeat for 15 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 + 4),
+  CATCFG_T_OVERHEAD = (CATCFG_T_WARMUP + CATCFG_T_SETTLE),
   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 = 20200804;
+static const int32_t fwVersion = 20200513;
 
 static const byte INIT_PACKAGE_INTERVAL = 100;  // send an init package every 100 packages;
 static const byte MAX_VALUES_TO_SEND = 8;
@@ -64,10 +64,8 @@ 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 = 20;   // when weight changes by 100g, then send data
+static const uint16_t SEND_DIFF_THRESHOLD_5GRAMS = 10;   // when weight value drops by 50g, then send data
-static const long NOT_PLAUSIBLE_16 = 65535;
+static const long NOT_ATTACHED = -2147483648;
-static const long NOT_PLAUSIBLE_32 = 2147483647;
-static const byte INIT_PACKETS = 5;
 
 // must be 64 bytes long (size of kAppConf)
 typedef struct {

mini_beieli_node_hx711.h

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

mini_beieli_node_nau7802.h

@@ -1,5 +1,3 @@
-#pragma once
-
 #include <Wire.h>
 
 #ifndef _HELPER_H_
@@ -8,117 +6,72 @@
 
 #include "SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.h"
 
-#define SAMPLES 5
+#define SAMPLES 10
 
+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.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.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);
 
-  if (!myScale.begin(Wire, false))
+  pinMode(interruptPin, INPUT);
+  Wire.begin();
+
+  if (!myScale.begin())
   {
-    gCatena.SafePrintf("Scale not detected. Please check wiring. Freezing...\n");
+    Serial.println("Scale not detected. Please check wiring. Freezing...");
     return false;
   }
-  gCatena.SafePrintf("Scale detected!\n");
+  Serial.println("Scale detected!");
 
-  bool result = InitializeScales();
+  myScale.setIntPolarityHigh();
-  if (debug_level > 0) {
+  delay(500);
-    gCatena.SafePrintf("SetupScales done, result: %d\n", result);
-  }
 
-  return result;
+  return true;
 }
 
 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;
   } else {
     channelNumber = NAU7802_CHANNEL_2;
   }
-  unsigned long startTime = millis();
+  long startTime = millis();
   myScale.setChannel(channelNumber);
-  bool calibrate_success = myScale.calibrateAFE();
+  myScale.clearBit(NAU7802_PGA_PWR_PGA_CAP_EN, NAU7802_PGA_PWR);
-  if (! calibrate_success) {
+  myScale.setSampleRate(NAU7802_SPS_10);
-    if (debug_level > 0) {
+  myScale.setLDO(NAU7802_LDO_2V7);
-      gCatena.SafePrintf("Error: Calibration not successful!\n");
+  myScale.calibrateAFE();
-    }
+  //delay(500);
-  }
 
-  if (myScale.available()) {
+  long res;
-    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 array to hold readings
+  long readings[num_scale_readings];  // create arry to hold readings
+
   for (int i = 0; i < num_scale_readings; i++) {
-    //while (digitalRead(interruptPin) == LOW) {
+    while (digitalRead(interruptPin) == LOW) {
-    unsigned long mytimer = millis();
+      //while(! myScale.available()) {
-    int timeouts = 0;
+      // we set a timeout of 60 seconds for the measurement...
-    while (! myScale.available() && (timeouts < 3)) {
+      if ((millis() - startTime) > 60000) {
-      // we set a timeout of 10 seconds for the measurement...
-      if ((millis() - mytimer) > 10000) {
-        timeouts = timeouts + 1;
-        // Timeout reading scale...
-        Wire.endTransmission(true);
-        delay(50);
-        InitializeScales();
         if (debug_level > 0) {
           gCatena.SafePrintf("Timeout while reading scale...\n");
         }
+        return 0;
       }
-      delay(50);
+      delay(1);
     }
-    long reading;
+    readings[i] = myScale.getReading();  // fill the array with instantaneous readings from the scale
-    if (myScale.available()) {
-      reading = myScale.getReading();
-      readings[i] = reading;
-    }
-    if (debug_level > 0) {
-      gCatena.SafePrintf("Reading: %d\n", reading);
-    }
-    delay(50);
   }
 
-  unsigned long duration = millis() - startTime;
+  long duration = millis() - startTime;
   res = median(readings, num_scale_readings); // calculate median
 
   if (debug_level > 0) {
@@ -127,48 +80,20 @@ 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()
 {
-  if (debug_level > 0) {
+  myScale.powerUp(); //Power up scale. This scale takes ~600ms to boot and take reading.
-    gCatena.SafePrintf("PowerupScale Start\n");
-  }
-
-  InitializeScales();
-
-  if (debug_level > 0) {
-    gCatena.SafePrintf("PowerupScale Done\n");
-  }
 }