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

Add additional chk before converting template

This commit is contained in:
Theo Arends 2020-10-04 15:46:20 +02:00
parent d100ba3592
commit 82e74b369f
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tasmota/support.ino
View File

@ -1522,17 +1522,23 @@ bool JsonTemplate(char* dataBuf)
JsonParserArray arr = root[PSTR(D_JSON_GPIO)]; JsonParserArray arr = root[PSTR(D_JSON_GPIO)];
if (arr) { if (arr) {
#ifdef ESP8266 #ifdef ESP8266
JsonParserToken gpio17 = arr[13]; bool old_template = false;
if (!gpio17) { // Old template uint8_t template8[sizeof(mytmplt8285)] = { GPIO_NONE };
if (13 == arr.size()) { // Possible old template
uint32_t gpio = 0;
for (uint32_t i = 0; i < ARRAY_SIZE(template8) -1; i++) {
gpio = arr[i].getUInt();
if (gpio > 255) { // New templates might have values above 255
break;
}
template8[i] = gpio;
}
old_template = (gpio < 256);
}
if (old_template) {
AddLog_P(LOG_LEVEL_DEBUG, PSTR("TPL: Converting template ...")); AddLog_P(LOG_LEVEL_DEBUG, PSTR("TPL: Converting template ..."));
uint8_t template8[sizeof(mytmplt8285)] = { GPIO_NONE };
for (uint32_t i = 0; i < ARRAY_SIZE(template8) -1; i++) {
JsonParserToken val = arr[i];
if (!val) { break; }
template8[i] = val.getUInt();
}
val = root[PSTR(D_JSON_FLAG)]; val = root[PSTR(D_JSON_FLAG)];
if (val) { if (val) {
template8[ARRAY_SIZE(template8) -1] = val.getUInt() & 0x0F; template8[ARRAY_SIZE(template8) -1] = val.getUInt() & 0x0F;