github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-17 01:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pulse meter

Browse Source
This commit is contained in:
Gunnar Skjold
2024-01-26 18:21:51 +01:00
parent 52bc2f6a9b
commit 9a767d9ac4
8 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/AmsToMqttBridge.cpp
View File

@@ -1195,6 +1195,13 @@ bool readHanPort() {
if(pulseMc != NULL) {
pulseMc->onPulse(pulses);
pulses = 0;
if(meterState.getListType() < 3) {
time_t now = time(nullptr);
if(now > FirmwareVersion::BuildEpoch) {
ImpulseAmsData init = ImpulseAmsData(ds.getEstimatedImportCounter());
meterState.apply(init);
}
}
}
if(!mc->loop()) {
meterState.setLastError(mc->getLastError());

5
src/ImpulseAmsData.cpp
View File

@@ -14,3 +14,8 @@ ImpulseAmsData::ImpulseAmsData(AmsData& state, uint16_t pulsePerKwh, uint8_t pul
lastUpdateMillis = state.getLastUpdateMillis();
}
}
ImpulseAmsData::ImpulseAmsData(double activeImportCounter) {
this->activeImportCounter = activeImportCounter;
this->listType = 3;
}

1
src/ImpulseAmsData.h
View File

@@ -6,6 +6,7 @@
class ImpulseAmsData : public AmsData {
public:
ImpulseAmsData(AmsData &state, uint16_t pulsePerKwh, uint8_t pulses);
ImpulseAmsData(double activeImportCounter);
};
#endif

8
src/PulseMeterCommunicator.cpp
View File

@@ -48,10 +48,10 @@ void PulseMeterCommunicator::setupGpio() {
if(meterConfig.rxPin != NOT_A_PIN) {
pinMode(meterConfig.rxPin, meterConfig.rxPinPullup ? INPUT_PULLUP : INPUT);
}
if(meterConfig.txPin != NOT_A_PIN) {
pinMode(meterConfig.txPin, OUTPUT);
digitalWrite(meterConfig.txPin, HIGH);
}
// Export counter?
// if(meterConfig.txPin != NOT_A_PIN) {
// pinMode(meterConfig.txPin, meterConfig.rxPinPullup ? INPUT_PULLUP : INPUT);
// }
}
void PulseMeterCommunicator::onPulse(uint8_t pulses) {

2
src/PulseMeterCommunicator.h
View File

@@ -16,7 +16,7 @@
class PulseMeterCommunicator : public MeterCommunicator {
public:
PulseMeterCommunicator(RemoteDebug* debugger);
void configure(MeterConfig&, Timezone*);
void configure(MeterConfig& config, Timezone* tz);
bool loop();
AmsData* getData(AmsData& meterState);
int getLastError();