Merge branch 'bugfix/fixes_from_github' into 'master'

Fixes from Github See merge request idf/esp-idf!2730
jason-mao · Jul 13, 2018 · b354770 · b354770
2 parents 46639ba + 3e16333
commit b354770
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 &&

diff --git 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;

diff --git 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"];
     }
 
 

diff --git 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::
 

diff --git 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`` 设置是否正确： ::