wn/rainsensor2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wn:v1.0.0
Branches Tags
wn:master wn:release
wn:v1.0.3 wn:v1.0.2 wn:v1.0.1 wn:v1.0.0
...
compare: wn:release
Branches Tags
wn:release wn:master
wn:v1.0.3 wn:v1.0.2 wn:v1.0.1 wn:v1.0.0

4 Commits
v1.0.0 ... release

Author SHA1 Message Date
Wolfgang Hottgenroth
7d9e4dfda1 another fix 2020-07-29 15:19:10 +02:00
Wolfgang Hottgenroth
9ffea49d71 adjust release info 2020-07-29 15:13:24 +02:00
Wolfgang Hottgenroth
c295d2c169 fix heartbeat 2020-07-29 15:11:49 +02:00
Wolfgang Hottgenroth
b344fca66e heartbeat added 2020-07-28 23:34:38 +02:00
4 changed files with 30 additions and 11 deletions
Expand all files Collapse all files

2
libraries/includes/defines.h
View File

@ -11,6 +11,8 @@
// #define DEBUG // #define DEBUG
#define VALUES_BUF_SIZE 128
#define HEARTBEAT_BUF_SIZE 256
#define NODEMCU #define NODEMCU

6
releaseInfo.json
View File

@ -1,8 +1,8 @@
{ {
"releaseTag": "v1.0.0", "releaseTag": "v1.0.3",
"createReleaseTag": "true", "createReleaseTag": "true",
"releaseName": "initial", "releaseName": "heartbeat fix 2",
"description": "initial" "description": "heartbeat message fixed, raincnt has to be static"
} }

4
sketch/ConfigDataStructure.py
View File

@ -10,11 +10,13 @@ configItems = [
{"label":"MQTT Port", "key":"mqttPort", "type":"I", "default":1883}, {"label":"MQTT Port", "key":"mqttPort", "type":"I", "default":1883},
{"label":"MQTT ValuesTopic", "key":"mqttValuesTopic", "type":"C", "length":64, "default":"IoT/RainSensor2/Values"}, {"label":"MQTT ValuesTopic", "key":"mqttValuesTopic", "type":"C", "length":64, "default":"IoT/RainSensor2/Values"},
{"label":"MQTT DebugTopic", "key":"mqttDebugTopic", "type":"C", "length":64, "default":"IoT/RainSensor2/Debug"}, {"label":"MQTT DebugTopic", "key":"mqttDebugTopic", "type":"C", "length":64, "default":"IoT/RainSensor2/Debug"},
{"label":"MQTT HeartbeatTopic", "key":"mqttHeartbeatTopic", "type":"C", "length":64, "default":"IoT/RainSensor2/Heartbeat"},
{"label":"MQTT WatchdogTopic", "key":"mqttWatchdogTopic", "type":"C", "length":64, "default":"IoT/Watchdog"}, {"label":"MQTT WatchdogTopic", "key":"mqttWatchdogTopic", "type":"C", "length":64, "default":"IoT/Watchdog"},
{"label":"Values period (s)", "key":"valuesPeriod", "type":"I", "default":3600}, {"label":"Values period (s)", "key":"valuesPeriod", "type":"I", "default":3600},
{"label":"Heartbeat period (s)", "key":"heartbeatPeriod", "type":"I", "default":5},
{"label":"Debounce time (us)", "key":"debounce", "type":"I", "default":300}, {"label":"Debounce time (us)", "key":"debounce", "type":"I", "default":300},
{"label":"DebugMode", "key":"debugMode", "type":"I", "default":0} {"label":"DebugMode", "key":"debugMode", "type":"I", "default":0}
] ]
magic = 3235774471 magic = 3235774472
appName = "ESP8266 based RainSensor/Counter" appName = "ESP8266 based RainSensor/Counter"

29
sketch/application.cpp
View File

@ -67,12 +67,13 @@ void loopApplication() {
} }
static uint32_t totalCnt = 0; static uint32_t totalCnt = 0;
static uint32_t lastMillis = 0; static uint32_t lastValuesMillis = 0;
if (currentMillis > (lastMillis + (configBlock.valuesPeriod * 1000))) { static uint32_t lastHeartbeatMillis = 0;
lastMillis = currentMillis; static uint32_t rainCnt = 0;
if (currentMillis > (lastValuesMillis + (configBlock.valuesPeriod * 1000))) {
lastValuesMillis = currentMillis;
// rain sensor // rain sensor
uint32_t rainCnt = 0;
noInterrupts(); noInterrupts();
rainCnt = cnt; rainCnt = cnt;
cnt = 0; cnt = 0;
@ -84,12 +85,26 @@ void loopApplication() {
totalCnt += rainCnt; totalCnt += rainCnt;
// MQTT publishing // MQTT publishing
#define BUF_SIZE 256 char buf[VALUES_BUF_SIZE];
char buf[BUF_SIZE]; memset(buf, 0, VALUES_BUF_SIZE);
snprintf(buf, BUF_SIZE-1, "{\"raincnt\":%ld, \"totalCnt\":%ld, \"uptime\":%ld}", rainCnt, totalCnt, uptime); snprintf(buf, VALUES_BUF_SIZE-1, "{\"raincnt\":%ld, \"totalCnt\":%ld, \"uptime\":%ld}", rainCnt, totalCnt, uptime);
mqttClient.publish(configBlock.mqttValuesTopic, buf); mqttClient.publish(configBlock.mqttValuesTopic, buf);
} }
if (currentMillis > (lastHeartbeatMillis + (configBlock.heartbeatPeriod * 1000))) {
lastHeartbeatMillis = currentMillis;
#ifdef DEBUG
Serial.println("Publishing heartbeat");
#endif
// MQTT publishing
char heartbeatBuf[HEARTBEAT_BUF_SIZE];
memset(heartbeatBuf, 0, HEARTBEAT_BUF_SIZE);
snprintf(heartbeatBuf, HEARTBEAT_BUF_SIZE-1, "{\"lastValues\":{\"raincnt\":%ld, \"totalCnt\":%ld}, \"uptime\":%ld}", rainCnt, totalCnt, uptime);
mqttClient.publish(configBlock.mqttHeartbeatTopic, heartbeatBuf);
}
} }