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

Merge pull request #16584 from urechi/development

Browse Source 
Add ZIGBEE_TOPIC_FNAME
This commit is contained in:
s-hadinger 2022-09-19 17:04:21 +02:00 committed by GitHub
commit 778a66e16c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasmota/my_user_config.h
View File

@ -361,6 +361,7 @@
#define ZIGBEE_DISTINCT_TOPICS false // [SetOption89] Enable unique device topic based on Zigbee device ShortAddr #define ZIGBEE_DISTINCT_TOPICS false // [SetOption89] Enable unique device topic based on Zigbee device ShortAddr
#define ZIGBEE_RMV_ZBRECEIVED false // [SetOption100] Remove ZbReceived form JSON message #define ZIGBEE_RMV_ZBRECEIVED false // [SetOption100] Remove ZbReceived form JSON message
#define ZIGBEE_INDEX_EP false // [SetOption101] Add the source endpoint as suffix to attributes, ex `Power3` instead of `Power` if sent from endpoint 3 #define ZIGBEE_INDEX_EP false // [SetOption101] Add the source endpoint as suffix to attributes, ex `Power3` instead of `Power` if sent from endpoint 3
#define ZIGBEE_TOPIC_FNAME false // [SetOption112] Enable friendly name in Zigbee topic (use with ZIGBEE_DISTINCT_TOPICS)
/*********************************************************************************************\ /*********************************************************************************************\
* END OF SECTION 1 * END OF SECTION 1

1
tasmota/tasmota_support/settings.ino
View File

@ -1238,6 +1238,7 @@ void SettingsDefaultSet2(void) {
flag4.zigbee_distinct_topics |= ZIGBEE_DISTINCT_TOPICS; flag4.zigbee_distinct_topics |= ZIGBEE_DISTINCT_TOPICS;
flag4.remove_zbreceived |= ZIGBEE_RMV_ZBRECEIVED; flag4.remove_zbreceived |= ZIGBEE_RMV_ZBRECEIVED;
flag4.zb_index_ep |= ZIGBEE_INDEX_EP; flag4.zb_index_ep |= ZIGBEE_INDEX_EP;
flag4.zb_topic_fname |= ZIGBEE_TOPIC_FNAME;
flag4.mqtt_tls |= MQTT_TLS_ENABLED; flag4.mqtt_tls |= MQTT_TLS_ENABLED;
flag4.mqtt_no_retain |= MQTT_NO_RETAIN; flag4.mqtt_no_retain |= MQTT_NO_RETAIN;