Merge branch 'bugfix/backport_some_wifi_bugs_0323_v4.1' into 'release/v4.1'
esp_wifi: Backport some wifi bugs 0323 (backport v4.1) See merge request espressif/esp-idf!8086
This commit is contained in:
commit
dbaf0f1e93
|
@ -595,6 +595,7 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
|
||||||
._get_time = get_time_wrapper,
|
._get_time = get_time_wrapper,
|
||||||
._random = os_random,
|
._random = os_random,
|
||||||
._log_write = esp_log_write,
|
._log_write = esp_log_write,
|
||||||
|
._log_writev = esp_log_writev,
|
||||||
._log_timestamp = esp_log_timestamp,
|
._log_timestamp = esp_log_timestamp,
|
||||||
._malloc_internal = malloc_internal_wrapper,
|
._malloc_internal = malloc_internal_wrapper,
|
||||||
._realloc_internal = realloc_internal_wrapper,
|
._realloc_internal = realloc_internal_wrapper,
|
||||||
|
|
|
@ -586,6 +586,7 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
|
||||||
._slowclk_cal_get = esp_clk_slowclk_cal_get,
|
._slowclk_cal_get = esp_clk_slowclk_cal_get,
|
||||||
#endif
|
#endif
|
||||||
._log_write = esp_log_write,
|
._log_write = esp_log_write,
|
||||||
|
._log_writev = esp_log_writev,
|
||||||
._log_timestamp = esp_log_timestamp,
|
._log_timestamp = esp_log_timestamp,
|
||||||
._malloc_internal = malloc_internal_wrapper,
|
._malloc_internal = malloc_internal_wrapper,
|
||||||
._realloc_internal = realloc_internal_wrapper,
|
._realloc_internal = realloc_internal_wrapper,
|
||||||
|
|
|
@ -111,6 +111,7 @@ typedef struct {
|
||||||
uint32_t (* _slowclk_cal_get)(void);
|
uint32_t (* _slowclk_cal_get)(void);
|
||||||
#endif
|
#endif
|
||||||
void (* _log_write)(uint32_t level, const char* tag, const char* format, ...);
|
void (* _log_write)(uint32_t level, const char* tag, const char* format, ...);
|
||||||
|
void (* _log_writev)(uint32_t level, const char* tag, const char* format, va_list args);
|
||||||
uint32_t (* _log_timestamp)(void);
|
uint32_t (* _log_timestamp)(void);
|
||||||
void * (* _malloc_internal)(size_t size);
|
void * (* _malloc_internal)(size_t size);
|
||||||
void * (* _realloc_internal)(void *ptr, size_t size);
|
void * (* _realloc_internal)(void *ptr, size_t size);
|
||||||
|
|
|
@ -217,7 +217,7 @@ typedef struct {
|
||||||
uint8_t channel; /**< Channel of ESP32 soft-AP */
|
uint8_t channel; /**< Channel of ESP32 soft-AP */
|
||||||
wifi_auth_mode_t authmode; /**< Auth mode of ESP32 soft-AP. Do not support AUTH_WEP in soft-AP mode */
|
wifi_auth_mode_t authmode; /**< Auth mode of ESP32 soft-AP. Do not support AUTH_WEP in soft-AP mode */
|
||||||
uint8_t ssid_hidden; /**< Broadcast SSID or not, default 0, broadcast the SSID */
|
uint8_t ssid_hidden; /**< Broadcast SSID or not, default 0, broadcast the SSID */
|
||||||
uint8_t max_connection; /**< Max number of stations allowed to connect in, default 4, max 4 */
|
uint8_t max_connection; /**< Max number of stations allowed to connect in, default 4, max 10 */
|
||||||
uint16_t beacon_interval; /**< Beacon interval, 100 ~ 60000 ms, default 100 ms */
|
uint16_t beacon_interval; /**< Beacon interval, 100 ~ 60000 ms, default 100 ms */
|
||||||
} wifi_ap_config_t;
|
} wifi_ap_config_t;
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit c47f210ea59a820f2b03706b9c9632b8d8e01757
|
Subproject commit 2b8ab43dee18d1b79bda2a3f7623661eb1424ec1
|
|
@ -78,7 +78,7 @@ test cases:
|
||||||
- - SSC SSC2 sta -C -s <target_ssid>
|
- - SSC SSC2 sta -C -s <target_ssid>
|
||||||
- - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
|
- - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
|
||||||
- - SSC SSC1 ap -S -s <target_ssid> -n 15
|
- - SSC SSC1 ap -S -s <target_ssid> -n 15
|
||||||
- - R SSC1 C +SAP:OK
|
- - R SSC1 C +SAP:ERROR
|
||||||
- - SSC SSC2 sta -C -s <target_ssid>
|
- - SSC SSC2 sta -C -s <target_ssid>
|
||||||
- - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
|
- - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
|
||||||
- - SSC SSC2 sta -D
|
- - SSC SSC2 sta -D
|
||||||
|
|
|
@ -125,6 +125,15 @@ uint32_t esp_log_early_timestamp(void);
|
||||||
*/
|
*/
|
||||||
void esp_log_write(esp_log_level_t level, const char* tag, const char* format, ...) __attribute__ ((format (printf, 3, 4)));
|
void esp_log_write(esp_log_level_t level, const char* tag, const char* format, ...) __attribute__ ((format (printf, 3, 4)));
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Write message into the log, va_list variant
|
||||||
|
* @see esp_log_write()
|
||||||
|
*
|
||||||
|
* This function is provided to ease integration toward other logging framework,
|
||||||
|
* so that esp_log can be used as a log sink.
|
||||||
|
*/
|
||||||
|
void esp_log_writev(esp_log_level_t level, const char* tag, const char* format, va_list args);
|
||||||
|
|
||||||
/** @cond */
|
/** @cond */
|
||||||
|
|
||||||
#include "esp_log_internal.h"
|
#include "esp_log_internal.h"
|
||||||
|
|
|
@ -162,9 +162,10 @@ void clear_log_level_list(void)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void esp_log_write(esp_log_level_t level,
|
void esp_log_writev(esp_log_level_t level,
|
||||||
const char *tag,
|
const char *tag,
|
||||||
const char *format, ...)
|
const char *format,
|
||||||
|
va_list args)
|
||||||
{
|
{
|
||||||
if (!esp_log_impl_lock_timeout()) {
|
if (!esp_log_impl_lock_timeout()) {
|
||||||
return;
|
return;
|
||||||
|
@ -185,9 +186,17 @@ void esp_log_write(esp_log_level_t level,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
(*s_log_print_func)(format, args);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void esp_log_write(esp_log_level_t level,
|
||||||
|
const char *tag,
|
||||||
|
const char *format, ...)
|
||||||
|
{
|
||||||
va_list list;
|
va_list list;
|
||||||
va_start(list, format);
|
va_start(list, format);
|
||||||
(*s_log_print_func)(format, list);
|
esp_log_writev(level, tag, format, list);
|
||||||
va_end(list);
|
va_end(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue