alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge 62f89c3bb3 into 46acfdce96

Browse Source
This commit is contained in:
diplfranzhoepfinger 2024-10-02 17:32:52 +02:00 committed by GitHub
commit 109117f9b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/wifi/scan/main/scan.c
View File

@ -22,7 +22,7 @@
#define DEFAULT_SCAN_LIST_SIZE CONFIG_EXAMPLE_SCAN_LIST_SIZE #define DEFAULT_SCAN_LIST_SIZE CONFIG_EXAMPLE_SCAN_LIST_SIZE
#ifdef CONFIG_EXAMPLE_USE_SCAN_CHANNEL_BITMAP #ifdef CONFIG_EXAMPLE_USE_SCAN_CHANNEL_BITMAP
#define USE_CHANNEL_BTIMAP 1 #define USE_CHANNEL_BITMAP 1
#define CHANNEL_LIST_SIZE 3 #define CHANNEL_LIST_SIZE 3
static uint8_t channel_list[CHANNEL_LIST_SIZE] = {1, 6, 11}; static uint8_t channel_list[CHANNEL_LIST_SIZE] = {1, 6, 11};
#endif /*CONFIG_EXAMPLE_USE_SCAN_CHANNEL_BITMAP*/ #endif /*CONFIG_EXAMPLE_USE_SCAN_CHANNEL_BITMAP*/
@ -140,7 +140,7 @@ static void print_cipher_type(int pairwise_cipher, int group_cipher)
} }
} }
#ifdef USE_CHANNEL_BTIMAP #ifdef USE_CHANNEL_BITMAP
static void array_2_channel_bitmap(const uint8_t channel_list[], const uint8_t channel_list_size, wifi_scan_config_t *scan_config) { static void array_2_channel_bitmap(const uint8_t channel_list[], const uint8_t channel_list_size, wifi_scan_config_t *scan_config) {
for(uint8_t i = 0; i < channel_list_size; i++) { for(uint8_t i = 0; i < channel_list_size; i++) {
@ -148,7 +148,7 @@ static void array_2_channel_bitmap(const uint8_t channel_list[], const uint8_t c
scan_config->channel_bitmap.ghz_2_channels |= (1 << channel); scan_config->channel_bitmap.ghz_2_channels |= (1 << channel);
} }
} }
#endif /*USE_CHANNEL_BTIMAP*/ #endif /*USE_CHANNEL_BITMAP*/
/* Initialize Wi-Fi as sta and set scan method */ /* Initialize Wi-Fi as sta and set scan method */
@ -171,7 +171,7 @@ static void wifi_scan(void)
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA)); ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
ESP_ERROR_CHECK(esp_wifi_start()); ESP_ERROR_CHECK(esp_wifi_start());
#ifdef USE_CHANNEL_BTIMAP #ifdef USE_CHANNEL_BITMAP
wifi_scan_config_t *scan_config = (wifi_scan_config_t *)calloc(1,sizeof(wifi_scan_config_t)); wifi_scan_config_t *scan_config = (wifi_scan_config_t *)calloc(1,sizeof(wifi_scan_config_t));
if (!scan_config) { if (!scan_config) {
ESP_LOGE(TAG, "Memory Allocation for scan config failed!"); ESP_LOGE(TAG, "Memory Allocation for scan config failed!");
@ -183,7 +183,7 @@ static void wifi_scan(void)
#else #else
esp_wifi_scan_start(NULL, true); esp_wifi_scan_start(NULL, true);
#endif /*USE_CHANNEL_BTIMAP*/ #endif /*USE_CHANNEL_BITMAP*/
ESP_LOGI(TAG, "Max AP number ap_info can hold = %u", number); ESP_LOGI(TAG, "Max AP number ap_info can hold = %u", number);
ESP_ERROR_CHECK(esp_wifi_scan_get_ap_num(&ap_count)); ESP_ERROR_CHECK(esp_wifi_scan_get_ap_num(&ap_count));