Jiang Jiang Jian
ffe6af44c1
Merge branch 'cherry-pick-6ffd089c' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_fix_no_set_rand_addr_event_callback' into 'release/v3.0'
See merge request idf/esp-idf!2163
2018-03-30 16:52:23 +08:00
Jiang Jiang Jian
1fca253a65
Merge branch 'bugfix/btdm_fix_no_set_rand_addr_event_callback' into 'master'
...
Component/bt: fix no set rand add callback
See merge request idf/esp-idf!2140
(cherry picked from commit 6ffd089c97
)
aa236809
Component/bt: fix no set rand add callback event
2018-03-30 16:05:43 +08:00
Jiang Jiang Jian
486ff50eac
Merge branch 'cherry-pick-e84df7a2' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_fix_strncpy_error_in_blufi' into 'release/v3.0'
See merge request idf/esp-idf!2158
2018-03-30 15:58:59 +08:00
Jiang Jiang Jian
cf69dfa458
Merge branch 'cherry-pick-b26ab188' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_fix_service_change_event_param_error' into 'release/v3.0'
See merge request idf/esp-idf!2161
2018-03-30 15:53:51 +08:00
Jiang Jiang Jian
501640514a
Merge branch 'bugfix/btdm_xQueueGenericSend_assertion_3.0' into 'release/v3.0'
...
component/bt: Fix xQueueGenericSend assertion in release/v3.0
See merge request idf/esp-idf!2160
2018-03-30 15:51:53 +08:00
Jiang Jiang Jian
a80e687f8c
Merge branch 'bugfix/btdm_fix_service_change_event_param_error' into 'master'
...
Component/bt: fix service change event params error
See merge request idf/esp-idf!2150
(cherry picked from commit b26ab188af
)
f5d58142
Component/bt: fix service change event params error
2018-03-30 14:57:24 +08:00
baohongde
bc90b89e2b
component/bt: Fix xQueueGenericSend assertion in release/v3.0
2018-03-30 14:53:27 +08:00
Jiang Jiang Jian
a1cc202b70
Merge branch 'bugfix/no_link_key_notify_on_repair_for_v3.0' into 'release/v3.0'
...
component/bt: bugfix for no link key notification event on repairing for…
See merge request idf/esp-idf!2134
2018-03-30 14:26:35 +08:00
Jiang Jiang Jian
062ba57d0f
Merge branch 'bugfix/btdm_fix_strncpy_error_in_blufi' into 'master'
...
Component/bt: fix strncpy error in blufi
See merge request idf/esp-idf!2141
(cherry picked from commit e84df7a27d
)
6a942046
Component/bt: fix strncp error in blufi
2018-03-30 14:15:03 +08:00
wangmengyang
af211fcf0c
component/bt: bugfix for no link key notification event on repairing for initiating side of simple_pairing
...
In response to: https://github.com/espressif/esp-idf/issues/1275
2018-03-27 15:49:52 +08:00
Jiang Jiang Jian
5ee7233b5b
Merge branch 'bugfix/btdm_fix_error_when_close_SMP' into 'release/v3.0'
...
Component/bt: fix build error when close SMP for v3.0
See merge request idf/esp-idf!2108
2018-03-21 15:33:28 +08:00
zhiweijian
48c7afde27
Component/bt: fix build error when close SMP
2018-03-21 13:48:05 +08:00
Jiang Jiang Jian
d3bab0d7f0
Merge branch 'cherry-pick-84788230' into 'release/v3.0'
...
cherry pick 'bugfix/dfs_rtc_fixes' into 'release/v3.0'
See merge request idf/esp-idf!2107
2018-03-21 13:19:17 +08:00
Jiang Jiang Jian
c9ed467e26
Merge branch 'bugfix/dfs_rtc_fixes' into 'master'
...
DFS related fixes
See merge request idf/esp-idf!2102
(cherry picked from commit 8478823039
)
9377d4ac
pm: fix incorrect configuration at startup
7167ad45
pm: improve debug output from esp_pm_dump_locks
1618dbc9
soc/rtc: wait for frequency switch to complete
2018-03-21 12:02:58 +08:00
Jiang Jiang Jian
f0eb023f17
Merge branch 'bugfix/wifi_lwip_set_ip_post_wrong_event_v3.0' into 'release/v3.0'
...
Fix the bug that incorrect event is posted when setting static ip of softap and ethernet
See merge request idf/esp-idf!2096
2018-03-21 11:45:34 +08:00
XiaXiaotian
8944b90a06
Fix the bug that incorrect event is posted when setting static ip of softap and ethernet
2018-03-21 11:01:32 +08:00
Jiang Jiang Jian
9e4ec90a1e
Merge branch 'bugfix/tw18031_lwip_assert' into 'release/v3.0'
...
cherry pick 'bugfix/redirect_psram_muxes_to_single_mux' into 'release/v3.0'
See merge request idf/esp-idf!2055
2018-03-21 10:22:30 +08:00
Jiang Jiang Jian
e4357d9cf3
Merge branch 'cherry-pick-0f6f762b' into 'release/v3.0'
...
cherry pick 'bugfix/btdm_add_char_descr_uuid_error' into 'release/v3.0'
See merge request idf/esp-idf!2100
2018-03-21 10:21:54 +08:00
Jiang Jiang Jian
db17ffef00
Merge branch 'cherry-pick-8ab17d7c' into 'release/v3.0'
...
cherry pick 'bugfix/btdm_avrc_remote_bda_error_when_disconnect' into 'release/v3.0'
See merge request idf/esp-idf!2099
2018-03-20 19:58:24 +08:00
Jiang Jiang Jian
7f2a9f0359
Merge branch 'bugfix/btdm_fix_reconnect_fail_in_smp_v30' into 'release/v3.0'
...
Component/bt: fix reconnect fail in smp for v3.0
See merge request idf/esp-idf!2075
2018-03-20 18:49:13 +08:00
Jiang Jiang Jian
ecdeea9a85
Merge branch 'bugfix/btdm_add_char_descr_uuid_error' into 'master'
...
component/bt: Change the char_uuid to descr_uuid in the add descriptor callback params.
See merge request idf/esp-idf!2065
(cherry picked from commit 0f6f762be0
)
c802ea84
component/bt: Change the char_uuid to descr_uuid in the add descriptor callback params.
2018-03-20 18:43:59 +08:00
Jiang Jiang Jian
cfce9e1c72
Merge branch 'bugfix/btdm_avrc_remote_bda_error_when_disconnect' into 'master'
...
component/bt: Fix bug: AVRC remote_bda error when disconnect
See merge request idf/esp-idf!2093
(cherry picked from commit 8ab17d7ccf
)
2531975c
component/bt: Fix bug: AVRC remote_bda error when disconnect
2018-03-20 18:24:50 +08:00
Jiang Jiang Jian
dfce994b54
Merge branch 'feature/optimize_wifi_tx_v3.0' into 'release/v3.0'
...
esp32: optimize wifi tx
See merge request idf/esp-idf!2092
2018-03-20 18:22:24 +08:00
Jiang Jiang Jian
1b78dc2deb
Merge branch 'cherry-pick-45eb556d' into 'release/v3.0'
...
cherry pick 'bugfix/wpa2_assert_when_use_sha256_signature' into 'release/v3.0'
See merge request idf/esp-idf!2094
2018-03-20 16:38:13 +08:00
Liu Zhi Fu
37a4b0e933
esp32: optimize wifi tx
...
1. Optimize WiFi TX retry counter
2. Optimize WiFi TX timeout
2018-03-20 15:23:47 +08:00
Jiang Jiang Jian
8fab9ffb95
Merge branch 'bugfix/wpa2_assert_when_use_sha256_signature' into 'master'
...
bugfix of wpa2 assert when use sha256 do signature
See merge request idf/esp-idf!2089
(cherry picked from commit 45eb556ddf
)
bc97b0f3
bugfix of wpa2 assert when use sha256 do signature
2018-03-20 15:20:13 +08:00
Jiang Jiang Jian
354137a313
Merge branch 'bugfix/tw19041_esp_wifi_stop_not_return_v3.0' into 'release/v3.0'
...
esp32: Fix wifi stop never returns issue
See merge request idf/esp-idf!2088
2018-03-20 15:18:17 +08:00
Liu Zhi Fu
0399c8ecaf
esp32: Fix wifi stop never returns issue
...
Fix esp_wifi_stop never returns issue
2018-03-19 21:06:05 +08:00
Jiang Jiang Jian
a12e7fa638
Merge branch 'bugfix/tw19020_force_1.9V_when_flash_is_80M_v3.0' into 'release/v3.0'
...
bootloader: force SDIO 1.9V if flash is 80M
See merge request idf/esp-idf!2084
2018-03-19 18:50:47 +08:00
Jiang Jiang Jian
3278f755d2
Merge branch 'bugfix/fix_wpa2_disconnect_assert_issue_v3.0' into 'release/v3.0'
...
fix the issue that wpa2 assert when disconnect from AP
See merge request idf/esp-idf!2066
2018-03-19 18:24:01 +08:00
Liu Zhi Fu
30281166b1
bootloader: force SDIO 1.9V if flash is 80M
...
If the SPI flash frequency is 80M, the voltage of SDIO is 1.9V,
otherwise, it can configured to 1.8V or 1.9V via menuconfig.
2018-03-19 16:45:05 +08:00
Jiang Jiang Jian
9bd227f8c5
Merge branch 'bugfix/btdm_fix_gattc_open_API_v30' into 'release/v3.0'
...
component/bt: fix gattc open api for v3.0
See merge request idf/esp-idf!2077
2018-03-19 14:27:22 +08:00
Jiang Jiang Jian
80423d638d
Merge branch 'bugfix/btdm_fix_eddystone_v30' into 'release/v3.0'
...
Component/bt: fix eddystone demo error for v3.0
See merge request idf/esp-idf!2076
2018-03-19 14:27:08 +08:00
Jiang Jiang Jian
998e18ed69
Merge branch 'bugfix/multi_connection_performance' into 'release/v3.0'
...
component/bt : improve multi-connection performance and stability
See merge request idf/esp-idf!2068
2018-03-19 14:05:19 +08:00
zhiweijian
d0e553358a
Component/bt: fix reconnect fail in smp
2018-03-19 11:15:38 +08:00
Jiang Jiang Jian
0cdb8b4888
Merge branch 'bugfix/btdm_fix_get_attr_value_error_after_prepare_write_v30' into 'release/v3.0'
...
Component/bt: fix get attr value error after prepare write for v3.0
See merge request idf/esp-idf!2028
2018-03-19 10:48:39 +08:00
Jiang Jiang Jian
c1e4ebf2bc
Merge branch 'cherry-pick-db690e3f-2' into 'release/v3.0'
...
Component/bt: add params check in prefer_conn_params() for v3.0
See merge request idf/esp-idf!2062
2018-03-19 10:47:55 +08:00
Jiang Jiang Jian
71ca4c50b0
Merge branch 'bugfix/btdm_clear_start_stop_adv_callback_when_complete_v30' into 'release/v3.0'
...
Component/bt: clear start/stop adv callback when complete_v3.0
See merge request idf/esp-idf!2029
2018-03-19 10:47:19 +08:00
Ivan Grokhotkov
56d82dd5ce
Merge branch 'cherry-pick-09a30ddf_into_release/v3.0' into 'release/v3.0'
...
bugfix/Fix BLK3_RESERVED_FLAG register and other minor bugs
See merge request idf/esp-idf!2078
2018-03-18 19:23:03 +08:00
Darian Leung
c4a6eef841
bugfix/Fix BLK3_RESERVED_FLAG register and other minor bugs
...
This commit fixes an incorrect register definition for BLK3_RESERVED_FLAG.
Other bugs include a missing conditional check, and updated comments
on modifying eFuse checking behavior.
2018-03-16 20:56:27 +08:00
zwj
05b5671fc4
component/bt: fix gattc open api
2018-03-16 19:23:31 +08:00
zhiweijian
d3646ca59f
Component/bt: fix eddystone demo error
2018-03-16 18:28:58 +08:00
Jiang Jiang Jian
0cb7b27f8b
Merge branch 'cherry-pick-702b4610-2' into 'release/v3.0'
...
Component/bt: fix set error params and return callback when start adv for v3.0
See merge request idf/esp-idf!2061
2018-03-15 18:07:19 +08:00
Jiang Jiang Jian
2319e8a0eb
Merge branch 'cherry-pick-dc66940f' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_a2dp_disc_rsn_error_when_as_master' into 'release/v3.0'
See merge request idf/esp-idf!2067
2018-03-15 18:06:00 +08:00
Tian Hao
bc12970dde
component/bt : improve multi-connection performance and stability
2018-03-15 15:36:53 +08:00
Jiang Jiang Jian
7a863cca7c
Merge branch 'cherry-pick-047870fd' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_string_to_bdaddr_error_when_opening_nano' into 'v3.0'
See merge request idf/esp-idf!2064
2018-03-15 15:34:48 +08:00
Jiang Jiang Jian
9c42b6194e
Merge branch 'bugfix/btdm_a2dp_disc_rsn_error_when_as_master' into 'master'
...
component/bt: Fix bug: a2dp disc_rsn error when as master
See merge request idf/esp-idf!1995
(cherry picked from commit dc66940f82
)
f1d3f689
component/bt: Fix bug: a2dp disc_rsn error when as master
2018-03-15 15:28:53 +08:00
Jiang Jiang Jian
3511109b6e
Merge branch 'bugfix/btdm_a2dp_cleanup_bug_3.0' into 'release/v3.0'
...
component/bt: Fix bug of a2dp cleanup bug when connected in v3.0
See merge request idf/esp-idf!2040
2018-03-15 15:04:07 +08:00
XiaXiaotian
acff7e58d2
fix the issue that wpa2 assert when disconnect from AP
2018-03-15 14:42:31 +08:00
Jiang Jiang Jian
0f45323879
Merge branch 'bugfix/btdm_string_to_bdaddr_error_when_opening_nano' into 'master'
...
component/bt: Fix bug: string_to_bdaddr() error when opening nano
See merge request idf/esp-idf!1981
(cherry picked from commit 047870fd80
)
54320d5f
component/bt: Fix bug: string_to_bdaddr() error when opening nano
2018-03-15 14:15:31 +08:00