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
11,675 Commits 20 Branches 148 Tags 384 MiB
f9b2bba5a4
Commit Graph

1811 Commits

Author SHA1 Message Date
lly
9d4abeb907 ble_mesh: stack: Remove node set device name return status check 2021-01-20 21:11:33 +08:00
lly
4c86bec0e9 ble_mesh: stack: Fix proxy client may fail to resend msg 2021-01-20 21:10:30 +08:00
lly
8737392af0 ble_mesh: stack: Use different random for each provisioning 2021-01-20 21:09:28 +08:00
Jiang Jiang Jian
a61ec41740 Merge branch 'bugfix/btdm_blufi_send_custom_data_will_congested_after_connection_is_broken_v4.0' into 'release/v4.0' 
component/bt: fix Blufi sends customer data will congested when connection is broken(backport v4.0)

See merge request espressif/esp-idf!11849
 2021-01-19 21:44:35 +08:00
lly
421f044eea ble_mesh: stack: Fix compile warning when log is disabled 2021-01-19 14:05:25 +08:00
lly
f9152550d2 ble_mesh: stack: Add prefix BLE_MESH_ for log related macros 2021-01-19 14:05:25 +08:00
Island
ff7db0cdc4 Merge branch 'update/ble_mesh_set_hsl_states_v4.0' into 'release/v4.0' 
ble_mesh: stack: Enable updating lighting hsl state (v4.0)

See merge request espressif/esp-idf!12037
 2021-01-18 19:10:26 +08:00
lly
7134ef67cf ble_mesh: stack: Fix compile warning with BIT macro 2021-01-18 14:08:49 +08:00
lly
d42f39dcb4 ble_mesh: stack: Update mesh max conn macro when using bluedroid 2021-01-18 14:08:12 +08:00
lly
5c1e3eabc1 ble_mesh: stack: Enable updating lighting hsl state 2021-01-18 14:02:01 +08:00
Island
3a56233a4d Merge branch 'bugfix/bluedroid_avoid_same_bdaddr_conn_v4.0' into 'release/v4.0' 
Bluedroid: Do not connect if peer BD_ADDR is same as own BD_ADDR. (v4.0)

See merge request espressif/esp-idf!11992
 2021-01-18 14:01:19 +08:00
lly
4902b2745b ble_mesh: stack: Fix using wrong | for OR between macros 2021-01-14 15:59:46 +08:00
Island
a47099b028 Merge branch 'feat/ble_mesh_support_ble_scan_v4.0' into 'release/v4.0' 
ble_mesh: stack: Add BLE scan callback when mesh is enabled (v4.0)

See merge request espressif/esp-idf!11965
 2021-01-14 15:47:52 +08:00
Chinmay Chhajed
c4fe4dbf67 Bluedroid: Do not connect if peer BD_ADDR is same as own BD_ADDR. 2021-01-14 12:23:04 +05:30
Jiang Jiang Jian
f2038b959a Merge branch 'bugfix/fix_spp_vfs_dynamic_memory_bugs_v4.0' into 'release/v4.0' 
component_bt/fix spp vfs demo crash when use dynamic memory[backport v4.0]

See merge request espressif/esp-idf!11729
 2021-01-14 11:19:34 +08:00
lly
f9b53a909b ble_mesh: stack: Support reporting normal ble adv packets 2021-01-12 19:15:36 +08:00
lly
34b5c1cf72 ble_mesh: stack: Add a btc file for ble coex functions 
Previously if starting/stopping BLE advertising when BLE Mesh
is enabled, the corresponding events will be notified through
the callback registered by esp_ble_mesh_register_prov_callback().

With this commit, the func esp_ble_mesh_register_ble_callback()
needs to be invoked for resgitering the callback used for BLE
coexistence related functionalities (i.e. ADV/SCAN).
 2021-01-12 19:15:36 +08:00
lly
88b550ba75 ble_mesh: stack: Move ble scan funcitons to a single file 2021-01-12 19:15:35 +08:00
lly
d1553311a2 ble_mesh: stack: Optimize handling received mesh adv packets 2021-01-12 19:15:35 +08:00
lly
73dee43e55 ble_mesh: stack: Move bt_mesh_rand to mesh_common.c 2021-01-11 19:28:36 +08:00
lly
decd6956f3 ble_mesh: stack: Remove useless BT_DBG_ENABLED in a few files 2021-01-11 19:28:31 +08:00
lly
93991bda4a ble_mesh: Replace zephyr integer types with C99 types [Zephyr] 2021-01-11 19:28:25 +08:00
lly
866b6b439c ble_mesh: stack: Update ARRAY_SIZE definition 2021-01-11 19:27:55 +08:00
lly
8c883fd410 ble_mesh: stack: Provisioner supports multiple nvs namespaces 
Now Provisioner can use different NVS namespaces to store
different instances of mesh information, for example, for
different user accounts.
 2021-01-11 10:08:23 +08:00
lly
f0af8858da ble_mesh: stack: Provisioner supports receiving heartbeat 2021-01-08 09:33:04 +08:00
lly
726225c5f3 ble_mesh: stack: Fix Node ID adv with wrong timeout 2021-01-05 20:15:16 +08:00
XieWenxiang
f81bdd933e component/bt: fix Blufi sends customer data will congested when connection is broken 2020-12-31 15:54:09 +08:00
Chinmay Chhajed
b3d5ed3a03 Bluedroid: Fixes for some vulnerabilities. 
This commit fixes 'Impersonation in Passkey entry protocol'
(CVE-2020-26558) and suggests fixes for other vulnerabilites like
'Impersonation in the Pin Pairing Protocol' (CVE-2020-26555) and
'Authentication of the LE Legacy Pairing Protocol'

CVE-2020-26558 can be easily implemented if the peer device can
impersonate our public key. This commit adds a check by comparing our
and received public key and returns failed pairing if keys are same.

This commit also adds comments suggesting to use secure connection when
supported by all devices.
 2020-12-25 16:01:47 +05:30
liqigan
d64a19b73c fix spp vfs demo crash when use dynamic memory 2020-12-23 15:26:58 +08:00
baohongde
711184762b components/bt: Fix waking up fail while sleeping 2020-12-22 21:28:44 +08:00
baohongde
998a1f9ebb components/bt: Make sleep avaliable in hli(for future use) 2020-12-22 21:23:09 +08:00
wangcheng
b9f79249b8 components/bt: backport need commit to release/v4.0 2020-12-22 19:54:53 +08:00
wangcheng
0f4592eea0 components/bt: fixed memory damage caused by bluetooth memory release 2020-12-22 19:54:53 +08:00
weitianhua
ca66b50481 collection of bugfix backport for release/v4.0 2020-12-22 19:54:53 +08:00
wangcheng
e11820cd5b components/bt: Fixed the problem of early release of pointer(p_ccb) in funcion 2020-12-22 19:54:53 +08:00
Jiang Jiang Jian
ef7aca1a66 Merge branch 'nimble/fix_misc_coverity_issue_v4.0' into 'release/v4.0' 
Nimble: Fix misc issues in NimBLE NVS, `ble_eddystone`, recursive call and  L2CAP CoC (v4.0)

See merge request espressif/esp-idf!11392
 2020-12-22 15:01:25 +08:00
Jiang Jiang Jian
e2cd3495a1 Merge branch 'bugfix/confirmed_bugfix_from_baidu_proj_4.0' into 'release/v4.0' 
Fix BT controller dead issue caused by clk overflow [backport v4.0]

See merge request espressif/esp-idf!10546
 2020-12-22 12:47:44 +08:00
weitianhua
66be657233 Fix crash cause by calling a2dp deinit when connected 2020-12-21 10:27:04 +08:00
weitianhua
cd46129b49 Free ACL RX Buffer in EM when disconnecting 2020-12-17 20:35:57 +08:00
weitianhua
911b90eb21 Confirmed bugfix from Baidu Project 2020-12-17 20:35:57 +08:00
weitianhua
62f781553b Enable PCM config in Host 2020-12-17 20:35:57 +08:00
Artem Godlevskyi
ce999fe02e Added missing MYNEWT_VAL_BLE_L2CAP_COC_MPS definition 
Signed-off-by: Prasad Alatkar <prasad.alatkar@espressif.com>

Merges https://github.com/espressif/esp-idf/pull/5825
 2020-12-17 07:19:59 +00:00
Prasad Alatkar
80ad3c1337 NimBLE: Fix misc coverity issues in NimBLE host 
- NimBLE NVS : Additional check to account for NVS operation failure
- NimBLE host: Fix minor bug in ble_eddystone_set_adv_data_gen
- NimBLE host: remove recursive call, upstream PR: https://github.com/apache/mynewt-nimble/pull/857
 2020-12-17 07:19:59 +00:00
lly
85e3b86fd7 ble_mesh: stack: Need uuid when adding device for provisioning 2020-12-15 11:59:11 +00:00
Island
0182e53431 Merge branch 'feature/btdm_support_some_ble_new_features_v4.0' into 'release/v4.0' 
components/bt: backport some new features for Bluedroid BLE(release v4.0)

See merge request espressif/esp-idf!11453
 2020-12-03 19:04:02 +08:00
xiewenxiang
f8581b40fc component/bt: support BLE Read Attribute value by UUID 2020-12-03 16:47:13 +08:00
xiewenxiang
2505769c0b component/bt: refactor ble random address setting 2020-12-03 16:47:04 +08:00
XieWenxiang
8db16a50ae component/bt: support BLE Application Layer Encryption key size check 2020-12-03 16:46:53 +08:00
XieWenxiang
069325a7ed component/bt: support BLE Authorization 2020-12-03 16:44:45 +08:00
xiewenxiang
b585eccf36 component/bt: fix incorrect encryption flag setting 2020-12-03 16:36:19 +08:00
Jiang Jiang Jian
6823364442 Merge branch 'bugfix/blufi_config_potential_double_free_v4.0' into 'release/v4.0' 
Bugfix/blufi config potential double free v4.0

See merge request espressif/esp-idf!11165
 2020-12-02 17:03:27 +08:00
lly
e3ddd91fb7 ble_mesh: stack: Fix wrong declaration of node bind AppKey func 2020-11-25 11:02:00 +08:00
lly
f151771bce ble_mesh: stack: Add node local netkey/appkey func 2020-11-25 11:01:46 +08:00
wangcheng
e7375c79b0 component/bt: Add a macro to control the compilation of blufi. 2020-11-24 10:54:39 +08:00
wangcheng
3adfbaeb2f component/bt: Fix a potential double free error. 2020-11-24 10:46:25 +08:00
wangcheng
724d863116 blufi: fix an error caused by incorrect conn_id parameters. 2020-11-24 10:46:22 +08:00
lly
4391a24c2f ble_mesh: stack: Add a Kconfig option to make Health Server model optional 2020-11-23 20:13:06 +08:00
lly
b71b99b7be ble_mesh: stack: Split model Kconfig menu into foundation and others 2020-11-23 20:13:06 +08:00
lly
7f411c9cb7 ble_mesh: stack: Add Kconfig options to make server models optional 2020-11-23 20:13:05 +08:00
lly
440b94d272 ble_mesh: stack: Use Kconfig option to make client models optional 2020-11-23 20:13:05 +08:00
lly
bc163f982d ble_mesh: stack: Make some internal static functions inline 2020-11-23 20:13:05 +08:00
lly
fe86760ff6 ble_mesh: stack: Add a Kconfig option to make deinit optional 2020-11-23 20:13:04 +08:00
lly
58ac97cb4c ble_mesh: stack: Introduce a new header file mesh_config.h 2020-11-23 20:13:04 +08:00
Island
1d771d081b Merge branch 'bugfix/ble_mesh_proxy_cfg_replay_v4.0' into 'release/v4.0' 
Bugfix/ble mesh proxy cfg replay (v4.0)

See merge request espressif/esp-idf!11337
 2020-11-23 20:08:55 +08:00
Island
ab055d2421 Merge branch 'bugfix/ble_mesh_node_deinit_v4.0' into 'release/v4.0' 
ble_mesh: stack: Persistent storage misc fixes (v4.0)

See merge request espressif/esp-idf!11336
 2020-11-23 20:01:28 +08:00
Jiang Jiang Jian
1e3eed8265 Merge branch 'bugfix/fix_spp_read_flow_control_v4.0' into 'release/v4.0' 
component_bt/fix spp flow control and vfs write [backport 4.0]

See merge request espressif/esp-idf!11074
 2020-11-23 15:49:54 +08:00
lly
5c7960de0d ble_mesh: stack: Store kr phase after value changed [Zephyr] 2020-11-23 15:07:14 +08:00
lly
613616b445 ble_mesh: stack: Fix rpl not check by proxy cfg [Zephyr] 2020-11-23 15:07:14 +08:00
lly
97a54a9818 ble_mesh: stack: Persistent storage misc fixes 
* Fix the issue that deinit node with "erase_flash"
  set to true, but info is not erased from nvs
* Reuse bt_mesh_cfg_reset() when deinit node
* Optimize Provisioner related erase operations
* No store pending timeout will be used when Node
  is not provisioned OR Provisioner is disabled
  and erase operation is performed
* Change the default timeout for settings operation
  to 0, and rpl store rate to 0
 2020-11-23 15:01:50 +08:00
Island
39d213378c Merge branch 'bugfix/ble_mesh_settings_fix_v4.0' into 'release/v4.0' 
Bugfix/ble mesh settings fix (v4.0)

See merge request espressif/esp-idf!11326
 2020-11-23 14:42:18 +08:00
liqigan
023f44e348 replace list and ringbuffer with fixed queue 
use eventgroup to sync spp_vfs_write

each connection has a switch_delay_timer not sharing a one

revert functions like spp_find_slot_by_xxx

fix vfs read bug when peer close
 2020-11-23 12:22:30 +08:00
liqigan
2765d5b829 move flow control to btc layer 
defer free slot in btc layer when receive BTA_JV_RFCOMM_CLOSE_EVT
 2020-11-23 12:22:30 +08:00
liqigan
ba3f69feea add event when calling spp API failed 2020-11-23 12:22:30 +08:00
lly
004393ec5f ble_mesh: stack: Update connection interval to 15ms 2020-11-23 08:53:37 +08:00
lly
b1383f5c0f ble_mesh: stack: Update connection parameters used by Central 2020-11-23 08:53:37 +08:00
lly
4fa39cae98 ble_mesh: stack: Use settings_core_erase when deinit 2020-11-23 08:45:04 +08:00
lly
666488a940 ble_mesh: stack: Fix storing next net_idx and app_idx 2020-11-23 08:45:04 +08:00
lly
3421336d66 ble_mesh: stack: Continue restore even if failure happens 
Previously we have used this solution for node info
restore. Here use the same solution for other mesh
information restore.
 2020-11-23 08:45:04 +08:00
lly
ad1d5764e2 ble_mesh: stack: Split model settings store and clear 2020-11-23 08:45:04 +08:00
lly
db4a344a33 ble_mesh: stack: Erase netkey and appkey with key index 2020-11-23 08:45:04 +08:00
lly
29c7645093 ble_mesh: stack: Add clear hb_pub in settings 2020-11-23 08:45:04 +08:00
lly
692ccf774b ble_mesh: stack: Transport rx reset settings update 
When reset the rx info of transport layer, the
rpl list will always cleared, and rpl stored
in the nvs will only be erased when erase flag
is true and BLE_MESH_SETTINGS is enabled.
Compared with the previous solution, it should
be more clear.
 2020-11-23 08:45:04 +08:00
lly
034906c6a8 ble_mesh: stack: Use erase settings functions 2020-11-23 08:45:04 +08:00
lly
69131a11ed ble_mesh: stack: Use mutex for settings operation 
Also expose the settings functions with the parameter
bt_mesh_nvs_handle_t, which will be used for further
updates.
 2020-11-23 08:45:04 +08:00
lly
8cbc93101e ble_mesh: stack: Add role check before enabling device 2020-11-23 08:45:03 +08:00
lly
c39097a601 ble_mesh: stack: Define a type for mesh nvs handle 2020-11-23 08:45:03 +08:00
lly
8d9b0909a3 ble_mesh: stack: Use model callback for operations [Zephyr] 
- Previously when a model is initialized or deinitialized, in the
  access layer, we need to check the model id with the ids in the
  table in order to find the proper model operation function.
- Currently all the operation functions of each model will be set
  during the mesh initialization. When the model is found, we can
  directly use the corresponding callback for different operations.
- Currently only init/deinit operations are registered, later we
  will add more operations.
 2020-11-22 09:26:41 +00:00
Jiang Jiang Jian
747f281325 Merge branch 'component/seperate_bta_jv_l2c_4.0' into 'release/v4.0' 
component_bt:/ seperate bta jv l2c  [backport v4.0]

See merge request espressif/esp-idf!9646
 2020-11-21 22:34:00 +08:00
Jiang Jiang Jian
4e9de58779 Merge branch 'optimize/ble_mesh_provisioner_delete_dev_v4.0' into 'release/v4.0' 
ble_mesh: stack: Optimize Provisioner delete device function (v4.0)

See merge request espressif/esp-idf!10605
 2020-11-21 17:54:25 +08:00
Jiang Jiang Jian
2fa70c8aed Merge branch 'feat/ble_mesh_device_properties_v2_v4.0' into 'release/v4.0' 
Feat/ble mesh device properties v2 (v4.0)

See merge request espressif/esp-idf!10789
 2020-11-21 17:54:14 +08:00
Jiang Jiang Jian
2a93a30c42 Merge branch 'bugfix/ble_mesh_check_stack_init_v4.0' into 'release/v4.0' 
ble_mesh: stack: Check if mesh stack initialized before init vendor client (v4.0)

See merge request espressif/esp-idf!10483
 2020-11-21 17:53:11 +08:00
Jiang Jiang Jian
d101748448 Merge branch 'bugfix/ble_mesh_prov_iv_index_v4.0' into 'release/v4.0' 
ble_mesh: stack: Using the latest iv_index for provisioning (v4.0)

See merge request espressif/esp-idf!10418
 2020-11-21 17:52:20 +08:00
weitianhua
ca00390174 Seperate BTA_JV_L2CAP for less bin size 2020-11-21 09:38:46 +00:00
Jiang Jiang Jian
6d23d64b18 Merge branch 'bugfix/fix_bredr_read_rssi_delta_v4.0' into 'release/v4.0' 
Bugfix/Fix Read Rssi Delta Bug in Bredr [backport v4.0]

See merge request espressif/esp-idf!10805
 2020-11-20 15:36:39 +08:00
Jiang Jiang Jian
00b9f48081 Merge branch 'bugfix/add_clear_bond_complete_evt_4_0' into 'release/v4.0' 
componenet_bt/bugfix: add remove bond device complete event 4.0

See merge request espressif/esp-idf!10656
 2020-11-20 13:50:13 +08:00
Jiang Jiang Jian
befde68eea Merge branch 'bugfix/btdm_blufi_data_sequence_not_reset_after_disconnect_v4.0' into 'release/v4.0' 
component/bt: fix Blufi sends data after disconnect the seq still increase(backport v4.0)

See merge request espressif/esp-idf!10239
 2020-11-16 19:38:22 +08:00
baohongde
8f3fe29deb components/bt: Replace task post with btc_inter_profile_call, when post message from btc_dm to btc_gap 2020-11-12 19:23:10 +08:00
baohongde
19ef328f8e components/bt: Fix clear bond fail when connected without ble included 2020-11-12 19:18:52 +08:00
xiongweichao
e51818f6fc add remove bond device complete event 2020-11-12 19:18:52 +08:00
Jiang Jiang Jian
e9ba0e05f2 Merge branch 'bugfix/nimble_host_rcv_pkt_length_check_v4.0' into 'release/v4.0' 
NimBLE: host_rcv_pkt event buf size check. (v4.0)

See merge request espressif/esp-idf!10760
 2020-11-12 14:20:29 +08:00