Merge branch 'main' into feature/15min_prices

This commit is contained in:
Gunnar Skjold
2025-11-06 18:27:29 +01:00
14 changed files with 81 additions and 44 deletions

View File

@@ -40,10 +40,6 @@ public:
private:
uint8_t boardType;
String pubTopic;
String subTopic;
String deviceName;
String deviceModel;
String deviceUid;

View File

@@ -22,10 +22,6 @@
void HomeAssistantMqttHandler::setHomeAssistantConfig(HomeAssistantConfig config, char* hostname) {
l1Init = l2Init = l2eInit = l3Init = l3eInit = l4Init = l4eInit = rtInit = rteInit = pInit = sInit = rInit = fInit = false;
pubTopic = String(mqttConfig.publishTopic);
subTopic = String(mqttConfig.subscribeTopic);
if(subTopic.isEmpty()) subTopic = pubTopic+"/command";
if(strlen(config.discoveryNameTag) > 0) {
snprintf_P(json, 128, PSTR("AMS reader (%s)"), config.discoveryNameTag);
deviceName = String(json);