Compare commits

...

5 Commits

3 changed files with 7 additions and 12 deletions

View File

@ -22,7 +22,7 @@ Das sind die verwendeten Libraries [1]:
| https://github.com/mcci-catena/Adafruit_Sensor.git | f2af6f4 | Tue, 1 Sep 2015 15:57:59 +0200 | | 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 | 9191f0c | Tue, 30 Jun 2020 09:56:19 -0400 | | https://github.com/mcci-catena/arduino-lmic.git | 9191f0c | Tue, 30 Jun 2020 09:56:19 -0400 |
| https://github.com/mcci-catena/arduino-lorawan.git | 4bc0d48 | Sat, 9 May 2020 12:38:28 -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 | 478ad23 | Fri, 26 Jun 2020 18:39:01 -0400 | | https://github.com/mcci-catena/Catena-Arduino-Platform.git | 7620a89 | Fri, 31 Jul 2020 14:14:30 -0400 |
| https://github.com/mcci-catena/Catena-mcciadk.git | a428006 | Sat, 21 Dec 2019 20:45:26 -0500 | | 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/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 | | https://github.com/tatobari/Q2-HX711-Arduino-Library.git | ccda8d8 | Wed, 13 Mar 2019 12:41:44 -0300 |

View File

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

View File

@ -10,7 +10,6 @@
#define SAMPLES 5 #define SAMPLES 5
NAU7802 myScale; //Create instance of the NAU7802 class
byte debug_level; byte debug_level;
@ -27,14 +26,10 @@ bool InitializeScales()
result = myScale.reset(); //Reset all registers result = myScale.reset(); //Reset all registers
result &= myScale.powerUp(); //Power on analog and digital sections of the scale result &= myScale.powerUp(); //Power on analog and digital sections of the scale
result &= myScale.setIntPolarityHigh();
result &= myScale.setLDO(NAU7802_LDO_3V3); //Set LDO to 3.3V result &= myScale.setLDO(NAU7802_LDO_3V3); //Set LDO to 3.3V
result &= myScale.setGain(NAU7802_GAIN_128); //Set gain to 128 result &= myScale.setGain(NAU7802_GAIN_128); //Set gain to 128
result &= myScale.setSampleRate(NAU7802_SPS_40); //Set samples per second to 40 result &= myScale.setSampleRate(NAU7802_SPS_40); //Set samples per second to 40
result &= myScale.setRegister(NAU7802_ADC, 0x30); //Turn off CLK_CHP. From 9.1 power on sequencing. result &= myScale.setRegister(NAU7802_ADC, 0x30); //Turn off CLK_CHP. From 9.1 power on sequencing.
result &= myScale.clearBit(NAU7802_PGA_PWR_PGA_CAP_EN, NAU7802_PGA_PWR);
//result &= myScale.setRegister(NAU7802_OTP_B1, 0x30);
//result &= myScale.setRegister(NAU7802_PGA, NAU7802_PGA_OUT_EN | NAU7802_PGA_CHP_DIS);
result &= myScale.calibrateAFE(); //Re-cal analog front end when we change gain, sample rate, or channel result &= myScale.calibrateAFE(); //Re-cal analog front end when we change gain, sample rate, or channel
@ -47,7 +42,7 @@ bool SetupScales(byte dbg_level)
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("SetupScales start\n"); gCatena.SafePrintf("SetupScales start\n");
} }
// pinMode(interruptPin, INPUT); // pinMode(interruptPin, INPUT);
if (!myScale.begin(Wire, false)) if (!myScale.begin(Wire, false))
{ {
@ -93,7 +88,7 @@ long ReadScale(char channel)
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
// 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 array 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) {
unsigned long mytimer = millis(); unsigned long mytimer = millis();