github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-02-06 00:25:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for pulse meter

Browse Source
This commit is contained in:
Gunnar Skjold
2024-01-18 07:57:56 +01:00
parent e7ca408baa
commit 87ddf00afa
8 changed files with 244 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/AmsToMqttBridge.cpp
View File

@@ -30,11 +30,12 @@ ADC_MODE(ADC_VCC);
#define WDT_TIMEOUT 60
#define METER_SOURCE_NONE 0
#define METER_SOURCE_SERIAL 1
#define METER_SOURCE_GPIO 1
#define METER_SOURCE_MQTT 2
#define METER_SOURCE_ESPNOW 3
#define METER_PARSER_PASSIVE 0
#define METER_PARSER_PULSE 2
#define METER_PARSER_KAMSTRUP 9
#define METER_ERROR_NO_DATA 90
@@ -79,6 +80,7 @@ ADC_MODE(ADC_VCC);
#include "MeterCommunicator.h"
#include "PassiveMeterCommunicator.h"
#include "KamstrupPullCommunicator.h"
#include "PulseMeterCommunicator.h"
#include "Uptime.h"
@@ -172,6 +174,7 @@ RealtimePlot rtp;
MeterCommunicator* mc = NULL;
PassiveMeterCommunicator* passiveMc = NULL;
KamstrupPullCommunicator* kamstrupMc = NULL;
PulseMeterCommunicator* pulseMc = NULL;
bool networkConnected = false;
bool setupMode = false;
@@ -193,6 +196,9 @@ bool handleVoltageCheck();
bool readHanPort();
void errorBlink();
uint8_t pulses = 0;
void onPulse();
#if defined(ESP32)
uint8_t dnsState = 0;
ip_addr_t dns0;
@@ -682,9 +688,13 @@ void loop() {
if(config.isMeterChanged()) {
config.getMeterConfig(meterConfig);
if(meterConfig.source = METER_SOURCE_SERIAL) {
if(meterConfig.source = METER_SOURCE_GPIO) {
switch(meterConfig.parser) {
case METER_PARSER_PASSIVE:
if(pulseMc != NULL) {
delete pulseMc;
pulseMc = NULL;
}
if(kamstrupMc != NULL) {
delete(kamstrupMc);
kamstrupMc = NULL;
@@ -697,6 +707,10 @@ void loop() {
mc = passiveMc;
break;
case METER_PARSER_KAMSTRUP:
if(pulseMc != NULL) {
delete pulseMc;
pulseMc = NULL;
}
if(passiveMc != NULL) {
delete(passiveMc);
passiveMc = NULL;
@@ -708,6 +722,23 @@ void loop() {
hwSerial = kamstrupMc->getHwSerial();
mc = kamstrupMc;
break;
case METER_PARSER_PULSE:
if(kamstrupMc != NULL) {
delete(kamstrupMc);
kamstrupMc = NULL;
}
if(passiveMc != NULL) {
delete(passiveMc);
passiveMc = NULL;
}
if(pulseMc == NULL) {
pulseMc = new PulseMeterCommunicator(&Debug);
}
pulseMc->configure(meterConfig, tz);
attachInterrupt(digitalPinToInterrupt(meterConfig.rxPin), onPulse, meterConfig.rxPinPullup ? RISING : FALLING);
mc = pulseMc;
break;
default:
debugE_P(PSTR("Unknown meter parser selected: %d"), meterConfig.parser);
}
@@ -1092,6 +1123,10 @@ void toggleSetupMode() {
bool readHanPort() {
if(mc == NULL) return false;
if(pulseMc != NULL) {
pulseMc->onPulse(pulses);
pulses = 0;
}
if(!mc->loop()) {
meterState.setLastError(mc->getLastError());
return false;
@@ -1818,3 +1853,7 @@ void configFileParse() {
config.save();
LittleFS.end();
}
void IRAM_ATTR onPulse() {
pulses++;
}