From 7c79d6e663586b9fbab77141204ce496edc474cb Mon Sep 17 00:00:00 2001 From: yinqingzhao Date: Fri, 20 Jun 2025 16:05:59 +0800 Subject: [PATCH] feat(wifi): add support for country EU --- components/esp_wifi/include/esp_wifi_types_generic.h | 2 +- components/esp_wifi/lib | 2 +- components/esp_wifi/regulatory/esp_wifi_regulatory.c | 2 ++ .../esp_wifi/regulatory/esp_wifi_regulatory.txt | 11 +++++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/components/esp_wifi/include/esp_wifi_types_generic.h b/components/esp_wifi/include/esp_wifi_types_generic.h index 2cc2fa008a..6c186b8785 100644 --- a/components/esp_wifi/include/esp_wifi_types_generic.h +++ b/components/esp_wifi/include/esp_wifi_types_generic.h @@ -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 diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 583c685668..b08bd88c83 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 583c685668cc420e60f5f22148ddf10c32e94cc3 +Subproject commit b08bd88c839b56d27a95bf9fe61e7fa963cf1a36 diff --git a/components/esp_wifi/regulatory/esp_wifi_regulatory.c b/components/esp_wifi/regulatory/esp_wifi_regulatory.c index c11c33f2ed..2003b302cc 100644 --- a/components/esp_wifi/regulatory/esp_wifi_regulatory.c +++ b/components/esp_wifi/regulatory/esp_wifi_regulatory.c @@ -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}, diff --git a/components/esp_wifi/regulatory/esp_wifi_regulatory.txt b/components/esp_wifi/regulatory/esp_wifi_regulatory.txt index 22c96d3381..ade4bbeaac 100644 --- a/components/esp_wifi/regulatory/esp_wifi_regulatory.txt +++ b/components/esp_wifi/regulatory/esp_wifi_regulatory.txt @@ -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