Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/backport_some_wifi_bugs_0310_v3.3' into 'release/v3.3'

Browse source 
Backport some wifi bugs 0310 (backport v3.3)

See merge request espressif/esp-idf!7935
This commit is contained in:
Jiang Jiang Jian 2020-03-13 19:38:01 +08:00
parent 1bd55a9af2 c9e7a04a9e
commit 766eace598
6 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/esp32/esp_adapter.c
View file

@ -588,6 +588,7 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
._get_time = get_time_wrapper,
._random = os_random,
._log_write = esp_log_write,
._log_writev = esp_log_writev,
._log_timestamp = esp_log_timestamp,
._malloc_internal = malloc_internal_wrapper,
._realloc_internal = realloc_internal_wrapper,

1
components/esp32/include/esp_wifi_os_adapter.h
View file

@ -105,6 +105,7 @@ typedef struct {
int32_t (* _get_time)(void *t);
unsigned long (* _random)(void);
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);
void * (* _malloc_internal)(size_t size);
void * (* _realloc_internal)(void *ptr, size_t size);

2
components/esp32/include/esp_wifi_types.h
View file

@ -214,7 +214,7 @@ typedef struct {
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 */
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 */
} wifi_ap_config_t;

2
components/esp32/lib

@ -1 +1 @@
Subproject commit 3875c415108573d7067efb64c51b1ceb39f764f6
Subproject commit b7749ef26a3d3179a2f5f4b2fa9c53025c450b3b

9
components/log/include/esp_log.h
View file

@ -108,6 +108,15 @@ void esp_log_write(esp_log_level_t level, const char* tag, const char* format, .
/** @cond */
/**
* @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);
#include "esp_log_internal.h"
#ifndef LOG_LOCAL_LEVEL

14
components/log/log.c
View file

@ -184,9 +184,10 @@ void clear_log_level_list()
#endif
}
void IRAM_ATTR esp_log_write(esp_log_level_t level,
void IRAM_ATTR esp_log_writev(esp_log_level_t level,
const char* tag,
const char* format, ...)
const char* format,
va_list args)
{
if (!s_log_mutex) {
s_log_mutex = xSemaphoreCreateMutex();
@ -210,9 +211,16 @@ void IRAM_ATTR esp_log_write(esp_log_level_t level,
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_start(list, format);
(*s_log_print_func)(format, list);
esp_log_writev(level, tag, format, list);
va_end(list);
}