From 81fedaaa6a87e96a2977587f4b5c80e4ee72dbd7 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Sat, 1 Apr 2023 07:38:24 +0200 Subject: [PATCH] Moved from postfix to prefix on HA sensor name tag --- .../include/HomeAssistantMqttHandler.h | 8 ++++---- .../src/HomeAssistantMqttHandler.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h b/lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h index eb764f79..6bb7f367 100644 --- a/lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h +++ b/lib/HomeAssistantMqttHandler/include/HomeAssistantMqttHandler.h @@ -17,11 +17,11 @@ public: if(strlen(config.discoveryNameTag) > 0) { snprintf_P(buf, 128, PSTR("AMS reader (%s)"), config.discoveryNameTag); deviceName = String(buf); - snprintf_P(buf, 128, PSTR(" (%s)"), config.discoveryNameTag); - sensorNamePostFix = String(buf); + snprintf_P(buf, 128, PSTR("[%s] "), config.discoveryNameTag); + sensorNamePrefix = String(buf); } else { deviceName = "AMS reader"; - sensorNamePostFix = ""; + sensorNamePrefix = ""; } deviceModel = boardTypeToString(boardType); manufacturer = boardManufacturerToString(boardType); @@ -82,7 +82,7 @@ private: String deviceUrl; String discoveryTopic; - String sensorNamePostFix; + String sensorNamePrefix; bool l1Init, l2Init, l2eInit, l3Init, l3eInit, l4Init, l4eInit, rtInit, rteInit, pInit, sInit; bool tInit[32] = {false}; diff --git a/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp b/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp index 6bec414c..0aa3e2ee 100644 --- a/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp +++ b/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp @@ -310,8 +310,8 @@ void HomeAssistantMqttHandler::publishSensor(const HomeAssistantSensor& sensor) uid.replace("]", ""); uid.replace("'", ""); snprintf_P(json, BufferSize, HADISCOVER_JSON, + sensorNamePrefix.c_str(), sensor.name, - sensorNamePostFix.c_str(), topic.c_str(), sensor.topic, deviceUid.c_str(), uid.c_str(), deviceUid.c_str(), uid.c_str(),