mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9270 from s-hadinger/zigbee_sep_8 

Fix crash in `ZbRestore`
This commit is contained in:
s-hadinger 2020-09-08 21:16:20 +02:00 committed by GitHub
parent 469f0813d4 5eb2434808
commit aa4606fdec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/xdrv_23_zigbee_1_headers.ino
View File

@ -57,7 +57,7 @@ JsonVariant &startsWithCaseInsensitive(const JsonObject &json, const char *needl
return *(JsonVariant*)nullptr; return *(JsonVariant*)nullptr;
} }
String needle_s(needle); String needle_s((const __FlashStringHelper *)needle);
needle_s.toLowerCase(); needle_s.toLowerCase();
for (auto kv : json) { for (auto kv : json) {

2
tasmota/xdrv_23_zigbee_7_statemachine.ino
View File

@ -681,7 +681,7 @@ ZBM(ZBS_SET_CONCENTRATOR, EZSP_setConcentrator, 0x00 /*high*/, 0x00 /*false*/, 0
ZBM(ZBR_SET_CONCENTRATOR, EZSP_setConcentrator, 0x00 /*high*/, 0x00 /*ok*/) // 100000 ZBM(ZBR_SET_CONCENTRATOR, EZSP_setConcentrator, 0x00 /*high*/, 0x00 /*ok*/) // 100000
// setInitialSecurityState // setInitialSecurityState
#define EZ_SECURITY_MODE EMBER_TRUST_CENTER_GLOBAL_LINK_KEY | EMBER_PRECONFIGURED_NETWORK_KEY_MODE | EMBER_HAVE_NETWORK_KEY | EMBER_HAVE_PRECONFIGURED_KEY | EMBER_NO_FRAME_COUNTER_RESET #define EZ_SECURITY_MODE EMBER_TRUST_CENTER_GLOBAL_LINK_KEY | EMBER_PRECONFIGURED_NETWORK_KEY_MODE | EMBER_HAVE_NETWORK_KEY | EMBER_HAVE_PRECONFIGURED_KEY
ZBR(ZBS_SET_SECURITY, EZSP_setInitialSecurityState, 0x00 /*high*/, ZBR(ZBS_SET_SECURITY, EZSP_setInitialSecurityState, 0x00 /*high*/,
Z_B0(EZ_SECURITY_MODE), Z_B1(EZ_SECURITY_MODE), Z_B0(EZ_SECURITY_MODE), Z_B1(EZ_SECURITY_MODE),
// preConfiguredKey // preConfiguredKey

1
tasmota/xdrv_23_zigbee_9_serial.ino
View File

@ -598,6 +598,7 @@ int32_t ZigbeeProcessInputEZSP(class SBuffer &buf) {
case EZSP_messageSentHandler: // 3F00 case EZSP_messageSentHandler: // 3F00
case EZSP_setConfigurationValue: // 5300 case EZSP_setConfigurationValue: // 5300
case EZSP_setPolicy: // 5500 case EZSP_setPolicy: // 5500
case 0x0059: // 5900 - supposedly removed by still happening
case EZSP_setMulticastTableEntry: // 6400 case EZSP_setMulticastTableEntry: // 6400
case EZSP_setInitialSecurityState: // 6800 case EZSP_setInitialSecurityState: // 6800
case EZSP_getCurrentSecurityState: // 6900 case EZSP_getCurrentSecurityState: // 6900