Merge branch 'bugfix/revert_default_country' into 'master'

esp_wifi: Revert default country to China

See merge request espressif/esp-idf!14251
pull/7307/head
Jiang Jiang Jian 2021-07-05 13:15:43 +00:00
commit 0edcf11089
2 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -608,7 +608,7 @@ esp_err_t esp_wifi_get_channel(uint8_t *primary, wifi_second_chan_t *second);
* @attention 1. It is discouraged to call this API since this doesn't validate the per-country rules,
* it's up to the user to fill in all fields according to local regulations.
* Please use esp_wifi_set_country_code instead.
* @attention 2. The default country is world safe mode {.cc="01", .schan=1, .nchan=11, policy=WIFI_COUNTRY_POLICY_MANUAL}
* @attention 2. The default country is CHINA {.cc="CN", .schan=1, .nchan=13, policy=WIFI_COUNTRY_POLICY_AUTO}
* @attention 3. When the country policy is WIFI_COUNTRY_POLICY_AUTO, the country info of the AP to which
* the station is connected is used. E.g. if the configured country info is {.cc="USA", .schan=1, .nchan=11}
* and the country info of the AP to which the station is connected is {.cc="JP", .schan=1, .nchan=14}
@ -1265,7 +1265,7 @@ esp_err_t esp_wifi_set_connectionless_wake_interval(uint16_t interval);
* "RO","SE","SI","SK","TW","US"
*
* @attention 7. When country code "01" (world safe mode) is set, SoftAP mode won't contain country IE.
* @attention 8. The default country is world safe mode {.cc="01", .schan=1, .nchan=11, policy=WIFI_COUNTRY_POLICY_MANUAL}
* @attention 8. The default country is "CN" and ieee80211d_enabled is TRUE.
*
* @param country the configured country ISO code
* @param ieee80211d_enabled 802.11d is enabled or not

@ -1 +1 @@
Subproject commit 8bdee7d79b54488f1732121233d8b93561842971
Subproject commit ae2b749c217a8bec6f862bca1e06000b56045ff5