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

millis() is unsigned long

This commit is contained in:
Joerg Lehmann 2020-07-14 19:45:25 +02:00
parent cfaccfb14a
commit 1f0072797f
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -20,7 +20,7 @@ Das sind die verwendeten Libraries [1]:
| --- | ----- | ----------- | | --- | ----- | ----------- |
| https://github.com/mcci-catena/Adafruit_BME280_Library.git | 3dafbe1 | Wed, 13 Dec 2017 13:56:30 -0500 | | https://github.com/mcci-catena/Adafruit_BME280_Library.git | 3dafbe1 | Wed, 13 Dec 2017 13:56:30 -0500 |
| 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 | 1964dcf | Mon, 22 Jun 2020 10:54:56 -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 | 478ad23 | Fri, 26 Jun 2020 18:39:01 -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 |
@ -31,6 +31,7 @@ Das sind die verwendeten Libraries [1]:
| https://github.com/mcci-catena/SHT1x.git | be7042c | Tue, 20 Sep 2011 13:56:23 +1000 | | https://github.com/mcci-catena/SHT1x.git | be7042c | Tue, 20 Sep 2011 13:56:23 +1000 |
Patch arduino-lmic, so initial SF12 is used initially: Patch arduino-lmic, so initial SF12 is used initially:
` `

6
mini-beieli-node.ino
View File

@ -101,7 +101,7 @@ sMyExtraCommands_top(
\****************************************************************************/ \****************************************************************************/
byte my_position = 0; // what is our actual measurement, starts with 0 byte my_position = 0; // what is our actual measurement, starts with 0
long timer_pos0; unsigned long timer_pos0;
// Global Variables // Global Variables
LORA_data lora_data; LORA_data lora_data;
@ -713,7 +713,7 @@ void StartNewIteration() {
} }
// Loop sending is in progress, timeout just in case after 600 seconds // Loop sending is in progress, timeout just in case after 600 seconds
long start_time = millis(); unsigned long start_time = millis();
if (config_data.debug_level > 0) { if (config_data.debug_level > 0) {
gCatena.SafePrintf("waiting while send is in progress\n"); gCatena.SafePrintf("waiting while send is in progress\n");
} }
@ -943,7 +943,7 @@ void doSleepAlert(const bool fDeepSleep)
} }
for (int i = 0; i <= 15; i++) { for (int i = 0; i <= 15; i++) {
long prevPrint = millis(); unsigned long prevPrint = millis();
while (os_queryTimeCriticalJobs(ms2osticks(2000)) != 0) while (os_queryTimeCriticalJobs(ms2osticks(2000)) != 0)
{ {
gCatena.poll(); gCatena.poll();

2
mini_beieli_node.h
View File

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

6
mini_beieli_node_nau7802.h
View File

@ -78,7 +78,7 @@ long ReadScale(char channel)
} else { } else {
channelNumber = NAU7802_CHANNEL_2; channelNumber = NAU7802_CHANNEL_2;
} }
long startTime = millis(); unsigned long startTime = millis();
myScale.setChannel(channelNumber); myScale.setChannel(channelNumber);
bool calibrate_success = myScale.calibrateAFE(); bool calibrate_success = myScale.calibrateAFE();
if (! calibrate_success) { if (! calibrate_success) {
@ -96,7 +96,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
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) {
long mytimer = millis(); unsigned long mytimer = millis();
int timeouts = 0; int timeouts = 0;
while (! myScale.available() && (timeouts < 3)) { while (! myScale.available() && (timeouts < 3)) {
// we set a timeout of 10 seconds for the measurement... // we set a timeout of 10 seconds for the measurement...
@ -123,7 +123,7 @@ long ReadScale(char channel)
delay(50); delay(50);
} }
long duration = millis() - startTime; unsigned long duration = millis() - startTime;
res = median(readings, num_scale_readings); // calculate median res = median(readings, num_scale_readings); // calculate median
if (debug_level > 0) { if (debug_level > 0) {