topaLE
/
ahoy
mirror of https://github.com/lumapu/ahoy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix attempt for HA autodiscovery

pull/630/head
Rémi K 2 years ago
parent
22ae6d2e22
commit
3bd8fe61b5
1 changed files with 12 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      src/publisher/pubMqtt.h

23
src/publisher/pubMqtt.h
View File

@ -236,23 +236,24 @@ class PubMqtt {
const char *devCls = getFieldDeviceClass(rec->assign[i].fieldId); const char *devCls = getFieldDeviceClass(rec->assign[i].fieldId);
const char *stateCls = getFieldStateClass(rec->assign[i].fieldId); const char *stateCls = getFieldStateClass(rec->assign[i].fieldId);
doc.clear(); DynamicJsonDocument doc2(512);
doc[F("name")] = name; doc2.clear();
doc[F("stat_t")] = String(mCfgMqtt->topic) + "/" + String(iv->config->name) + String(topic); doc2[F("name")] = name;
doc[F("unit_of_meas")] = iv->getUnit(i, rec); doc2[F("stat_t")] = String(mCfgMqtt->topic) + "/" + String(iv->config->name) + String(topic);
doc[F("uniq_id")] = String(iv->config->serial.u64, HEX) + "_" + uniq_id; doc2[F("unit_of_meas")] = iv->getUnit(i, rec);
doc[F("dev")] = deviceObj; doc2[F("uniq_id")] = String(iv->config->serial.u64, HEX) + "_" + uniq_id;
doc[F("exp_aft")] = MQTT_INTERVAL + 5; // add 5 sec if connection is bad or ESP too slow @TODO: stimmt das wirklich als expire!? doc2[F("dev")] = deviceObj;
doc2[F("exp_aft")] = MQTT_INTERVAL + 5; // add 5 sec if connection is bad or ESP too slow @TODO: stimmt das wirklich als expire!?
if (devCls != NULL) if (devCls != NULL)
doc[F("dev_cla")] = String(devCls); doc2[F("dev_cla")] = String(devCls);
if (stateCls != NULL) if (stateCls != NULL)
doc[F("stat_cla")] = String(stateCls); doc2[F("stat_cla")] = String(stateCls);
snprintf(topic, 64, "%s/sensor/%s/ch%d_%s/config", MQTT_DISCOVERY_PREFIX, iv->config->name, rec->assign[i].ch, iv->getFieldName(i, rec)); snprintf(topic, 64, "%s/sensor/%s/ch%d_%s/config", MQTT_DISCOVERY_PREFIX, iv->config->name, rec->assign[i].ch, iv->getFieldName(i, rec));
size_t size = measureJson(doc) + 1; size_t size = measureJson(doc2) + 1;
char *buf = new char[size]; char *buf = new char[size];
memset(buf, 0, size); memset(buf, 0, size);
serializeJson(doc, buf, size); serializeJson(doc2, buf, size);
publish(topic, buf, true, false); publish(topic, buf, true, false);
delete[] buf; delete[] buf;
} }

Write Preview
Loading…
Cancel
Save