drpuur
/
mini-beieli-node
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace bodge/HX711 with Sthing/Q2-HX711-Arduino-Library

This commit is contained in:
Joerg Lehmann 2020-02-10 19:41:40 +01:00
parent 3f348f2abb
commit e26fc4051b
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mini-beieli-node.ino
View File

@ -25,7 +25,7 @@
#include <cmath> #include <cmath>
#include <type_traits> #include <type_traits>
#include <HX711.h> #include <Q2HX711.h>
#include "mini_beieli_node.h" #include "mini_beieli_node.h"
using namespace McciCatena; using namespace McciCatena;
@ -132,7 +132,7 @@ Catena_Mx25v8035f gFlash;
bool fFlash; bool fFlash;
// Scales // Scales
HX711 LoadCell; Q2HX711 hx711(A1, A0);
// USB power // USB power
bool fUsbPower; bool fUsbPower;
@ -302,18 +302,8 @@ bool setup_scales(void)
// Enable Power // Enable Power
digitalWrite(D10, HIGH); digitalWrite(D10, HIGH);
// Initialize library with data output pin, clock input pin and gain factor. // we wait 400ms (settling time according HX711 datasheet @ 10 SPS
// Channel selection is made by passing the appropriate gain: delay(400);
// - With a gain factor of 64 or 128, channel A is selected
// - With a gain factor of 32, channel B is selected
// By omitting the gain factor parameter, the library
// default "128" (Channel A) is used here.
LoadCell.begin(A1, A0, 32);
if (!(LoadCell.wait_ready_timeout(2000))) {
gCatena.SafePrintf("%010d - Scale not ready after Init.\n");
res = false;
}
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - setup_scale done\n", millis()); gCatena.SafePrintf("%010d - setup_scale done\n", millis());
@ -576,7 +566,7 @@ void bubbleSort(long A[], int len) {
long my_read_average(byte gain, byte times) { long my_read_average(byte gain, byte times) {
long res; long res;
int const num_scale_readings = 25; // number of instantaneous scale readings to calculate the median int const num_scale_readings = 50; // number of instantaneous scale readings to calculate the median
// we use the median, not the average, see https://community.particle.io/t/boron-gpio-provides-less-current-than-electrons-gpio/46647/13 // we use the median, not the average, see https://community.particle.io/t/boron-gpio-provides-less-current-than-electrons-gpio/46647/13
long readings[num_scale_readings]; // create arry to hold readings long readings[num_scale_readings]; // create arry to hold readings
@ -585,12 +575,10 @@ long my_read_average(byte gain, byte times) {
gCatena.SafePrintf("%010d - my_read_average, measurements: ", millis()); gCatena.SafePrintf("%010d - my_read_average, measurements: ", millis());
} }
LoadCell.set_gain(gain); hx711.setGain(gain);
// we wait 400ms (settling time according HX711 datasheet @ 10 SPS
delay(400);
for (int i = 0; i < num_scale_readings; i++) { for (int i = 0; i < num_scale_readings; i++) {
readings[i] = LoadCell.read(); // fill the array with instantaneous readings from the scale readings[i] = hx711.read(); // fill the array with instantaneous readings from the scale
} }
res = median(readings, num_scale_readings); // calculate median res = median(readings, num_scale_readings); // calculate median

2
mini_beieli_node.h
View File

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