andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-06-15 12:26:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
proddy
2026-05-25 12:51:36 +02:00
parent 46c5560222
commit 7f78e27649
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/system.cpp
View File

@@ -1523,9 +1523,10 @@ bool System::check_upgrade() {
// changes going to v3.9 from an earlier version // changes going to v3.9 from an earlier version
if (settings_version.major() == 3 && settings_version.minor() < 9) { if (settings_version.major() == 3 && settings_version.minor() < 9) {
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
// AP_MODE_ALWAYS has been removed
EMSESP::esp32React.getAPSettingsService()->update([&](APSettings & apSettings) { EMSESP::esp32React.getAPSettingsService()->update([&](APSettings & apSettings) {
if (apSettings.provisionMode == 0) { if (apSettings.provisionMode == 0) {
apSettings.provisionMode = AP_MODE_DISCONNECTED; // AP_MODE_ALWAYS has been removed apSettings.provisionMode = AP_MODE_DISCONNECTED; // AP_MODE_DISCONNECTED is the new default
LOG_INFO("Upgrade: Setting AP provision mode to auto"); LOG_INFO("Upgrade: Setting AP provision mode to auto");
return StateUpdateResult::CHANGED; return StateUpdateResult::CHANGED;
} }
@@ -2980,8 +2981,8 @@ bool System::uploadFirmwareURL(const char * url) {
// record the CDN actually sends in practice. // record the CDN actually sends in practice.
ssl_client.setBufferSizes(16384, 1024); ssl_client.setBufferSizes(16384, 1024);
ssl_client.setSessionTimeout(120); ssl_client.setSessionTimeout(120);
basic_client.setTimeout(15000); // socket-level read timeout basic_client.setTimeout(15000); // socket-level read timeout
ssl_client.setTimeout(15000); // Stream::readBytes timeout used by Update ssl_client.setTimeout(15000); // Stream::readBytes timeout used by Update
ssl_client.setClient(&basic_client); ssl_client.setClient(&basic_client);
String url_remain = saved_url.substring(8); // strip "https://" String url_remain = saved_url.substring(8); // strip "https://"
@@ -3138,12 +3139,12 @@ bool System::uploadFirmwareURL(const char * url) {
EMSESP::system_.systemStatus(SYSTEM_STATUS::SYSTEM_STATUS_UPLOADING); EMSESP::system_.systemStatus(SYSTEM_STATUS::SYSTEM_STATUS_UPLOADING);
// explicit chunked read loop instead of Update.writeStream(): // explicit chunked read loop instead of Update.writeStream():
constexpr size_t CHUNK_SIZE = 1024; constexpr size_t CHUNK_SIZE = 1024;
constexpr uint32_t READ_TIMEOUT_MS = 30000; // overall stall timeout per chunk constexpr uint32_t READ_TIMEOUT_MS = 30000; // overall stall timeout per chunk
uint8_t buf[CHUNK_SIZE]; uint8_t buf[CHUNK_SIZE];
size_t total_read = 0; size_t total_read = 0;
bool magic_ok = false; bool magic_ok = false;
int last_pct = -1; int last_pct = -1;
while (total_read < (size_t)firmware_size) { while (total_read < (size_t)firmware_size) {
// wait for some data or for the connection to drop // wait for some data or for the connection to drop
@@ -3189,10 +3190,7 @@ bool System::uploadFirmwareURL(const char * url) {
} }
if (Update.write(buf, n) != n) { if (Update.write(buf, n) != n) {
LOG_ERROR("Firmware upload failed - flash write error at %u of %d bytes: %s", LOG_ERROR("Firmware upload failed - flash write error at %u of %d bytes: %s", (unsigned)total_read, firmware_size, Update.errorString());
(unsigned)total_read,
firmware_size,
Update.errorString());
EMSESP::system_.systemStatus(SYSTEM_STATUS::SYSTEM_STATUS_ERROR_UPLOAD); EMSESP::system_.systemStatus(SYSTEM_STATUS::SYSTEM_STATUS_ERROR_UPLOAD);
return false; return false;
} }