MirrorSave
/
ESPresense
mirror of https://github.com/ESPresense/ESPresense.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: rename mqtt entities to conform to new home assistant reqs (#1015) 

Co-authored-by: Sam Kirsch <samkirsch@MacBook-Pro-2.kirsch.site>
Co-authored-by: DTTerastar <DT@Terastar.biz>
This commit is contained in:
Sam Kirsch 2023-08-22 07:26:56 -04:00 committed by GitHub
parent 15a3f8c529
commit 88606316c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.cpp
View File

@ -44,9 +44,6 @@ bool sendTelemetry(unsigned int totalSeen, unsigned int totalFpSeen, int unsigne
&& sendNumberDiscovery("Max Distance", EC_CONFIG)
&& sendNumberDiscovery("Absorption", EC_CONFIG)
&& sendDeleteDiscovery("switch", "Status LED")
&& sendDeleteDiscovery("switch", "Active Scan")
&& Updater::SendDiscovery()
&& GUI::SendDiscovery()
&& Motion::SendDiscovery()

18
src/mqtt.cpp
View File

@ -39,7 +39,7 @@ bool sendConnectivityDiscovery()
{
commonDiscovery();
doc["~"] = roomsTopic;
doc["name"] = "ESPresense " + room;
doc["name"] = "Connectivity";
doc["uniq_id"] = Sprintf("espresense_%06x_connectivity", CHIPID);
doc["json_attr_t"] = "~/telemetry";
doc["stat_t"] = "~/status";
@ -58,7 +58,7 @@ bool sendTeleBinarySensorDiscovery(const String &name, const String &entityCateg
commonDiscovery();
doc["~"] = roomsTopic;
doc["name"] = Sprintf("ESPresense %s %s", room.c_str(), name.c_str());
doc["name"] = name;
doc["uniq_id"] = Sprintf("espresense_%06x_%s", CHIPID, slug.c_str());
doc["avty_t"] = "~/status";
doc["stat_t"] = "~/telemetry";
@ -77,7 +77,7 @@ bool sendTeleSensorDiscovery(const String &name, const String &entityCategory, c
commonDiscovery();
doc["~"] = roomsTopic;
doc["name"] = Sprintf("ESPresense %s %s", room.c_str(), name.c_str());
doc["name"] = name;
doc["uniq_id"] = Sprintf("espresense_%06x_%s", CHIPID, slug.c_str());
doc["avty_t"] = "~/status";
doc["stat_t"] = "~/telemetry";
@ -97,7 +97,7 @@ bool sendSensorDiscovery(const String &name, const String &entityCategory, const
commonDiscovery();
doc["~"] = roomsTopic;
doc["name"] = Sprintf("ESPresense %s %s", room.c_str(), name.c_str());
doc["name"] = name;
doc["uniq_id"] = Sprintf("espresense_%06x_%s", CHIPID, slug.c_str());
doc["avty_t"] = "~/status";
doc["stat_t"] = "~/" + slug;
@ -117,7 +117,7 @@ bool sendBinarySensorDiscovery(const String &name, const String &entityCategory,
commonDiscovery();
doc["~"] = roomsTopic;
doc["name"] = Sprintf("ESPresense %s %s", room.c_str(), name.c_str());
doc["name"] = name;
doc["uniq_id"] = Sprintf("espresense_%06x_%s", CHIPID, slug.c_str());
doc["avty_t"] = "~/status";
doc["stat_t"] = "~/" + slug;
@ -135,7 +135,7 @@ bool sendButtonDiscovery(const String &name, const String &entityCategory)
commonDiscovery();
doc["~"] = roomsTopic;
doc["name"] = Sprintf("ESPresense %s %s", room.c_str(), name.c_str());
doc["name"] = name;
doc["uniq_id"] = Sprintf("espresense_%06x_%s", CHIPID, slug.c_str());
doc["avty_t"] = "~/status";
doc["stat_t"] = "~/" + slug;
@ -153,7 +153,7 @@ bool sendSwitchDiscovery(const String &name, const String &entityCategory)
commonDiscovery();
doc["~"] = roomsTopic;
doc["name"] = Sprintf("ESPresense %s %s", room.c_str(), name.c_str());
doc["name"] = name;
doc["uniq_id"] = Sprintf("espresense_%06x_%s", CHIPID, slug.c_str());
doc["avty_t"] = "~/status";
doc["stat_t"] = "~/" + slug;
@ -171,7 +171,7 @@ bool sendNumberDiscovery(const String &name, const String &entityCategory)
commonDiscovery();
doc["~"] = roomsTopic;
doc["name"] = Sprintf("ESPresense %s %s", room.c_str(), name.c_str());
doc["name"] = name;
doc["uniq_id"] = Sprintf("espresense_%06x_%s", CHIPID, slug.c_str());
doc["avty_t"] = "~/status";
doc["stat_t"] = "~/" + slug;
@ -190,7 +190,7 @@ bool sendLightDiscovery(const String &name, const String &entityCategory, bool r
commonDiscovery();
doc["~"] = roomsTopic;
doc["name"] = Sprintf("ESPresense %s %s", room.c_str(), name.c_str());
doc["name"] = name;
doc["uniq_id"] = Sprintf("espresense_%06x_%s", CHIPID, slug.c_str());
doc["schema"] = "json";
doc["stat_t"] = "~/" + slug;