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

Merge branch 'development' into pre-release-9.4.0

Browse Source
This commit is contained in:
Theo Arends 2021-04-14 14:34:20 +02:00
commit e6e00c80cc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/support_tasmota.ino
View File

@ -1155,7 +1155,7 @@ void Every250mSeconds(void)
} }
#endif // ESP8266 #endif // ESP8266
char version[50]; char version[50];
snprintf_P(version, sizeof(version), PSTR("%s-%s"), TasmotaGlobal.image_name, TasmotaGlobal.version); snprintf_P(version, sizeof(version), PSTR("%s%s"), TasmotaGlobal.version, TasmotaGlobal.image_name);
AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPLOAD "%s %s"), TasmotaGlobal.mqtt_data, version); AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPLOAD "%s %s"), TasmotaGlobal.mqtt_data, version);
WiFiClient OTAclient; WiFiClient OTAclient;
ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(OTAclient, TasmotaGlobal.mqtt_data, version)); ota_result = (HTTP_UPDATE_FAILED != ESPhttpUpdate.update(OTAclient, TasmotaGlobal.mqtt_data, version));

2
tasmota/tasmota.ino
View File

@ -78,7 +78,7 @@
#include <SPI.h> #include <SPI.h>
#ifdef USE_SDCARD #ifdef USE_SDCARD
#include <SD.h> #include <SD.h>
#include <SDFAT.h> #include <SdFat.h>
#endif // USE_SDCARD #endif // USE_SDCARD
#endif // ESP8266 #endif // ESP8266
#ifdef ESP32 #ifdef ESP32