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

Document and add errorchecks to OTA

Browse Source 
Document and add errorchecks to OTA
This commit is contained in:
Theo Arends 2020-01-17 17:14:53 +01:00
parent e8ce1eb641
commit be5c7a4367
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tasmota/support_tasmota.ino
View File

@ -885,22 +885,36 @@ void Every250mSeconds(void)
strlcpy(mqtt_data, GetOtaUrl(log_data, sizeof(log_data)), sizeof(mqtt_data)); strlcpy(mqtt_data, GetOtaUrl(log_data, sizeof(log_data)), sizeof(mqtt_data));
#ifndef FIRMWARE_MINIMAL #ifndef FIRMWARE_MINIMAL
if (RtcSettings.ota_loader) { if (RtcSettings.ota_loader) {
char *bch = strrchr(mqtt_data, '/'); // Only consider filename after last backslash prevent change of urls having "-" in it // OTA File too large so try OTA minimal version
char *pch = strrchr((bch != nullptr) ? bch : mqtt_data, '-'); // Change from filename-DE.bin into filename-minimal.bin // Replace tasmota with tasmota-minimal
char *ech = strrchr((bch != nullptr) ? bch : mqtt_data, '.'); // Find file type (none, .bin or .bin.gz) // Replace tasmota-DE with tasmota-minimal
// Replace tasmota.bin with tasmota-minimal.bin
// Replace tasmota.xyz with tasmota-minimal.xyz
// Replace tasmota.bin.gz with tasmota-minimal.bin.gz
// Replace tasmota.xyz.gz with tasmota-minimal.xyz.gz
// Replace http://domus1:80/api/arduino/tasmota.bin with http://domus1:80/api/arduino/tasmota-minimal.bin
// Replace http://domus1:80/api/arduino/tasmota.bin.gz with http://domus1:80/api/arduino/tasmota-minimal.bin.gz
// Replace http://domus1:80/api/arduino/tasmota-DE.bin.gz with http://domus1:80/api/arduino/tasmota-minimal.bin.gz
// Replace http://domus1:80/api/ard-uino/tasmota-DE.bin.gz with http://domus1:80/api/ard-uino/tasmota-minimal.bin.gz
char *bch = strrchr(mqtt_data, '/'); // Only consider filename after last backslash prevent change of urls having "-" in it
if (bch == nullptr) { bch = mqtt_data; } // No path found so use filename only
char *ech = strrchr(bch, '.'); // Find file type in filename (none, .bin or .gz)
if ((ech != nullptr) && (0 == strncasecmp_P(ech, PSTR(".GZ"), 3))) { if ((ech != nullptr) && (0 == strncasecmp_P(ech, PSTR(".GZ"), 3))) {
char *fch = ech; char *fch = ech;
*fch = '\0'; *fch = '\0';
ech = strrchr((bch != nullptr) ? bch : mqtt_data, '.'); // Find file type .bin.gz ech = strrchr(bch, '.'); // Find file type .bin.gz
*fch = '.'; *fch = '.';
} }
if (ech == nullptr) { ech = mqtt_data + strlen(mqtt_data); }
char ota_url_type[strlen(ech) +1]; char ota_url_type[strlen(ech) +1];
strncpy(ota_url_type, ech, sizeof(ota_url_type)); // Either nothing, .bin or .bin.gz strncpy(ota_url_type, ech, sizeof(ota_url_type)); // Either empty, .bin or .bin.gz
if (pch == nullptr) { pch = ech; }
if (pch) { char *pch = strrchr(bch, '-'); // Find last dash (-) and ignore remainder - handles tasmota-DE
mqtt_data[pch - mqtt_data] = '\0'; if (pch == nullptr) { pch = ech; } // No dash so ignore filetype
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), mqtt_data, ota_url_type); // Minimal filename must be filename-minimal *pch = '\0'; // mqtt_data = http://domus1:80/api/arduino/tasmota
} snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s-" D_JSON_MINIMAL "%s"), mqtt_data, ota_url_type); // Minimal filename must be filename-minimal
} }
#endif // FIRMWARE_MINIMAL #endif // FIRMWARE_MINIMAL
AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPLOAD "%s"), mqtt_data); AddLog_P2(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPLOAD "%s"), mqtt_data);