From 44ffc903d4c8cbc9b3702d92a760dc6d8a6d623f Mon Sep 17 00:00:00 2001 From: Rodrigo Alfonso Date: Thu, 6 Feb 2025 08:01:09 -0300 Subject: [PATCH] LinkWirelessMultiboot: Moving progress reporting to example (without needing to enable logs) --- .../src/scenes/MultibootScene.cpp | 9 ++++++++- lib/LinkWirelessMultiboot.hpp | 10 ++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/examples/LinkWirelessMultiboot_demo/src/scenes/MultibootScene.cpp b/examples/LinkWirelessMultiboot_demo/src/scenes/MultibootScene.cpp index a3b965f..96538da 100644 --- a/examples/LinkWirelessMultiboot_demo/src/scenes/MultibootScene.cpp +++ b/examples/LinkWirelessMultiboot_demo/src/scenes/MultibootScene.cpp @@ -256,9 +256,16 @@ void MultibootScene::processButtons() { printFile(); // (2) Send the ROM + u32 percentage = 0; auto result = linkWirelessMultiboot->sendRom( romToSend, fileLength, "Multiboot", "Test", 0xFFFF, players, - [](LinkWirelessMultiboot::MultibootProgress progress) { + [&percentage](LinkWirelessMultiboot::MultibootProgress progress) { + // Show progress + if (percentage != progress.percentage) { + percentage = progress.percentage; + log("-> " + std::to_string(percentage)); + } + u16 keys = ~REG_KEYS & KEY_ANY; if (keys & KEY_SELECT) { // SELECT = Start transfer before the player count is reached diff --git a/lib/LinkWirelessMultiboot.hpp b/lib/LinkWirelessMultiboot.hpp index 6128dad..6d2897c 100644 --- a/lib/LinkWirelessMultiboot.hpp +++ b/lib/LinkWirelessMultiboot.hpp @@ -450,10 +450,7 @@ class LinkWirelessMultiboot { LINK_WIRELESS_MULTIBOOT_TRY_SUB(sendAndExpectData(sendBuffer, response)) u8 newPercentage = multiTransfer.processResponse(response); - if (newPercentage != progress.percentage) { - progress.percentage = newPercentage; - _LWMLOG_("-> " + std::to_string(newPercentage)); - } + progress.percentage = newPercentage; } return Result::SUCCESS; @@ -1252,10 +1249,7 @@ class LinkWirelessMultiboot { return (void)stop(Result::FAILURE); u8 newPercentage = multiTransfer.processResponse(receiveDataResponse); - if (newPercentage != dynamicData.percentage) { - dynamicData.percentage = newPercentage; - _LWMLOG_("-> " + std::to_string(newPercentage)); - } + dynamicData.percentage = newPercentage; dynamicData.frameTransfers++; startTimer();