KBF-32 rename wifi.h to wifi_legacy.h

CMakeLists.txt

@@ -19,9 +19,9 @@ idf_component_register(
         "src/task.cpp"
         "src/uart.cpp"
         "src/web_service.cpp"
-        "src/wifi/ap.cpp"
-        "src/wifi/sta.cpp"
-        "src/wifi/driver.cpp"
+        "src/wifi_legacy/ap.cpp"
+        "src/wifi_legacy/sta.cpp"
+        "src/wifi_legacy/driver.cpp"
 
         INCLUDE_DIRS "include" "lib"
 

include/kbf/wifi.h → include/kbf/wifi_legacy.h

@@ -1,5 +1,5 @@
-#ifndef KBF_WIFI_H
-#define KBF_WIFI_H
+#ifndef KBF_WIFI_LEGACY_H
+#define KBF_WIFI_LEGACY_H
 
 #include <string>
 #include <memory>
@@ -16,7 +16,11 @@ using std::shared_ptr;
 using std::map;
 using std::vector;
 
-/** @brief WiFi functions */
+/**
+ * @brief WiFi functions
+ *
+ * @deprecated use kbf::wifi instead
+ */
 namespace kbf::wifi {
     /** @brief Tag used for logging */
     static constexpr const char *TAG = "kbf::wifi";
@@ -383,4 +387,4 @@ namespace kbf::wifi {
 
 }
 
-#endif //KBF_WIFI_H
+#endif //KBF_WIFI_LEGACY_H

src/wifi/ap.cpp → src/wifi_legacy/ap.cpp

@@ -1,4 +1,4 @@
-#include "kbf/wifi.h"
+#include "kbf/wifi_legacy.h"
 
 #include "kbf/macros.h"
 

src/wifi/driver.cpp → src/wifi_legacy/driver.cpp

@@ -1,4 +1,4 @@
-#include "kbf/wifi.h"
+#include "kbf/wifi_legacy.h"
 
 #include <utility>
 #include <memory>

src/wifi/sta.cpp → src/wifi_legacy/sta.cpp

@@ -1,4 +1,4 @@
-#include "kbf/wifi.h"
+#include "kbf/wifi_legacy.h"
 
 #include "kbf/macros.h"
 #include "kbf/nvs.h"

test/test_http.cpp

@@ -3,7 +3,7 @@
 #include <nlohmann_json/json.hpp>
 
 #include "kbf.h"
-#include "kbf/wifi.h"
+#include "kbf/wifi_legacy.h"
 #include "kbf/http/client.h"
 #include "kbf/http/server.h"
 #include "kbf/http/exception.h"

test/test_https.cpp

@@ -1,7 +1,7 @@
 #include <nlohmann_json/json.hpp>
 
 #include "kbf.h"
-#include "kbf/wifi.h"
+#include "kbf/wifi_legacy.h"
 #include "kbf/http/server.h"
 #include "kbf/http/client.h"
 #include "kbf/rtos.h"

test/test_net.cpp

@@ -1,5 +1,5 @@
 #include <unity.h>
-#include <kbf/wifi.h>
+#include <kbf/wifi_legacy.h>
 #include <kbf/rtos.h>
 #include <kbf/uart.h>
 

test/test_web_service.cpp

@@ -1,4 +1,4 @@
-#include <kbf/wifi.h>
+#include <kbf/wifi_legacy.h>
 #include <kbf/http/client.h>
 #include <kbf/web_service.h>
 

test/test_wifi.cpp → test/test_wifi_legacy.cpp

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include <kbf.h>
-#include <kbf/wifi.h>
+#include <kbf/wifi_legacy.h>
 #include <kbf/rtos.h>
 #include <kbf/http/client.h>
 #include <kbf/web_service.h>
@@ -40,7 +40,7 @@ static void waitForState(int expectedState, int timeoutSeconds) {
     }
 }
 
-TEST_CASE("WiFi STA mode reconnect", "[kbf_wifi]") {
+TEST_CASE("WiFi legacy STA mode reconnect", "[kbf_wifi_legacy]") {
     using namespace kbf;
 
     state = 0;
@@ -68,7 +68,7 @@ TEST_CASE("WiFi STA mode reconnect", "[kbf_wifi]") {
     wifi::stop();
 }
 
-TEST_CASE("WiFi STA mode reconnect cancel", "[kbf_wifi]") {
+TEST_CASE("WiFi legacy STA mode reconnect cancel", "[kbf_wifi_legacy]") {
     using namespace kbf;
 
     wifi::start(wifi::STA::create());
@@ -150,7 +150,7 @@ void wifiSingleSlave() {
     TEST_ASSERT_EQUAL(5, state);
 }
 
-TEST_CASE_MULTIPLE_DEVICES("WiFi AP <--> STA", "[kbf_wifi]", wifiSingleMaster, wifiSingleSlave)
+TEST_CASE_MULTIPLE_DEVICES("WiFi legacy AP <--> STA", "[kbf_wifi_legacy]", wifiSingleMaster, wifiSingleSlave)
 
 void wifiDualMaster() {
     using namespace kbf;
@@ -216,7 +216,7 @@ void wifiDualSlave() {
     wifi::stop();
 }
 
-TEST_CASE_MULTIPLE_DEVICES("WiFi AP+STA <--> AP+STA", "[kbf_wifi]", wifiDualMaster, wifiDualSlave)
+TEST_CASE_MULTIPLE_DEVICES("WiFi legacy AP+STA <--> AP+STA", "[kbf_wifi_legacy]", wifiDualMaster, wifiDualSlave)
 
 void wifiScanMaster() {
     using namespace kbf;
@@ -263,7 +263,7 @@ void wifiScanSlave() {
     wifi::stop();
 }
 
-TEST_CASE_MULTIPLE_DEVICES("WiFi scan", "[kbf_wifi]", wifiScanMaster, wifiScanSlave)
+TEST_CASE_MULTIPLE_DEVICES("WiFi legacy scan", "[kbf_wifi_legacy]", wifiScanMaster, wifiScanSlave)
 
 static kbf::rtos::EventGroup eventGroup;
 
@@ -302,7 +302,7 @@ void wifiIpSlave() {
     wifi::stop();
 }
 
-TEST_CASE_MULTIPLE_DEVICES("WiFi custom IP address", "[kbf_wifi]", wifiIpMaster, wifiIpSlave)
+TEST_CASE_MULTIPLE_DEVICES("WiFi legacy custom IP address", "[kbf_wifi_legacy]", wifiIpMaster, wifiIpSlave)
 
 static kbf::http::Client *client;
 
@@ -382,9 +382,9 @@ void wifiModeSwitchSlave() {
     wifi::stop();
 }
 
-TEST_CASE_MULTIPLE_DEVICES("WiFi mode switching", "[kbf_wifi]", wifiModeSwitchMaster, wifiModeSwitchSlave)
+TEST_CASE_MULTIPLE_DEVICES("WiFi legacy mode switching", "[kbf_wifi_legacy]", wifiModeSwitchMaster, wifiModeSwitchSlave)
 
-TEST_CASE("WiFi state handling", "[kbf_wifi]") {
+TEST_CASE("WiFi legacy state handling", "[kbf_wifi_legacy]") {
     using namespace kbf;
 
     wifi::stop();