From 048556803b8f2f2e9bdc6daf7cf024c65fbecdd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Sat, 30 Apr 2022 21:08:09 +0200
Subject: [PATCH] [core] Move non-interface classes to libraries

---
 arduino/libretuya/{api => libraries/NetUtils}/IPv6Address.cpp  | 0
 arduino/libretuya/{api => libraries/NetUtils}/IPv6Address.h    | 0
 arduino/libretuya/{api => libraries/NetUtils}/LwIPRxBuffer.cpp | 0
 arduino/libretuya/{api => libraries/NetUtils}/LwIPRxBuffer.h   | 0
 arduino/libretuya/libraries/NetUtils/api/IPv6Address.h         | 3 +++
 arduino/realtek-ambz/libraries/WiFi/WiFiClient.h               | 2 +-
 builder/arduino-common.py                                      | 1 +
 7 files changed, 5 insertions(+), 1 deletion(-)
 rename arduino/libretuya/{api => libraries/NetUtils}/IPv6Address.cpp (100%)
 rename arduino/libretuya/{api => libraries/NetUtils}/IPv6Address.h (100%)
 rename arduino/libretuya/{api => libraries/NetUtils}/LwIPRxBuffer.cpp (100%)
 rename arduino/libretuya/{api => libraries/NetUtils}/LwIPRxBuffer.h (100%)
 create mode 100644 arduino/libretuya/libraries/NetUtils/api/IPv6Address.h

diff --git a/arduino/libretuya/api/IPv6Address.cpp b/arduino/libretuya/libraries/NetUtils/IPv6Address.cpp
similarity index 100%
rename from arduino/libretuya/api/IPv6Address.cpp
rename to arduino/libretuya/libraries/NetUtils/IPv6Address.cpp
diff --git a/arduino/libretuya/api/IPv6Address.h b/arduino/libretuya/libraries/NetUtils/IPv6Address.h
similarity index 100%
rename from arduino/libretuya/api/IPv6Address.h
rename to arduino/libretuya/libraries/NetUtils/IPv6Address.h
diff --git a/arduino/libretuya/api/LwIPRxBuffer.cpp b/arduino/libretuya/libraries/NetUtils/LwIPRxBuffer.cpp
similarity index 100%
rename from arduino/libretuya/api/LwIPRxBuffer.cpp
rename to arduino/libretuya/libraries/NetUtils/LwIPRxBuffer.cpp
diff --git a/arduino/libretuya/api/LwIPRxBuffer.h b/arduino/libretuya/libraries/NetUtils/LwIPRxBuffer.h
similarity index 100%
rename from arduino/libretuya/api/LwIPRxBuffer.h
rename to arduino/libretuya/libraries/NetUtils/LwIPRxBuffer.h
diff --git a/arduino/libretuya/libraries/NetUtils/api/IPv6Address.h b/arduino/libretuya/libraries/NetUtils/api/IPv6Address.h
new file mode 100644
index 0000000..b7aa458
--- /dev/null
+++ b/arduino/libretuya/libraries/NetUtils/api/IPv6Address.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "../IPv6Address.h"
diff --git a/arduino/realtek-ambz/libraries/WiFi/WiFiClient.h b/arduino/realtek-ambz/libraries/WiFi/WiFiClient.h
index 5dfdbf5..e1d264f 100644
--- a/arduino/realtek-ambz/libraries/WiFi/WiFiClient.h
+++ b/arduino/realtek-ambz/libraries/WiFi/WiFiClient.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <api/LwIPRxBuffer.h>
 #include <api/WiFiClient.h>
+#include <LwIPRxBuffer.h>
 #include <memory>
 
 class SocketHandle;
diff --git a/builder/arduino-common.py b/builder/arduino-common.py
index 5185466..0141945 100644
--- a/builder/arduino-common.py
+++ b/builder/arduino-common.py
@@ -21,6 +21,7 @@ env.Prepend(
         join(LT_API_DIR, "compat"),
         join(LT_API_DIR, "libraries", "base64"),
         join(LT_API_DIR, "libraries", "HTTPClient"),
+        join(LT_API_DIR, "libraries", "NetUtils"),
         join(LT_API_DIR, "libraries", "WebServer"),
         join(LT_API_DIR, "libraries", "WiFiMulti"),
         # fmt: on