From 0c949def03e80d49a3ed357ef349192314d44c94 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Wed, 30 Mar 2022 14:48:42 +0200 Subject: [PATCH] allow configuring different dual ant pins --- src/espwifistack.cpp | 8 ++++---- src/espwifistackconfig.h | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/espwifistack.cpp b/src/espwifistack.cpp index 0623200..6e52edc 100644 --- a/src/espwifistack.cpp +++ b/src/espwifistack.cpp @@ -343,14 +343,14 @@ void init(const config &config) if (config.dual_ant) { { - constexpr const wifi_ant_gpio_config_t config { + const wifi_ant_gpio_config_t cfg { .gpio_cfg { - wifi_ant_gpio_t { .gpio_select = 1, .gpio_num = 2 }, - wifi_ant_gpio_t { .gpio_select = 1, .gpio_num = 25 } + wifi_ant_gpio_t { .gpio_select = 1, .gpio_num = (uint8_t)config.dual_ant->selectPin0 }, + wifi_ant_gpio_t { .gpio_select = 1, .gpio_num = (uint8_t)config.dual_ant->selectPin1 } } }; - if (const auto result = esp_wifi_set_ant_gpio(&config); result != ESP_OK) + if (const auto result = esp_wifi_set_ant_gpio(&cfg); result != ESP_OK) ESP_LOGE(TAG, "esp_wifi_set_ant_gpio() failed with %s", esp_err_to_name(result)); } diff --git a/src/espwifistackconfig.h b/src/espwifistackconfig.h index d45c88b..1217541 100644 --- a/src/espwifistackconfig.h +++ b/src/espwifistackconfig.h @@ -11,6 +11,7 @@ // esp-idf includes #include +#include // 3rdparty lib includes #include @@ -133,7 +134,8 @@ struct sta_scan_config struct dual_ant_config { - + gpio_num_t selectPin0{GPIO_NUM_2}; + gpio_num_t selectPin1{GPIO_NUM_25}; }; struct sta_config