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

take over counter handling from old project

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2020-07-26 23:33:54 +02:00
parent 0c095c80ac
commit bd885752b4
4 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sketch/ConfigDataStructure.py
View File

@ -11,6 +11,8 @@ configItems = [
{"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 WatchdogTopic", "key":"mqttWatchdogTopic", "type":"C", "length":64, "default":"IoT/Watchdog"},
{"label":"Values period (s)", "key":"valuesPeriod", "type":"I", "default":3600},
{"label":"Debounce time (us)", "key":"debounce", "type":"I", "default":300},
{"label":"DebugMode", "key":"debugMode", "type":"I", "default":0}
]

46
sketch/application.cpp
View File

@ -24,6 +24,20 @@
volatile uint32_t cnt = 0;
uint32_t uptime = 0;
void count() {
static uint32_t lastEvent = 0;
uint32_t currentEvent = micros();
if (currentEvent > (lastEvent + configBlock.debounce)) {
lastEvent = currentEvent;
cnt++;
}
}
// void subscribeApplication() {
// }
@ -36,12 +50,44 @@
void setupApplication() {
mqttSetup();
pinMode(REED_PIN, INPUT_PULLUP);
attachInterrupt(REED_PIN, count, FALLING);
}
void loopApplication() {
mqttLoop();
uint32_t currentMillis = millis();
static uint32_t lastUptimeMillis = 0;
if (currentMillis > (lastUptimeMillis + 1000)) {
lastUptimeMillis = currentMillis;
uptime++;
}
static uint32_t lastMillis = 0;
if (currentMillis > (lastMillis + (configBlock.period * 1000))) {
lastMillis = currentMillis;
// rain sensor
uint32_t rainCnt = 0;
noInterrupts();
rainCnt = cnt;
cnt = 0;
interrupts();
#ifdef DEBUG
Serial.print(rainCnt);
Serial.println();
#endif
// MQTT publishing
#define BUF_SIZE 256
char buf[BUF_SIZE];
snprintf(buf, BUF_SIZE-1, "{\"raincnt\":%ld, \"uptime\":%ld}", rainCnt, uptime);
mqttClient.publish(configBlock.mqttValuesTopic, buf);
}
}