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
Jiang Jiang Jian
fe1f8a25b5
Merge branch 'bugfix/intrrupt_num_conflict' into 'master'
...
component/bt : fix interrupt number conflict
See merge request !878
2017-06-15 20:45:57 +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
Tian Hao
09f7cf45dd
component/bt : fix interrupt number conflict
...
1. the typical problem is when push keyboard on serial tool, the bluetooth may stop.
2017-06-15 19:41:54 +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
Jiang Jiang Jian
2e33dace16
Merge branch 'bugfix/fix_wifi_assert_at_ieee80211_output_line_733' into 'master'
...
fix the bug that wifi assert at ieee80211_output.c line 733
See merge request !870
2017-06-15 11:06:04 +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
XiaXiaotian
435b907475
fix the bug that wifi assert at ieee80211_output.c line 733
2017-06-14 21:20:28 +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
Jiang Jiang Jian
aefde1517d
Merge branch 'bugfix/i2c_delete_interrupt_race' into 'master'
...
i2c driver: When deleting, disable interrupts before freeing data structures
See merge request !836
2017-06-14 17:47:22 +08: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
Angus Gratton
55bec0e82f
Merge branch 'feature/libsodium' into 'master'
...
Add libsodium cryptography library component (v1.0.12)
See merge request !852
2017-06-14 14:58:16 +08:00
Jiang Jiang Jian
db87a640ea
Merge branch 'feature/optimize_task_priority_in_wifi_lib' into 'master'
...
Optimize priorities of pp, pm, timer, wps and wpa2 tasks.
See merge request !861
2017-06-14 14:01:53 +08:00
Angus Gratton
211580bf4f
Add libsodium v1.0.12
...
Run some unit test cases based (poorly) around sodium's test infrastructure.
Increase in unity test task stack is due to signature tests, load a lot of data onto the stack.
2017-06-14 15:51:08 +10:00
Angus Gratton
8e0ec6a9ab
Merge branch 'bugfix/abort_in_interrupt_context' into 'master'
...
Panic handler backtrace fixes
See merge request !835
2017-06-14 13:45:36 +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
XiaXiaotian
28e84a5299
Optimize priorities of pp, pm, timer, wps and wpa2 tasks.
2017-06-14 11:06:57 +08:00
Jiang Jiang Jian
69e8085624
Merge branch 'bugfix/wps_receive_m2d_fail_process' into 'master'
...
ESP32: Add error wps fail reason
See merge request !855
2017-06-14 10:57:59 +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
Ivan Grokhotkov
0c83e46b08
Merge branch 'bugfix/nvs_max_value_size' into 'master'
...
nvs: check value size before writing, document limitations
See merge request !796
2017-06-14 09:15:59 +08:00
Ivan Grokhotkov
6e704fc421
Merge branch 'bugifx/cplusplus_guards' into 'master'
...
add C++ include guards to header files which are missing them
See merge request !799
2017-06-14 09:14:02 +08:00
Ivan Grokhotkov
71d7716a45
Merge branch 'bugfix/esp_event_send_init_check' into 'master'
...
esp_event_send: check if the event loop is initialized
See merge request !817
2017-06-14 09:11:50 +08:00
Angus Gratton
91593a5237
Merge branch 'bugfix/rmt_driver_interrupts' into 'master'
...
rmt driver: Fix some issues around interrupts
See merge request !837
2017-06-14 08:35:22 +08:00
Angus Gratton
8bf675786a
Merge branch 'feature/freertos_get_priority' into 'master'
...
freertos: Mark uxTaskPriorityGet() as tested, add SMP task priority unit tests
See merge request !794
2017-06-14 08:31:00 +08:00
Angus Gratton
5d7bffea2b
panic handler: Print backtraces with calling address not return address
...
This seems to clean up some of the more wrong addr2line output results (not
sure why, something to do with optimisations I think - perhaps the return
address may also be a jump target from some earlier line of the code.)
2017-06-14 10:30:04 +10:00
Deng Xin
3d963f1c61
Merge branch bugfix/wps_receive_m2d_fail_process to master
...
ESP32: Add error wps fail reason enum in esp_event.h
see merge request !226
2017-06-13 21:48:48 +08:00
Ivan Grokhotkov
81f98c0a77
Merge branch 'test/nvs_compatible_test' into 'master'
...
test: add WIFI NVS compatible test case
See merge request !812
2017-06-13 21:32:50 +08:00
Jiang Jiang Jian
ff8287645b
Merge branch 'bugfix/tw13140_fix_assoc_timeout_bug' into 'master'
...
esp32: update wifi lib to fix assoc timeout issue
See merge request !854
2017-06-13 21:14:33 +08: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
Liu Zhi Fu
bf4dd5175b
esp32: update wifi lib to fix assoc timeout issue
...
Fix assoc timeout thread-safe issue
2017-06-13 20:08:00 +08:00
Jiang Jiang Jian
1ce18758d4
Merge branch 'bugfix/tw13140_fix_throughput_test_crash_issue' into 'master'
...
esp32: update wifi lib to fix wifi crash bug
See merge request !840
2017-06-13 18:22:39 +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
Ivan Grokhotkov
cd89a653e4
Merge branch 'bugfix/app_cpu_reset' into 'master'
...
esp32: don’t reset APP CPU if it was already reset by OpenOCD
See merge request !848
2017-06-13 18:15:47 +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