R_Duszkiewicz/PI_mikrokontroler_2
1
1
Fork 0
forked from Akcelerometry_drgania_WMT/PI_mikrokontroler
Code Issues Pull Requests Releases 1 Activity

Fix IDLE0 starvation with vTaskDelay(1)

Browse Source
This commit is contained in:
Robert Duszkiewicz
2026-05-10 19:28:41 +02:00
parent 382433b91f
commit ab0173a5b6
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
releases/v1.3.4.2/src/UploadManager.cpp
View File

@@ -60,28 +60,35 @@ void UploadManager::processPendingUploads() {
File dir = SD.open(path); File dir = SD.open(path);
if (!dir || !dir.isDirectory()) { if (!dir || !dir.isDirectory()) {
if(dir) dir.close(); if(dir) dir.close();
vTaskDelay(1); // yield do IDLE0 między katalogami
continue; continue;
} }
for (File f = dir.openNextFile(); f; f = dir.openNextFile()) { for (File f = dir.openNextFile(); f; f = dir.openNextFile()) {
vTaskDelay(1); // yield do IDLE0 przy każdym pliku — zapobiega głodzeniu WDT
if (f.isDirectory()) { f.close(); continue; } if (f.isDirectory()) { f.close(); continue; }
String childPath = String(f.name()); String childPath = String(f.name());
if (!childPath.startsWith("/")) { if (!childPath.startsWith("/")) {
childPath = path + "/" + childPath; childPath = path + "/" + childPath;
} }
if (childPath.endsWith(".wmt")) {
if (childPath == capture_.getCurrentCapturePath()) continue;
ESP_LOGI(TAG_UPLOAD, "Found pending file: %s", childPath.c_str());
uploadFile(childPath);
delay(1000);
}
f.close(); f.close();
// Pomijamy pliki .upl (już wgrane) i inne rozszerzenia
if (!childPath.endsWith(".wmt")) continue;
// Pomijamy plik aktualnie zapisywany przez pomiar
if (childPath == capture_.getCurrentCapturePath()) continue;
Watchdog::feed(); Watchdog::feed();
if (WiFi.status() != WL_CONNECTED) { if (WiFi.status() != WL_CONNECTED) {
dir.close(); dir.close();
return; return;
} }
ESP_LOGI(TAG_UPLOAD, "Found pending file: %s", childPath.c_str());
uploadFile(childPath);
// Krótka przerwa po uploaderze — pozwala IDLE0 na reset WDT
vTaskDelay(pdMS_TO_TICKS(200));
} }
dir.close(); dir.close();
} }

21
src/UploadManager.cpp
View File

@@ -60,28 +60,35 @@ void UploadManager::processPendingUploads() {
File dir = SD.open(path); File dir = SD.open(path);
if (!dir || !dir.isDirectory()) { if (!dir || !dir.isDirectory()) {
if(dir) dir.close(); if(dir) dir.close();
vTaskDelay(1); // yield do IDLE0 między katalogami
continue; continue;
} }
for (File f = dir.openNextFile(); f; f = dir.openNextFile()) { for (File f = dir.openNextFile(); f; f = dir.openNextFile()) {
vTaskDelay(1); // yield do IDLE0 przy każdym pliku — zapobiega głodzeniu WDT
if (f.isDirectory()) { f.close(); continue; } if (f.isDirectory()) { f.close(); continue; }
String childPath = String(f.name()); String childPath = String(f.name());
if (!childPath.startsWith("/")) { if (!childPath.startsWith("/")) {
childPath = path + "/" + childPath; childPath = path + "/" + childPath;
} }
if (childPath.endsWith(".wmt")) {
if (childPath == capture_.getCurrentCapturePath()) continue;
ESP_LOGI(TAG_UPLOAD, "Found pending file: %s", childPath.c_str());
uploadFile(childPath);
delay(1000);
}
f.close(); f.close();
// Pomijamy pliki .upl (już wgrane) i inne rozszerzenia
if (!childPath.endsWith(".wmt")) continue;
// Pomijamy plik aktualnie zapisywany przez pomiar
if (childPath == capture_.getCurrentCapturePath()) continue;
Watchdog::feed(); Watchdog::feed();
if (WiFi.status() != WL_CONNECTED) { if (WiFi.status() != WL_CONNECTED) {
dir.close(); dir.close();
return; return;
} }
ESP_LOGI(TAG_UPLOAD, "Found pending file: %s", childPath.c_str());
uploadFile(childPath);
// Krótka przerwa po uploaderze — pozwala IDLE0 na reset WDT
vTaskDelay(pdMS_TO_TICKS(200));
} }
dir.close(); dir.close();
} }