github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-26 20:23:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build errors

Browse Source
This commit is contained in:
Gunnar Skjold
2023-12-25 07:44:42 +01:00
parent 50de5abf93
commit fa87cfaa61
5 changed files with 79 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h
View File

@@ -98,13 +98,8 @@ private:
bool publishList3(AmsData* data, EnergyAccounting* ea);
bool publishList4(AmsData* data, EnergyAccounting* ea);
String getMeterModel(AmsData* data);
<<<<<<< HEAD
bool publishRealtime(AmsData* data, EnergyAccounting* ea, PriceService* ps);
void publishSensor(const HomeAssistantSensor& sensor);
=======
bool publishRealtime(AmsData* data, EnergyAccounting* ea, EntsoeApi* eapi);
void publishSensor(const HomeAssistantSensor sensor);
>>>>>>> main
void publishList1Sensors();
void publishList1ExportSensors();
void publishList2Sensors();