From f46039cd13e5001520d71c4838a3e97fe1462dd8 Mon Sep 17 00:00:00 2001 From: mikee47 Date: Sat, 13 Mar 2021 20:57:38 +0000 Subject: [PATCH] Move `addItem` methods into header... --- .../rboot/include/Network/RbootHttpUpdater.h | 25 +++++++++++++++++-- .../Components/rboot/src/RbootHttpUpdater.cpp | 25 ------------------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/Sming/Components/rboot/include/Network/RbootHttpUpdater.h b/Sming/Components/rboot/include/Network/RbootHttpUpdater.h index 049056488d..9c835f111d 100644 --- a/Sming/Components/rboot/include/Network/RbootHttpUpdater.h +++ b/Sming/Components/rboot/include/Network/RbootHttpUpdater.h @@ -50,7 +50,15 @@ class RbootHttpUpdater : protected HttpClient * @retval bool * @note Use the `Partition` overload where possible */ - bool addItem(uint32_t offset, const String& firmwareFileUrl, size_t maxSize = 0); + bool addItem(uint32_t offset, const String& firmwareFileUrl, size_t maxSize = 0) + { + RbootHttpUpdaterItem add; + add.targetOffset = offset; + add.url = firmwareFileUrl; + add.size = maxSize; + add.stream = nullptr; + return items.add(add); + } /** * @brief Add an item to update @@ -69,7 +77,20 @@ class RbootHttpUpdater : protected HttpClient * @param stream * @retval bool */ - bool addItem(const String& firmwareFileUrl, RbootOutputStream* stream); + bool addItem(const String& firmwareFileUrl, RbootOutputStream* stream) + { + if(stream == nullptr) { + return false; + } + + RbootHttpUpdaterItem add; + add.targetOffset = stream->getStartAddress(); + add.url = firmwareFileUrl; + add.size = stream->getMaxLength(); + add.stream = stream; + + return items.add(add); + } void start(); diff --git a/Sming/Components/rboot/src/RbootHttpUpdater.cpp b/Sming/Components/rboot/src/RbootHttpUpdater.cpp index b6a6f4b101..ac7f435195 100644 --- a/Sming/Components/rboot/src/RbootHttpUpdater.cpp +++ b/Sming/Components/rboot/src/RbootHttpUpdater.cpp @@ -15,31 +15,6 @@ #include -bool RbootHttpUpdater::addItem(uint32_t offset, const String& firmwareFileUrl, size_t maxSize) -{ - RbootHttpUpdaterItem add; - add.targetOffset = offset; - add.url = firmwareFileUrl; - add.size = maxSize; - add.stream = nullptr; - return items.add(add); -} - -bool RbootHttpUpdater::addItem(const String& firmwareFileUrl, RbootOutputStream* stream) -{ - if(stream == nullptr) { - return false; - } - - RbootHttpUpdaterItem add; - add.targetOffset = stream->getStartAddress(); - add.url = firmwareFileUrl; - add.size = stream->getMaxLength(); - add.stream = stream; - - return items.add(add); -} - void RbootHttpUpdater::start() { for(unsigned i = 0; i < items.count(); i++) {