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 branch 'feature/tw8221_softap_supports_max_10_stations' into 'master'

Browse Source 
esp32/tcpip_adapter: softap supports max 10 stations

The max number of stations softap supports is modified from 8 to 10

See merge request !158
This commit is contained in:
Wu Jian Gang 2016-10-31 18:09:03 +08:00
commit d7b4197ade
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp32/include/esp_wifi_types.h
View File

@ -154,10 +154,10 @@ typedef struct {
uint8_t mac[6]; /**< mac address of sta that associated with ESP32 soft-AP */ uint8_t mac[6]; /**< mac address of sta that associated with ESP32 soft-AP */
}wifi_sta_info_t; }wifi_sta_info_t;
#define ESP_WIFI_MAX_CONN_NUM (8+2) /**< max number of sta the eSP32 soft-AP can connect */ #define ESP_WIFI_MAX_CONN_NUM (10) /**< max number of stations which can connect to ESP32 soft-AP */
typedef struct { typedef struct {
wifi_sta_info_t sta[ESP_WIFI_MAX_CONN_NUM]; /**< station list */ wifi_sta_info_t sta[ESP_WIFI_MAX_CONN_NUM]; /**< station list */
uint8_t num; /**< number of station that associated with ESP32 soft-AP */ int num; /**< number of station that associated with ESP32 soft-AP */
}wifi_sta_list_t; }wifi_sta_list_t;
typedef enum { typedef enum {

2
components/esp32/lib

@ -1 +1 @@
Subproject commit 12b3435fc0cd04efc249d52d71efb1cdecda50f8 Subproject commit 9d18fd1a8f7610130e69f8be74ec68f6399221b1

4
components/tcpip_adapter/include/tcpip_adapter.h
View File

@ -73,8 +73,8 @@ typedef struct {
}tcpip_adapter_sta_info_t; }tcpip_adapter_sta_info_t;
typedef struct { typedef struct {
tcpip_adapter_sta_info_t sta[ESP_WIFI_MAX_CONN_NUM+2]; tcpip_adapter_sta_info_t sta[ESP_WIFI_MAX_CONN_NUM];
uint8_t num; int num;
}tcpip_adapter_sta_list_t; }tcpip_adapter_sta_list_t;
#endif #endif

1
components/tcpip_adapter/tcpip_adapter_lwip.c
View File

@ -598,6 +598,7 @@ esp_err_t tcpip_adapter_get_sta_list(wifi_sta_list_t *wifi_sta_list, tcpip_adapt
return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS; return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
memset(tcpip_sta_list, 0, sizeof(tcpip_adapter_sta_list_t)); memset(tcpip_sta_list, 0, sizeof(tcpip_adapter_sta_list_t));
tcpip_sta_list->num = wifi_sta_list->num;
for (i=0; i<wifi_sta_list->num; i++){ for (i=0; i<wifi_sta_list->num; i++){
memcpy(tcpip_sta_list->sta[i].mac, wifi_sta_list->sta[i].mac, 6); memcpy(tcpip_sta_list->sta[i].mac, wifi_sta_list->sta[i].mac, 6);
dhcp_search_ip_on_mac(tcpip_sta_list->sta[i].mac, &tcpip_sta_list->sta[i].ip); dhcp_search_ip_on_mac(tcpip_sta_list->sta[i].mac, &tcpip_sta_list->sta[i].ip);