j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge 608f56ebf4 into 503e66a500

Browse source
This commit is contained in:
Alessio Pollero 2021-02-13 23:22:37 +05:00 • committed by GitHub
commit e2de1071c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/include/sdk_internal.h
View file

@ -210,7 +210,7 @@ struct sdk_g_ic_volatile_st {
struct sdk_g_ic_ssid_with_length { struct sdk_g_ic_ssid_with_length {
uint32_t ssid_length; // 0x1e4 sdk_wpa_config_profile uint32_t ssid_length; // 0x1e4 sdk_wpa_config_profile
uint8_t ssid[32]; // 0x1e8 Station ssid. Null terminated string. uint8_t ssid[33]; // 0x1e8 Station ssid. Null terminated string.
}; };
// This is the portion of g_ic which is loaded/saved to the flash ROM, and thus // This is the portion of g_ic which is loaded/saved to the flash ROM, and thus

4
extras/wificfg/wificfg.c
View file

@ -2057,7 +2057,7 @@ void wificfg_init(uint32_t port, const wificfg_dispatch *dispatch)
sysparam_get_string("hostname", &hostname); sysparam_get_string("hostname", &hostname);
if (!hostname && wificfg_default_hostname) { if (!hostname && wificfg_default_hostname) {
uint8_t macaddr[6]; uint8_t macaddr[6];
char name[32]; char name[33];
sdk_wifi_get_macaddr(1, macaddr); sdk_wifi_get_macaddr(1, macaddr);
snprintf(name, sizeof(name), wificfg_default_hostname, macaddr[3], snprintf(name, sizeof(name), wificfg_default_hostname, macaddr[3],
macaddr[4], macaddr[5]); macaddr[4], macaddr[5]);
@ -2108,7 +2108,7 @@ void wificfg_init(uint32_t port, const wificfg_dispatch *dispatch)
/* Default AP ssid and password. */ /* Default AP ssid and password. */
if (!wifi_ap_ssid && wificfg_default_ssid) { if (!wifi_ap_ssid && wificfg_default_ssid) {
uint8_t macaddr[6]; uint8_t macaddr[6];
char ssid[32]; char ssid[33];
sdk_wifi_get_macaddr(1, macaddr); sdk_wifi_get_macaddr(1, macaddr);
snprintf(ssid, sizeof(ssid), wificfg_default_ssid, macaddr[3], snprintf(ssid, sizeof(ssid), wificfg_default_ssid, macaddr[3],
macaddr[4], macaddr[5]); macaddr[4], macaddr[5]);

2
include/espressif/esp_softap.h
View file

@ -11,7 +11,7 @@ extern "C" {
#endif #endif
struct sdk_softap_config { struct sdk_softap_config {
uint8_t ssid[32]; uint8_t ssid[33];
uint8_t password[64]; uint8_t password[64];
uint8_t ssid_len; uint8_t ssid_len;
uint8_t channel; uint8_t channel;

4
include/espressif/esp_sta.h
View file

@ -15,7 +15,7 @@ extern "C" {
#endif #endif
struct sdk_station_config { struct sdk_station_config {
uint8_t ssid[32]; /* Null terminated string */ uint8_t ssid[33]; /* Null terminated string */
uint8_t password[64]; /* Null terminated string */ uint8_t password[64]; /* Null terminated string */
uint8_t bssid_set; /* One if bssid is used, otherwise zero. */ uint8_t bssid_set; /* One if bssid is used, otherwise zero. */
uint8_t bssid[6]; /* The BSSID bytes */ uint8_t bssid[6]; /* The BSSID bytes */
@ -38,7 +38,7 @@ struct sdk_bss_info {
STAILQ_ENTRY(sdk_bss_info) next; STAILQ_ENTRY(sdk_bss_info) next;
uint8_t bssid[6]; uint8_t bssid[6];
uint8_t ssid[32]; uint8_t ssid[33];
uint8_t channel; uint8_t channel;
int8_t rssi; int8_t rssi;
AUTH_MODE authmode; AUTH_MODE authmode;