plausibility checks, eliminiate NOT_ATTACHED

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  | cdbb111 | Thu, 11 Jun 2020 14:56:40 +0530  |
+| 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  |
@@ -52,3 +52,23 @@ index efff7d5..74efb37 100644
 
 `[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

@@ -156,7 +156,7 @@ void setup(void)
 
   setup_platform();
   SetupScales(config_data.debug_level);
-  ClearLoraData();
+  ClearLoraData(true);
   setup_bme280();
 
   setup_flash();
@@ -382,7 +382,7 @@ void loop()
   }
 }
 
-void ClearLoraData(void)
+void ClearLoraData(bool clearLastValues)
 {
   lora_data.version = LORA_DATA_VERSION;
   lora_data.vbat = 0;
@@ -412,13 +412,15 @@ 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)
@@ -504,7 +506,7 @@ uint8_t GetVBatValue(int millivolts)
 void DoDeepSleep(uint32_t sleep_time)
 {
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("DoDeepSleep, now going to deep sleep, millis: %d\n",millis());
+    gCatena.SafePrintf("DoDeepSleep, now going to deep sleep, millis: %d\n", millis());
   }
 
   // Prepare Deep Sleep
@@ -521,13 +523,19 @@ void DoDeepSleep(uint32_t sleep_time)
   deepSleepRecovery();
 
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("done with deep sleep, millis: %d\n",millis());
+    gCatena.SafePrintf("done with deep sleep, millis: %d\n", millis());
   }
 }
 
-void ReadSensors(SENSOR_data &sensor_data) {
+// Returns true if measurements are plausible, otherwise false
+bool ReadSensors(SENSOR_data &sensor_data) {
+  bool plausible;
+  bool plausible_a;
+  bool plausible_b;
   SENSOR_data res;
   int32_t weight_current32;
+  int32_t weight_current32_a;
+  int32_t weight_current32_b;
   long w1_0_real;
   long w2_0_real;
 
@@ -545,29 +553,13 @@ void ReadSensors(SENSOR_data &sensor_data) {
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("LoadCell is ready.\n");
     }
-    if (config_data.cal_w1_0 != NOT_ATTACHED) {
-      res.weight1 = (int32_t)ReadScale('A');
-      if (config_data.debug_level > 0) {
-        gCatena.SafePrintf("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("Load_cell 1 is disabled\n");
-      }
+    res.weight1 = (int32_t)ReadScale('A');
+    if (config_data.debug_level > 0) {
+      gCatena.SafePrintf("Load_cell 1 weight1_current: %ld\n", res.weight1);
     }
-    if (config_data.cal_w2_0 != NOT_ATTACHED) {
-      res.weight2 = (int32_t)ReadScale('B');
-      if (config_data.debug_level > 0) {
-        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("Load_cell 2 is disabled\n");
-      }
+    res.weight2 = (int32_t)ReadScale('B');
+    if (config_data.debug_level > 0) {
+      gCatena.SafePrintf("Load_cell 2 weight2_current: %ld\n", res.weight2);
     }
   }
   else {
@@ -580,18 +572,32 @@ void ReadSensors(SENSOR_data &sensor_data) {
   PowerdownScale();
 
   // 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);
+  weight_current32_a = (int32_t)((res.weight1 - w1_0_real) / config_data.cal_w1_factor);
+  weight_current32_b = (int32_t)((res.weight2 - w2_0_real) / config_data.cal_w2_factor);
+  weight_current32 = (int32_t)((weight_current32_a + weight_current32_b) / 5.0);
+
+  // we check if weights are plausible
+  plausible_a = (weight_current32_a > -10000) && (weight_current32_a < 150000);
+  plausible_b = (weight_current32_b > -10000) && (weight_current32_b < 150000);
+  plausible = (plausible_a && plausible_b);
 
   if (weight_current32 < 0) {
-    weight_current32 = 0;
+    if (plausible) { 
+      weight_current32 = 0;
+    } 
   } else if (weight_current32 > UINT16_MAX) {
     //weight_current32 = UINT16_MAX;
     // we set the weight to 0, as such high values are not realistic and probably a sign for bad calibration...
     weight_current32 = 0;
   }
-  if (config_data.cal_w1_0 == NOT_ATTACHED || config_data.cal_w2_0 == NOT_ATTACHED) {
-    // when at least one load cell is disabled, we multiply the measured weight by 2
-    weight_current32 = weight_current32 * 2;
+  if (!plausible) {
+    weight_current32 = NOT_PLAUSIBLE_16;
+    if (!plausible_a) {
+      res.weight1 = NOT_PLAUSIBLE_32;
+    }
+    if (!plausible_b) {
+      res.weight2 = NOT_PLAUSIBLE_32;
+    }
   }
   res.weight = (uint16_t)weight_current32;
 
@@ -619,6 +625,7 @@ void ReadSensors(SENSOR_data &sensor_data) {
   }
 
   sensor_data = res;
+  return plausible;
 }
 
 void StartNewIteration() {
@@ -630,7 +637,18 @@ void StartNewIteration() {
   iteration++;
 
   SENSOR_data current_sensor_reading;
-  ReadSensors(current_sensor_reading);
+  if (!ReadSensors(current_sensor_reading)) {
+    // we try a second time if Readings do not seem plausible
+    if (config_data.debug_level > 0) {
+      gCatena.SafePrintf("Readings do not seem plausible, try a second time\n");
+    }
+    delay(500);
+    if (!ReadSensors(current_sensor_reading)) {
+      if (config_data.debug_level > 0) {
+        gCatena.SafePrintf("Readings do not seem plausible for a second time, we give up!\n");
+      }
+    }
+  }
   int16_t temp_change;
 
   // vBus
@@ -679,25 +697,27 @@ 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) || ((my_position > 1) && (abs(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("startSendingUplink(), my_position: %d, iteration: %d, package_counter: %d\n", 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 <INIT_PACKETS> packets are "Init-Packets" or each INIT_PACKAGE_INTERVAL ...
-    startSendingUplink(next_package_is_init_package);
+    // 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 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("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();
@@ -727,6 +747,9 @@ void StartNewIteration() {
   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;
@@ -768,7 +791,7 @@ void StartNewIteration() {
   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);
+    gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
   }
 
   if (!fUsbPower && !stop_iterations)  {
@@ -791,7 +814,7 @@ void StartNewIteration() {
   }
 }
 
-void startSendingUplink(bool firstTime)
+void startSendingUplink(bool firstTime, bool confirmed)
 {
   send_in_progress = true;
 
@@ -815,6 +838,11 @@ void startSendingUplink(bool firstTime)
     fConfirmed = true;
   }
 
+  // we can overwrite fConfirmed
+  if (confirmed) {
+    fConfirmed = true;
+  }
+
   if (firstTime) {
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("SendBuffer firstTime\n");
@@ -824,19 +852,19 @@ void startSendingUplink(bool firstTime)
       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);
+        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);
+      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("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)) {
@@ -844,16 +872,16 @@ void startSendingUplink(bool firstTime)
       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);
+        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);
+      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
     }
   }
 
-  ClearLoraData();
+  ClearLoraData(false);
 }
 
 static void sendBufferDoneCb(
@@ -1185,7 +1213,7 @@ cCommandStream::CommandStatus cmdCalibrateScales(cCommandStream * pThis, void *p
   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();
@@ -1203,15 +1231,9 @@ cCommandStream::CommandStatus cmdCalibrateScaleA(cCommandStream * pThis, void *p
   String w1_gramm(argv[1]);
   long weight1;
 
-  if (w1_gramm == "NA") {
-    // scale a is not connected
-    config_data.cal_w1_factor = 1.0;
-    config_data.cal_w1_0 = NOT_ATTACHED;
-  } else {
-    setup_scales();
-    weight1 = ReadScale('A');
-    config_data.cal_w1_factor = (float)((weight1 - config_data.cal_w1_0) / w1_gramm.toFloat());
-  }
+  setup_scales();
+  weight1 = ReadScale('A');
+  config_data.cal_w1_factor = (float)((weight1 - config_data.cal_w1_0) / w1_gramm.toFloat());
 
   gCatena.getFram()->saveField(cFramStorage::kAppConf, (const uint8_t *)&config_data, sizeof(config_data));
 
@@ -1225,15 +1247,9 @@ cCommandStream::CommandStatus cmdCalibrateScaleB(cCommandStream * pThis, void *p
   String w2_gramm(argv[1]);
   long weight2;
 
-  if (w2_gramm == "NA") {
-    // scale b is not connected
-    config_data.cal_w2_factor = 1.0;
-    config_data.cal_w2_0 = NOT_ATTACHED;
-  } else {
-    setup_scales();
-    weight2 = ReadScale('B');
-    config_data.cal_w2_factor = (float)((weight2 - config_data.cal_w2_0) / w2_gramm.toFloat());
-  }
+  setup_scales();
+  weight2 = ReadScale('B');
+  config_data.cal_w2_factor = (float)((weight2 - config_data.cal_w2_0) / w2_gramm.toFloat());
 
   gCatena.getFram()->saveField(cFramStorage::kAppConf, (const uint8_t *)&config_data, sizeof(config_data));
 

mini_beieli_node.h

@@ -56,7 +56,7 @@ enum {
   |
   \****************************************************************************/
 
-static const int32_t fwVersion = 20200611;
+static const int32_t fwVersion = 20200701;
 
 static const byte INIT_PACKAGE_INTERVAL = 100;  // send an init package every 100 packages;
 static const byte MAX_VALUES_TO_SEND = 8;
@@ -65,7 +65,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 long NOT_ATTACHED = -2147483648;
+static const long NOT_PLAUSIBLE_16 = 65535;
+static const long NOT_PLAUSIBLE_32 = 2147483647;
 static const byte INIT_PACKETS = 5;
 
 // must be 64 bytes long (size of kAppConf)

mini_beieli_node_nau7802.h

@@ -97,17 +97,20 @@ long ReadScale(char channel)
   for (int i = 0; i < num_scale_readings; i++) {
     //while (digitalRead(interruptPin) == LOW) {
     long mytimer = millis();
-    while (! myScale.available()) {
+    int timeouts = 0;
+    while (! myScale.available() && (timeouts < 3)) {
       // 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");
         }
-        break;
       }
-      delay(1);
+      delay(50);
     }
     long reading;
     if (myScale.available()) {
@@ -117,7 +120,7 @@ long ReadScale(char channel)
     if (debug_level > 0) {
       gCatena.SafePrintf("Reading: %d\n", reading);
     }
-    delay(10);
+    delay(50);
   }
 
   long duration = millis() - startTime;