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

Compare commits

base: wn:master
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

3 Commits
master ... 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
2 changed files with 6 additions and 6 deletions
Expand all files Collapse all files

6
releaseInfo.json
View File

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

6
sketch/application.cpp
View File

@ -69,12 +69,11 @@ void loopApplication() {
static uint32_t totalCnt = 0; static uint32_t totalCnt = 0;
static uint32_t lastValuesMillis = 0; static uint32_t lastValuesMillis = 0;
static uint32_t lastHeartbeatMillis = 0; static uint32_t lastHeartbeatMillis = 0;
char buf[VALUES_BUF_SIZE]; static uint32_t rainCnt = 0;
if (currentMillis > (lastValuesMillis + (configBlock.valuesPeriod * 1000))) { if (currentMillis > (lastValuesMillis + (configBlock.valuesPeriod * 1000))) {
lastValuesMillis = currentMillis; lastValuesMillis = currentMillis;
// rain sensor // rain sensor
uint32_t rainCnt = 0;
noInterrupts(); noInterrupts();
rainCnt = cnt; rainCnt = cnt;
cnt = 0; cnt = 0;
@ -86,6 +85,7 @@ void loopApplication() {
totalCnt += rainCnt; totalCnt += rainCnt;
// MQTT publishing // MQTT publishing
char buf[VALUES_BUF_SIZE];
memset(buf, 0, VALUES_BUF_SIZE); memset(buf, 0, VALUES_BUF_SIZE);
snprintf(buf, VALUES_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);
@ -101,7 +101,7 @@ void loopApplication() {
// MQTT publishing // MQTT publishing
char heartbeatBuf[HEARTBEAT_BUF_SIZE]; char heartbeatBuf[HEARTBEAT_BUF_SIZE];
memset(heartbeatBuf, 0, HEARTBEAT_BUF_SIZE); memset(heartbeatBuf, 0, HEARTBEAT_BUF_SIZE);
snprintf(heartbeatBuf, HEARTBEAT_BUF_SIZE-1, "{\"lastMessage\":%s, \"uptime\":%ld}", buf, uptime); snprintf(heartbeatBuf, HEARTBEAT_BUF_SIZE-1, "{\"lastValues\":{\"raincnt\":%ld, \"totalCnt\":%ld}, \"uptime\":%ld}", rainCnt, totalCnt, uptime);
mqttClient.publish(configBlock.mqttHeartbeatTopic, heartbeatBuf); mqttClient.publish(configBlock.mqttHeartbeatTopic, heartbeatBuf);
} }