Move addItem methods into header...

SmingHub · Mar 16, 2021 · f46039c · f46039c
1 parent 70d3818
commit f46039c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 27 deletions.
diff --git 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
@@ -15,31 +15,6 @@
 
 #include <Network/RbootHttpUpdater.h>
 
-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++) {