jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-04-24 23:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix zigbee topic when using SO112

Browse Source 
Fix zigbee topic when using SO112 (#9051)
This commit is contained in:
Theo Arends 2020-12-23 13:55:54 +01:00
parent 25e3e5a42d
commit 5a29fffcc6
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tasmota/xdrv_23_zigbee_2a_devices_impl.ino
View File

@ -534,20 +534,19 @@ void Z_Device::jsonPublishAttrList(const char * json_prefix, const Z_attribute_l
} }
if (Settings.flag4.zigbee_distinct_topics) { if (Settings.flag4.zigbee_distinct_topics) {
char subtopic[TOPSZ];
if (Settings.flag4.zb_topic_fname && friendlyName) { if (Settings.flag4.zb_topic_fname && friendlyName) {
//Clean special characters and check size of friendly name // Clean special characters and check size of friendly name
char stemp[TOPSZ]; char stemp[TOPSZ];
strlcpy(stemp, (!strlen(friendlyName)) ? MQTT_TOPIC : friendlyName, sizeof(stemp)); strlcpy(stemp, (!strlen(friendlyName)) ? MQTT_TOPIC : friendlyName, sizeof(stemp));
MakeValidMqtt(0, stemp); MakeValidMqtt(0, stemp);
//Create topic with Prefix3 and cleaned up friendly name snprintf_P(subtopic, sizeof(subtopic), PSTR("%s/%s"), TasmotaGlobal.mqtt_topic, stemp);
char frtopic[TOPSZ];
snprintf_P(frtopic, sizeof(frtopic), PSTR("%s/%s/" D_RSLT_SENSOR), SettingsText(SET_MQTTPREFIX3), stemp);
MqttPublish(frtopic, Settings.flag.mqtt_sensor_retain);
} else { } else {
char subtopic[16]; snprintf_P(subtopic, sizeof(subtopic), PSTR("%s/%04X"), TasmotaGlobal.mqtt_topic, shortaddr);
snprintf_P(subtopic, sizeof(subtopic), PSTR("%04X/" D_RSLT_SENSOR), shortaddr);
MqttPublishPrefixTopic_P(TELE, subtopic, Settings.flag.mqtt_sensor_retain);
} }
char stopic[TOPSZ];
GetTopic_P(stopic, TELE, subtopic, D_RSLT_SENSOR);
MqttPublish(stopic, Settings.flag.mqtt_sensor_retain);
} else { } else {
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain); MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
} }
@ -624,10 +623,10 @@ Z_Device & Z_Devices::parseDeviceFromName(const char * param, uint16_t * parsed_
} }
/*********************************************************************************************\ /*********************************************************************************************\
* *
* Methods below build a JSON representation of device data * Methods below build a JSON representation of device data
* Used by: ZbLight, ZbStatus, ZbInfo * Used by: ZbLight, ZbStatus, ZbInfo
* *
\*********************************************************************************************/ \*********************************************************************************************/
// Add "Device":"0x1234","Name":"FrienflyName" // Add "Device":"0x1234","Name":"FrienflyName"