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

Fix template conversion when GPIO17 is 0

Browse Source
This commit is contained in:
Theo Arends 2020-10-04 12:46:06 +02:00
parent eecfbd990a
commit 73ad5706c3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tasmota/support.ino
View File

@ -1522,13 +1522,16 @@ 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
if (!arr[13].getUInt()) { // Old template JsonParserToken gpio17 = arr[13];
if (!gpio17) { // 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 }; uint8_t template8[sizeof(mytmplt8285)] = { GPIO_NONE };
for (uint32_t i = 0; i < ARRAY_SIZE(template8) -1; i++) { for (uint32_t i = 0; i < ARRAY_SIZE(template8) -1; i++) {
template8[i] = arr[i].getUInt(); 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) {
@ -1539,7 +1542,9 @@ bool JsonTemplate(char* dataBuf)
} else { } else {
#endif #endif
for (uint32_t i = 0; i < ARRAY_SIZE(Settings.user_template.gp.io); i++) { for (uint32_t i = 0; i < ARRAY_SIZE(Settings.user_template.gp.io); i++) {
uint16_t gpio = arr[i].getUInt(); JsonParserToken val = arr[i];
if (!val) { break; }
uint16_t gpio = val.getUInt();
if (gpio == (AGPIO(GPIO_NONE) +1)) { if (gpio == (AGPIO(GPIO_NONE) +1)) {
gpio = AGPIO(GPIO_USER); gpio = AGPIO(GPIO_USER);
} }