From a9290385abf47afdf868024492504b2983450468 Mon Sep 17 00:00:00 2001 From: a Date: Fri, 21 Aug 2020 04:28:11 +0200 Subject: [PATCH] use components/wifi-controller/espidf-v4.1.c --- components/wifi-controller/CMakeLists.txt | 2 +- components/wifi-controller/espidf-v4.0.c | 3 --- components/wifi-controller/espidf-v4.1.c | 2 -- components/wifi-controller/zephyr.c | 2 -- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/components/wifi-controller/CMakeLists.txt b/components/wifi-controller/CMakeLists.txt index 549afa6..a858a48 100644 --- a/components/wifi-controller/CMakeLists.txt +++ b/components/wifi-controller/CMakeLists.txt @@ -1,6 +1,6 @@ idf_component_register( SRCS - "espidf-v4.0.c" + "espidf-v4.1.c" INCLUDE_DIRS "." PRIV_REQUIRES esp_wifi diff --git a/components/wifi-controller/espidf-v4.0.c b/components/wifi-controller/espidf-v4.0.c index de32e3a..8c60824 100644 --- a/components/wifi-controller/espidf-v4.0.c +++ b/components/wifi-controller/espidf-v4.0.c @@ -1,5 +1,3 @@ -#ifdef FRAMEWORK_espidf -// Copyright 2020 Lukas Haubaum // // Licensed under the GNU Affero General Public License, Version 3; // you may not use this file except in compliance with the License. @@ -176,4 +174,3 @@ wifi_ap_record_t *wifi_controller_connection(void) } return NULL; } -#endif diff --git a/components/wifi-controller/espidf-v4.1.c b/components/wifi-controller/espidf-v4.1.c index d041872..3f4b8f0 100644 --- a/components/wifi-controller/espidf-v4.1.c +++ b/components/wifi-controller/espidf-v4.1.c @@ -1,4 +1,3 @@ -#ifdef FRAMEWORK_espidf // Copyright 2020 Lukas Haubaum // // Licensed under the GNU Affero General Public License, Version 3; @@ -184,4 +183,3 @@ wifi_ap_record_t *wifi_controller_connection(void) } return NULL; } -#endif diff --git a/components/wifi-controller/zephyr.c b/components/wifi-controller/zephyr.c index a560f8d..e8d1b89 100644 --- a/components/wifi-controller/zephyr.c +++ b/components/wifi-controller/zephyr.c @@ -1,3 +1 @@ -#ifdef FRAMEWORK_zephyr #error WIFI not implemented, yet -#endif