From 90afad266600288a96a75efa5e53bbbe596e78ab Mon Sep 17 00:00:00 2001 From: a Date: Fri, 21 Aug 2020 03:50:13 +0200 Subject: [PATCH] adjusted to modified locations; updated to latest content --- components/wifi-controller/CMakeLists.txt | 4 +- components/wifi-controller/espidf-v4.0.c | 179 ++++++++++++++++++ .../{wifi-controller.c => espidf-v4.1.c} | 4 +- .../wifi-controller}/zephyr.c | 0 main/wifi/espidf-v4.0.c | 162 ---------------- main/wifi/espidf-v4.1.c | 174 ----------------- 6 files changed, 184 insertions(+), 339 deletions(-) create mode 100644 components/wifi-controller/espidf-v4.0.c rename components/wifi-controller/{wifi-controller.c => espidf-v4.1.c} (99%) rename {main/wifi => components/wifi-controller}/zephyr.c (100%) delete mode 100644 main/wifi/espidf-v4.0.c delete mode 100644 main/wifi/espidf-v4.1.c diff --git a/components/wifi-controller/CMakeLists.txt b/components/wifi-controller/CMakeLists.txt index f5bd135..549afa6 100644 --- a/components/wifi-controller/CMakeLists.txt +++ b/components/wifi-controller/CMakeLists.txt @@ -1,8 +1,8 @@ idf_component_register( SRCS - "wifi-controller.c" + "espidf-v4.0.c" INCLUDE_DIRS "." PRIV_REQUIRES esp_wifi nvs_flash -) \ No newline at end of file +) diff --git a/components/wifi-controller/espidf-v4.0.c b/components/wifi-controller/espidf-v4.0.c new file mode 100644 index 0000000..de32e3a --- /dev/null +++ b/components/wifi-controller/espidf-v4.0.c @@ -0,0 +1,179 @@ +#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. +// You may obtain a copy of the License at + +// https://www.gnu.org/licenses/agpl-3.0.html +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +#include + +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "freertos/event_groups.h" +#include "esp_system.h" +#include "esp_wifi.h" +#include "esp_event.h" +#include "esp_log.h" +#include "nvs_flash.h" + +#include "lwip/err.h" +#include "lwip/sys.h" + +#include "wifi-controller.h" + +#define WIFI_CONNECTED_BIT BIT0 +#define WIFI_FAIL_BIT BIT1 + +static EventGroupHandle_t s_wifi_event_group; + +static bool initialized = false; + +static wifi_ap_record_t current_wifi_ap; + +void wifi_controller_init(void) +{ + // init NVS for WIFI + esp_err_t ret; + ret = nvs_flash_init(); + if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) + { + ESP_ERROR_CHECK(nvs_flash_erase()); + ESP_ERROR_CHECK(nvs_flash_init()); + } + + tcpip_adapter_init(); + + ESP_ERROR_CHECK(esp_event_loop_create_default()); + wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); + ESP_ERROR_CHECK(esp_wifi_init(&cfg)); + + initialized = true; +} + +void wifi_controller_scan(wifi_ap_record_t *ap_info, uint16_t *ap_count) +{ + if (!initialized) + { + wifi_controller_init(); + } + + uint16_t number = 10; + + ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); + ESP_ERROR_CHECK(esp_wifi_start()); + ESP_ERROR_CHECK(esp_wifi_scan_start(NULL, true)); + ESP_ERROR_CHECK(esp_wifi_scan_get_ap_records(&number, ap_info)); + ESP_ERROR_CHECK(esp_wifi_scan_get_ap_num(ap_count)); + ESP_ERROR_CHECK(esp_wifi_stop()); +} + +static void event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data) +{ + if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) + { + esp_wifi_connect(); + } + else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) + { + xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT); + } + else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) + { + ESP_LOGD(WIFI_LOG, "got IP"); + xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT); + heap_caps_check_integrity_all(true); + } +} + +esp_err_t wifi_controller_connect(wifi_config_t wifi_config) +{ + if (!initialized) + { + wifi_controller_init(); + } + + ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL)); + ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &event_handler, NULL)); + + ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); + ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config)); + ESP_ERROR_CHECK(esp_wifi_start()); + + s_wifi_event_group = xEventGroupCreate(); + + EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group, WIFI_CONNECTED_BIT | WIFI_FAIL_BIT, pdFALSE, pdFALSE, portMAX_DELAY); + + ESP_ERROR_CHECK(esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, event_handler)); + vEventGroupDelete(s_wifi_event_group); + + if (bits & WIFI_CONNECTED_BIT) + { + ESP_LOGV(WIFI_LOG, "connected to ap SSID:%s", wifi_config.sta.ssid); + return ESP_OK; + } + else if (bits & WIFI_FAIL_BIT) + { + ESP_LOGI(WIFI_LOG, "Failed to connect to SSID:%s with PASSWORD:%s", wifi_config.sta.ssid, wifi_config.sta.password); + return ESP_ERR_INVALID_ARG; + } + else + { + ESP_LOGE(WIFI_LOG, "UNEXPECTED EVENT"); + return ESP_FAIL; + } +} + +esp_err_t wifi_controller_reconnect(void) +{ + if (!initialized) + { + wifi_controller_init(); + } + + ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL)); + ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &event_handler, NULL)); + + ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); + ESP_ERROR_CHECK(esp_wifi_start()); + + s_wifi_event_group = xEventGroupCreate(); + + EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group, WIFI_CONNECTED_BIT | WIFI_FAIL_BIT, pdFALSE, pdFALSE, portMAX_DELAY); + + ESP_ERROR_CHECK(esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, event_handler)); + vEventGroupDelete(s_wifi_event_group); + + if (bits & WIFI_CONNECTED_BIT) + { + ESP_LOGV(WIFI_LOG, "reconnected to last ap"); + return ESP_OK; + } + else if (bits & WIFI_FAIL_BIT) + { + ESP_LOGI(WIFI_LOG, "Failed to reconnect to last ap"); + return ESP_ERR_INVALID_ARG; + } + else + { + ESP_LOGE(WIFI_LOG, "UNEXPECTED EVENT"); + return ESP_FAIL; + } +} + +wifi_ap_record_t *wifi_controller_connection(void) +{ + if (esp_wifi_sta_get_ap_info(¤t_wifi_ap) == ESP_OK) + { + ESP_LOGD(WIFI_LOG, "Current AP: %s", current_wifi_ap.ssid); + return ¤t_wifi_ap; + } + return NULL; +} +#endif diff --git a/components/wifi-controller/wifi-controller.c b/components/wifi-controller/espidf-v4.1.c similarity index 99% rename from components/wifi-controller/wifi-controller.c rename to components/wifi-controller/espidf-v4.1.c index 7395e63..d041872 100644 --- a/components/wifi-controller/wifi-controller.c +++ b/components/wifi-controller/espidf-v4.1.c @@ -1,3 +1,4 @@ +#ifdef FRAMEWORK_espidf // Copyright 2020 Lukas Haubaum // // Licensed under the GNU Affero General Public License, Version 3; @@ -182,4 +183,5 @@ wifi_ap_record_t *wifi_controller_connection(void) return ¤t_wifi_ap; } return NULL; -} \ No newline at end of file +} +#endif diff --git a/main/wifi/zephyr.c b/components/wifi-controller/zephyr.c similarity index 100% rename from main/wifi/zephyr.c rename to components/wifi-controller/zephyr.c diff --git a/main/wifi/espidf-v4.0.c b/main/wifi/espidf-v4.0.c deleted file mode 100644 index 84b21ad..0000000 --- a/main/wifi/espidf-v4.0.c +++ /dev/null @@ -1,162 +0,0 @@ -#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. -// You may obtain a copy of the License at - -// https://www.gnu.org/licenses/agpl-3.0.html -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -#include - -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "freertos/event_groups.h" -#include "esp_system.h" -#include "esp_wifi.h" -#include "esp_event.h" -#include "esp_log.h" -#include "nvs_flash.h" - -#include "lwip/err.h" -#include "lwip/sys.h" - -#include "ena-cwa.h" - -#include "wifi.h" - -#define WIFI_CONNECTED_BIT BIT0 -#define WIFI_FAIL_BIT BIT1 - -static EventGroupHandle_t s_wifi_event_group; - -static int s_retry_num = 0; - -static bool connected = false; - -void wifi_stop(void) -{ - connected = false; - esp_wifi_stop(); - esp_wifi_deinit(); - esp_event_loop_delete_default(); -} - -static esp_err_t event_handler(void *ctx, system_event_t *event) -{ - switch (event->event_id) { - case SYSTEM_EVENT_STA_START: - esp_wifi_connect(); - break; - case SYSTEM_EVENT_STA_DISCONNECTED: - if (s_retry_num < WIFI_MAXIMUM_RETRY) - { - esp_wifi_connect(); - s_retry_num++; - ESP_LOGD(WIFI_LOG, "retry to connect to the AP"); - } - else - { - xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT); - } - ESP_LOGD(WIFI_LOG, "connect to the AP fail"); - connected = false; - break; - case SYSTEM_EVENT_STA_GOT_IP: - s_retry_num = 0; - xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT); - connected = true; - - heap_caps_check_integrity_all(true); - break; - default: - ESP_LOGD(WIFI_LOG, "eventbase WIFI, eventid %d", event->event_id); - break; - } - return ESP_OK; -} - -void wifi_start(void) -{ - - // init NVS for WIFI - esp_err_t ret; - ret = nvs_flash_init(); - if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) - { - ESP_ERROR_CHECK(nvs_flash_erase()); - ESP_ERROR_CHECK(nvs_flash_init()); - } - - s_wifi_event_group = xEventGroupCreate(); - - ESP_ERROR_CHECK(esp_event_loop_create_default()); - - tcpip_adapter_init(); - ESP_ERROR_CHECK(esp_event_loop_init(event_handler, NULL) ); - wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); - ESP_ERROR_CHECK(esp_wifi_init(&cfg)); - ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_RAM)); - - - wifi_config_t wifi_config = { - .sta = { - .ssid = WIFI_SSID, - .password = WIFI_PASSWORD, - /* Setting a password implies station will connect to all security modes including WEP/WPA. - * However these modes are deprecated and not advisable to be used. Incase your Access point - * doesn't support WPA2, these mode can be enabled by commenting below line */ - .threshold.authmode = WIFI_AUTH_WPA2_PSK, - - .pmf_cfg = { - .capable = true, - .required = false}, - }, - }; - ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); - ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config)); - ESP_ERROR_CHECK(esp_wifi_start()); - - /* Waiting until either the connection is established (WIFI_CONNECTED_BIT) or connection failed for the maximum - * number of re-tries (WIFI_FAIL_BIT). The bits are set by event_handler() (see above) */ - EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group, - WIFI_CONNECTED_BIT | WIFI_FAIL_BIT, - pdFALSE, - pdFALSE, - portMAX_DELAY); - - /* xEventGroupWaitBits() returns the bits before the call returned, hence we can test which event actually - * happened. */ - if (bits & WIFI_CONNECTED_BIT) - { - ESP_LOGV(WIFI_LOG, "connected to ap SSID:%s", - WIFI_SSID); - } - else if (bits & WIFI_FAIL_BIT) - { - ESP_LOGI(WIFI_LOG, "Failed to connect to SSID:%s", - WIFI_SSID); - } - else - { - ESP_LOGE(WIFI_LOG, "UNEXPECTED EVENT"); - } - -#if 0 - /* The event will not be processed after unregister */ - ESP_ERROR_CHECK(esp_event_handler_instance_unregister(IP_EVENT, IP_EVENT_STA_GOT_IP, instance_got_ip)); - ESP_ERROR_CHECK(esp_event_handler_instance_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, instance_any_id)); - vEventGroupDelete(s_wifi_event_group); -#endif -} - -bool wifi_is_connected(void) -{ - return connected; -} -#endif diff --git a/main/wifi/espidf-v4.1.c b/main/wifi/espidf-v4.1.c deleted file mode 100644 index a6a0a8f..0000000 --- a/main/wifi/espidf-v4.1.c +++ /dev/null @@ -1,174 +0,0 @@ -#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. -// You may obtain a copy of the License at - -// https://www.gnu.org/licenses/agpl-3.0.html -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -#include - -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "freertos/event_groups.h" -#include "esp_system.h" -#include "esp_wifi.h" -#include "esp_event.h" -#include "esp_log.h" -#include "nvs_flash.h" - -#include "lwip/err.h" -#include "lwip/sys.h" - -#include "ena-cwa.h" - -#include "wifi.h" - -#define WIFI_CONNECTED_BIT BIT0 -#define WIFI_FAIL_BIT BIT1 - -static EventGroupHandle_t s_wifi_event_group; - -static int s_retry_num = 0; - -static bool connected = false; - -void wifi_stop(void) -{ - connected = false; - esp_wifi_stop(); - esp_wifi_deinit(); - esp_event_loop_delete_default(); -} - -static void event_handler(void *arg, esp_event_base_t event_base, - int32_t event_id, void *event_data) -{ - if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) - { - esp_wifi_connect(); - } - else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) - { - if (s_retry_num < WIFI_MAXIMUM_RETRY) - { - esp_wifi_connect(); - s_retry_num++; - ESP_LOGD(WIFI_LOG, "retry to connect to the AP"); - } - else - { - xEventGroupSetBits(s_wifi_event_group, WIFI_FAIL_BIT); - } - ESP_LOGD(WIFI_LOG, "connect to the AP fail"); - connected = false; - } - else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) - { - s_retry_num = 0; - xEventGroupSetBits(s_wifi_event_group, WIFI_CONNECTED_BIT); - connected = true; - - heap_caps_check_integrity_all(true); - } - else - { - ESP_LOGD(WIFI_LOG, "eventbase %s, eventid %d", event_base, event_id); - } -} - -void wifi_start(void) -{ - - // init NVS for WIFI - esp_err_t ret; - ret = nvs_flash_init(); - if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) - { - ESP_ERROR_CHECK(nvs_flash_erase()); - ESP_ERROR_CHECK(nvs_flash_init()); - } - - s_wifi_event_group = xEventGroupCreate(); - - ESP_ERROR_CHECK(esp_event_loop_create_default()); - - ESP_ERROR_CHECK(esp_netif_init()); - esp_netif_create_default_wifi_sta(); - - wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); - ESP_ERROR_CHECK(esp_wifi_init(&cfg)); - - esp_event_handler_instance_t instance_any_id; - esp_event_handler_instance_t instance_got_ip; - ESP_ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT, - ESP_EVENT_ANY_ID, - &event_handler, - NULL, - &instance_any_id)); - ESP_ERROR_CHECK(esp_event_handler_instance_register(IP_EVENT, - IP_EVENT_STA_GOT_IP, - &event_handler, - NULL, - &instance_got_ip)); - - wifi_config_t wifi_config = { - .sta = { - .ssid = WIFI_SSID, - .password = WIFI_PASSWORD, - /* Setting a password implies station will connect to all security modes including WEP/WPA. - * However these modes are deprecated and not advisable to be used. Incase your Access point - * doesn't support WPA2, these mode can be enabled by commenting below line */ - .threshold.authmode = WIFI_AUTH_WPA2_PSK, - - .pmf_cfg = { - .capable = true, - .required = false}, - }, - }; - ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); - ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config)); - ESP_ERROR_CHECK(esp_wifi_start()); - - /* Waiting until either the connection is established (WIFI_CONNECTED_BIT) or connection failed for the maximum - * number of re-tries (WIFI_FAIL_BIT). The bits are set by event_handler() (see above) */ - EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group, - WIFI_CONNECTED_BIT | WIFI_FAIL_BIT, - pdFALSE, - pdFALSE, - portMAX_DELAY); - - /* xEventGroupWaitBits() returns the bits before the call returned, hence we can test which event actually - * happened. */ - if (bits & WIFI_CONNECTED_BIT) - { - ESP_LOGV(WIFI_LOG, "connected to ap SSID:%s", - WIFI_SSID); - } - else if (bits & WIFI_FAIL_BIT) - { - ESP_LOGI(WIFI_LOG, "Failed to connect to SSID:%s", - WIFI_SSID); - } - else - { - ESP_LOGE(WIFI_LOG, "UNEXPECTED EVENT"); - } - - /* The event will not be processed after unregister */ - ESP_ERROR_CHECK(esp_event_handler_instance_unregister(IP_EVENT, IP_EVENT_STA_GOT_IP, instance_got_ip)); - ESP_ERROR_CHECK(esp_event_handler_instance_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, instance_any_id)); - vEventGroupDelete(s_wifi_event_group); -} - -bool wifi_is_connected(void) -{ - return connected; -} -#endif