alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fixes_from_github' into 'master'

Browse Source 
Fixes from Github

See merge request idf/esp-idf!2730
This commit is contained in:
Ivan Grokhotkov 2018-07-13 15:03:50 +08:00
commit b354770f42
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/bluedroid/api/include/api/esp_gatt_defs.h
View File

@ -422,7 +422,7 @@ typedef struct {
* @brief service element * @brief service element
*/ */
typedef struct { 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 start_handle; /*!< The start handle of the service */
uint16_t end_handle; /*!< The end handle of the service */ uint16_t end_handle; /*!< The end handle of the service */
esp_bt_uuid_t uuid; /*!< The uuid of the service */ esp_bt_uuid_t uuid; /*!< The uuid of the service */

2
components/bt/bluedroid/bta/gatt/bta_gatts_co.c
View File

@ -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 ** Returns TRUE - if the request is processed successfully and
** the response is returned in p_rsp. ** 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, BOOLEAN bta_gatts_co_srv_chg(tBTA_GATTS_SRV_CHG_CMD cmd,

2
components/bt/bluedroid/bta/include/bta/bta_gatts_co.h
View File

@ -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 ** Returns TRUE - if the request is processed successfully and
** the response is returned in p_rsp. ** 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, extern BOOLEAN bta_gatts_co_srv_chg(tBTA_GATTS_SRV_CHG_CMD cmd,

2
components/bt/bluedroid/stack/btm/btm_ble.c
View File

@ -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 ** 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) BOOLEAN btm_get_local_div (BD_ADDR bd_addr, UINT16 *p_div)
{ {

2
components/driver/include/driver/rtc_io.h
View File

@ -35,7 +35,7 @@ typedef enum {
* @brief Determine if the specified GPIO is a valid RTC GPIO. * @brief Determine if the specified GPIO is a valid RTC GPIO.
* *
* @param gpio_num GPIO number * @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) inline static bool rtc_gpio_is_valid_gpio(gpio_num_t gpio_num)
{ {

2
components/esp32/esp_timer_esp32.c
View File

@ -201,7 +201,7 @@ uint64_t IRAM_ATTR esp_timer_impl_get_time()
ticks_per_us = s_timer_ticks_per_us; ticks_per_us = s_timer_ticks_per_us;
/* Read them again and compare */ /* 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 * Because there's remain count enough to allow FRC_TIMER_COUNT_REG grow
*/ */
if (REG_READ(FRC_TIMER_COUNT_REG(1)) > timer_val && if (REG_READ(FRC_TIMER_COUNT_REG(1)) > timer_val &&

6
components/openssl/platform/ssl_pm.c
View File

@ -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 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; 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; 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; 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; mode = MBEDTLS_SSL_VERIFY_UNSET;
else else
mode = MBEDTLS_SSL_VERIFY_NONE; mode = MBEDTLS_SSL_VERIFY_NONE;

2
docs/en/api-guides/wifi.rst
View File

@ -699,7 +699,7 @@ Scenario:
EVENT_TASK <- WIFI_TASK [label="4.6 > SYSTEM_EVENT_STA_DISCONNECTED"]; EVENT_TASK <- WIFI_TASK [label="4.6 > SYSTEM_EVENT_STA_DISCONNECTED"];
WIFI_TASK -> AP [label="4.7 > 4/4 EAPOL"]; 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.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"];
} }

2
docs/en/get-started/linux-setup.rst
View File

@ -57,7 +57,7 @@ ESP32 toolchain for Linux is available for download from Espressif website:
.. note:: .. 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:: 3. Log off and log in back to make the ``.profile`` changes effective. Run the following command to verify if ``PATH`` is correctly set::

2
docs/zh_CN/get-started/linux-setup.rst
View File

@ -55,7 +55,7 @@ Linux 版的 ESP32 工具链可以从 Espressif 的网站下载：
.. note:: .. note::
如果将 ``/bin/bash`` 设置为登录 shell，且同时存在 ``.bash_profile`` 和 ``.profile``，则更新 ``.bash_profile`` 。 如果将 ``/bin/bash`` 设置为登录 shell，且同时存在 ``.bash_profile`` 和 ``.profile``，则更新 ``.bash_profile`` 。在 CentOS 环境下, ``alias`` 需要添加到 ``.bashrc`` 文件中。
3. 退出并重新登录以使 ``.profile`` 更改生效。 运行以下命令来检查 ``PATH`` 设置是否正确： :: 3. 退出并重新登录以使 ``.profile`` 更改生效。 运行以下命令来检查 ``PATH`` 设置是否正确： ::