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

Merge branch 'main' into dev-v2.3

Browse Source
This commit is contained in:
Gunnar Skjold
2023-12-10 09:49:22 +01:00
parent 111bd70763 ed899440ed
commit ee462ec468
21 changed files with 146 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/AmsToMqttBridge.cpp
View File

@@ -111,12 +111,18 @@ PriceService* ps = NULL;
Timezone* tz = NULL;
ConnectionHandler* ch = NULL;
AmsWebServer ws(commonBuffer, &Debug, &hw);
#if defined(ESP32)
__NOINIT_ATTR ResetDataContainer rdc;
#else
ResetDataContainer rdc;
#endif
AmsWebServer ws(commonBuffer, &Debug, &hw, &rdc);
bool mqttEnabled = false;
AmsMqttHandler* mqttHandler = NULL;
#if defined(ESP32)
#if defined(ESP32) && defined(ENERGY_SPEEDOMETER_PASS)
JsonMqttHandler* energySpeedometer = NULL;
MqttConfig energySpeedometerConfig = {
"mqtt.sandtime.energy",
@@ -556,7 +562,7 @@ void loop() {
mqttHandler->disconnect();
}
#if defined(ENERGY_SPEEDOMETER_PASS)
#if defined(ESP32) && defined(ENERGY_SPEEDOMETER_PASS)
if(sysConfig.energyspeedometer == 7) {
if(!meterState.getMeterId().isEmpty()) {
if(energySpeedometer == NULL) {
@@ -813,7 +819,7 @@ void handleSystem(unsigned long now) {
if(mqttHandler != NULL) {
mqttHandler->publishSystem(&hw, ps, &ea);
}
#if defined(ENERGY_SPEEDOMETER_PASS)
#if defined(ESP32) && defined(ENERGY_SPEEDOMETER_PASS)
if(energySpeedometer != NULL) {
energySpeedometer->publishSystem(&hw, ps, &ea);
}
@@ -1117,7 +1123,7 @@ void handleDataSuccess(AmsData* data) {
delay(10);
}
}
#if defined(ENERGY_SPEEDOMETER_PASS)
#if defined(ESP32) && defined(ENERGY_SPEEDOMETER_PASS)
if(energySpeedometer != NULL && energySpeedometer->publish(&meterState, &meterState, &ea, ps)) {
delay(10);
}