espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ignore_duplicated_offchan_error_v5.5' into 'release/v5.5'

Browse Source 
fix(wifi): ignore duplicated offchan error, add coex wifi event imm

See merge request espressif/esp-idf!40065
This commit is contained in:
Jiang Jiang Jian
2025-06-26 17:36:05 +08:00
parent cbe9388f45 f3579cee33
commit 3fcb964577
7 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_coex/lib

Submodule components/esp_coex/lib updated: cb6667841f...c62361f19c

6
components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld
View File

@@ -154,11 +154,11 @@ pm_beacon_monitor_tbtt_timeout_process = 0x40000e00;
pm_update_next_tbtt = 0x40000e04;
pm_twt_disallow_tx = 0x40000e08;
pm_clear_wakeup_signal = 0x40000e0c;
/*pm_mac_disable_tsf_tbtt_soc_wakeup = 0x40000e10;
pm_mac_disable_tsf_tbtt_modem_wakeup = 0x40000e14;
//pm_mac_disable_tsf_tbtt_soc_wakeup = 0x40000e10;
//pm_mac_disable_tsf_tbtt_modem_wakeup = 0x40000e14;
//pm_mac_enable_tsf_tbtt_soc_wakeup = 0x40000e18;
//pm_mac_enable_tsf_tbtt_modem_wakeup = 0x40000e1c;
//pm_mac_modem_params_rt_update = 0x40000e20;*/
//pm_mac_modem_params_rt_update = 0x40000e20;
pm_update_at_next_beacon = 0x40000e24;
tbtt_adaptive_setup = 0x40000e28;
tbtt_adaptive_servo = 0x40000e2c;

2
components/esp_wifi/include/esp_wifi_types_generic.h
View File

@@ -1467,7 +1467,7 @@ typedef struct {
bool dcm; /**< Using dcm rate to send frame */
} wifi_tx_rate_config_t;
#define WIFI_MAX_SUPPORT_COUNTRY_NUM 175 /**< max number of supported countries */
#define WIFI_MAX_SUPPORT_COUNTRY_NUM 176 /**< max number of supported countries */
#ifdef CONFIG_SOC_WIFI_SUPPORT_5G
#define WIFI_MAX_REGULATORY_RULE_NUM 7 /**< max number of regulatory rules */
#else

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 583c685668...ead6707574

2
components/esp_wifi/regulatory/esp_wifi_regulatory.c
View File

@@ -89,6 +89,7 @@ typedef enum {
const wifi_regdomain_t regdomain_table[WIFI_MAX_SUPPORT_COUNTRY_NUM] = {
{"01", ESP_WIFI_REGULATORY_TYPE_DEFAULT},
{"EU", ESP_WIFI_REGULATORY_TYPE_CE},
{"AD", ESP_WIFI_REGULATORY_TYPE_CE},
{"AE", ESP_WIFI_REGULATORY_TYPE_IFETEL},
{"AF", ESP_WIFI_REGULATORY_TYPE_AF},
@@ -1067,6 +1068,7 @@ typedef enum {
const wifi_regdomain_t regdomain_table[WIFI_MAX_SUPPORT_COUNTRY_NUM] = {
{"01", ESP_WIFI_REGULATORY_TYPE_DEFAULT},
{"EU", ESP_WIFI_REGULATORY_TYPE_CE},
{"AD", ESP_WIFI_REGULATORY_TYPE_CE},
{"AE", ESP_WIFI_REGULATORY_TYPE_CE},
{"AF", ESP_WIFI_REGULATORY_TYPE_CE},

11
components/esp_wifi/regulatory/esp_wifi_regulatory.txt
View File

@@ -44,6 +44,17 @@ country 01:
# Channel 52 - 64
(5250 - 5330 @ 80), (20), NO-IR, DFS, AUTO-BW
# EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213
# EU decision 2006/771/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02008D0432-20080611
# Harmonized CEPT countries: https://www.ecodocdb.dk/download/25c41779-cd6e/Rec7003e.pdf
country EU: DFS-ETSI
(2400 - 2483.5 @ 40), (100 mW)
(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI
(5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI
(5470 - 5725 @ 160), (500 mW), DFS, wmmrule=ETSI
# short range devices (ETSI EN 300 440-1)
(5725 - 5875 @ 80), (25 mW)
# AD as part of CEPT accepted decisions 2005/513/EC (5GHz RLAN, EN 301 893)
# and 2006/771/EC (amended by 2008/432/EC, Short-Range Devices, EN 300 440)
# EU decision 2005/513/EC: https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=CELEX:02005D0513-20070213

2
components/wpa_supplicant/esp_supplicant/src/esp_hostap.c
View File

@@ -158,7 +158,7 @@ void *hostap_init(void)
auth_conf->group_mgmt_cipher = WPA_CIPHER_BIP_GMAC_256;
break;
default:
wpa_printf(MSG_DEBUG, "Invalid pairwise cipher (0x%x)", pairwise_cipher);
auth_conf->group_mgmt_cipher = WPA_CIPHER_AES_128_CMAC;
}
}
if (authmode == WIFI_AUTH_WPA2_WPA3_PSK) {