jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 12:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Zigbee SetOption synonyms

Browse Source 
Add commands ``ZbNameKey``, ``ZbDeviceTopic``, ``ZbNoPrefix``, ``ZbEndpointSuffix``, ``ZbNoAutoBind``, ``ZbNameTopic`` as synonyms for ``SetOption83, 89, 100, 101, 110 and 112`` respectively
This commit is contained in:
Stephan Hadinger 2021-01-26 19:24:13 +01:00
parent 05650384dd
commit bc6f2b066f
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasmota/i18n.h
View File

@ -529,6 +529,12 @@
// Commands xdrv_23_zigbee.ino // Commands xdrv_23_zigbee.ino
#define D_PRFX_ZB "Zb" #define D_PRFX_ZB "Zb"
#define D_SO_ZIGBEE_NAMEKEY "NameKey"
#define D_SO_ZIGBEE_DEVICETOPIC "DeviceTopic"
#define D_SO_ZIGBEE_NOPREFIX "NoPrefix"
#define D_SO_ZIGBEE_ENDPOINTSUFFIX "EndpointSuffix"
#define D_SO_ZIGBEE_NOAUTOBIND "NoAutoBind"
#define D_SO_ZIGBEE_NAMETOPIC "NameTopic"
#define D_ZIGBEE_NOT_STARTED "Zigbee not started" #define D_ZIGBEE_NOT_STARTED "Zigbee not started"
#define D_CMND_ZIGBEE_PERMITJOIN "PermitJoin" #define D_CMND_ZIGBEE_PERMITJOIN "PermitJoin"
#define D_CMND_ZIGBEE_STATUS "Status" #define D_CMND_ZIGBEE_STATUS "Status"

11
tasmota/xdrv_23_zigbee_A_impl.ino
View File

@ -24,6 +24,9 @@
#include "UnishoxStrings.h" #include "UnishoxStrings.h"
const char kZbCommands[] PROGMEM = D_PRFX_ZB "|" // prefix const char kZbCommands[] PROGMEM = D_PRFX_ZB "|" // prefix
// SetOption synonyms
D_SO_ZIGBEE_NAMEKEY "|" D_SO_ZIGBEE_DEVICETOPIC "|" D_SO_ZIGBEE_NOPREFIX "|" D_SO_ZIGBEE_ENDPOINTSUFFIX "|" D_SO_ZIGBEE_NOAUTOBIND "|"
D_SO_ZIGBEE_NAMETOPIC "|"
#ifdef USE_ZIGBEE_ZNP #ifdef USE_ZIGBEE_ZNP
D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEEZNPRECEIVE "|" D_CMND_ZIGBEEZNPSEND "|" D_CMND_ZIGBEEZNPRECEIVE "|"
#endif // USE_ZIGBEE_ZNP #endif // USE_ZIGBEE_ZNP
@ -39,6 +42,12 @@ const char kZbCommands[] PROGMEM = D_PRFX_ZB "|" // prefix
D_CMND_ZIGBEE_CONFIG "|" D_CMND_ZIGBEE_DATA D_CMND_ZIGBEE_CONFIG "|" D_CMND_ZIGBEE_DATA
; ;
const uint8_t kZbSynonyms[] PROGMEM = {
6, // number of synonyms
83, 89, 100, 101, 110,
112,
};
void (* const ZigbeeCommand[])(void) PROGMEM = { void (* const ZigbeeCommand[])(void) PROGMEM = {
#ifdef USE_ZIGBEE_ZNP #ifdef USE_ZIGBEE_ZNP
&CmndZbZNPSend, &CmndZbZNPReceive, &CmndZbZNPSend, &CmndZbZNPReceive,
@ -2182,7 +2191,7 @@ bool Xdrv23(uint8_t function)
ZigbeeInit(); ZigbeeInit();
break; break;
case FUNC_COMMAND: case FUNC_COMMAND:
result = DecodeCommand(kZbCommands, ZigbeeCommand); result = DecodeCommand(kZbCommands, ZigbeeCommand, kZbSynonyms);
break; break;
case FUNC_SAVE_BEFORE_RESTART: case FUNC_SAVE_BEFORE_RESTART:
#ifdef USE_ZIGBEE_EZSP #ifdef USE_ZIGBEE_EZSP