From 0cab3cecfdafffcc4bfd3aa90b4a523e455b2d7a Mon Sep 17 00:00:00 2001 From: Avraham Shukron Date: Wed, 13 Jun 2018 08:45:41 +0300 Subject: [PATCH 1/5] doc/wifi: small fixup The WiFi station connect sequence diagram does not have any "successful" ending. It looks like a copy-paste error, because there are two consequent `SYSTEM_EVENT_STA_DISCONNECTED` events firing with nothing happening in between. I think the original meaning was that the last event should be `SYSTEM_EVENT_STA_CONNECTED` to signify that if all goes well, that is the event that will be fired. Merges https://github.com/espressif/esp-idf/pull/2065 --- docs/en/api-guides/wifi.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/api-guides/wifi.rst b/docs/en/api-guides/wifi.rst index 1c1f326cf..fe1f3b743 100644 --- a/docs/en/api-guides/wifi.rst +++ b/docs/en/api-guides/wifi.rst @@ -699,7 +699,7 @@ Scenario: EVENT_TASK <- WIFI_TASK [label="4.6 > SYSTEM_EVENT_STA_DISCONNECTED"]; WIFI_TASK -> AP [label="4.7 > 4/4 EAPOL"]; EVENT_TASK <- WIFI_TASK [label="4.8 > SYSTEM_EVENT_STA_DISCONNECTED"]; - EVENT_TASK <- WIFI_TASK [label="4.9 > SYSTEM_EVENT_STA_DISCONNECTED"]; + EVENT_TASK <- WIFI_TASK [label="4.9 > SYSTEM_EVENT_STA_CONNECTED"]; } From a8da9c1b96f7b4dfaf62f53c58244af6d4f366e9 Mon Sep 17 00:00:00 2001 From: Le-Andrew Date: Fri, 15 Jun 2018 19:32:43 +1000 Subject: [PATCH 2/5] Fixed typos on booleans. Merges https://github.com/espressif/esp-idf/pull/2067 --- components/bt/bluedroid/api/include/api/esp_gatt_defs.h | 2 +- components/bt/bluedroid/bta/gatt/bta_gatts_co.c | 2 +- components/bt/bluedroid/bta/include/bta/bta_gatts_co.h | 2 +- components/bt/bluedroid/stack/btm/btm_ble.c | 2 +- components/driver/include/driver/rtc_io.h | 2 +- components/esp32/esp_timer_esp32.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/bt/bluedroid/api/include/api/esp_gatt_defs.h b/components/bt/bluedroid/api/include/api/esp_gatt_defs.h index 77cdcd652..7053f266f 100644 --- a/components/bt/bluedroid/api/include/api/esp_gatt_defs.h +++ b/components/bt/bluedroid/api/include/api/esp_gatt_defs.h @@ -422,7 +422,7 @@ typedef struct { * @brief service element */ typedef struct { - bool is_primary; /*!< The service flag, ture if the service is primary service, else is secondly service */ + bool is_primary; /*!< The service flag, true if the service is primary service, else is secondly service */ uint16_t start_handle; /*!< The start handle of the service */ uint16_t end_handle; /*!< The end handle of the service */ esp_bt_uuid_t uuid; /*!< The uuid of the service */ diff --git a/components/bt/bluedroid/bta/gatt/bta_gatts_co.c b/components/bt/bluedroid/bta/gatt/bta_gatts_co.c index 1bc7881cc..2130005a1 100644 --- a/components/bt/bluedroid/bta/gatt/bta_gatts_co.c +++ b/components/bt/bluedroid/bta/gatt/bta_gatts_co.c @@ -125,7 +125,7 @@ void bta_gatts_co_update_handle_range(BOOLEAN is_add, tBTA_GATTS_HNDL_RANGE *p_h ** ** Returns TRUE - if the request is processed successfully and ** the response is returned in p_rsp. -** FASLE - if the request can not be processed +** FALSE - if the request can not be processed ** *******************************************************************************/ BOOLEAN bta_gatts_co_srv_chg(tBTA_GATTS_SRV_CHG_CMD cmd, diff --git a/components/bt/bluedroid/bta/include/bta/bta_gatts_co.h b/components/bt/bluedroid/bta/include/bta/bta_gatts_co.h index 79c70c8b0..9d81d6461 100644 --- a/components/bt/bluedroid/bta/include/bta/bta_gatts_co.h +++ b/components/bt/bluedroid/bta/include/bta/bta_gatts_co.h @@ -55,7 +55,7 @@ extern void bta_gatts_co_update_handle_range(BOOLEAN is_add, tBTA_GATTS_HNDL_RAN ** ** Returns TRUE - if the request is processed successfully and ** the response is returned in p_rsp. -** FASLE - if the request can not be processed +** FALSE - if the request can not be processed ** *******************************************************************************/ extern BOOLEAN bta_gatts_co_srv_chg(tBTA_GATTS_SRV_CHG_CMD cmd, diff --git a/components/bt/bluedroid/stack/btm/btm_ble.c b/components/bt/bluedroid/stack/btm/btm_ble.c index 838aaec6c..664a3d2cb 100644 --- a/components/bt/bluedroid/stack/btm/btm_ble.c +++ b/components/bt/bluedroid/stack/btm/btm_ble.c @@ -1105,7 +1105,7 @@ BOOLEAN btm_ble_get_enc_key_type(BD_ADDR bd_addr, UINT8 *p_key_types) ** ** Description This function is called to read the local DIV ** -** Returns TURE - if a valid DIV is availavle +** Returns TRUE - if a valid DIV is availavle *******************************************************************************/ BOOLEAN btm_get_local_div (BD_ADDR bd_addr, UINT16 *p_div) { diff --git a/components/driver/include/driver/rtc_io.h b/components/driver/include/driver/rtc_io.h index 710c040e5..f1c321b18 100644 --- a/components/driver/include/driver/rtc_io.h +++ b/components/driver/include/driver/rtc_io.h @@ -35,7 +35,7 @@ typedef enum { * @brief Determine if the specified GPIO is a valid RTC GPIO. * * @param gpio_num GPIO number - * @return true if GPIO is valid for RTC GPIO use. talse otherwise. + * @return true if GPIO is valid for RTC GPIO use. false otherwise. */ inline static bool rtc_gpio_is_valid_gpio(gpio_num_t gpio_num) { diff --git a/components/esp32/esp_timer_esp32.c b/components/esp32/esp_timer_esp32.c index 3d63cf2bd..d42c8cfdc 100644 --- a/components/esp32/esp_timer_esp32.c +++ b/components/esp32/esp_timer_esp32.c @@ -201,7 +201,7 @@ uint64_t IRAM_ATTR esp_timer_impl_get_time() ticks_per_us = s_timer_ticks_per_us; /* Read them again and compare */ - /* In this function, do not call timer_count_reload() when overflow is ture. + /* In this function, do not call timer_count_reload() when overflow is true. * Because there's remain count enough to allow FRC_TIMER_COUNT_REG grow */ if (REG_READ(FRC_TIMER_COUNT_REG(1)) > timer_val && From fab55e326674e2102efb316064b6dee0afd0fff4 Mon Sep 17 00:00:00 2001 From: Carney Wu Date: Sun, 24 Jun 2018 23:12:12 +0800 Subject: [PATCH 3/5] alias should set in .bashrc Merges https://github.com/espressif/esp-idf/pull/2097 --- docs/en/get-started/linux-setup.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/get-started/linux-setup.rst b/docs/en/get-started/linux-setup.rst index bc4102a85..0c0970fbb 100644 --- a/docs/en/get-started/linux-setup.rst +++ b/docs/en/get-started/linux-setup.rst @@ -57,7 +57,7 @@ ESP32 toolchain for Linux is available for download from Espressif website: .. note:: - If you have ``/bin/bash`` set as login shell, and both ``.bash_profile`` and ``.profile`` exist, then update ``.bash_profile`` instead. + If you have ``/bin/bash`` set as login shell, and both ``.bash_profile`` and ``.profile`` exist, then update ``.bash_profile`` instead. In CentOS, ``alias`` should set in ``.bashrc``. 3. Log off and log in back to make the ``.profile`` changes effective. Run the following command to verify if ``PATH`` is correctly set:: From 7ccc28de6c84456a4539ac82e5a6be8b2862181c Mon Sep 17 00:00:00 2001 From: Carney Wu Date: Sun, 24 Jun 2018 23:16:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?alias=20=E9=9C=80=E8=A6=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=B0=20.bashrc=20=E6=96=87=E4=BB=B6=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merges https://github.com/espressif/esp-idf/pull/2097 --- docs/zh_CN/get-started/linux-setup.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh_CN/get-started/linux-setup.rst b/docs/zh_CN/get-started/linux-setup.rst index 8c5c0cf6b..500f248ee 100644 --- a/docs/zh_CN/get-started/linux-setup.rst +++ b/docs/zh_CN/get-started/linux-setup.rst @@ -55,7 +55,7 @@ Linux 版的 ESP32 工具链可以从 Espressif 的网站下载： .. note:: - 如果将 ``/bin/bash`` 设置为登录 shell，且同时存在 ``.bash_profile`` 和 ``.profile``，则更新 ``.bash_profile`` 。 + 如果将 ``/bin/bash`` 设置为登录 shell，且同时存在 ``.bash_profile`` 和 ``.profile``，则更新 ``.bash_profile`` 。在 CentOS 环境下, ``alias`` 需要添加到 ``.bashrc`` 文件中。 3. 退出并重新登录以使 ``.profile`` 更改生效。 运行以下命令来检查 ``PATH`` 设置是否正确： :: From 3e1633354afad06a4ccd60be22fd5e31abf9be3a Mon Sep 17 00:00:00 2001 From: Chris Morgan Date: Sat, 7 Jul 2018 15:54:47 -0400 Subject: [PATCH 5/5] ssl_pm_reload_crt() - Fix verify_mode checking to match openssl documentation https://www.openssl.org/docs/manmaster/man3/SSL_CTX_set_verify.html Merges https://github.com/espressif/esp-idf/pull/2162 --- components/openssl/platform/ssl_pm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/openssl/platform/ssl_pm.c b/components/openssl/platform/ssl_pm.c index cd9960da1..1448faa4e 100644 --- a/components/openssl/platform/ssl_pm.c +++ b/components/openssl/platform/ssl_pm.c @@ -220,11 +220,11 @@ static int ssl_pm_reload_crt(SSL *ssl) struct pkey_pm *pkey_pm = (struct pkey_pm *)ssl->cert->pkey->pkey_pm; struct x509_pm *crt_pm = (struct x509_pm *)ssl->cert->x509->x509_pm; - if (ssl->verify_mode == SSL_VERIFY_PEER) + if (ssl->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT) mode = MBEDTLS_SSL_VERIFY_REQUIRED; - else if (ssl->verify_mode == SSL_VERIFY_FAIL_IF_NO_PEER_CERT) + else if (ssl->verify_mode & SSL_VERIFY_PEER) mode = MBEDTLS_SSL_VERIFY_OPTIONAL; - else if (ssl->verify_mode == SSL_VERIFY_CLIENT_ONCE) + else if (ssl->verify_mode & SSL_VERIFY_CLIENT_ONCE) mode = MBEDTLS_SSL_VERIFY_UNSET; else mode = MBEDTLS_SSL_VERIFY_NONE;