Quellcode durchsuchen

Merge branch 'bugfix/revert_default_country_v4.3' into 'release/v4.3'

esp_wifi: Revert default country to China (backport v4.3)

See merge request espressif/esp-idf!14250
Jiang Jiang Jian vor 4 Jahren
Ursprung
Commit
8807d8a5d8
2 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
  1. 2 2
      components/esp_wifi/include/esp_wifi.h
  2. 1 1
      components/esp_wifi/lib

+ 2 - 2
components/esp_wifi/include/esp_wifi.h

@@ -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
components/esp_wifi/lib

@@ -1 +1 @@
-Subproject commit 40c15f97db769d159c5e1537ae7a7297368cc2c9
+Subproject commit b061caea3ac901c345085f551140ccd079e62da3