Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/docs_prs_from_github' into 'master'

Browse source 
Small documenation and API fixes from GitHub

See merge request idf/esp-idf!1952
This commit is contained in:
Angus Gratton 2018-02-14 09:45:09 +08:00
parent 22ae5adb95 37b98f7306
commit 7d13e3fa6a
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/bt/bluedroid/btc/profile/std/gatt/btc_gattc.c
View file

@ -631,7 +631,7 @@ static void btc_gattc_prepare_write_char_descr(btc_ble_gattc_args_t *arg)
arg->prep_write_descr.auth_req); 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); 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); btc_gattc_prepare_write_char_descr(arg);
break; break;
case BTC_GATTC_ACT_EXECUTE_WRITE: case BTC_GATTC_ACT_EXECUTE_WRITE:
btc_gattc_execute_wrtie(arg); btc_gattc_execute_write(arg);
break; break;
case BTC_GATTC_ACT_REG_FOR_NOTIFY: case BTC_GATTC_ACT_REG_FOR_NOTIFY:
btc_gattc_reg_for_notify(arg); btc_gattc_reg_for_notify(arg);

2
docs/api-guides/romconsole.rst
View file

@ -44,7 +44,7 @@ Expressions, Math
Control 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 - *start for block*
- FOR variable = start TO end STEP value - *start for block with step* - FOR variable = start TO end STEP value - *start for block with step*
- NEXT - *end of for block* - NEXT - *end of for block*

2
docs/get-started/index-cn.rst
View file

@ -142,7 +142,7 @@ ESP-IDF 将会被下载到 ``~/esp/esp-idf``。
将 :example:`get-started/hello_world` 拷贝到 ``~/esp`` 目录： :: 将 :example:`get-started/hello_world` 拷贝到 ``~/esp`` 目录： ::
cd ~/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` 目录下有一系列示例工程，都可以按照上面的方法进行创建。 ESP-IDF 的 :idf:`examples` 目录下有一系列示例工程，都可以按照上面的方法进行创建。