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

Various changes after testing new HA features

Browse Source
This commit is contained in:
Gunnar Skjold
2023-04-01 07:31:40 +02:00
parent f214af3595
commit 71e0f13f0e
9 changed files with 56 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,16 +35,20 @@ public:
deviceUid = hostname; // Maybe configurable in the future?
if(strlen(config.discoveryHostname) > 0) {
snprintf_P(buf, 128, PSTR("http://%s.local/"), config.discoveryHostname);
String deviceUrl = String(buf);
if(strncmp_P(config.discoveryHostname, PSTR("http"), 4) == 0) {
deviceUrl = String(config.discoveryHostname);
} else {
snprintf_P(buf, 128, PSTR("http://%s/"), config.discoveryHostname);
deviceUrl = String(buf);
}
} else {
snprintf_P(buf, 128, PSTR("http://%s.local/"), hostname);
String deviceUrl = String(buf);
deviceUrl = String(buf);
}
if(strlen(config.discoveryTopic) > 0) {
discoveryTopic = String(config.discoveryTopic);
if(!discoveryTopic.endsWith("/")) discoveryTopic += "/";
if(strlen(config.discoveryPrefix) > 0) {
snprintf_P(buf, 128, PSTR("%s/sensor/"), config.discoveryPrefix);
discoveryTopic = String(buf);
} else {
discoveryTopic = "homeassistant/sensor/";
}

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

@@ -323,7 +323,7 @@ void HomeAssistantMqttHandler::publishSensor(const HomeAssistantSensor& sensor)
deviceModel.c_str(),
VERSION,
manufacturer.c_str(),
sensorNamePostFix.c_str(),
deviceUrl.c_str(),
strlen_P(sensor.stacl) > 0 ? ", \"stat_cla\" :" : "",
strlen_P(sensor.stacl) > 0 ? (char *) FPSTR(sensor.stacl) : ""
);