revised version 20200522

This commit is contained in:
Joerg Lehmann 2020-05-22 14:52:09 +02:00
parent 760ae035fd
commit 775eafc74f
1 changed files with 30 additions and 6 deletions

View File

@ -41,6 +41,7 @@ bool SetupScales(byte dbg_level)
myScale.clearBit(NAU7802_PGA_PWR_PGA_CAP_EN, NAU7802_PGA_PWR); myScale.clearBit(NAU7802_PGA_PWR_PGA_CAP_EN, NAU7802_PGA_PWR);
myScale.setSampleRate(NAU7802_SPS_80); myScale.setSampleRate(NAU7802_SPS_80);
myScale.setLDO(NAU7802_LDO_3V3); myScale.setLDO(NAU7802_LDO_3V3);
myScale.setGain(NAU7802_GAIN_128);
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - SetupScales done\n", millis()); gCatena.SafePrintf("%010d - SetupScales done\n", millis());
@ -51,6 +52,8 @@ bool SetupScales(byte dbg_level)
long ReadScale(char channel) long ReadScale(char channel)
{ {
long res;
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - ReadScale Start\n", millis()); gCatena.SafePrintf("%010d - ReadScale Start\n", millis());
} }
@ -63,15 +66,20 @@ long ReadScale(char channel)
} }
long startTime = millis(); long startTime = millis();
myScale.setChannel(channelNumber); 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; int32_t dummy;
long dummy;
int const ignore_readings = IGNORE_READINGS; // number of first <n> readings to ignore 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 int const num_scale_readings = SAMPLES; // number of instantaneous scale readings to calculate the median
for (int i = 0; i < ignore_readings; i++) { for (int i = 0; i < ignore_readings; i++) {
while (digitalRead(interruptPin) == LOW) { //while (digitalRead(interruptPin) == LOW) {
while (! myScale.available()) {
if ((millis() - startTime) > 60000) { if ((millis() - startTime) > 60000) {
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("Timeout while reading scale (dummy values)...\n"); gCatena.SafePrintf("Timeout while reading scale (dummy values)...\n");
@ -87,7 +95,8 @@ long ReadScale(char channel)
startTime = millis(); startTime = millis();
long readings[num_scale_readings]; // create arry to hold readings long readings[num_scale_readings]; // create arry to hold readings
for (int i = 0; i < num_scale_readings; i++) { for (int i = 0; i < num_scale_readings; i++) {
while (digitalRead(interruptPin) == LOW) { //while (digitalRead(interruptPin) == LOW) {
while (! myScale.available()) {
//while(! myScale.available()) { //while(! myScale.available()) {
// we set a timeout of 60 seconds for the measurement... // we set a timeout of 60 seconds for the measurement...
if ((millis() - startTime) > 60000) { if ((millis() - startTime) > 60000) {
@ -98,7 +107,12 @@ long ReadScale(char channel)
} }
delay(1); 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; long duration = millis() - startTime;
@ -110,6 +124,16 @@ long ReadScale(char channel)
sdev = stddev(readings, num_scale_readings); sdev = stddev(readings, num_scale_readings);
float sdev_proc; float sdev_proc;
sdev_proc = 100 * (sdev / float(res)); 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: %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("Standard Deviation / Median (Percent): %d.%03d\n", (int)sdev_proc, (int)abs(sdev_proc * 1000) % 1000);
gCatena.SafePrintf("Duration (ms): %d\n", duration); gCatena.SafePrintf("Duration (ms): %d\n", duration);