try second time if first try fails (SendBuffer)

mini-beieli-node.ino

@@ -783,17 +783,37 @@ void startSendingUplink(bool firstTime)
     fConfirmed = true;
   }
 
+  gCatena.poll();
+
   if (firstTime) {
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("SendBuffer firstTime\n");
     }
-    gLoRaWAN.SendBuffer((uint8_t*)&lora_data_first, sizeof(LORA_data_first), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
+    bool success = gLoRaWAN.SendBuffer((uint8_t*)&lora_data_first, sizeof(LORA_data_first), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
+    // we try a second time if not successful...
+    if (! success) {
+      if (config_data.debug_level > 0) {
+        gCatena.SafePrintf("SendBuffer was not successful, we try a second time...\n");
+      }
+      gCatena.poll();
+      delay(500);
+      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("SendBuffer not firstTime\n");
     }
-    gLoRaWAN.SendBuffer((uint8_t*)&lora_data, sizeof(LORA_data), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
+    bool success = gLoRaWAN.SendBuffer((uint8_t*)&lora_data, sizeof(LORA_data), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
+    // we try a second time if not successful...
+    if (! success) {
+      if (config_data.debug_level > 0) {
+        gCatena.SafePrintf("SendBuffer was not successful, we try a second time...\n");
+      }
+      gCatena.poll();
+      delay(500);
+      gLoRaWAN.SendBuffer((uint8_t*)&lora_data, sizeof(LORA_data), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
+    }
     package_counter++;
   }
 

mini_beieli_node.h

@@ -56,7 +56,7 @@ enum {
   |
   \****************************************************************************/
 
-static const int32_t fwVersion = 20200527;
+static const int32_t fwVersion = 20200528;
 
 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

@@ -96,9 +96,11 @@ long ReadScale(char channel)
   long readings[num_scale_readings];  // create arry to hold readings
   for (int i = 0; i < num_scale_readings; i++) {
     //while (digitalRead(interruptPin) == LOW) {
+    long mytimer = millis();
     while (! myScale.available()) {
       // we set a timeout of 10 seconds for the measurement...
-      if ((millis() - startTime) > 10000) {
+      if ((millis() - mytimer) > 10000) {
+        // Timeout reading scale...
         Wire.endTransmission(true);
         if (debug_level > 0) {
           gCatena.SafePrintf("Timeout while reading scale...\n");
@@ -107,11 +109,14 @@ long ReadScale(char channel)
       }
       delay(1);
     }
-    long reading = myScale.getReading();
+    long reading;
+    if (myScale.available()) {
+      reading = myScale.getReading();  
+      readings[i] = reading;  
+    }
     if (debug_level > 0) {
       gCatena.SafePrintf("Reading: %d\n", reading);
     }
-    readings[i] = reading;  // fill the array with instantaneous readings from the scale
     delay(10);
   }