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

Minor strstr() refactor

Browse Source
This commit is contained in:
Theo Arends 2021-04-26 10:35:39 +02:00
parent 015ca3ce84
commit 1c2db8ca46
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tasmota/support.ino
View File

@ -1403,6 +1403,7 @@ bool ValidModule(uint32_t index)
} }
bool ValidTemplate(const char *search) { bool ValidTemplate(const char *search) {
/*
char template_name[strlen(SettingsText(SET_TEMPLATE_NAME)) +1]; char template_name[strlen(SettingsText(SET_TEMPLATE_NAME)) +1];
char search_name[strlen(search) +1]; char search_name[strlen(search) +1];
@ -1410,6 +1411,8 @@ bool ValidTemplate(const char *search) {
LowerCase(search_name, search); LowerCase(search_name, search);
return (strstr(template_name, search_name) != nullptr); return (strstr(template_name, search_name) != nullptr);
*/
return (StrStr_P(SettingsText(SET_TEMPLATE_NAME), search) != nullptr);
} }
String AnyModuleName(uint32_t index) String AnyModuleName(uint32_t index)

2
tasmota/support_tasmota.ino
View File

@ -1149,7 +1149,7 @@ void Every250mSeconds(void)
} }
#endif // FIRMWARE_MINIMAL #endif // FIRMWARE_MINIMAL
if (ota_retry_counter < OTA_ATTEMPTS / 2) { if (ota_retry_counter < OTA_ATTEMPTS / 2) {
if (strstr_P(TasmotaGlobal.mqtt_data, PSTR(".gz"))) { // Might be made case insensitive... if (StrStr_P(TasmotaGlobal.mqtt_data, PSTR(".gz"))) {
ota_retry_counter = 1; ota_retry_counter = 1;
} else { } else {
strcat_P(TasmotaGlobal.mqtt_data, PSTR(".gz")); strcat_P(TasmotaGlobal.mqtt_data, PSTR(".gz"));