jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 05:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix HA auto-discovery MAC identifier

Browse Source
This commit is contained in:
fvanroie 2021-02-04 22:48:52 +01:00
parent 7df826d2de
commit beddba6daf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/svc/hasp_mqtt_ha.cpp
View File

@ -15,6 +15,7 @@
#define RETAINED true #define RETAINED true
#define HASP_MAC_ADDRESS halGetMacAddress(0, "").c_str() #define HASP_MAC_ADDRESS halGetMacAddress(0, "").c_str()
#define HASP_MAC_ADDRESS_STR halGetMacAddress(0, "")
extern PubSubClient mqttClient; extern PubSubClient mqttClient;
extern char mqttNodeName[16]; extern char mqttNodeName[16];
@ -38,7 +39,7 @@ void mqtt_ha_add_device(DynamicJsonDocument & doc)
JsonObject device = doc.createNestedObject(F("device")); JsonObject device = doc.createNestedObject(F("device"));
JsonArray ids = device.createNestedArray(F("ids")); JsonArray ids = device.createNestedArray(F("ids"));
ids.add(mqttNodeName); ids.add(mqttNodeName);
ids.add(HASP_MAC_ADDRESS); ids.add(HASP_MAC_ADDRESS_STR);
char version[32]; char version[32];
haspGetVersion(version, sizeof(version)); haspGetVersion(version, sizeof(version));
@ -54,7 +55,7 @@ void mqtt_ha_add_device(DynamicJsonDocument & doc)
void mqtt_ha_register_button(uint8_t page, uint8_t id) void mqtt_ha_register_button(uint8_t page, uint8_t id)
{ {
char buffer[128]; char buffer[128];
DynamicJsonDocument doc(512); DynamicJsonDocument doc(640);
mqtt_ha_add_device(doc); mqtt_ha_add_device(doc);
snprintf_P(buffer, sizeof(buffer), PSTR(HASP_OBJECT_NOTATION), page, id); snprintf_P(buffer, sizeof(buffer), PSTR(HASP_OBJECT_NOTATION), page, id);
@ -96,7 +97,7 @@ void mqtt_ha_register_button(uint8_t page, uint8_t id)
void mqtt_ha_register_switch(uint8_t page, uint8_t id) void mqtt_ha_register_switch(uint8_t page, uint8_t id)
{ {
char buffer[128]; char buffer[128];
DynamicJsonDocument doc(512); DynamicJsonDocument doc(640);
mqtt_ha_add_device(doc); mqtt_ha_add_device(doc);
snprintf_P(buffer, sizeof(buffer), PSTR(HASP_OBJECT_NOTATION), page, id); snprintf_P(buffer, sizeof(buffer), PSTR(HASP_OBJECT_NOTATION), page, id);