snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2025-12-18 07:07:41 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix progress bar overflow

Browse Source
This commit is contained in:
Dave Allie 2025-12-16 18:19:06 +11:00
parent 01a6fc1a4a
commit d552ace462
No known key found for this signature in database
GPG Key ID: F2FDDB3AD8D0276F
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/screens/UploadFileScreen.cpp
View File

@ -34,9 +34,9 @@ void UploadFileScreen::render() const {
renderer.drawCenteredText(SMALL_FONT_ID, pageHeight / 2 + 95, "UPLOADING"); renderer.drawCenteredText(SMALL_FONT_ID, pageHeight / 2 + 95, "UPLOADING");
if (currentUploadStatus == InProgress) { if (currentUploadStatus == InProgress) {
const double complete = static_cast<double>(currentUploadCompleteSize) / static_cast<double>(currentUploadTotalSize);
renderer.drawRect(20, pageHeight / 2 + 110, pageWidth - 40, 50); renderer.drawRect(20, pageHeight / 2 + 110, pageWidth - 40, 50);
renderer.fillRect(22, pageHeight / 2 + 112, renderer.fillRect(22, pageHeight / 2 + 112, (pageWidth - 44) * complete, 46);
static_cast<size_t>(pageWidth - 44) * currentUploadCompleteSize / currentUploadTotalSize, 46);
} }
renderer.displayBuffer(); renderer.displayBuffer();
@ -69,10 +69,12 @@ void UploadFileScreen::onFileUploadPart(AsyncWebServerRequest* request, const ui
request->_tempFile.write(data, len); request->_tempFile.write(data, len);
xSemaphoreGive(renderingMutex); xSemaphoreGive(renderingMutex);
const int oldPercent = static_cast<double>(currentUploadCompleteSize) / static_cast<double>(currentUploadTotalSize) * 100;
currentUploadCompleteSize += len; currentUploadCompleteSize += len;
const int newPercent = static_cast<double>(currentUploadCompleteSize) / static_cast<double>(currentUploadTotalSize) * 100;
// Only update the screen at most every 5% to avoid blocking the SPI channel // Only update the screen at most every 5% to avoid blocking the SPI channel
if (currentUploadTotalSize > 0 && (currentUploadCompleteSize - len) * 100 / currentUploadTotalSize / 5 < if (oldPercent / 5 < newPercent / 5) {
currentUploadCompleteSize * 100 / currentUploadTotalSize / 5) {
updateRequired = true; updateRequired = true;
} }
} }