Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2838 commits 10 branches 75 tags 114 MiB
Commit graph

434 commits

Author SHA1 Message Date
Jiang Jiang Jian 1cae2da0a0 Merge branch 'bugfix/classicBT_SMP_dependence' into 'master' 
component/bt: add constraint in Kconfig to enable SMP_ENABLE when using classic BT

See merge request !877
 2017-06-15 21:28:36 +08:00
wangmengyang 85e9a0fa17 component/bt: add constraint in Kconfig to enable SMP_ENABLE when using classic BT 
1. For now, some security related functions used in classic Bluetooth are controlled by "SMP_ENABLE". This commit fixes the dependency.
2. The two options, "CLASSIC_BT_ENABLED" and "SMP_ENABLED" The two options will be decoupled in the future.
 2017-06-15 20:06:49 +08:00
Jiang Jiang Jian fd12a6c706 Merge branch 'bugfix/btdm_add_set_pkt_data_length_evt_cback' into 'master' 
component / bt: add set pkt data length event callback

See merge request !869
 2017-06-15 19:51:22 +08:00
zhiweijian 58b65291d9 component / bt: add set pkt data length event callback 2017-06-15 16:02:03 +08:00
Jiang Jiang Jian 491932b80c Merge branch 'bugfix/btdm_cherry_pick_hit_limit_github_#12259' into 'master' 
component/bt: cherry-pick the btdm_hit_limit_github_#12259 branch to this branch.

See merge request !867
 2017-06-15 15:14:10 +08:00
Jiang Jiang Jian ac5040a7c2 Merge branch 'bugfix/btdm_ll_get_remote_feature' into 'master' 
component/bt: Fix can't get remote's feature bug

See merge request !871
 2017-06-15 15:10:52 +08:00
Yulong 83b7144207 component/bt: Added the lmp_verion default value to 4.0. 2017-06-15 02:13:31 -04:00
Jiang Jiang Jian 5f24dcdf4e Merge branch 'bugfix/btdm_blufi' into 'master' 
component/bt : fix blufi second init fail bug

See merge request !866
 2017-06-15 13:37:31 +08:00
Yulong 6ffa30a408 component/bt: Change the return position in the btc_gatts_inter_cb function. 2017-06-14 23:40:25 -04:00
Jiang Jiang Jian 113c21a481 Merge branch 'bugfix/fail_to_disconn_after_pair_#13172' into 'master' 
component/bt: Added the judgment to check the address is public or not.

See merge request !868
 2017-06-15 11:20:12 +08:00
Tian Hao 7cf5eea36f component/bt : fix blufi second init fail bug 2017-06-15 11:05:21 +08:00
Jiang Jiang Jian a18032fe80 Merge branch 'bugfix/btdm_gattc_refresh_cache_does_not_work_properly' into 'master' 
component /bt: using esp_ble_gattc_cache_refresh() does not work when open event callback

See merge request !864
 2017-06-15 11:02:35 +08:00
island e2e5f4caae component/bt: Fix can't get remote's feature bug 
- Slave send version_ind cause some Android 7.0 devices can't encrypt correctly
 2017-06-14 21:56:59 +08:00
Yulong a03e5f95be component/bt: Added the judgment to check the address is public or not. 2017-06-14 09:01:29 -04:00
Yulong 00bcee2df2 component/bt: cherry-pick the btdm_hit_limit_github_#12259 branch to this branch. 2017-06-14 07:14:23 -04:00
zhiweijian 60d5b677e7 Component /bt: using esp_ble_gattc_cache_refresh() does not work when open event callback. 2017-06-14 16:45:17 +08:00
Jiang Jiang Jian ae7269d39d Merge branch 'bugfix/btdm_smp_auth_complete_error' into 'master' 
component/bt: Change the btc layer data copy method.

See merge request !844
 2017-06-14 15:16:38 +08:00
Jiang Jiang Jian 6b3a559ee7 Merge branch 'bugfix/btdm_master_write_service_change_ccc' into 'master' 
component/bt: Fix slave initiate service change ccc discovery procedure bug

See merge request !847
 2017-06-14 15:12:45 +08:00
island c5debed621 component/bt: Fix bug while writing slave's service change characteristic 
- Fix slave initiate service discovery procedure
- Fix master re-discovery every time connection established
- Optimize service discovery char ccc write procedure
- Optimize esp_log_buffer function
- Modify default supervision timeout from 20s to 2s
 2017-06-14 13:12:38 +08:00
Jiang Jiang Jian 06fa08b022 Merge branch 'bugfix/btdm_config_bluedroid_mem_debug_github_#12631' into 'master' 
component/bt: Change the osi_mem_dbg_init to the esp_bluedroid_init function.

See merge request !860
 2017-06-14 11:18:34 +08:00
Jiang Jiang Jian 243bc97119 Merge branch 'bugfix/btdm_task_post' into 'master' 
component/bt : fix task post bug && fix controller init protection

See merge request !856
 2017-06-14 10:52:56 +08:00
Yulong 3f997d3e8c component/bt: Added the unhandle log to the btc dm case. 2017-06-13 22:37:44 -04:00
Jiang Jiang Jian 12c1238730 Merge branch 'bugfix/btdm_uuid_convert' into 'master' 
component/bt : fix uuid convert warning

See merge request !857
 2017-06-13 21:03:55 +08:00
Yulong 2a759a9864 component/bt: Change the osi_mem_dbg_init to the esp_bluedroid_init function. 2017-06-13 08:52:26 -04:00
Tian Hao 063dccd6c0 component/bt : fix uuid convert warning 2017-06-13 20:21:59 +08:00
Jiang Jiang Jian 57d27faee8 Merge branch 'bugfix/btdm_write_API_to_write_char_get_wrong_status_when_server_response_NULL' into 'master' 
component /bt: write_API_to_write_char_get_wrong_status_when_server_response_NULL

See merge request !842
 2017-06-13 18:18:30 +08:00
Jiang Jiang Jian be680a0ef3 Merge branch 'bugfix/btdm_auth_val_error_#12962' into 'master' 
component/bt: correct the security demo pair status code.

See merge request !841
 2017-06-13 18:14:39 +08:00
Tian Hao 808b07799c component/bt : fix task post bug && fix controller init protection 
1. fix bluedroid task post to blocking.
2. use semphore protect btdm controller task when be called from higher priority task
 2017-06-13 17:14:50 +08:00
zhiweijian 352cc0c7fe Component /bt: write_API_to_write_char_get_wrong_status_when_server_response_NULL 2017-06-12 15:02:21 +08:00
Yulong 411b5ecc43 component/bt: delete the bd_addr to avoid the warning. 2017-06-09 05:07:26 -04:00
Yulong e07482504a component/bt: Change the btc ESP_BLE_SM_SET_RSP_KEK to ESP_BLE_SM_SET_RSP_KEY 2017-06-09 04:54:56 -04:00
Yulong 4734ba40b0 component/bt: Change the btc layer data copy method. 2017-06-09 04:32:01 -04:00
Yulong e5adfb8119 component/bt: correct the security demo pair status code. 2017-06-09 02:37:28 -04:00
island 30783d481d component/bt: Fix crash problem while using invalid control parameter 
- Fix crash problem while using invalid control parameter to set gatt characteristic or descriptor
 2017-06-07 20:18:36 +08:00
Tian Hao bd309731da component/bt : fix bug of task schedule delayed. 
1. BLE RX test mode require quick task reaction, so allow higher priority task schedule from ISR.
2. Maybe other scenario also require this.
 2017-06-07 14:58:17 +08:00
Jiang Jiang Jian 99d5959d8a Merge branch 'bugfix/btdm_library' into 'master' 
component/bt : revert the bluetooth library

See merge request !827
 2017-06-07 14:17:33 +08:00
Tian Hao 460c37ddf6 component/bt : revert the bluetooth library 
bluetooth library use a old one, so update to the newest.
 2017-06-07 13:52:28 +08:00
Jiang Jiang Jian 7da4b42ed1 Merge branch 'feature/btdm_add_connect_event_and_disconnect_event_for_gattc' into 'master' 
component/bt: Add disconnect & connect func and event

See merge request !806
 2017-06-07 13:45:43 +08:00
Jiang Jiang Jian 82b8b1db1f Merge branch 'bugfix/bt_ble_separation' into 'master' 
component/bt: fix the build error when using classic BT, with GATTC, GATTS and SMP disabled

See merge request !822
 2017-06-06 20:56:05 +08:00
Jiang Jiang Jian b78242da58 Merge branch 'bugfix/btdm_rebase_update_param_#9626' into 'master' 
component/bt: rebase the btdm_updata_param_bug_#9626 to the new master.

See merge request !808
 2017-06-06 20:55:23 +08:00
Yulong e6acc32df6 component/bt: rebase the btdm_updata_param_bug_#9626 to the new master. 
- Added the error code for the time out status.
 2017-06-06 05:51:31 -04:00
Yulong 531f751fd3 component/bt: Cherry-pick the btdm_no_doc_for_value_type_github_#118659 to this branch to avoid conflict. 2017-06-06 05:22:17 -04:00
zhiweijian db96edc5d9 component/bt: Add disconnect & connect func and event 
- Add disconnect func for gap
- Add connect event and disconnect event for gattc
 2017-06-06 16:53:37 +08:00
Jiang Jiang Jian b0d93fccce Merge branch 'bugfix/btdm_ble_scan_5min_stop_github_#12723' into 'master' 
component/bt: Change the duration type from UINT8 to UINT32

See merge request !815
 2017-06-06 14:11:05 +08:00
wangmengyang ca4506fba9 component/bt: fix the build error when using classic BT, with GATTC, GATTS and SMP disabled 2017-06-05 21:01:58 +08:00
Yulong a42bf640bc component/bt: Change the duration type from UINT8 to UINT32 2017-06-03 01:00:10 -04:00
Jiang Jiang Jian 0a66f0db4c Merge branch 'bugfix/btdm_bit_against_enums_github_#12289' into 'master' 
component/bt: Change the esp_gatt_perm_t & esp_gatt_char_prop_t type from enum t…

See merge request !809
 2017-06-02 15:41:01 +08:00
Yulong be3eda0044 component/bt: Change the esp_gatt_perm_t & esp_gatt_char_prop_t type from enum to uint16_t & uint8_t. 2017-06-02 01:48:56 -04:00
zhiweijian f5a59f4f78 component/bt: add open and close event for gatts 
1.added open event and close event for gatts.
2.used esp_log_buffer_char/hex for gattc scan result.
 2017-06-01 15:01:54 +08:00
jack fc130fba86 fix bug that files missing commit in MR 773 2017-05-31 19:37:39 +08:00