handle scale timeouts better

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,7 +31,7 @@ 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 SF10 is used initially:
+Patch arduino-lmic, so initial SF12 is used initially:
 
 `
 [joerg@cinnamon src]$ git diff
@@ -44,7 +44,7 @@ index efff7d5..74efb37 100644
  #define LMICbandplan_isFSK()    (/* RX datarate */LMIC.dndr == EU868_DR_FSK)
  
 -#define LMICbandplan_getInitialDrJoin() (EU868_DR_SF7)
-+#define LMICbandplan_getInitialDrJoin() (EU868_DR_SF10)
++#define LMICbandplan_getInitialDrJoin() (EU868_DR_SF12)
  
  void LMICeu868_setBcnRxParams(void);
  #define LMICbandplan_setBcnRxParams()   LMICeu868_setBcnRxParams()
@@ -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

@@ -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 },
@@ -154,7 +156,7 @@ void setup(void)
 
   setup_platform();
   SetupScales(config_data.debug_level);
-  ClearLoraData();
+  ClearLoraData(true);
   setup_bme280();
 
   setup_flash();
@@ -380,7 +382,7 @@ void loop()
   }
 }
 
-void ClearLoraData(void)
+void ClearLoraData(bool clearLastValues)
 {
   lora_data.version = LORA_DATA_VERSION;
   lora_data.vbat = 0;
@@ -410,6 +412,7 @@ void ClearLoraData(void)
   my_position = 0;
 
   // We initialize last_sensor_reading
+  if (clearLastValues) {
     last_sensor_reading.vbat = 0;
     last_sensor_reading.weight1 = 0;
     last_sensor_reading.weight2 = 0;
@@ -418,6 +421,7 @@ void ClearLoraData(void)
     last_sensor_reading.humidity = 0;
     last_sensor_reading.pressure = 0;
   }
+}
 
 void ShowLORAData(bool firstTime)
 {
@@ -677,25 +681,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) || (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();
@@ -725,6 +731,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;
@@ -769,7 +778,7 @@ void StartNewIteration() {
     gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n", LMIC.seqnoUp, LMIC.seqnoDn);
   }
 
-  if (!fUsbPower) {
+  if (!fUsbPower && !stop_iterations)  {
     DoDeepSleep(sleep_time_sec);
     if (! stop_iterations) {
       start_new_iteration = true;
@@ -789,7 +798,7 @@ void StartNewIteration() {
   }
 }
 
-void startSendingUplink(bool firstTime)
+void startSendingUplink(bool firstTime, bool confirmed)
 {
   send_in_progress = true;
 
@@ -813,6 +822,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");
@@ -851,7 +865,7 @@ void startSendingUplink(bool firstTime)
     }
   }
 
-  ClearLoraData();
+  ClearLoraData(false);
 }
 
 static void sendBufferDoneCb(
@@ -1113,7 +1127,6 @@ cCommandStream::CommandStatus cmdHello(cCommandStream * pThis, void *pContext, i
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-
 cCommandStream::CommandStatus cmdGetCalibrationSettings(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   pThis->printf("{\n");
@@ -1178,6 +1191,25 @@ cCommandStream::CommandStatus cmdCalibrateZeroScaleB(cCommandStream * pThis, voi
   return cCommandStream::CommandStatus::kSuccess;
 }
 
+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]);

mini_beieli_node.h

@@ -56,7 +56,7 @@ enum {
   |
   \****************************************************************************/
 
-static const int32_t fwVersion = 20200606;
+static const int32_t fwVersion = 20200630;
 
 static const byte INIT_PACKAGE_INTERVAL = 100;  // send an init package every 100 packages;
 static const byte MAX_VALUES_TO_SEND = 8;

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;