From 475e3cc43e86b1752f4003491724c91f69d175c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ing=2E=20Jaroslav=20=C5=A0afka?= Date: Thu, 1 Feb 2018 11:00:29 +0100 Subject: [PATCH 1/3] Fix function name typo. Closes https://github.com/espressif/esp-idf/issue/1572 --- components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c b/components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c index a49f3ed1b..6a4d51974 100644 --- a/components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c +++ b/components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c @@ -631,7 +631,7 @@ static void btc_gattc_prepare_write_char_descr(btc_ble_gattc_args_t *arg) arg->prep_write_descr.auth_req); } -static void btc_gattc_execute_wrtie(btc_ble_gattc_args_t *arg) +static void btc_gattc_execute_write(btc_ble_gattc_args_t *arg) { BTA_GATTC_ExecuteWrite(arg->exec_write.conn_id, arg->exec_write.is_execute); } @@ -711,7 +711,7 @@ void btc_gattc_call_handler(btc_msg_t *msg) btc_gattc_prepare_write_char_descr(arg); break; case BTC_GATTC_ACT_EXECUTE_WRITE: - btc_gattc_execute_wrtie(arg); + btc_gattc_execute_write(arg); break; case BTC_GATTC_ACT_REG_FOR_NOTIFY: btc_gattc_reg_for_notify(arg); From ef080c0841920c0c73e386be977d445ba5b61049 Mon Sep 17 00:00:00 2001 From: SmallRoomLabs Date: Fri, 9 Feb 2018 13:01:52 +0100 Subject: [PATCH 2/3] Remove the THEN keyword from IF. Closes https://github.com/espressif/esp-idf/issue/1606 Both the TinyBasicPlus and the ESP32 variant don't use the THEN keyword in a IF statement --- docs/api-guides/romconsole.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-guides/romconsole.rst b/docs/api-guides/romconsole.rst index 37fd5694e..d33ca0000 100644 --- a/docs/api-guides/romconsole.rst +++ b/docs/api-guides/romconsole.rst @@ -44,7 +44,7 @@ Expressions, Math Control ------- -- IF expression THEN statement - *perform statement if expression is true* +- IF expression statement - *perform statement if expression is true* - FOR variable = start TO end - *start for block* - FOR variable = start TO end STEP value - *start for block with step* - NEXT - *end of for block* From 37b98f7306f8f2743ea8f0e672da5e06c732baea Mon Sep 17 00:00:00 2001 From: njyq2008 Date: Tue, 13 Feb 2018 16:35:28 +0800 Subject: [PATCH 3/3] Update index-cn.rst. Closes https://github.com/espressif/esp-idf/issue/1620 --- docs/get-started/index-cn.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/get-started/index-cn.rst b/docs/get-started/index-cn.rst index 5a0bbbe62..5d2a21da3 100644 --- a/docs/get-started/index-cn.rst +++ b/docs/get-started/index-cn.rst @@ -142,7 +142,7 @@ ESP-IDF 将会被下载到 ``~/esp/esp-idf``。 将 :example:`get-started/hello_world` 拷贝到 ``~/esp`` 目录： :: cd ~/esp - cp -r $IDF_PATH/examples/get-started/hello_world + cp -r $IDF_PATH/examples/get-started/hello_world . ESP-IDF 的 :idf:`examples` 目录下有一系列示例工程，都可以按照上面的方法进行创建。