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

remove timestamps in debug messages, debug nau7802 i2c connection

This commit is contained in:
Joerg Lehmann 2020-05-23 18:13:08 +02:00
parent 775eafc74f
commit 1ce266ab22
4 changed files with 90 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
mini-beieli-node.ino
View File

@ -170,7 +170,7 @@ void setup(void)
void setup_platform(void) void setup_platform(void)
{ {
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - setup_platform\n", millis()); gCatena.SafePrintf("Setup_platform\n");
} }
/* add our application-specific commands */ /* add our application-specific commands */
@ -181,12 +181,12 @@ void setup_platform(void)
// read config_data from fram... // read config_data from fram...
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - Reading Calibration Config from FRAM...\n", millis()); gCatena.SafePrintf("Reading Calibration Config from FRAM...\n");
} }
gCatena.getFram()->getField(cFramStorage::kAppConf, (uint8_t *)&config_data, sizeof(config_data)); gCatena.getFram()->getField(cFramStorage::kAppConf, (uint8_t *)&config_data, sizeof(config_data));
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - setup_platform, this is the configuration\n", millis()); gCatena.SafePrintf("Setup_platform, this is the configuration\n");
gCatena.SafePrintf("cal_w1_0: %d\n", config_data.cal_w1_0); gCatena.SafePrintf("cal_w1_0: %d\n", config_data.cal_w1_0);
gCatena.SafePrintf("cal_w2_0: %d\n", config_data.cal_w2_0); gCatena.SafePrintf("cal_w2_0: %d\n", config_data.cal_w2_0);
gCatena.SafePrintf("cal_w1_factor: %d.%03d\n", (int)config_data.cal_w1_factor, (int)abs(config_data.cal_w1_factor * 1000) % 1000); gCatena.SafePrintf("cal_w1_factor: %d.%03d\n", (int)config_data.cal_w1_factor, (int)abs(config_data.cal_w1_factor * 1000) % 1000);
@ -286,7 +286,7 @@ void setup_platform(void)
void setup_bme280(void) void setup_bme280(void)
{ {
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - setup_bme280\n", millis()); gCatena.SafePrintf("Setup_bme280\n");
} }
if (gBME280.begin(BME280_ADDRESS, Adafruit_BME280::OPERATING_MODE::Sleep)) { if (gBME280.begin(BME280_ADDRESS, Adafruit_BME280::OPERATING_MODE::Sleep)) {
@ -301,7 +301,7 @@ void setup_bme280(void)
bool setup_scales(void) bool setup_scales(void)
{ {
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - setup_scales\n", millis()); gCatena.SafePrintf("Setup_scales\n");
} }
bool res; bool res;
@ -311,7 +311,7 @@ bool setup_scales(void)
PowerupScale(); PowerupScale();
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - setup_scale done\n", millis()); gCatena.SafePrintf("Setup_scale done\n");
} }
return res; return res;
@ -320,14 +320,14 @@ bool setup_scales(void)
void setup_flash(void) void setup_flash(void)
{ {
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - setup_flash\n", millis()); gCatena.SafePrintf("setup_flash\n");
} }
if (gFlash.begin(&gSPI2, Catena::PIN_SPI2_FLASH_SS)) { if (gFlash.begin(&gSPI2, Catena::PIN_SPI2_FLASH_SS)) {
fFlash = true; fFlash = true;
gFlash.powerDown(); gFlash.powerDown();
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - FLASH found, but power down\n", millis()); gCatena.SafePrintf("FLASH found, but power down\n");
} }
} }
else { else {
@ -335,7 +335,7 @@ void setup_flash(void)
gFlash.end(); gFlash.end();
gSPI2.end(); gSPI2.end();
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - No FLASH found: check hardware\n", millis()); gCatena.SafePrintf("FLASH found: check hardware\n");
} }
} }
} }
@ -343,7 +343,7 @@ void setup_flash(void)
void setup_uplink(void) void setup_uplink(void)
{ {
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - setup_uplink\n", millis()); gCatena.SafePrintf("setup_uplink\n");
} }
LMIC_setClockError(1 * 65536 / 100); LMIC_setClockError(1 * 65536 / 100);
@ -354,14 +354,14 @@ void setup_uplink(void)
// Do an unjoin, so every reboot will trigger a join // Do an unjoin, so every reboot will trigger a join
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - do an unjoin...\n", millis()); gCatena.SafePrintf("do an unjoin...\n");
} }
LMIC_unjoin(); LMIC_unjoin();
/* trigger a join by sending the first packet */ /* trigger a join by sending the first packet */
if (!(gCatena.GetOperatingFlags() & static_cast<uint32_t>(gCatena.OPERATING_FLAGS::fManufacturingTest))) { if (!(gCatena.GetOperatingFlags() & static_cast<uint32_t>(gCatena.OPERATING_FLAGS::fManufacturingTest))) {
if (!gLoRaWAN.IsProvisioned()) if (!gLoRaWAN.IsProvisioned())
gCatena.SafePrintf("%010d - LoRaWAN not provisioned yet. Use the commands to set it up.\n"); gCatena.SafePrintf("LoRaWAN not provisioned yet. Use the commands to set it up.\n");
else { else {
if (config_data.debug_level > 1) { if (config_data.debug_level > 1) {
gLed.Set(LedPattern::Joining); gLed.Set(LedPattern::Joining);
@ -422,7 +422,7 @@ void ClearLoraData(void)
void ShowLORAData(bool firstTime) void ShowLORAData(bool firstTime)
{ {
gCatena.SafePrintf("%010d - ShowLORAData\n", millis()); gCatena.SafePrintf("ShowLORAData\n");
if (firstTime) { if (firstTime) {
@ -503,7 +503,7 @@ uint8_t GetVBatValue(int millivolts)
void DoDeepSleep(uint32_t sleep_time) void DoDeepSleep(uint32_t sleep_time)
{ {
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - DoDeepSleep, now going to deep sleep\n", millis()); gCatena.SafePrintf("DoDeepSleep, now going to deep sleep\n");
} }
// Prepare Deep Sleep // Prepare Deep Sleep
@ -520,7 +520,7 @@ void DoDeepSleep(uint32_t sleep_time)
deepSleepRecovery(); deepSleepRecovery();
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - done with deep sleep\n", millis()); gCatena.SafePrintf("done with deep sleep\n");
} }
} }
@ -534,7 +534,7 @@ void ReadSensors(SENSOR_data &sensor_data) {
int vbat_mv = (int)(gCatena.ReadVbat() * 1000.0f); int vbat_mv = (int)(gCatena.ReadVbat() * 1000.0f);
res.vbat = GetVBatValue(vbat_mv); res.vbat = GetVBatValue(vbat_mv);
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - vBat: %d mV\n", millis(), vbat_mv); gCatena.SafePrintf("vBat: %d mV\n", vbat_mv);
} }
// Read Scales // Read Scales
@ -542,36 +542,36 @@ void ReadSensors(SENSOR_data &sensor_data) {
w2_0_real = config_data.cal_w2_0; w2_0_real = config_data.cal_w2_0;
if (setup_scales()) { if (setup_scales()) {
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - LoadCell is ready.\n", millis()); gCatena.SafePrintf("LoadCell is ready.\n");
} }
if (config_data.cal_w1_0 != NOT_ATTACHED) { if (config_data.cal_w1_0 != NOT_ATTACHED) {
res.weight1 = (int32_t)ReadScale('A'); res.weight1 = (int32_t)ReadScale('A');
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - Load_cell 1 weight1_current: %ld\n", millis(), res.weight1); gCatena.SafePrintf("Load_cell 1 weight1_current: %ld\n", res.weight1);
} }
} else { } else {
res.weight1 = 0; res.weight1 = 0;
w1_0_real = 0; w1_0_real = 0;
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - Load_cell 1 is disabled\n", millis()); gCatena.SafePrintf("Load_cell 1 is disabled\n");
} }
} }
if (config_data.cal_w2_0 != NOT_ATTACHED) { if (config_data.cal_w2_0 != NOT_ATTACHED) {
res.weight2 = (int32_t)ReadScale('B'); res.weight2 = (int32_t)ReadScale('B');
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - Load_cell 2 weight2_current: %ld\n", millis(), res.weight2); gCatena.SafePrintf("Load_cell 2 weight2_current: %ld\n", res.weight2);
} }
} else { } else {
res.weight2 = 0; res.weight2 = 0;
w2_0_real = 0; w2_0_real = 0;
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - Load_cell 2 is disabled\n", millis()); gCatena.SafePrintf("Load_cell 2 is disabled\n");
} }
} }
} }
else { else {
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - LoadCell not ready.\n", millis()); gCatena.SafePrintf("LoadCell not ready.\n");
} }
} }
@ -604,8 +604,7 @@ void ReadSensors(SENSOR_data &sensor_data) {
// humidity is one byte, where 0 == 0/256 and 0xFF == 255/256. // humidity is one byte, where 0 == 0/256 and 0xFF == 255/256.
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf( gCatena.SafePrintf(
"%010d - BME280: T: %d P: %d RH: %d\n", "BME280: T: %d P: %d RH: %d\n",
millis(),
(int)m.Temperature, (int)m.Temperature,
(int)m.Pressure, (int)m.Pressure,
(int)m.Humidity); (int)m.Humidity);
@ -614,7 +613,7 @@ void ReadSensors(SENSOR_data &sensor_data) {
res.humidity = (uint8_t)m.Humidity; res.humidity = (uint8_t)m.Humidity;
res.pressure = (uint8_t)((m.Pressure / 100) - PRESSURE_OFFSET); res.pressure = (uint8_t)((m.Pressure / 100) - PRESSURE_OFFSET);
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - pressure_current: %d\n", millis(), res.pressure); gCatena.SafePrintf("pressure_current: %d\n", res.pressure);
} }
} }
@ -635,7 +634,7 @@ void StartNewIteration() {
// vBus // vBus
float vBus = gCatena.ReadVbus(); float vBus = gCatena.ReadVbus();
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - vBus: %d mV\n", millis(), (int)(vBus * 1000.0f)); gCatena.SafePrintf("vBus: %d mV\n", (int)(vBus * 1000.0f));
} }
fUsbPower = (vBus > 4.3) ? true : false; fUsbPower = (vBus > 4.3) ? true : false;
@ -681,7 +680,7 @@ void StartNewIteration() {
if ( (next_package_is_init_package) || (my_position >= MAX_VALUES_TO_SEND) || ((last_sensor_reading.weight - current_sensor_reading.weight) > SEND_DIFF_THRESHOLD_5GRAMS) || ((millis() - timer_pos0) > 3600000)) { if ( (next_package_is_init_package) || (my_position >= MAX_VALUES_TO_SEND) || ((last_sensor_reading.weight - current_sensor_reading.weight) > SEND_DIFF_THRESHOLD_5GRAMS) || ((millis() - timer_pos0) > 3600000)) {
lora_data.offset_last_reading = (uint8_t)((millis() - timer_pos0) / 1000 / 60); lora_data.offset_last_reading = (uint8_t)((millis() - timer_pos0) / 1000 / 60);
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - startSendingUplink(), my_position: %d, iteration: %d, package_counter: %d\n", millis(), my_position, iteration, package_counter); gCatena.SafePrintf("startSendingUplink(), my_position: %d, iteration: %d, package_counter: %d\n", my_position, iteration, package_counter);
} }
// the first <INIT_PACKETS> packets are "Init-Packets" or each INIT_PACKAGE_INTERVAL ... // the first <INIT_PACKETS> packets are "Init-Packets" or each INIT_PACKAGE_INTERVAL ...
startSendingUplink(next_package_is_init_package); startSendingUplink(next_package_is_init_package);
@ -694,7 +693,7 @@ void StartNewIteration() {
// Loop while sending is in progress, timeout just in case after 300 seconds // Loop while sending is in progress, timeout just in case after 300 seconds
long start_time = millis(); long start_time = millis();
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - waiting while send is in progress\n", millis()); gCatena.SafePrintf("waiting while send is in progress\n");
} }
while (send_in_progress && ((millis() - start_time) < 300000)) while (send_in_progress && ((millis() - start_time) < 300000))
{ {
@ -703,7 +702,7 @@ void StartNewIteration() {
} }
wait_time = (uint32_t)((millis() - start_time) / 1000); wait_time = (uint32_t)((millis() - start_time) / 1000);
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - end waiting, wait time was %d seconds\n", millis(), wait_time); gCatena.SafePrintf("end waiting, wait time was %d seconds\n", wait_time);
} }
} }
@ -726,11 +725,11 @@ void StartNewIteration() {
} }
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - now going to sleep for %d seconds...\n", millis(), sleep_time_sec); gCatena.SafePrintf("now going to sleep for %d seconds...\n", sleep_time_sec);
if (fUsbPower) { if (fUsbPower) {
gCatena.SafePrintf("%010d - USB Power is on\n", millis()); gCatena.SafePrintf("USB Power is on\n");
} else { } else {
gCatena.SafePrintf("%010d - USB Power is off\n", millis()); gCatena.SafePrintf("USB Power is off\n");
} }
//Serial.flush(); //Serial.flush();
if (config_data.debug_level > 1) { if (config_data.debug_level > 1) {
@ -751,7 +750,7 @@ void StartNewIteration() {
} }
else { else {
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - light sleep; os_setTimedCallback for startNewIterationCb in %d...seconds\n", millis(), sleep_time_sec); gCatena.SafePrintf("light sleep; os_setTimedCallback for startNewIterationCb in %d...seconds\n", sleep_time_sec);
} }
os_setTimedCallback( os_setTimedCallback(
&iterationJob, &iterationJob,
@ -786,13 +785,13 @@ void startSendingUplink(bool firstTime)
if (firstTime) { if (firstTime) {
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - SendBuffer firstTime\n", millis()); gCatena.SafePrintf("SendBuffer firstTime\n");
} }
gLoRaWAN.SendBuffer((uint8_t*)&lora_data_first, sizeof(LORA_data_first), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort); gLoRaWAN.SendBuffer((uint8_t*)&lora_data_first, sizeof(LORA_data_first), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
package_counter++; package_counter++;
} else { } else {
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - SendBuffer not firstTime\n", millis()); gCatena.SafePrintf("SendBuffer not firstTime\n");
} }
gLoRaWAN.SendBuffer((uint8_t*)&lora_data, sizeof(LORA_data), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort); gLoRaWAN.SendBuffer((uint8_t*)&lora_data, sizeof(LORA_data), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort);
package_counter++; package_counter++;
@ -823,7 +822,7 @@ static void sendBufferDoneCb(
gLoRaWAN.Shutdown(); gLoRaWAN.Shutdown();
} }
else if (config_data.debug_level > 0) { else if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - send buffer failed\n", millis()); gCatena.SafePrintf("send buffer failed\n");
} }
} }
@ -854,7 +853,7 @@ static void settleDoneCb(
const bool fDeepSleep = checkDeepSleep(); const bool fDeepSleep = checkDeepSleep();
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - settleDoneCb\n", millis()); gCatena.SafePrintf("settleDoneCb\n");
} }
if (config_data.debug_level > 2) { if (config_data.debug_level > 2) {
@ -1004,7 +1003,7 @@ void doDeepSleep(osjob_t *pJob)
); );
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - doDeepSleep, sleepInterval: %d...\n", millis(), sleepInterval); gCatena.SafePrintf("doDeepSleep, sleepInterval: %d...\n", sleepInterval);
} }
/* ok... now it's time for a deep sleep */ /* ok... now it's time for a deep sleep */
@ -1046,7 +1045,7 @@ void doLightSleep(osjob_t *pJob)
if (config_data.debug_level > 1) { if (config_data.debug_level > 1) {
gLed.Set(LedPattern::Sleeping); gLed.Set(LedPattern::Sleeping);
gCatena.SafePrintf("%010d - doLightSleep\n", millis()); gCatena.SafePrintf("doLightSleep\n");
} }
if (gCatena.GetOperatingFlags() & if (gCatena.GetOperatingFlags() &
@ -1070,7 +1069,7 @@ static void sleepDoneCb(osjob_t* pJob)
} }
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - sleepDoneCb\n", millis()); gCatena.SafePrintf("sleepDoneCb\n");
} }
os_setTimedCallback( os_setTimedCallback(
@ -1082,7 +1081,7 @@ static void sleepDoneCb(osjob_t* pJob)
static void warmupDoneCb(osjob_t* pJob) static void warmupDoneCb(osjob_t* pJob)
{ {
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - warmupDoneCb\n", millis()); gCatena.SafePrintf("warmupDoneCb\n");
} }
send_in_progress = false; send_in_progress = false;
} }
@ -1090,7 +1089,7 @@ static void warmupDoneCb(osjob_t* pJob)
static void startNewIterationCb(osjob_t* pJob) static void startNewIterationCb(osjob_t* pJob)
{ {
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - startNewIterationCb\n", millis()); gCatena.SafePrintf("startNewIterationCb\n");
} }
if (! stop_iterations) { if (! stop_iterations) {
@ -1116,7 +1115,7 @@ static void receiveMessage(void *pContext, uint8_t port, const uint8_t *pMessage
SENSOR_data temp_sensor_data; SENSOR_data temp_sensor_data;
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("%010d - receiveMessage was called!!!\n", millis()); gCatena.SafePrintf("receiveMessage was called!!!\n");
} }
if (config_data.debug_level > 2) { if (config_data.debug_level > 2) {

2
mini_beieli_node.h
View File

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

8
mini_beieli_node_hx711.h
View File

@ -20,7 +20,7 @@ bool SetupScales(byte dbg_level)
{ {
debug_level = dbg_level; debug_level = dbg_level;
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - setup_scales\n", millis()); gCatena.SafePrintf("setup_scales\n");
} }
bool res; bool res;
@ -30,7 +30,7 @@ bool SetupScales(byte dbg_level)
pinMode(D10, OUTPUT); pinMode(D10, OUTPUT);
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - setup_scale done\n", millis()); gCatena.SafePrintf("setup_scale done\n");
} }
return res; return res;
@ -52,7 +52,7 @@ long ReadScale(char channel)
long readings[num_scale_readings]; // create arry to hold readings long readings[num_scale_readings]; // create arry to hold readings
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - my_read_average, measurements:\n", millis()); gCatena.SafePrintf("my_read_average, measurements:\n");
} }
for (int i = 0; i < num_scale_readings; i++) { for (int i = 0; i < num_scale_readings; i++) {
@ -89,6 +89,6 @@ void PowerupScale()
delay(400); delay(400);
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - setup_scale done\n", millis()); gCatena.SafePrintf("setup_scale done\n");
} }
} }

70
mini_beieli_node_nau7802.h
View File

@ -1,3 +1,5 @@
#pragma once
#include <Wire.h> #include <Wire.h>
#ifndef _HELPER_H_ #ifndef _HELPER_H_
@ -6,7 +8,7 @@
#include "SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.h" #include "SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.h"
#define SAMPLES 5 #define SAMPLES 10
#define IGNORE_READINGS 5 #define IGNORE_READINGS 5
NAU7802 myScale; //Create instance of the NAU7802 class NAU7802 myScale; //Create instance of the NAU7802 class
@ -20,34 +22,50 @@ void SetScalesDebugLevel(byte dbg_level)
debug_level = dbg_level; debug_level = dbg_level;
} }
bool InitializeScales()
{
bool result;
result &= myScale.reset(); //Reset all registers
result &= myScale.powerUp(); //Power on analog and digital sections of the scale
// we wait 100 ms to give it time to stabilze
delay(100);
result &= myScale.setIntPolarityHigh();
result &= myScale.setLDO(NAU7802_LDO_3V3); //Set LDO to 3.3V
result &= myScale.setGain(NAU7802_GAIN_128); //Set gain to 128
result &= myScale.setSampleRate(NAU7802_SPS_80); //Set samples per second to 10
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
return result;
}
bool SetupScales(byte dbg_level) bool SetupScales(byte dbg_level)
{ {
debug_level = dbg_level; debug_level = dbg_level;
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - SetupScales start\n", millis()); gCatena.SafePrintf("SetupScales start\n");
} }
pinMode(interruptPin, INPUT); pinMode(interruptPin, INPUT);
Wire.begin();
if (!myScale.begin()) if (!myScale.begin(Wire, false))
{ {
gCatena.SafePrintf("Scale not detected. Please check wiring. Freezing...\n"); gCatena.SafePrintf("Scale not detected. Please check wiring. Freezing...\n");
return false; return false;
} }
gCatena.SafePrintf("Scale detected!\n"); gCatena.SafePrintf("Scale detected!\n");
myScale.setIntPolarityHigh(); bool result = InitializeScales();
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) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - SetupScales done\n", millis()); gCatena.SafePrintf("SetupScales done, result: %d\n", result);
} }
return true; return result;
} }
long ReadScale(char channel) long ReadScale(char channel)
@ -55,7 +73,7 @@ long ReadScale(char channel)
long res; long res;
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - ReadScale Start\n", millis()); gCatena.SafePrintf("ReadScale Start, Channel %c\n", channel);
} }
uint8_t channelNumber; uint8_t channelNumber;
@ -84,31 +102,31 @@ long ReadScale(char channel)
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");
} }
return 0; break;
} }
delay(1); delay(1);
} }
dummy = myScale.getReading(); dummy = myScale.getReading();
if (debug_level > 0) {
gCatena.SafePrintf("Dummy Reading int32_t: %d\n", dummy);
}
} }
// 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
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) {
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("Timeout while reading scale...\n"); gCatena.SafePrintf("Timeout while reading scale...\n");
} }
return 0; break;
} }
delay(1); delay(1);
} }
int32_t reading = myScale.getReading(); int32_t reading = myScale.getReading();
delay(10);
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("Reading int32_t: %d\n", reading); gCatena.SafePrintf("Reading int32_t: %d\n", reading);
} }
@ -140,7 +158,7 @@ long ReadScale(char channel)
} }
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - ReadScale Done\n", millis()); gCatena.SafePrintf("ReadScale Done\n");
} }
return res; return res;
@ -149,25 +167,23 @@ long ReadScale(char channel)
void PowerdownScale() void PowerdownScale()
{ {
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - PowerdownScale Start\n", millis()); gCatena.SafePrintf("PowerdownScale Start\n");
} }
myScale.powerDown(); myScale.powerDown();
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - PowerdownScale Done\n", millis()); gCatena.SafePrintf("PowerdownScale Done\n");
} }
} }
void PowerupScale() void PowerupScale()
{ {
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - PowerupScale Start\n", millis()); gCatena.SafePrintf("PowerupScale Start\n");
} }
myScale.powerUp(); //Power up scale. This scale takes ~600ms to boot and take reading.
// we wait 100 ms to give it time to stabilze InitializeScales();
delay(100);
if (debug_level > 0) { if (debug_level > 0) {
gCatena.SafePrintf("%010d - PowerupScale Done\n", millis()); gCatena.SafePrintf("PowerupScale Done\n");
} }
} }