fix(wifi_remote): Fix CI

espressif · Apr 11, 2024 · 773d0f3 · 773d0f3
1 parent 7e12d38
commit 773d0f3
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 566 deletions.
diff --git a/components/esp_wifi_remote/CMakeLists.txt b/components/esp_wifi_remote/CMakeLists.txt
@@ -2,27 +2,16 @@ if(NOT CONFIG_ESP_WIFI_ENABLED)
     set(src_wifi_is_remote esp_wifi_remote.c esp_wifi_with_remote.c esp_wifi_remote_net.c)
 endif()
 
-#if(CONFIG_ESP_WIFI_REMOTE_LIBRARY_HOSTED)
-#    set(src_wifi_uses_esp_hosted wifi_remote_init.c wifi_remote_rpc.c)
-#endif()
-if(NOT CONFIG_ESP_WIFI_REMOTE_LIBRARY_EPPP)
+if(CONFIG_ESP_WIFI_REMOTE_LIBRARY_EPPP)
+    set(src_wifi_remote_eppp eppp/wifi_remote_rpc_client.cpp eppp/wifi_remote_rpc_server.cpp eppp/eppp_init.c)
+else()
     set(src_wifi_remote_weak esp_wifi_remote_weak.c)
 endif()
 
-#if(NOT SLAVE_BUILD)
-#    set(wifi_remote_host_srcs  esp_wifi_remote_net.c)
-#endif()
-
 idf_component_register(INCLUDE_DIRS include
-                    SRCS ${wifi_remote_host_srcs}
-                        ${src_wifi_remote_weak}
-                        eppp/wifi_remote_rpc_defs.c
-#                        eppp/wifi_remote_impl.cpp
-                        eppp/wifi_remote_rpc_client.cpp
-                        eppp/wifi_remote_rpc_server.cpp
-                        eppp/eppp_init.c
-                        ${src_wifi_uses_esp_hosted}
-                        ${src_wifi_is_remote}
+                    SRCS ${src_wifi_remote_weak}
+                         ${src_wifi_remote_eppp}
+                         ${src_wifi_is_remote}
                     PRIV_INCLUDE_DIRS eppp
                     REQUIRES esp_event esp_netif
                     PRIV_REQUIRES esp_wifi esp-tls)

diff --git a/components/esp_wifi_remote/eppp/eppp_init.c b/components/esp_wifi_remote/eppp/eppp_init.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include "esp_log.h"
-#include "esp_tls.h"
 #include "esp_wifi.h"
 #include "eppp_link.h"
 
@@ -21,19 +20,4 @@ esp_netif_t *wifi_remote_eppp_init(eppp_type_t role)
 #error ESP_WIFI_REMOTE supports only UART transport
 #endif
     return eppp_open(role, &config, portMAX_DELAY);
-
-//    if (role == EPPP_SERVER) {
-//
-//        eppp_config_t config = EPPP_DEFAULT_SERVER_CONFIG();
-//        config.transport = EPPP_TRANSPORT_UART;
-//        config.uart.tx_io = 22;  // d2
-//        config.uart.rx_io = 23;  // d3
-//        return eppp_open(role, &config, portMAX_DELAY);
-//    } else {
-//        eppp_config_t config = EPPP_DEFAULT_CLIENT_CONFIG();
-//        config.transport = EPPP_TRANSPORT_UART;
-//        config.uart.tx_io = 17;
-//        config.uart.rx_io = 16;
-//        return eppp_open(role, &config, portMAX_DELAY);
-//    }
 }