Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-11-01 10:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(l2): wait out the tile being read before the SD card is unmounted

Browse Source 
USB drive and Format card closed the open map pack and unmounted, while the
tile task could still be reading a tile off the card (a map left open, a
prefetch). Both now wait for it first, as the map's own redraw does.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-10-23 22:52:11 +02:00
co-authored by Claude Opus 5.5
parent a69ecd9d14
commit 21feec0972
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/ui-lvgl/StorageScreen.h
+10 -2
View File
@@ -55,6 +55,14 @@ static void stopWalk() {
s_walking = false; s_walking = false;
} }
// Before the card is unmounted: let the tile task finish the tile it may still
// be reading off it (from a map left open, or a prefetch), then close the map
// pack it reads from.
static void releaseMapFiles() {
while (mapview::s_cache.busy()) { delay(5); mapview::pollTiles(); }
mapview::s_vpacks.closeOpen();
}
static void startWalk() { static void startWalk() {
stopWalk(); stopWalk();
memset(s_bytes, 0, sizeof(s_bytes)); memset(s_bytes, 0, sizeof(s_bytes));
@@ -414,7 +422,7 @@ void UITask::storageFormatTap(bool go) {
lv_refr_now(NULL); // shown before the loop blocks lv_refr_now(NULL); // shown before the loop blocks
stopWalk(); stopWalk();
if (mapview::s_dl.active()) mapDownloadStop(); if (mapview::s_dl.active()) mapDownloadStop();
mapview::s_vpacks.closeOpen(); storeview::releaseMapFiles();
bool ok = lvport::formatCard(); bool ok = lvport::formatCard();
if (!ok) { if (!ok) {
if (s_fmt_overlay) lv_obj_delete_async(s_fmt_overlay); if (s_fmt_overlay) lv_obj_delete_async(s_fmt_overlay);
@@ -505,7 +513,7 @@ void UITask::usbTap(bool drive) {
if (!drive || locked()) return; if (!drive || locked()) return;
storeview::stopWalk(); storeview::stopWalk();
if (mapview::s_dl.active()) mapDownloadStop(); if (mapview::s_dl.active()) mapDownloadStop();
mapview::s_vpacks.closeOpen(); // a pack file kept open between reads: not across the unmount storeview::releaseMapFiles(); // the tile being read and the pack kept open: not across the unmount
if (!lvport::usbDriveStart()) { showToast("No SD card to share", 3000); return; } if (!lvport::usbDriveStart()) { showToast("No SD card to share", 3000); return; }
usbPanel("USB drive", usbPanel("USB drive",
"The computer has the SD card now. Eject it there (or unplug the cable) when you're done - " "The computer has the SD card now. Eject it there (or unplug the cable) when you're done - "