From 775eafc74fed7f3878c07033421966d61ac75137 Mon Sep 17 00:00:00 2001
From: Joerg Lehmann <joerg.lehmann@nbit.ch>
Date: Fri, 22 May 2020 14:52:09 +0200
Subject: [PATCH] revised version 20200522

---
 mini_beieli_node_nau7802.h | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/mini_beieli_node_nau7802.h b/mini_beieli_node_nau7802.h
index 20d45d2..4948860 100644
--- a/mini_beieli_node_nau7802.h
+++ b/mini_beieli_node_nau7802.h
@@ -41,6 +41,7 @@ bool SetupScales(byte dbg_level)
   myScale.clearBit(NAU7802_PGA_PWR_PGA_CAP_EN, NAU7802_PGA_PWR);
   myScale.setSampleRate(NAU7802_SPS_80);
   myScale.setLDO(NAU7802_LDO_3V3);
+  myScale.setGain(NAU7802_GAIN_128);
 
   if (debug_level > 0) {
     gCatena.SafePrintf("%010d - SetupScales done\n", millis());
@@ -51,6 +52,8 @@ bool SetupScales(byte dbg_level)
 
 long ReadScale(char channel)
 {
+  long res;
+
   if (debug_level > 0) {
     gCatena.SafePrintf("%010d - ReadScale Start\n", millis());
   }
@@ -63,15 +66,20 @@ long ReadScale(char channel)
   }
   long startTime = millis();
   myScale.setChannel(channelNumber);
-  myScale.calibrateAFE();
+  bool calibrate_success = myScale.calibrateAFE();
+  if (! calibrate_success) {
+    if (debug_level > 0) {
+      gCatena.SafePrintf("Error: Calibration not successful!\n");
+    }
+  }
 
-  long res;
-  long dummy;
+  int32_t 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) {
+    //while (digitalRead(interruptPin) == LOW) {
+    while (! myScale.available()) {
       if ((millis() - startTime) > 60000) {
         if (debug_level > 0) {
           gCatena.SafePrintf("Timeout while reading scale (dummy values)...\n");
@@ -87,7 +95,8 @@ long ReadScale(char channel)
   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 (digitalRead(interruptPin) == LOW) {
+    while (! myScale.available()) {
       //while(! myScale.available()) {
       // we set a timeout of 60 seconds for the measurement...
       if ((millis() - startTime) > 60000) {
@@ -98,7 +107,12 @@ long ReadScale(char channel)
       }
       delay(1);
     }
-    readings[i] = myScale.getReading();  // fill the array with instantaneous readings from the scale
+    int32_t reading = myScale.getReading();
+    delay(10);
+    if (debug_level > 0) {
+      gCatena.SafePrintf("Reading int32_t: %d\n", reading);
+    }
+    readings[i] = long(reading);  // fill the array with instantaneous readings from the scale
   }
 
   long duration = millis() - startTime;
@@ -110,6 +124,16 @@ 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);