Angus Gratton
782ab8d872
Merge branch 'fix/sdio_slave_recv_isr_load_v3.1' into 'release/v3.1'
...
sdio_slave: fix the recv crash when trans finish and load at the same time (backport v3.1)
See merge request idf/esp-idf!3232
2018-09-11 09:44:49 +08:00
michael
b3697e7741
sdio_slave: fix the recv crash when trans finish and load at the same time
2018-09-10 15:17:07 +08:00
Jiang Jiang Jian
35785d08fd
Merge branch 'feature/btdm_legacy_paring_v3.1' into 'release/v3.1'
...
component/bt: Add Legacy Pairing (backport 3.1)
See merge request idf/esp-idf!3193
2018-09-07 14:44:19 +08:00
Ivan Grokhotkov
297945c32e
Merge branch 'test/split_test_env_for_integration_test_v3.1' into 'release/v3.1'
...
test: split CI test environment (backport v3.1)
See merge request idf/esp-idf!3211
2018-09-07 11:06:51 +08:00
Jiang Jiang Jian
d193895ec6
Merge branch 'bugfix/btdm_hfp_invalid_hci_sync_pkt_len_for_v3.1' into 'release/v3.1'
...
bugfix/btdm_hfp_invalid_hci_sync_pkt_len_for_v3.1(backport v3.1)
See merge request idf/esp-idf!3188
2018-09-06 19:52:05 +08:00
He Yin Ling
f1bf446410
test: split CI test environment:
...
Currently CI test environment is complicated, usually includes NIC, AP.
These devices are not used for a lot test cases. Therefore we split the
test environment, remove unnecessary devices. Then it will be easier to
create CI runners.
2018-09-06 16:35:34 +08:00
Jiang Jiang Jian
e6a0eb74c8
Merge branch 'bugfix/btdm_discovery_ble_v3.1' into 'release/v3.1'
...
component/bt : fix bug that set discovery mode will stop ble adv
See merge request idf/esp-idf!3189
2018-09-06 14:19:31 +08:00
Jiang Jiang Jian
b3189bae38
Merge branch 'bugfix/tw25969_esp_derive_local_mac_missing_v3.1' into 'release/v3.1'
...
defination: fix the bug that esp_derive_local_mac() defination missing (backport v3.1)
See merge request idf/esp-idf!3199
2018-09-05 17:21:20 +08:00
zhangyanjiao
c27c381ba2
defination: fix the bug that esp_derive_local_mac() defination missing
2018-09-05 14:42:23 +08:00
baohongde
95c5805088
component/bt: Add Legacy Pairing (backport 3.1)
...
A cherry-pick of MR !3057
2018-09-04 20:59:03 +08:00
Tian Hao
196793dccb
component/bt : fix bug that set discovery mode will stop ble adv
...
As the bluedroid original implmentation of BR/EDR and BLE dual mode about discovery mode,
when set discovery mode for BR/EDR, it will stop ble advertising.
Reference to https://github.com/espressif/esp-idf/issues/2306
2018-09-04 20:29:36 +08:00
wangmengyang
7c6d447938
component/bt: bugfix for incorrect length of HCI SCO packet size in HFP resulted from uninitialized data buffer length
2018-09-04 20:24:00 +08:00
Jiang Jiang Jian
969161183a
Merge branch 'bugfix/esp_wifi_disconnect_fail_v3.1' into 'release/v3.1'
...
update wifi lib to fix two bugs (backport v3.1)
See merge request idf/esp-idf!3158
2018-09-04 15:06:49 +08:00
Jiang Jiang Jian
45e29a817c
Merge branch 'bugfix/btdm_update_private_address_v3.1' into 'release/v3.1'
...
component/bt: Update BLE private address after it's private address interval (backport 3.1)
See merge request idf/esp-idf!3170
2018-09-04 14:10:47 +08:00
Jiang Jiang Jian
dabebbf639
Merge branch 'bugfix/btdm_rfcomm_test_command_cause_crash_v3.1' into 'release/v3.1'
...
component/bt: Fix bug rfcomm test command cause crash (backport 3.1)
See merge request idf/esp-idf!3169
2018-09-04 14:10:05 +08:00
Jiang Jiang Jian
cd78dc632a
Merge branch 'bugfix/btdm_find_remote_service_by_uuid_always_return_success_v3.1' into 'release/v3.1'
...
component/bt: Fix bug of SDP find services by uuid always return success (backport 3.1)
See merge request idf/esp-idf!3164
2018-09-04 14:09:36 +08:00
Angus Gratton
33b3418b4e
Merge branch 'mesh/rewrite_docs_backport_v3.1' into 'release/v3.1'
...
docs/rewrite_mesh_docs (backport v3.1)
See merge request idf/esp-idf!3168
2018-09-03 18:12:12 +08:00
baohongde
6a2f492832
component/bt: Update BLE private address after it's private address interval (backport 3.1)
...
A cherry-pick of MR !2987
2018-09-03 14:27:15 +08:00
baohongde
24a03a8d3f
component/bt: Fix bug rfcomm test command cause crash (backport 3.1)
...
A cherry-pick of MR !3080
2018-09-03 14:17:56 +08:00
Darian Leung
27ffeacf07
docs/rewrite_mesh_docs
...
The following commit rewrites the ESP-MESH docs. This commit includes
new diagrams and a structure approach to the mesh docs. Some mesh api references
have also been modified.
2018-09-03 13:03:32 +08:00
baohongde
b1da63d645
component/bt: Fix bug of SDP find services by uuid always return success (backport 3.1)
...
A cherry-pick of MR !3036
2018-09-03 11:52:19 +08:00
zhangyanjiao
ec3a1318dc
update wifi lib to fix two bugs
...
1. fix the esp_wifi_disconnect() err when wifi is not started or inited
2. make g_intr_lock_mux and g_osi_funs_p in DRAM
2018-08-31 20:10:20 +08:00
Jiang Jiang Jian
22da5f6de9
Merge branch 'bugfix/btdm_security_vulnerability_v3.1' into 'release/v3.1'
...
fix bluetooth security vulnerability of ECDH public key checking
See merge request idf/esp-idf!3139
2018-08-31 02:11:55 +08:00
Jiang Jiang Jian
0ec9d3ec7d
Merge branch 'bugfix/wifi_reorder_mpdu_as_ampdu_v3.1' into 'release/v3.1'
...
esp32: reorder MPDU as AMPDU (backport v3.1)
See merge request idf/esp-idf!3140
2018-08-31 01:59:55 +08:00
Angus Gratton
70764a4cf9
Merge branch 'bugfix/ci_use_mirror_for_public_v3.1' into 'release/v3.1'
...
ci: Use local mirrors on the public branches (master, release-) too
See merge request idf/esp-idf!3126
2018-08-30 14:22:42 +08:00
XiaXiaotian
2ad5686937
esp32: reorder MPDU as AMPDU
...
Some APs transmit AMPDU and MPDU by turns. Moreover, the sequence
numbers of AMPDU and MPDU are out of order, e.g. MPDU(1253) -
AMPDU(1251, 1252) - MPDU(1254) - AMPDU(1255, 1256). In order to
receive both AMPDU and MPDU in order, MPDU must be reordered with
AMPDU.
2018-08-30 11:46:16 +08:00
He Yin Ling
84d10d8dad
Merge branch 'test/fix_test_summary_duplicate_v3.1' into 'release/v3.1'
...
test: fix duplicated summary of BTSTK_GAP_14007,BTSTK_GAP_14008,BTSTK_GAP_14009
See merge request idf/esp-idf!3086
2018-08-30 11:20:58 +08:00
Tian Hao
7f8de47631
fix bluetooth security vulnerability of ECDH publick key checking
2018-08-30 11:09:02 +08:00
Jiang Jiang Jian
16add00668
Merge branch 'bugfix/btdm_fix_memory_leak_in_security_server_v3.1' into 'release/v3.1'
...
Component/bt: fix memory leak in security server(backport v3.1)
See merge request idf/esp-idf!3081
2018-08-30 02:20:58 +08:00
zhiweijian
a83c918946
Component/bt: fix memory leak in security server
2018-08-29 17:56:14 +00:00
Jiang Jiang Jian
9f791e06f6
Merge branch 'bugfix/mesh_fix_hard_to_find_parent_v3.1' into 'release/v3.1'
...
mesh: bugfix and add two APIs (backport3.1)
See merge request idf/esp-idf!3134
2018-08-30 01:54:08 +08:00
Jiang Jiang Jian
c3ba237846
Merge branch 'bugfix/btdm_fix_crash_when_BLE_do_SMP_con_discon_stress_test_v3.1' into 'release/v3.1'
...
Component/bt: fix crash when BLE do connect and disconnect stress test(backport v3.1)
See merge request idf/esp-idf!3119
2018-08-30 01:51:33 +08:00
zhiweijian
17c4a76395
component/bt: fix crash when BLE do con and duscon stress test
2018-08-30 00:36:57 +08:00
Jiang Jiang Jian
114b16f0d5
Merge branch 'bugfix/btdm_fix_get_error_adv_sometimes_v3.1' into 'release/v3.1'
...
Component/bt: fix get error adv packet sometimes(backport v3.1)
See merge request idf/esp-idf!3082
2018-08-29 23:54:36 +08:00
Jiang Jiang Jian
e1fc259600
Merge branch 'bugfix/btdm_a2dp_sink_pcm_buf_size_for_v3.1' into 'release/v3.1'
...
bugfix/btdm_a2dp_sink_pcm_buffer_size_for_v3.1(backport v3.1)
See merge request idf/esp-idf!3116
2018-08-29 22:54:58 +08:00
Angus Gratton
1d537d29d5
Merge branch 'feature/cmake_v3.1' into release/v3.1
2018-08-29 19:30:06 +08:00
qiyuexia
09f5854c9a
mesh: bugfix and add two APIs
...
1. new APIs: esp_mesh_get_subnet_nodes_num() and esp_mesh_get_subnet_nodes_list().
2. fix hard to find the parent during connect.
3. disable Wi-Fi channel switch function.
4. fix a typo of MESH_EVENT_NO_PARENT_FOUND.
2018-08-29 17:28:17 +08:00
chensheng
200d8d235b
fix bug BTSTK_GAP_14007,BTSTK_GAP_14008,BTSTK_GAP_14009 duplicate summary
2018-08-29 12:27:59 +08:00
Anton Maklakov
84a32f3288
ci: Use local mirrors on the public branches (master, release-) too
...
Use DONT_USE_MIRROR=1 to force using the original repositories if you need
2018-08-28 23:43:30 +08:00
zhiweijian
bfc8142c99
Component/bt: fix get error adv packet sometimes
2018-08-28 14:13:10 +08:00
Jiang Jiang Jian
bcebf3e6f1
Merge branch 'bugfix/btdm_check_slave_feature_before_set_afh_for_v3.1' into 'release/v3.1'
...
bugfix/btdm_check_slave_feature_before_set_afh(backport v3.1)
See merge request idf/esp-idf!3103
2018-08-28 13:40:56 +08:00
Jiang Jiang Jian
4577270fc3
Merge branch 'bugfix/tw23404_dhcp_NAK_issue_v3.1' into 'release/v3.1'
...
lwip: optimize LWIP timer (backport v3.1)
See merge request idf/esp-idf!3060
2018-08-28 13:39:46 +08:00
Angus Gratton
2d22fbd4ff
cmake: Add missing example CMakeLists.txt files, CI check all examples have both
2018-08-28 11:11:57 +08:00
wangmengyang
9f6af0ad4b
component/bt: bugfix for incorrect computation of PCM data buffer size in A2DP sink
2018-08-28 10:59:22 +08:00
Jiang Jiang Jian
c060853f70
Merge branch 'bugfix/fix_probable_mem_leak_v3.1' into 'release/v3.1'
...
components/bt: Fix a probable memory leak for BTA_GATTS_CONF_EVT event (backport v3.1)
See merge request idf/esp-idf!3106
2018-08-28 10:41:42 +08:00
Jiang Jiang Jian
501d81ce32
lwip: optimize LWIP timer
...
Port LWIP timer implementation in LWIP v2.0.3 to IDF v3.0
2018-08-27 21:59:36 +08:00
Jiang Jiang Jian
f9a770134b
Merge branch 'bugfix/timer_oneshot_timeout_twice_v3.1' into 'release/v3.1'
...
component/bt: Some timer oneshot will timeout twice (backport v3.1)
See merge request idf/esp-idf!3063
2018-08-27 20:42:44 +08:00
Jiang Jiang Jian
b4fc5b0e8f
Merge branch 'bugfix/fix_several_wifi_bugs_v3.1' into 'release/v3.1'
...
esp32: update wifi lib to fix several WiFi bugs (backport v3.1)
See merge request idf/esp-idf!3098
2018-08-27 20:38:35 +08:00
Angus Gratton
a821805ddc
cmake: partition_table: Use PYTHON interpreter when running parttool.py (fixes flasher args on Windows)
2018-08-27 18:02:30 +08:00
Angus Gratton
cb9fa1f295
kconfig: Merge Kconfig.compiler back into Kconfig
...
Reverts 5e0a3d99e8
(no longer needed but also not supported by
mconf-idf built from kconfig-frontends repo.)
2018-08-27 17:24:31 +08:00