github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-24 19:40:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes for HA

Browse Source
This commit is contained in:
Gunnar Skjold
2023-03-26 15:12:24 +02:00
parent be522b40f9
commit 0178dc4184
13 changed files with 423 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/DomoticzMqttHandler/include/DomoticzMqttHandler.h
View File

@@ -9,7 +9,7 @@ public:
DomoticzMqttHandler(MQTTClient* mqtt, char* buf, DomoticzConfig config) : AmsMqttHandler(mqtt, buf) {
this->config = config;
};
bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, EntsoeApi* eapi);
bool publishTemperatures(AmsConfiguration*, HwTools*);
bool publishPrices(EntsoeApi*);
bool publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea);

2
lib/DomoticzMqttHandler/src/DomoticzMqttHandler.cpp
View File

@@ -1,7 +1,7 @@
#include "DomoticzMqttHandler.h"
#include "json/domoticz_json.h"
bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea) {
bool DomoticzMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea, EntsoeApi* eapi) {
bool ret = false;
if (config.elidx > 0) {
if(data->getActiveImportCounter() > 1.0) {