lly
287f80ec01
ble_mesh: add proxy client functionality
2019-11-08 11:10:52 +08:00
lly
c6286529eb
ble_mesh: add ble mesh friend node event
2019-11-08 11:10:52 +08:00
lly
fdfe59d369
ble_mesh: add low power node api and event
2019-11-08 11:10:52 +08:00
lly
afc00fb5f5
ble_mesh: add heartbeat message recv callback
2019-11-08 11:10:52 +08:00
lly
2511024e44
ble_mesh: modify health server model callbacks
2019-11-08 11:10:52 +08:00
lly
729af38346
ble_mesh: add separate advertising buffers for relay packets
2019-11-08 11:10:52 +08:00
Angus Gratton
b7c2c93ecc
Merge branch 'bugfix/wifi_internal_memory' into 'master'
...
wifi: Include DMA reserved pool when allocating internal-only memory
Closes WIFI-883
See merge request espressif/esp-idf!6545
2019-11-04 13:55:49 +08:00
baohongde
90b18dd4f6
components/bt: Not post message to a2dp ctrl queue from btc queue, just call it.
2019-11-01 14:12:25 +08:00
Jiang Jiang Jian
fd4da421e5
Merge branch 'bugfix/btdm_assert_deinit_a2dp_while_playing' into 'master'
...
components/bt: Fix assert when deinit A2DP while playing music
Closes BT-471
See merge request espressif/esp-idf!6533
2019-11-01 11:57:01 +08:00
Angus Gratton
1768473eb8
bt: Include DMA reserved pool when allocating internal-only memory
...
Fix for root cause of https://github.com/espressif/esp-idf/issues/3592
2019-10-31 15:19:17 +11:00
Krzysztof Budzynski
2c3548b65e
Provide BLE Mesh documentation
2019-10-30 17:01:18 +08:00
Jiang Jiang Jian
9d5a7f8df6
Merge branch 'bugfix/btdm_possibly_unable_to_enter_sleep_after_woken_up' into 'master'
...
bugfix/btdm_possibly_unable_to_enter_sleep_after_woken_up
See merge request espressif/esp-idf!6219
2019-10-30 15:38:58 +08:00
baohongde
a099b6f7e4
components/bt: Fix assert when deinit A2DP while playing music
2019-10-29 19:47:50 +08:00
Angus Gratton
055cc251b7
Merge branch 'feature/esp32s2beta_merge' into 'master'
...
esp32s2beta: Merge support to master
Closes IDF-513, IDF-756, IDF-758, IDF-999, IDF-753, IDF-749, IDF-754, IDF-840, and IDF-755
See merge request espressif/esp-idf!6100
2019-10-29 13:02:01 +08:00
Prasad Alatkar
c5339779a7
NimBLE: Update NimBLE submodule to latest nimble-1.2.0-idf
release
2019-10-29 12:52:05 +08:00
Tian Hao
4987a5ad90
fix bug that semaphore may schedule out in Critical Section
...
1. Since BLE full-scan feature for BLE mesh change the controller code cause this problem,
it cause coex semaphore take in "interrupt disable", then it may cause task schedule
and cause crash in freertos
2. Fix newlib lock ISR context and critical section check
3. Fix bt controller ISR context and critical section check
2019-10-28 18:43:35 +08:00
Jiang Jiang Jian
758db1e008
Merge branch 'bugfix/fix_mesh_proxy_adv_with_wrong_dev_name' into 'master'
...
ble_mesh: using bt device name in mesh proxy adv
Closes BLEMESH-51
See merge request espressif/esp-idf!6438
2019-10-26 20:45:10 +08:00
Jiang Jiang Jian
ea0f0b1700
Merge branch 'feature/btdm_add_api_to_set_channel_classification' into 'master'
...
Feature/btdm add api to set channel classification
Closes BT-450
See merge request espressif/esp-idf!6229
2019-10-26 20:42:58 +08:00
Jiang Jiang Jian
eef065374e
Merge branch 'bugfix/btdm_disable_bt_gatt' into 'master'
...
components/bt: Disable BR/EDR GATT
Closes BT-456
See merge request espressif/esp-idf!6420
2019-10-26 20:42:37 +08:00
Jiang Jiang Jian
87e1dfa31e
Merge branch 'bugfix/btdm_check_avrc_connected_error' into 'master'
...
components/bt: Fix error in checking AVRC connected
See merge request espressif/esp-idf!6415
2019-10-26 20:42:04 +08:00
Angus Gratton
7ce75a42c7
Merge branch 'master' into feature/esp32s2beta_merge
2019-10-25 15:13:52 +11:00
baohongde
ed984cc9b5
components/bt: Add API and EVT for BLE set channels(BLE)
2019-10-25 11:39:35 +08:00
baohongde
eaf5f6a319
components/bt: Add API and EVT for set AFH channels(BR/EDR)
2019-10-25 11:39:22 +08:00
Jiang Jiang Jian
f974811150
Merge branch 'feature/hf_ag' into 'master'
...
Feature: BT/HFP AG.
Closes BT-346 and BT-428
See merge request espressif/esp-idf!6306
2019-10-25 10:57:43 +08:00
wangmengyang
11aa4ef1ef
components/bt: bugfix that bluetooth controller may not be able to enter sleep after end of wake up request
2019-10-25 02:52:12 +00:00
baohongde
d6201066a3
components/bt: Fix error in checking AVRC connected
2019-10-25 02:50:31 +00:00
baohongde
93f86b8a6d
components/bt: Disable BR/EDR GATT
2019-10-25 02:49:51 +00:00
Hrishikesh Dhayagude
a26dfe70aa
nimble: Miscellaneous changes
...
1. Update NimBLE submodule as per changes in adv interval and stop port
2. Make changes in ESP BLE Mesh NimBLE host code for the same
2019-10-24 14:38:01 +08:00
lly
2350b15451
ble_mesh: using bt device name in mesh proxy adv
2019-10-22 15:04:19 +08:00
Jiang Jiang Jian
59aa07d5d9
Merge branch 'bugfix/btdm_fix_lmp_sniff_req_timeout' into 'master'
...
components/bt: Fix LMP sniff req timeout
See merge request espressif/esp-idf!6351
2019-10-22 11:20:14 +08:00
Angus Gratton
8675a818f9
Merge branch 'master' into feature/esp32s2beta_merge
2019-10-22 13:51:49 +11:00
Hrishikesh Dhayagude
f58d7d14c7
components/bt: Add support of NimBLE host in ESP BLE Mesh
2019-10-21 20:18:21 +08:00
Jiang Jiang Jian
5b0d262489
Merge branch 'bugfix/not_restoring_ble_mesh_cfg_val' into 'master'
...
ble_mesh: fix not restoring ble mesh cfg value
See merge request espressif/esp-idf!6275
2019-10-21 20:16:45 +08:00
Angus Gratton
ae21d669b9
Merge branch 'master' into feature/esp32s2beta_merge
2019-10-17 18:22:08 +11:00
Hrishikesh Dhayagude
10fd2ae653
NimBLE: Set the default number of max connections to the controller's value
...
Also, update the NimBLE submodule to remove unwanted logging stuff
2019-10-17 12:54:34 +08:00
Angus Gratton
496ede9bcd
Merge branch 'master' into feature/esp32s2beta_merge
2019-10-15 14:59:27 +11:00
Jiang Jiang Jian
93bca1dc2b
Merge branch 'hfp_bugfix' into 'master'
...
component/bt: Fix bugs in HFP feature
Closes BT-427
See merge request espressif/esp-idf!6197
2019-10-14 21:47:56 +08:00
Jiang Jiang Jian
bf87d0949b
Merge branch 'bugfix/btdm_osi_queue_gycfix_master' into 'master'
...
Component/bt : Added handling of osi memory calloc failure
See merge request espressif/esp-idf!6140
2019-10-14 21:35:41 +08:00
weitianhua
26b69f1363
New Clean Commit for AG.
...
Only Support single AG control block.
2019-10-14 07:54:09 +00:00
baohongde
e1d61d03de
components/bt: Fix LMP sniff req timeout
2019-10-14 14:56:07 +08:00
lly
35353de137
ble_mesh: fix not callback net_key when device is provisioned
2019-10-11 09:51:02 +08:00
Prasad Alatkar
19375a674e
NimBLE: Misc changes in NimBLE porting layer and menuconfig option
...
- Minor fix to remove while loop & delay while transmitting data from
host to controller.
- Add menuconfig option to enable predefined public-private keypair for
debugging (Vol. 3, Part H, 2.3.5.6.1)
2019-10-10 17:20:15 +08:00
lly
673f58fe03
ble_mesh: fix not restoring ble mesh cfg value
2019-10-08 16:34:05 +08:00
weitianhua
9f0a44f5c0
component/bt: Fix bugs in HFP feature
2019-10-08 07:07:45 +00:00
Ivan Grokhotkov
5830f529d8
Merge branch 'master' into feature/esp32s2beta_merge
2019-10-02 19:01:39 +02:00
Roland Dobai
15857d9cbb
Handle deprecated values in sdkconfig.defaults
...
The issue was pointed out also in
https://github.com/espressif/esp-idf/issues/4092
2019-10-02 16:29:25 +00:00
Jiang Jiang Jian
1c1108d47b
Merge branch 'bugfix/coex_fix_some_bugs' into 'master'
...
fix some coexist bugs
See merge request espressif/esp-idf!5200
2019-09-30 16:59:19 +08:00
Prasad Alatkar
fe08f435dc
NimBLE: Add optional mbedTLS support to NimBLE
...
- Additional menuconfig option to select either mbedTLS or Tinycrypt from NimBLE.
- Addition of `CMAC` and `ECP_RESTARTABLE` to mbedTLS menuconfig option and
`esp_config.h`.
- Changes NimBLE `component.mk` and `CMakeLists.txt` to support mbedTLS option.
- Minor changes to `app_mesh.c` application.
2019-09-30 14:15:43 +08:00
Xia Xiaotian
63019689d6
Coexist: fix some coexist bugs
...
1. Fix high beacon and broadcast packets loss ratio of WiFi to make
MDNS test pass.
2. Improve stability of WiFi performance with a little
sacrifice of throughput.
3. Improve BLE advertising and connection performance with dynamic
priority. It sacrifices a little WiFi throughput, but achieves balance
between WiFi and Bluetooth.
2019-09-30 11:49:16 +08:00
lly
7a450222f5
ble_mesh: fix client model invalid address access
2019-09-26 20:11:22 +08:00
Jiang Jiang Jian
3d8798f745
Merge branch 'bugfix/kconfig_corrections' into 'master'
...
Fix Kconfig issues discovered by upstream Kconfiglib
See merge request espressif/esp-idf!6183
2019-09-25 16:26:18 +08:00
Jiang Jiang Jian
ac0d2dc534
Merge branch 'bugfix/ble_mesh_queue_task_init_check' into 'master'
...
ble_mesh: check ble mesh queue and task init status
See merge request espressif/esp-idf!6192
2019-09-25 15:08:05 +08:00
Prasad Alatkar
2c3648b619
BT/Bluedroid : Add support to set min encryption key requirement
...
- Modifies `smp_utils.c` to add check on encryption key size received from
peer.
- Modifies `esp_ble_gap_set_security_param` API to add minimum encryption key
size requirement.
2019-09-25 11:56:47 +08:00
Jiang Jiang Jian
a2b65e1649
Merge branch 'bugfix/btdm_loop_in_feature_req_ext' into 'master'
...
components/bt: Fix sending LMP_features_req_ext in a loop
See merge request espressif/esp-idf!6022
2019-09-25 11:51:53 +08:00
lly
0792a2fde8
ble_mesh: check ble mesh queue and task init status
2019-09-25 11:09:40 +08:00
Roland Dobai
833822c10b
Fix Kconfig issues discovered by upstream Kconfiglib
2019-09-23 16:10:57 +02:00
Angus Gratton
adfc06a530
Merge branch 'master' into feature/esp32s2beta_merge
2019-09-20 10:28:37 +10:00
Jiang Jiang Jian
d78831ab2b
Merge branch 'bugfix/remove_v40_deprecations' into 'master'
...
Remove features deprecated before ESP-IDF V4.0
Closes IDF-507
See merge request espressif/esp-idf!5841
2019-09-19 16:07:01 +08:00
gengyuchao
87995c5f75
bugfix:btmd fix the problem that fixed_queue_enqueue may give the wrong semaphore if list_append fail to calloc a new node
2019-09-18 17:43:35 +08:00
Jiang Jiang Jian
5051bb906a
Merge branch 'bugfix/ble_mesh_get_timer_remaining_time' into 'master'
...
ble_mesh: fix ble mesh get timer remaining time
See merge request espressif/esp-idf!6060
2019-09-18 16:38:24 +08:00
lly
9ee5e3d8ed
ble_mesh: fix duplicate memory free during receiving status message
2019-09-16 17:34:08 +08:00
lly
e1b04df763
ble_mesh: make unicast elem lookup O(1)
2019-09-16 14:55:41 +08:00
Angus Gratton
438d513a95
Merge branch 'master' into feature/esp32s2beta_merge
2019-09-16 16:18:48 +10:00
Angus Gratton
596ccc6793
bluetooth: Remove bt.h header (deprecated in v3.1-dev)
2019-09-13 09:44:07 +10:00
Jiang Jiang Jian
9f145ff165
Merge branch 'feature/btdm_add_hf_nvrc_command' into 'master'
...
BT HFP: Add AT+NREC=0 command for disabling AG echo cancellation.
See merge request espressif/esp-idf!5974
2019-09-12 13:25:18 +08:00
Jiang Jiang Jian
d1e5d9c8c9
Merge branch 'bugfix/btdm_config_msbc' into 'master'
...
components/bt: Disable Wide Bond Speech when SCO data path is PCM
See merge request espressif/esp-idf!5978
2019-09-12 13:23:41 +08:00
lly
5d1f84f69c
ble_mesh: fix ble mesh get timer remaining time
2019-09-10 16:58:41 +08:00
lly
1a8f37b383
ble_mesh: update ble mesh examples sdkconfig.defaults
2019-09-09 17:15:16 +08:00
lly
d48c89b56a
ble_mesh: fix ble mesh btc may caused memory leak
2019-09-09 17:15:16 +08:00
lly
8a41132507
ble_mesh: fix publication period timestamp initialization
2019-09-09 17:15:16 +08:00
lly
715cf7d578
ble_mesh: remove useless mesh_opcode
2019-09-09 17:15:16 +08:00
lly
8580a3211b
ble_mesh: fix bt_mesh_net_resend() caused compiling error
2019-09-09 17:15:16 +08:00
lly
8a7ab6cb3d
ble_mesh: fix adhering to the configured Friend Queue size
2019-09-09 17:15:16 +08:00
lly
29de1a9acf
ble_mesh: remove useless code bt_mesh_trans_resend()
2019-09-09 17:15:16 +08:00
lly
386a5d649c
ble_mesh: lpn remove msg from cache on rejection
2019-09-09 17:15:16 +08:00
lly
9a672caa7e
ble_mesh: introduce a helper for send callback function
2019-09-09 17:15:16 +08:00
lly
05128c98ec
ble_mesh: fix heartbeat sending on friendship established/lost
2019-09-09 17:15:16 +08:00
lly
9f80c24b74
ble_mesh: fix checking for active heartbeat publication
2019-09-09 17:15:16 +08:00
lly
b9c43cec19
ble_mesh: fix starting iv update when not on primary subnet
2019-09-09 17:15:16 +08:00
lly
3f6968e31b
ble_mesh: fix canceling publication retransmit timer
2019-09-09 17:15:16 +08:00
lly
10bffaebf1
ble_mesh: fix resending segments on correct bearer
2019-09-09 17:15:16 +08:00
lly
e152df43f1
ble_mesh: fix not sending all segments through the Friend Queue
2019-09-09 17:15:16 +08:00
lly
f449cb7843
ble_mesh: fix canceled buffer memory leak
2019-09-09 17:15:16 +08:00
lly
2afc9b820d
ble_mesh: remove some useless copy during ecdh calculation
2019-09-09 17:15:16 +08:00
lly
75b0f50aa0
ble_mesh: move heartbeat sending to transport layer
2019-09-09 17:15:16 +08:00
lly
edf0b9ee02
ble_mesh: fix provisioning send error handling
2019-09-09 17:15:16 +08:00
lly
1c06494293
ble_mesh: fix rejecting invalid remote public key
2019-09-09 17:15:16 +08:00
lly
3e47f3ec87
ble_mesh: add error checks for scan start/stop
2019-09-09 17:15:16 +08:00
lly
3e489d40ff
ble_mesh: rename reset_link() to reset_adv_link()
2019-09-09 17:15:16 +08:00
lly
f2b0b00020
ble_mesh: fix public key mismatch error handling
2019-09-09 17:15:16 +08:00
lly
630e911958
ble_mesh: update protocol error timeout from zephyr
2019-09-09 17:15:16 +08:00
lly
716db01a7f
ble_mesh: fix segmented message RPL behavior
2019-09-09 17:15:16 +08:00
lly
5f5f5cf305
ble_mesh: clear LPN sent_req on failure
2019-09-09 17:15:16 +08:00
lly
4bf4094e40
ble_mesh: update proxy sar operation from zephyr
2019-09-09 17:15:16 +08:00
lly
9c98a8d645
ble_mesh: fix postponing storage deadline indefinitely
2019-09-09 17:15:16 +08:00
lly
c44a3f1209
ble_mesh: fix RPL storage timeout handling
2019-09-09 17:15:16 +08:00
lly
9a7efd30ef
ble_mesh: fix output MIC with additional data
2019-09-09 17:15:16 +08:00
lly
f3e7656c06
ble_mesh: remove non-standard relay opearation
2019-09-09 17:15:16 +08:00
lly
0c82a32524
ble_mesh: fix finding netkey/appkey/devkey for tx/rx msg
2019-09-09 17:15:16 +08:00
lly
b8cb769ce3
ble_mesh: fix failed to set device role caused mem leak
2019-09-09 17:15:16 +08:00
lly
624bf7e3a0
ble_mesh: ble mesh btc miscellaneous modifications
2019-09-09 17:15:16 +08:00
lly
1f96bf5906
ble_mesh: fix MESH/NODE/FRND/FN/BV-11-C related bug
2019-09-09 17:15:16 +08:00
lly
f25640e9e5
ble_mesh: fix MESH/NODE/CFG/GPXY/BV-02-C & MESH/NODE/CFG/NID/BV-02-C related bug
2019-09-09 17:15:16 +08:00
lly
014a35c1df
ble_mesh: fix MESH/NODE/CFG/HBS/BV-01-C related bug
2019-09-09 17:15:16 +08:00
lly
b3bc60183d
ble_mesh: rename ble mesh client model variables and functions
2019-09-09 17:15:16 +08:00
lly
5f6259a625
ble_mesh: reorganize ble mesh model files
2019-09-09 17:15:16 +08:00
lly
a788e7cd3d
ble_mesh: sync zephyr v1.14.0 bt_hex()
2019-09-09 17:15:16 +08:00
lly
c648054e08
ble_mesh: fix provisioner prov auth bug
2019-09-09 17:15:16 +08:00
Jiang Jiang Jian
84daad38c3
Merge branch 'bugfix/btdm_a2dp_sink_media_suspend_cmd_unack' into 'master'
...
bugfix/btdm_a2dp_sink_media_suspend_cmd_unack
See merge request espressif/esp-idf!5937
2019-09-06 14:29:45 +08:00
baohongde
cb2e1f93d1
components/bt: Fix sending LMP_features_req_ext in a loop
...
Remove xtensa/xtruntime.h at the same time
2019-09-06 12:00:54 +08:00
Jiang Jiang Jian
8d85792acc
Merge branch 'bugfix/btdm_crash_in_sket_ist' into 'master'
...
Fix 2 bugs in r_ld_fm_sket_isr
See merge request espressif/esp-idf!5946
2019-09-05 12:01:35 +08:00
Michael (XIAO Xufeng)
3b39e60f97
driver: remove unused drivers for esp32s2beta
2019-09-04 10:53:25 +10:00
baohongde
019067b6ac
components/bt: Rename some macros
2019-09-03 10:23:05 +08:00
Zac Bond
f8212988c4
Use CONFIG value instead of hard-coded value.
...
Add intermediate defines.
Use CONFIG_BTU_TASK_STACK_SIZE instead of hard-coded value in Bluedroid component
2019-09-03 10:21:45 +08:00
Jiang Jiang Jian
9b070666e1
Merge branch 'bugfix/btdm_linking_fail_with_toolchain_8.2.0' into 'master'
...
components/bt: Fix linking fail with toolchain 8.2.0
See merge request espressif/esp-idf!5782
2019-09-02 22:21:59 +08:00
Jiang Jiang Jian
81cf2cf130
Merge branch 'bugfix/btdm_remove_unused_macro_in_menuconfig' into 'master'
...
components/bt: Remove unused macro in menuconfig
See merge request espressif/esp-idf!5950
2019-09-02 22:20:49 +08:00
baohongde
185f47ab7e
components/bt: Disable Wide Bond Speech when SCO data path is PCM
2019-09-02 20:50:09 +08:00
nif
75578300f1
BT HFP: Add AT+NREC=0 command for disabling AG echo cancellation.
2019-09-02 09:28:38 +00:00
Angus Gratton
ff5cb217fe
Merge branch 'bugfix/unicore_config_prevent_ipc_code' into 'master'
...
ipc: prevent code getting pulled in for unicore configuration
See merge request espressif/esp-idf!5795
2019-08-30 16:26:47 +08:00
baohongde
d12503eb55
components/bt: Remove unused macro in menuconfig
2019-08-29 19:58:05 +08:00
baohongde
b6fe44b520
Fix 2 bugs in r_ld_fm_sket_isr
...
1. When remove two elt in the 1st isr, then assert in then 2nd one.
2. When timestamp of first elt is equal to sket_clkn, then crash.
2019-08-29 11:27:57 +08:00
Mahavir Jain
ebe53416ad
ipc: prevent code getting pulled in for unicore configuration
2019-08-28 12:47:08 +05:30
wangmengyang
30bc5953f2
bugfix that call of esp_a2d_media_ctrl(ESP_A2D_MEDIA_CTRL_SUSPEND) will not get an ACK from callback on A2DP sink
...
# Conflicts:
# components/bootloader/subproject/components/micro-ecc/micro-ecc
2019-08-28 15:16:10 +08:00
zhiweijian
f002d1c6aa
Component/bt: fix dome BLE bugs
...
- fix data loss and send same pkt twice sometimes
- fix adv data error in air sometimes
- fix adv start/stop crash sometimes
2019-08-26 14:17:46 +08:00
wangmengyang
76b6902e96
components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link for preventing KNOB attack
...
This patch is to address the CVE-2019-9506 vulnerability.
2019-08-23 08:26:15 +08:00
Prasad Alatkar
393eb1700d
NimBLE: Add misc menuconfig options
...
- Add option to configure stack size of NimBLE host task, update NimBLE
submodule for the same.
- Change max concurrent connections supported to 9 inline with controller.
2019-08-21 19:28:47 +08:00
baohongde
38ae31ebc4
components/bt: Fix linking fail with toolchain 8.2.0
2019-08-16 09:54:18 +00:00
Angus Gratton
8111b222c8
bt: Update to match master
2019-08-13 17:14:16 +10:00
Angus Gratton
18c5cfadae
Fix function prototypes
2019-08-13 17:14:16 +10:00
Angus Gratton
04ae56806c
Merge branch 'master' into feature/esp32s2beta_update
2019-08-08 15:26:58 +10:00
Angus Gratton
b23718995a
Merge branch 'bugfix/strict_prototypes' into 'master'
...
Enable strict prototypes checks
Closes IDFGH-757
See merge request espressif/esp-idf!4546
2019-08-05 09:38:39 +08:00
Tian Hao
a9dfae66ea
bugfix btdm sleep twice after wakeup request
...
This problem may cause HCI send command timeout.
When host call VHCI api to do btdm_wakeup_request, then controller
wakeup process will be handled in ISR and controller task context.
As host task priority is lower than controller task and ISR,
it will cause an incorrect behavior that before VHCI take the
rx_flow_on_semaphore, controller sleep again, then VHCI cannot take
the semaphore and has to wait the automatic wakeup.
2019-08-04 07:17:13 +00:00
Anton Maklakov
1beb0869e1
NimBLE: Update submodule to fix -Wstrict-prototypes warnings
2019-08-01 16:28:56 +07:00
Anton Maklakov
afbaf74007
tools: Mass fixing of empty prototypes (for -Wstrict-prototypes)
2019-08-01 16:28:56 +07:00
Angus Gratton
b803c7328a
Merge branch 'bugfix/btdm_some_unallocated_memory' into 'master'
...
Bugfix/btdm some unallocated memory
See merge request espressif/esp-idf!5629
2019-07-30 09:41:09 +08:00
Prasad Alatkar
1f0d682406
NimBLE: Update submodule to fix bug in delete bond procedure
...
- Fixes bug in `get_nvs_db_attribute` related to getting correct index while
deleting bond in NVS.
- MR raised on esp-nimble branch: https://gitlab.espressif.cn:6688/espressif/esp-nimble/merge_requests/12
2019-07-29 19:00:21 +08:00
baohongde
f77a5851bb
component/bt: Fix BLE SMP free without init
2019-07-26 14:40:03 +08:00
baohongde
d1f774bc0a
component/bt: Avoid PLC to use unallocated memory
...
Closes https://github.com/espressif/esp-idf/pull/3799
2019-07-26 14:39:50 +08:00
Jiang Jiang Jian
fcb668ec9c
Merge branch 'bugfix/btdm_AVRC_command_fail_while_playing' into 'master'
...
components/bt: Fix AVRCP command will not be executed while playing music
See merge request espressif/esp-idf!5458
2019-07-22 11:45:19 +08:00
Hrishikesh Dhayagude
c75240a939
NimBLE: Give an option to configuration no of bonds and CCCD's to save through menuconfig
2019-07-19 14:34:57 +08:00
baohongde
f048be924c
components/bt: Fix AVRCP command will not be executed while playing music
2019-07-16 08:50:36 +00:00
baohongde
f8c107fbe3
components/bt: Fix compile error with new toolchain
...
Closes https://github.com/espressif/esp-idf/issues/3331
Closes https://github.com/espressif/esp-idf/issues/3734
2019-07-09 17:50:43 +08:00
Jiang Jiang Jian
27628ef133
Merge branch 'doc/add_ble_mesh_doxyfile' into 'master'
...
ble_mesh: add Doxyfile for core apis & model apis
See merge request espressif/esp-idf!5401
2019-07-05 20:55:39 +08:00
zhiweijian
6029ef1b58
component/bt: fix rxwinsz assert in ble and wifi coex
2019-07-04 19:44:59 +08:00
Jiang Jiang Jian
a831fe596b
Merge branch 'bugfix/btdm_conn_fail_with_some_speaker' into 'master'
...
components/bt: Fix connect fail with some speakers
See merge request espressif/esp-idf!5358
2019-07-04 19:23:19 +08:00
lly
ff40911a51
ble_mesh: add Doxyfile for core apis & model apis
2019-07-03 17:58:09 +08:00
Hrishikesh Dhayagude
daa71d5e18
Fix the irrelevant characters added to test the config options
2019-07-03 17:17:14 +08:00
Hrishikesh Dhayagude
46a268dc78
Correct UUID value for ESP_GATT_UUID_ENVIRONMENTAL_SENSING_SVC
2019-07-03 16:49:30 +08:00
baohongde
60a3f3e09d
components/bt: Fix Wrong bt lib from commit "Bluetooth component refactoring"
2019-07-03 04:44:04 +00:00
Prasad Alatkar
396258380a
NimBLE: update nimble submodule
...
- Update submodule to fix https://jira.espressif.com:8443/browse/BT-192 .
- Upstream PR: https://github.com/apache/mynewt-nimble/pull/427
2019-07-02 11:26:24 +08:00
Jiang Jiang Jian
70474ae844
Merge branch 'feature/btdm_avrcp_volume' into 'master'
...
components/bt: Add AVRCP feature about volume
See merge request idf/esp-idf!5209
2019-06-30 16:40:10 +08:00
Hrishikesh Dhayagude
21165edf41
Bluetooth component refactoring
2019-06-30 16:39:00 +08:00
baohongde
30d7002731
components/bt: Add AVRCP feature about volume
2019-06-30 03:46:15 +00:00
Jiang Jiang Jian
45364fe54e
Merge branch 'bugfix/btdm_fail_to_config_url_in_eir' into 'master'
...
components/bt: Fix fail to config URL in EIR
See merge request idf/esp-idf!5352
2019-06-27 14:27:35 +08:00
Hrishikesh Dhayagude
917589e784
Fix typo from the commit "Reduce the size of DRAM"
2019-06-27 10:48:47 +08:00
Jiang Jiang Jian
4fc411e744
Merge branch 'bugfix/btdm_fix_hci_enhance_conn_complete_evt_unpack_error' into 'master'
...
component/bt: fix hci enhance connection complete event unpack error
See merge request idf/esp-idf!4889
2019-06-26 16:45:39 +08:00
Jiang Jiang Jian
291e25baa6
Merge branch 'bugfix/btdm_add_readme_for_BLE_demos' into 'master'
...
Component/bt: add readme doc for BLE demos
See merge request idf/esp-idf!4890
2019-06-26 16:04:28 +08:00
baohongde
84e9e243d0
components/bt: Fix connect fail with some speakers
2019-06-26 14:50:13 +08:00
Jiang Jiang Jian
1a34d65e4c
Merge branch 'bugfix/btdm_intr_wdt_after_controller_disable_then_enable' into 'master'
...
bugfix/btdm_intr_wdt_after_controller_disable_then_enable
See merge request idf/esp-idf!5301
2019-06-26 14:05:48 +08:00
baohongde
79ba509384
components/bt: Fix fail to config URL in EIR
2019-06-26 11:58:41 +08:00
Renz Christian Bagaporo
31ec634730
bt: fix build issue
...
Source files and include directories were appended to variables
used by the previous component registration command.
2019-06-25 16:53:37 +08:00
Angus Gratton
9a412d3a08
Merge branch 'feature/use_new_component_registration_apis' into 'master'
...
Use new component registration API
See merge request idf/esp-idf!4898
2019-06-25 10:24:11 +08:00
Hrishikesh Dhayagude
342f6a7829
Port NimBLE Host Stack on ESP-IDF
2019-06-25 09:03:58 +08:00
zhiweijian
6559f935ce
component/bt: fix unpack hci enhance connection complete event error
2019-06-24 07:05:01 +00:00
Island
fc3253163e
component/ble_mesh: ESP BLE Mesh release
...
1. BLE Mesh Core
* Provisioning: Node Role
* Advertising and GATT bearer
* Authentication OOB
* Provisioning: Provisioner Role
* Advertising and GATT bearer
* Authentication OOB
* Networking
* Relay
* Segmentation and Reassembly
* Key Refresh
* IV Update
* Proxy Support
* Multiple Client Models Run Simultaneously
* Support multiple client models send packets to different nodes simultaneously
* No blocking between client model and server
* NVS Storage
* Store Provisioning Data of BLE Mesh Nodes in Flash
2. BLE Mesh Applications
* BLE Mesh Node & Provisioner
* Node Example
* Provisioner Example
* Node + Generic OnOff Client Example
* Fast Provisioning
* Vendor Fast Prov Server Model
* Vendor Fast Prov Client Model
* Examples
* Wi-Fi & BLE Mesh Coexistence
* Example
* BLE Mesh Console Commands
* Example
3. BLE Mesh Models
* Foundation Models
* Configuration Server Model
* Configuration Client Model
* Health Server Model
* Health Client Model
* Generic Client Models
* Generic OnOff Client
* Generic Level Client
* Generic Location Client
* Generic Default Transition Timer Client
* Generic Power OnOff Client
* Generic Power Level Client
* Generic Battery Client
* Generic Property Client
* Generic Server Models
* Generic OnOff Server (Example)
* Lighting Client Models
* Light Lightness Client
* Light CTL Client
* Light HSL Client
* Light xyL Client
* Light LC Client
* Sensor Client Model
* Sensor Client
* Time and Scenes Client Models
* Time Client
* Scene Client
* Scheduler Client
2019-06-24 11:31:24 +08:00
Renz Christian Bagaporo
9eccd7c082
components: use new component registration api
2019-06-21 19:53:29 +08:00
baohongde
149e07911d
components/bt: Optimization and bugfix of previous commits
2019-06-21 11:55:45 +08:00
wangmengyang
f2e6ba8701
component/bt: clear BT/BLE interrupts after controller_disable to overwrite the default non-zero value of intcntl registers
2019-06-20 17:40:55 +08:00
baohongde
8024fcb296
components/bt: Add more functions for memory debug.
2019-06-20 17:12:04 +08:00
Tian Hao
2ad65bb434
Support timeout of fixed_queue and osi_thread
...
1. remove fixed_queue_try_dequeue and fixed_queue_try_enqueue,
2. add timeout parameter for fixed_queue_enqueue and fixed_queue_dequeue
3. replace where call fixed_queue_try_dequeue/enqueue to fixed_queue_dequeue/enqueue(..., timeout = 0)
4. replace where call fixed queue_enqueue/dequeue to fixed_queue_enqueue/dequeue( ..., timeout = FIXED_QUEUE_MAX_TIMEOUT)
5. modify the blocking_type of osi_thread_post to timeout.
2019-06-20 17:12:04 +08:00
baohongde
9863565a6f
components/bt: Optimization and bugfix of previous commit
2019-06-20 17:06:23 +08:00
baohongde
07fef85a23
components/bt: Separation of BT and BLE
2019-06-20 17:06:23 +08:00
baohongde
485c896740
components/bt: Combine A2DP sink task and A2DP source task into btc task
2019-06-20 16:00:55 +08:00
baohongde
930c304a57
components/bt: Combine two hci task into one
2019-06-20 16:00:55 +08:00
baohongde
5fd4cbb9d2
component/bt: Add functions for heap memory debug
2019-06-20 16:00:55 +08:00
baohongde
bd9fed4400
component/bt: reduce the size of DRAM
...
DRAM.data: 506B --> 196B
DRAM.bss : 26857B --> 2170B
2019-06-20 16:00:55 +08:00
baohongde
21cce564ba
component/bt: Macor from sdkconfig.h
is used only in bt_user_config.h
2019-06-20 11:41:17 +08:00
baohongde
faf23df19a
component/bt : modify OSI thread of bluedroid
...
abstract of OSI thread to make bluedroid more compatible with different OS.
2019-06-19 21:20:04 +08:00
Jiang Jiang Jian
28e0a17e0a
Merge branch 'bugfix/btdm_make_failed_due_to_macro' into 'master'
...
components/bt: Fix make errors due to macro usage error
See merge request idf/esp-idf!5105
2019-06-19 14:44:02 +08:00
Jiang Jiang Jian
ceb00f7a41
Merge branch 'bugfix/btdm_add_svc_inst_id_param_for_create_tab_event' into 'master'
...
Component/bt: add svc_inst_id param for create service table event
See merge request idf/esp-idf!4958
2019-06-18 21:19:41 +08:00
zhiweijian
4d8a46b376
component/bt: add readme doc for BLE demos
...
- Closes:https://github.com/espressif/esp-idf/issues/3341
2019-06-17 07:05:41 +00:00
zhiweijian
483e82caf8
Component/bt: modify some logs level
2019-06-17 07:05:41 +00:00
zhiweijian
8f2490cc6f
Component/bt: add svc_inst_id param for create service table event
...
- add svc_inst_id param for create service table event
- Closes https://github.com/espressif/esp-idf/issues/3256
2019-06-17 07:05:31 +00:00
zhiweijian
76b3a64b76
Component/bt: add new api to get connection parameters
2019-06-17 07:04:34 +00:00
Jiang Jiang Jian
4e09eaf8e2
Merge branch 'feature/btdm_config_eir' into 'master'
...
components/bt: Add API to config EIR data
See merge request idf/esp-idf!5038
2019-06-13 14:55:23 +08:00
Jiang Jiang Jian
b1bf41be22
Merge branch 'bugfix/btdm_coex_assert_in_lc_lmppdu' into 'master'
...
components/bt: Fix assert due to alloc LMP TX buffer failed
See merge request idf/esp-idf!5134
2019-06-13 13:58:43 +08:00
Renz Christian Bagaporo
3882e48e8a
cmake: use new signature form of target_link_library to link components
...
!4452 used setting LINK_LIBRARIES and INTERFACE_LINK_LIBRARIES to link
components built under ESP-IDF build system. However, LINK_LIBRARIES does
not produce behavior same as linking PRIVATE. This MR uses the new
signature for target_link_libraries directly instead. This also moves
setting dependencies during component registration rather than after all
components have been processed.
The consequence is that internally, components have to use the new
signature form as well. This does not affect linking the components to
external targets, such as with idf_as_lib example. This only affects
linking additional libraries to ESP-IDF libraries outside component processing (after
idf_build_process), which is not even possible for CMake<v3.13 as
target_link_libraries is not valid for targets not created in current
directory. See https://cmake.org/cmake/help/v3.13/policy/CMP0079.html#policy:CMP0079
2019-06-11 18:09:26 +08:00
baohongde
f3aab7d536
components/bt: Fix assert due to alloc LMP TX buffer failed
2019-06-10 15:14:23 +08:00
Jiang Jiang Jian
d95cedd782
Merge branch 'bugfix/keep_sco_data_path_on_hci_reset' into 'master'
...
Bugfix/keep_sco_data_path_on_hci_reset
See merge request idf/esp-idf!4949
2019-06-05 17:10:21 +08:00
baohongde
48e32113de
component/bt: Allow configuration of default SCO_DATA_PATH in bluetooth controller
2019-06-04 16:31:21 +08:00
Jiang Jiang Jian
5274739fff
Merge branch 'bugfix/btdm_a2dp_src_pkt_overflow' into 'master'
...
component/bt: fix some performance issues in A2DP source data flow control
See merge request idf/esp-idf!4932
2019-06-04 16:07:31 +08:00
baohongde
89e2b48a18
components/bt: Add API to config EIR data
2019-06-03 19:29:54 +08:00
Konstantin Kondrashov
399d2d2605
all: Using xxx_periph.h
...
Using xxx_periph.h in whole IDF instead of xxx_reg.h, xxx_struct.h, xxx_channel.h ... .
Cleaned up header files from unnecessary headers (releated to soc/... headers).
2019-06-03 14:15:08 +08:00
wangmengyang
bc6b80e7c2
add missing source files to CMakeLists for HFP
2019-05-31 18:54:19 +08:00
Jiang Jiang Jian
b859584f91
Merge branch 'feature/btdm_modem_sleep_with_32K_XTAL_under_light_sleep' into 'master'
...
Feature/btdm modem sleep with 32 k xtal under light sleep
See merge request idf/esp-idf!4744
2019-05-31 18:51:10 +08:00
baohongde
13908160fb
components/bt: Fix make errors due to macro usage error
2019-05-30 20:19:43 +08:00
Jiang Jiang Jian
da13efc17a
Merge branch 'feature/btdm_msbc_codec' into 'master'
...
Wide Band Speech for HFP
See merge request idf/esp-idf!4854
2019-05-29 14:39:21 +08:00
Angus Gratton
154fc74f76
Merge branch 'bugfix/nvs_typedef_naming_pr3239' into 'master'
...
nvs: Append _t to nvs_handle & nvs_open_mode types
Closes IDFGH-891
See merge request idf/esp-idf!4783
2019-05-29 08:14:00 +08:00
wangmengyang
f678a6289d
reduce the minimum delay uncertainty of esp_timer for Bluetooth modem sleep from 1.8ms to 0.5ms for lower power consumption
2019-05-28 19:56:31 +08:00
wangmengyang
ff2c583a0d
component/bt: Add option to configure BLE SCA through menuconfig and use a fixed value of clock cycle to estimate sleep duration for external 32kHz oscillator
2019-05-28 19:56:26 +08:00
wangmengyang
7403e8e11c
component/bt: remove the pm_lock that prevents light sleep in case that external 32kHz crystal is used as Bluetooth low power clock
2019-05-27 17:47:33 +08:00
baohongde
fcf4886172
components/bt: Support EV3 packet type
2019-05-24 17:36:10 +08:00
baohongde
dd906a91a5
components/bt: Enable mSBC and add decoder and encoder
2019-05-24 17:36:10 +08:00
baohongde
20758443df
components/bt: Add packet loss concealment (PLC) for HFP
2019-05-24 17:33:52 +08:00
baohongde
e10d5aaddc
component/bt: modify the SBC decoder to support mSBC mode
2019-05-24 17:33:52 +08:00
wangmengyang
7c28611a3d
component/bt: modify the SBC encoder to support mSBC mode
2019-05-24 17:33:52 +08:00
baohongde
f15323b453
component/bt: remove SBC frame scramling
2019-05-24 17:33:52 +08:00
GOPTIONS\pfrost
897bb55482
nvs: Append _t to nvs_handle & nvs_open_mode types
...
Merges https://github.com/espressif/esp-idf/pull/3239/
2019-05-22 02:53:28 +00:00
Roland Dobai
1ad2283641
Rename Kconfig options (components/bootloader)
2019-05-21 09:32:55 +02:00
Roland Dobai
a1bddb923b
Rename Kconfig options (components/bt)
2019-05-21 09:09:01 +02:00
Roland Dobai
0ae53691ba
Rename Kconfig options (components/esp32)
2019-05-21 09:09:01 +02:00
Renz Christian Bagaporo
ffec9d4947
components: update with build system changes
2019-05-13 19:59:17 +08:00
wangmengyang
38ec1b9a86
component/bt: fix some performance issues in A2DP source data flow control
...
1. modify the limit of frames to send to avoid dropping packet on A2DP source due to TX data queue overflow
2. reduce the A2DP source data queue size in order to achieve faster control respnonse
2019-05-05 11:42:27 +08:00
Jiang Jiang Jian
b5bbd42b9a
Merge branch 'bugfix/btdm_abort_if_deinit_spp_without_init' into 'master'
...
components/bt: Fix abort if call esp_spp_deinit without calling esp_spp_init
See merge request idf/esp-idf!4859
2019-04-25 20:38:37 +08:00
baohongde
db6b210a5f
components/bt: Fix abort if call esp_spp_deinit without calling esp_spp_init
2019-04-24 11:17:54 +08:00
zhiweijian
0ae4eb4f09
Component/bt: add ble link timeout config in menuconfig
...
- add ble link timeout config in menuconfig
- disable background connection when call gatts_open
2019-04-22 09:16:19 +00:00
Michael (XIAO Xufeng)
562af8f65e
global: move the soc component out of the common list
...
This MR removes the common dependency from every IDF components to the SOC component.
Currently, in the ``idf_functions.cmake`` script, we include the header path of SOC component by default for all components.
But for better code organization (or maybe also benifits to the compiling speed), we may remove the dependency to SOC components for most components except the driver and kernel related components.
In CMAKE, we have two kinds of header visibilities (set by include path visibility):
(Assume component A --(depends on)--> B, B is the current component)
1. public (``COMPONENT_ADD_INCLUDEDIRS``): means this path is visible to other depending components (A) (visible to A and B)
2. private (``COMPONENT_PRIV_INCLUDEDIRS``): means this path is only visible to source files inside the component (visible to B only)
and we have two kinds of depending ways:
(Assume component A --(depends on)--> B --(depends on)--> C, B is the current component)
1. public (```COMPONENT_REQUIRES```): means B can access to public include path of C. All other components rely on you (A) will also be available for the public headers. (visible to A, B)
2. private (``COMPONENT_PRIV_REQUIRES``): means B can access to public include path of C, but don't propagate this relation to other components (A). (visible to B)
1. remove the common requirement in ``idf_functions.cmake``, this makes the SOC components invisible to all other components by default.
2. if a component (for example, DRIVER) really needs the dependency to SOC, add a private dependency to SOC for it.
3. some other components that don't really depends on the SOC may still meet some errors saying "can't find header soc/...", this is because it's depended component (DRIVER) incorrectly include the header of SOC in its public headers. Moving all this kind of #include into source files, or private headers
4. Fix the include requirements for some file which miss sufficient #include directives. (Previously they include some headers by the long long long header include link)
This is a breaking change. Previous code may depends on the long include chain.
You may need to include the following headers for some files after this commit:
- soc/soc.h
- soc/soc_memory_layout.h
- driver/gpio.h
- esp_sleep.h
The major broken include chain includes:
1. esp_system.h no longer includes esp_sleep.h. The latter includes driver/gpio.h and driver/touch_pad.h.
2. ets_sys.h no longer includes soc/soc.h
3. freertos/portmacro.h no longer includes soc/soc_memory_layout.h
some peripheral headers no longer includes their hw related headers, e.g. rom/gpio.h no longer includes soc/gpio_pins.h and soc/gpio_reg.h
BREAKING CHANGE
2019-04-16 13:21:15 +08:00
Jiang Jiang Jian
603d293365
Merge branch 'feature/btdm_AVRCP_TG' into 'master'
...
component/bt: implement AVRCP Target APIs
See merge request idf/esp-idf!3899
2019-04-15 18:53:51 +08:00
wangmengyang
61bd453c15
component/bt: implement AVRCP Target APIs
...
1. Add more notification events to the enum according to the event list in AVRCP specification.
2. Add API and callback events for basic AVRCP target functionalities to do init, deinit, callback-registration, connection status indication.
3. Implement API to set/get supported PASSTHROUGH command on local AVRCP TG, implement callback events for remote passthrough command indication.
4. Implement API to set/get supported notification eventIDs on local AVRCP TG, implement API to send event notifications to remote CT. \
Currently supported event in TG only includes ESP_AVRC_RN_VOLUME_CHANGE(0xd), which can be extended in later commits.
5. Implement callback events for SetAbsoluteVolume command indication on TG.
6. Add limitation of event_ids supported in RegisterNotification command in CT. The supported event_ids include: \
ESP_AVRC_RN_PLAY_STATUS_CHANGE(0x1), ESP_AVRC_RN_TRACK_CHANGE(0x2), ESP_AVRC_RN_PLAY_POS_CHANGE(0x5), ESP_AVRC_RN_VOLUME_CHANGE(0xd).
7. Add feature bit mask in parameter of callback event ESP_AVRC_CT_REMOTE_FEATURES_EVT for peer feature information got from SDP.
8. Add API and callback event to AVRCP CT to retrieve remote TG's supported notification event capabilities.
9. Modify data type for parameter of callback event ESP_AVRC_CT_CHANGE_NOTIFY_EVT.
10. Change AVRCP version from 1.3 to 1.4 for compatibility cause in using AbsoluteVolume feature.
11. Modify local AVRCP device to be category 1 as CT and category 2 as TG that applies to bluetooth headphones or speakers.
12. Update the use of AVRCP APIs and events in the two examples: a2dp_sink and a2dp_gatts_coex, which include the demo of volume control and notification.
2019-04-10 16:34:13 +08:00
zhiweijian
6e4a89ffce
component/bt: fix memory leak when settig tx power
2019-04-04 19:49:23 +08:00
Jiang Jiang Jian
3ab9d00219
Merge branch 'bugfix/btdm_fix_warning_when_disable_logs' into 'master'
...
components/bt: Fix warning when disable debug logs or in release mode and improve the code structure
See merge request idf/esp-idf!4618
2019-04-04 18:45:25 +08:00
Jiang Jiang Jian
e7f85f1987
Merge branch 'bugfix/btdm_disconn_with_apple_device' into 'master'
...
components/bt: Fix disconnect with apple device
See merge request idf/esp-idf!4665
2019-04-04 18:44:53 +08:00
morris
f5b03c9ea3
misc adjustment of esp32 component
2019-04-03 19:57:46 +08:00
baohongde
a332bca0c7
components/bt: Fix disconnect with apple device
...
1. Fix disconnect with apple device
2. Fix hci_refresh_enc_key_cmd will be ignored
3. Fix hci_refresh_enc_key_cmd will crash
Closes https://github.com/espressif/esp-idf/issues/3140
2019-04-03 17:22:01 +08:00
zhiweijian
0acc2f59e5
Component/bt: add mesh beacon adv and svc uuid for duplicate scan exceptional list
2019-03-28 06:09:19 +00:00
Jiang Jiang Jian
fe793eb574
Merge branch 'bugfix/btdm_modify_HCI_GET_CMD_BUF' into 'master'
...
Component/bt: modify HCI_GET_CMD_BUF
See merge request idf/esp-idf!4465
2019-03-27 14:23:52 +08:00
baohongde
59d77660ef
components/bt: Fix warning when disable debug logs or in release mode and improve the code structure
2019-03-26 14:37:37 +08:00
zhiweijian
c0bdea6aae
Component/bt: add new param for update_whitelist()
2019-03-22 12:22:51 +00:00
Ivan Grokhotkov
106dc05903
Merge branch 'feature/specify_includes_belonging_esp32' into 'master'
...
move esp32 chip specific includes to esp32/xxx.h
See merge request idf/esp-idf!4534
2019-03-21 18:34:08 +08:00
Jiang Jiang Jian
bd103f3743
Merge branch 'feature/btdm_add_api_to_clean_gattc_cache' into 'master'
...
Component/bt: add api to clean gattc cache
See merge request idf/esp-idf!3951
2019-03-20 22:05:00 +08:00
Jiang Jiang Jian
c1600f28d1
Merge branch 'bugfix/btdm_fix_no_adv_report_when_scaning_with_sleep_enable' into 'master'
...
Component/bt: fix no adv report when scanning with sleep enable
See merge request idf/esp-idf!4535
2019-03-20 21:36:23 +08:00
Jiang Jiang Jian
c5fb88c2e2
Merge branch 'bugfix/btdm_fix_build_warning_when_bluedroid_disable_log' into 'master'
...
Component/bt: fix build warning when bluedroid disable log
See merge request idf/esp-idf!4524
2019-03-20 21:09:59 +08:00
zhiweijian
7f606d0c2b
Component/bt: modify HCI_GET_CMD_BUF
2019-03-20 19:35:06 +08:00
Jiang Jiang Jian
dc5ff1d633
Merge branch 'bugfix/btdm_fix_blufi_prepare_write_crash' into 'master'
...
Component/bt: fix blufi prepare write crash
See merge request idf/esp-idf!4447
2019-03-20 11:46:15 +08:00
morris
956c25dedd
move esp32 chip specific includes to esp32/xxx.h
2019-03-18 17:14:05 +08:00
zhiweijian
a628577f64
Component/bt: fix no adv report when scaning with sleep enable
2019-03-18 16:35:50 +08:00
zhiweijian
1940ee0910
Component/bt: fix build warning when bluedroid disable log
2019-03-18 14:18:12 +08:00
Jiang Jiang Jian
5beb2802e0
Merge branch 'bugfix/bluetooth_fix_API_esp_bt_gap_set_scan_mode' into 'master'
...
Modify esp_bt_gap_set_scan_mode() to be able to set connection modes as well as discoverable modes
See merge request idf/esp-idf!2208
2019-03-17 14:19:11 +08:00
Tian Hao
b39bd0615c
fix the bug assert(8192 0) in rwble.c 234
2019-03-14 15:38:23 +08:00
zhiweijian
296fbca2e7
Component/bt: fix blufi prepare write crash
2019-03-13 17:57:25 +08:00
zhiweijian
d5e78e79d3
Component/bt: add api to clean gattc cache
2019-03-13 15:23:33 +08:00
Hrishikesh Dhayagude
d9ce0bb705
Modify esp_bt_gap_set_scan_mode() to be able to set connection modes as well as discoverable modes
...
The current API is insufficient to allow the users to set different combinations of connection and discoverable mode
Users should be able to choose the device modes independently:
1. Connectable-
i. Non-connectable mode
ii. Connectable mode
2. Discoverable-
i. Non-discoverable mode
ii. Limited discoverable mode
iii. General discoverable mode
2019-03-13 11:24:00 +05:30
zhiweijian
d5f15a45ca
Component/bt: add BLE adv report flow control
2019-03-12 11:10:26 +08:00
Jiang Jiang Jian
c1e50c8a27
Merge branch 'bugfix/btdm_fix_iOS_and_win10_compatibility_error_for_HID' into 'master'
...
Component/bt: fix iOS and win10 compatibility error for HID
See merge request idf/esp-idf!4396
2019-03-06 14:11:38 +08:00
XiaXiaotian
b9b401ee39
Decouple WiFi and BT with coexist to reduce bin size
...
1. Do not link WiFi code when only BT or BLE is used and WiFi is not
used.
2. Do not link coexist code when CONFIG_SW_COEXIST_ENABLE is disabled.
2019-03-05 10:38:14 +08:00
zhiweijian
d71df18d92
Component/bt: fix iOS and win10 compatibility error for HID
2019-02-28 20:39:12 +08:00
Jiang Jiang Jian
484d8ab7ed
Merge branch 'bugfix/btdm_fix_remove_bonded_device_warnning' into 'master'
...
Component/bt: fix remove bonded device warnning
See merge request idf/esp-idf!3704
2019-02-27 17:54:37 +08:00
Tian Hao
d877ca4438
component/bt : fix bug that there's low ratio crash when BLE do re-connect/re-scan/re-adv
...
fix 3 bugs:
1. do BLE connect (both of slave and master), it mgiht cause crash due to there's much interrupts happens effect ble code running, for example, wifi run on the same core as bluetooth controller and wifi run throughtput test.
2. do BLE scan stop or adv stop or connection stop, it might cause ASSERT or crash due to memory corrupted in controller memory poll.
3. minor bug fix, not really effect bluetooth.
2019-02-22 06:24:03 +00:00
zwj
faf9126ed4
component/bt: fix connection params update issues
2019-02-18 19:52:16 +08:00
Jiang Jiang Jian
2ce401c664
Merge branch 'bugfix/btdm_crash_when_inquiry_cancel' into 'master'
...
Bugfix/btdm crash when inquiry cancel
See merge request idf/esp-idf!4142
2019-02-16 16:27:49 +08:00
Angus Gratton
a2b47fd314
Merge branch 'bugfix/win_kconfig_backslash' into 'master'
...
tools: Fix Windows related Kconfig issues
See merge request idf/esp-idf!4206
2019-02-04 14:27:38 +08:00
Jiang Jiang Jian
d4d3ccf6d9
Merge branch 'bugfix/btdm_add_handle_in_gatts_conf_event_for_indication' into 'master'
...
Component/bt: add handle in gatts conf event for indication
See merge request idf/esp-idf!4024
2019-02-01 21:33:39 +08:00
Roland Dobai
80cb4a1a18
tools: Don't use backslashes in Kconfigs and ignore long lines to avoid errors
...
Closes https://github.com/espressif/esp-idf/issues/3012
2019-02-01 11:33:41 +01:00
zhiweijian
b51a0fcea5
Component/bt: fix write char crash after disconnection
2019-01-31 12:18:54 +00:00
baohongde
e87d05d81f
components/bt: Add precautions for esp_vhci_host_send_packet
2019-01-31 11:47:58 +08:00
baohongde
27235e023f
components/bt: Fix crash when inquiry stop
2019-01-31 11:47:41 +08:00
Roland Dobai
37126d3451
Correct Kconfigs according to the coding style
2019-01-29 13:37:01 +01:00
zhiweijian
b2a515c347
Component/bt: add handle in gatts conf event for indication
2019-01-28 07:12:22 +00:00
Jiang Jiang Jian
5c88c5996d
Merge branch 'bugfix/ble_active_scan_not_wait_scan_rsp' into 'master'
...
component/bt: add a option to make report adv data and scan response individually
See merge request idf/esp-idf!4131
2019-01-25 11:53:06 +08:00
Tian Hao
6c8a8664aa
component/bt: add a option to make report adv data and scan response individually
...
Originally, when doing BLE active scan, Bluedroid will not report adv to
application layer until receive scan response. This option is used to
disable the behavior. When enable this option, Bluedroid will report
adv data or scan response to application layer immediately.
2019-01-24 14:30:02 +08:00
Michael Reutman
fdd865f22d
Fix typo in error message in esp_bluedroid_init
...
Closes https://github.com/espressif/esp-idf/pull/2835
2019-01-23 16:47:23 +05:30
MartinValik
e3428adf87
Added Cmake support for dhcp_state
2019-01-10 07:51:54 +00:00
Jiang Jiang Jian
c4963fc329
Merge branch 'bugfix/btdm_miscellaneous_modifications' into 'master'
...
component/bt: some miscellaneous modifications for BLE
See merge request idf/esp-idf!4032
2019-01-02 14:04:44 +08:00
Jiang Jiang Jian
1de94b7b45
Merge branch 'bugfix/btdm_debug_numeric_comparison_mode' into 'master'
...
component/bt: modify the BLE example to make it run with "numeric comparison" mode
See merge request idf/esp-idf!3500
2019-01-02 14:02:58 +08:00
Jiang Jiang Jian
9874bcc8e7
Merge branch 'bugfix/remove_gatts_warning' into 'master'
...
components/bt: Remove warnings in btc_gatts_arg_deep_copy() that are confusing
See merge request idf/esp-idf!4008
2019-01-02 12:00:10 +08:00
Tree
68626ed494
component/bt: some miscellaneous modifications for BLE
2018-12-26 20:36:33 +08:00
wangmengyang
74eae4b50e
component/bt: add more information and description for bluetooth modem sleep
...
Add remark that "EVED" mode for bluetooth modem sleep is only used for internal test
2018-12-21 19:30:20 +08:00
Hrishikesh Dhayagude
11a5fb8ab6
components/bt: Remove warnings in btc_gatts_arg_deep_copy() that are confusing
...
Fixes: https://github.com/espressif/esp-idf/issues/2811
The warning print "NULL value" is only kept for event
BTC_GATTS_ACT_SET_ATTR_VALUE as this can be useful in case user forgets
to set attribute value
Signed-off-by: Hrishikesh Dhayagude <hrishi@espressif.com>
2018-12-20 14:20:56 +05:30
Jiang Jiang Jian
65142bc59e
Merge branch 'bugfix/btdm_configure_ssp_in_menuconfig' into 'master'
...
components/bt: Configure SSP in menuconfig and fix two bugs
See merge request idf/esp-idf!3892
2018-12-20 15:31:08 +08:00
Jiang Jiang Jian
f8910cecce
Merge branch 'bugfix/btdm_fix_crash_adv_scan_coex' into 'master'
...
component/bt: fix crash when adv and scan coex and optimize duplicate scan
See merge request idf/esp-idf!3975
2018-12-20 14:59:20 +08:00
baohongde
d601ed8023
components/bt: Fix two bugs about pairing
...
1. Fix Legacy Pairing failed without remote device name
2. Fix discovery no device after disabling SSP
2018-12-20 11:10:52 +08:00
baohongde
9c48528fcc
components/bt: Configure SSP in menuconfig
2018-12-20 11:10:27 +08:00
Jiang Jiang Jian
1607812fef
Merge branch 'bugfix/btdm_fix_receive_adv_pkt_when_duplicate_scan_enabled' into 'master'
...
Component/bt: fix receive adv pkt when enable duplicate scan
See merge request idf/esp-idf!3783
2018-12-18 11:44:38 +08:00
wangmengyang
561021e7f7
component/bt: use a pm_lock to prevent light sleep when bluetooth is enabled due to current imcompatibility
2018-12-17 19:54:57 +08:00
zhiweijian
05e84cad1e
Component/bt: fix receive adv pkt when enable duplicate scan
2018-12-17 15:49:04 +08:00
zwj
90a451c181
fix crash when adv and scan coex and optimize duplicate scan
2018-12-17 11:40:50 +08:00
Tian Hao
1a4fa06125
fix bug that there's very low ratio to cause BLE assert(65536, 0) in rwble.c at line 222
2018-12-14 17:38:52 +08:00
Jiang Jiang Jian
6cb37ecc57
Merge branch 'bugfix/btdm_modem_sleep_cowork_with_DFS' into 'master'
...
bugfix/btdm_modem_sleep_cowork_with_DFS
See merge request idf/esp-idf!3797
2018-12-14 14:03:56 +08:00
wangmengyang
b4299433bd
component/bt: add DRAM_ATTR attribute to global variables(bss segment) in bt.c which can be accessed in ISR
2018-12-14 11:29:00 +08:00
Jiang Jiang Jian
bc30569842
Merge branch 'bufix/btdm_fix_save_key_when_auth_mode_without_bond' into 'master'
...
Component/bt: fix save keys when auth mode without bond
See merge request idf/esp-idf!3782
2018-12-14 10:35:14 +08:00
Jiang Jiang Jian
58a200e70c
Merge branch 'bugfix/btdm_fix_auth_mode_error_when_reconnection_in_smp' into 'master'
...
Component/bt: fix auth_mode error when reconnection in SMP
See merge request idf/esp-idf!3856
2018-12-13 17:04:12 +08:00
zhiweijian
7c6211fe45
Component/bt: fix save keys when auth mode without bond
2018-12-13 15:43:31 +08:00
Jiang Jiang Jian
bfd22a24da
Merge branch 'bugfix/btdm_fix_accept_specified_sec_auth' into 'master'
...
Component/bt: fix accept specified sec auth error
See merge request idf/esp-idf!3770
2018-12-13 11:19:53 +08:00
wangmengyang
59f34461d7
component/bt: bugfix of bluetooth modem sleep not being able to work with Dynamic Frequency Scaling
...
1. start an esp_timer on entering sleep to acquire pm_lock before wake up from modem sleep
2. decrease the clock division of XTAL fed to bluetooth low power clock from 32us to 2us period to allow to work under 240MHz Max CPU frequency
3. decrease the minimum sleep duration threshold to allow shorter bluetooth modem sleep period, especially for BLE with short connection interval
4. reconfigure bluetooth baseband(BT-BB) settings after PHY/RF init upon waking up from modem sleep to avoid packet RX/TX performance degradation
2018-12-11 16:49:01 +08:00
Tian Hao
357f2264e6
fix bug that there's very low ratio to cause BLE assert(32768, 0) in rwble.c at line 222
2018-12-06 16:54:14 +08:00
zhiweijian
5c5799fa51
Component/bt: fix auth_mode error when reconnection in SMP
2018-12-04 18:05:25 +08:00
Tian Hao
a9429ee5da
component/bt and esp32: fix two bluetooth bugs that caused by coexist module
...
1. Fix interrupt watchdog timeout in bluetooth "btdm_bb_isr"
2. Fix BLE assert(512) or assert(1536) in rwble.c at line 222
3. Update librtc.a to fix BLE assert(512) in rwble.c at line 222
The #1 and #2 occurs random.
The #3 bug occurs in certain scenario:
1. If Wifi start softap and BLE is working
2. If wifi start station, but do not use normal station operation, such
as just use espnow, while BLE is working
3. Any other scenario, that wifi works without use software coexist
operation, while BLE is working(such as do advertising and ...)
4. update libcoexist.a version to v1.1.2
2018-12-03 19:41:43 +08:00
Jiang Jiang Jian
6bd497f9ed
Merge branch 'feature/btdm_ble_full_scan_support' into 'master'
...
component/bt: Added the ble full scan supported feature.
See merge request idf/esp-idf!3820
2018-11-30 21:53:21 +08:00
yulong
0f3eb977cd
component/bt: Added the ble full scan supported feature.
...
1. Add the full scan swith in the menuconfig;
2. Change the bt lib in order to support ble full scan
2018-11-30 20:48:42 +08:00
Angus Gratton
759185b16c
Merge branch 'bugfix/bt_ut_build_all' into 'master'
...
Fix unit test cmake build for BT
See merge request idf/esp-idf!3767
2018-11-29 09:52:55 +08:00
Jiang Jiang Jian
7312294648
Merge branch 'bugfix/btdm_rf_reg' into 'master'
...
fix bug to unsupport rf reg access from hci cmd
See merge request idf/esp-idf!3787
2018-11-28 21:21:20 +08:00
Anton Maklakov
87e8757569
bt: Fix unit tests build with CMake
2018-11-28 15:19:04 +08:00
Renz Christian Bagaporo
37d30c7a6e
cmake: separate app from idf lib project
...
mbedtls: import mbedtls using unmodified cmake file
2018-11-27 13:59:24 +08:00
Tian Hao
f3bfdeaeec
fix bug to unsupport rf reg access from hci cmd
...
Always return 0 when read rf register and do nothing when write rf register
2018-11-27 12:00:06 +08:00
zhiweijian
18a27b88c7
Component/bt: fix accept specified sec auth error
2018-11-23 20:14:03 +08:00
zhiweijian
dd3d89db49
Component/bt: add update duplicate scan exceptional list APIs
2018-11-23 16:46:17 +08:00
baohongde
7e142f9d22
components/bt: Move function in interrupt into IRAM
...
1. Move function in interrupt into IRAM
2. Delete unused code, saving 240B DRAM and some code size
2018-11-22 15:59:53 +08:00
Jiang Jiang Jian
0d7f2d77c2
Merge branch 'feature/btdm_add_set_long_adv_data_api' into 'master'
...
Component/bt: add set long adv data api
See merge request idf/esp-idf!3722
2018-11-21 11:31:13 +08:00
Jiang Jiang Jian
69c9e050b0
Merge branch 'bugfix/btdm_add_check_peer_addr_type_in_set_adv_params' into 'master'
...
Component/bt: add check peer addr type in set adv params
See merge request idf/esp-idf!3732
2018-11-20 20:02:13 +08:00
zhiweijian
5e3d88ee64
Component/bt: fix remove bonded device warnning
2018-11-20 07:15:02 +00:00
Jiang Jiang Jian
ffda37dd16
Merge branch 'feature/btdm_BLE_Blocking_APIs' into 'master'
...
Component/bt: add BLE Blocking APIs
See merge request idf/esp-idf!3513
2018-11-20 14:40:50 +08:00
Jiang Jiang Jian
b422a42697
Merge branch 'bugfix/btdm_errors_in_comment' into 'master'
...
components/bt: Some errors in comment
See merge request idf/esp-idf!3703
2018-11-20 14:26:12 +08:00
zhiweijian
775c6e5ab7
Component/bt: add set long adv data api
2018-11-20 11:19:51 +08:00
zhiweijian
3c7819eaf2
Component/bt: add check peer addr type in set adv params
2018-11-19 17:04:48 +08:00
baohongde
ac5a3443a4
components/bt: Some errors in comment
2018-11-16 11:27:22 +08:00
Tian Hao
9c9aa4ea4c
Fix two bugs when disable bluetooth controller
...
1. Fix the bug that disable controller suddenly cause crash when ble is working. (585cfba1)
2. Fix the bug that when disable controller, it will cause wifi cannot RX, TX timeout, buffer lack and etc. (f8546145)
2018-11-16 02:42:38 +00:00
Jiang Jiang Jian
c7fb749b84
Merge branch 'bugfix/btdm_fix_memory_leak_in_v3.2' into 'master'
...
Component/bt: fix memory leak in service change char
See merge request idf/esp-idf!3631
2018-11-12 11:27:00 +08:00
Jiang Jiang Jian
ccb3841a9e
Merge branch 'feature/btdm_add_vendor_hci_cmd' into 'master'
...
component/bt: add vendor hci cmd
See merge request idf/esp-idf!3577
2018-11-12 11:26:35 +08:00
Angus Gratton
3685d325d8
Merge branch 'bugfix/multiple_github_pr' into 'master'
...
Multiple github PR's
See merge request idf/esp-idf!3665
2018-11-12 09:14:35 +08:00
Jiang Jiang Jian
9859428606
Merge branch 'bugfix/btdm_add_scan_window_interval_check' into 'master'
...
Component/bt: add scan window and interval check when set scan params
See merge request idf/esp-idf!3581
2018-11-09 19:32:11 +08:00
zwj
baf57b9702
component/bt: add vendor hci cmd
2018-11-09 14:39:04 +08:00
zhiweijian
fb3aa88565
Component/bt: add BLE Blocking APIs
2018-11-09 03:31:08 +00:00
Stephen Bird
b5c58557fc
bt: Fix bracket warning
...
Merges https://github.com/espressif/esp-idf/pull/2568
2018-11-08 15:57:12 +05:30
Jiang Jiang Jian
71f1a34540
Merge branch 'feature/btdm_support_oob_in_SMP' into 'master'
...
Component/bt: support OOB in SMP
See merge request idf/esp-idf!3496
2018-11-08 16:44:15 +08:00
Hrishikesh Dhayagude
2c353edbc4
components/bt: Fix btc_gatts_arg_deep_copy() and bta_gatts_indicate_handle()
2018-11-06 21:01:54 +08:00
Jiang Jiang Jian
888406231c
Merge branch 'bugfix/btdm_fuction_in_isr_is_not_in_iram' into 'master'
...
components/bt: Put function in isr into iram
See merge request idf/esp-idf!3619
2018-11-06 17:13:34 +08:00
zhiweijian
77668b3912
Component/bt: add scan window and interval check when set scan params
2018-11-06 08:45:25 +00:00
zhiweijian
2e139c7885
Component/bt: fix memory leak in service change char
2018-11-06 08:43:59 +00:00
Jiang Jiang Jian
ded53bd0ff
Merge branch 'bugfix/btdm_allow_a2dp_codec_dynamic_alloc' into 'master'
...
bugfix/btdm_allow_a2dp_codec_dynamic_allocated
See merge request idf/esp-idf!3598
2018-11-06 11:56:30 +08:00
baohongde
b33cdfc1f5
components/bt: Put function in isr into iram
2018-11-02 16:37:52 +08:00
baohongde
f2309f1013
components/bt: Point ACL RX buffer ptr to ACL RX buffer if ACL RX buffer ptr is null
...
1. When WIFI task or other high priority task blocks the Bluetooth task, ACL RX buffer will use up, ACL RX buffer ptr will point to null and will never point to a valid adress. Causing errors in Bluetooth.
2. hcimsgs.h used whether flow control is on or off
2018-11-01 17:33:44 +08:00
Jiang Jiang Jian
12b2268ee5
Merge branch 'bugfix/btdm_sniff_anchor_point_calculation_error' into 'master'
...
bugfix/btdm_sniff_anchor_point_calculation_error
See merge request idf/esp-idf!3582
2018-11-01 15:58:00 +08:00
Jiang Jiang Jian
a60a71ff07
Merge branch 'bugfix/btdm_name_buffer_allocation_size_differs' into 'master'
...
components/bt: Fix the different size of name buffer allocation size
See merge request idf/esp-idf!3587
2018-11-01 15:56:45 +08:00
Jiang Jiang Jian
cac7b951a8
Merge branch 'bugfix/btdm_fix_get_attr_value_error' into 'master'
...
Component/bt: fix get attr value API error
See merge request idf/esp-idf!3583
2018-11-01 15:55:22 +08:00
baohongde
373f1c121b
component/bt: bugfix of error when entering sniff mode with attempt large than 0xFF
2018-10-31 16:16:49 +00:00
wangmengyang
159d4ac742
component/bt: bugfix for the error in calculation sniff anchor point which can result in supervision timeout after connection is brought into sniff mode
2018-10-31 16:16:49 +00:00
zhiweijian
1716d12547
Component/bt: fix ble cannot send or receive packet sometimes
2018-10-31 16:13:51 +00:00
wangmengyang
7bb83b0056
component/bt: allow dynamic allocation of SBC encoder/decoder buffer used in A2DP to save internal DRAM
2018-10-31 16:11:49 +00:00
Jiang Jiang Jian
dba29eeb2e
Merge branch 'bugfix/btdm_change_default_CoD_of_BT_profile' into 'master'
...
components/bt: Set default Class of Device of BT profile
See merge request idf/esp-idf!3564
2018-10-31 20:51:15 +08:00
baohongde
e19a352a2b
components/bt: Fix the different size of name buffer allocation size
...
Close https://github.com/espressif/esp-idf/issues/2615
2018-10-31 17:39:31 +08:00
Jiang Jiang Jian
39c03558e8
Merge branch 'bugfix/btdm_add_attr_handle_for_ESP_GATTS_CONF_EVT' into 'master'
...
Component/bt: add attr_handle for ESP_GATTS_CONF_EVT
See merge request idf/esp-idf!3492
2018-10-31 17:20:47 +08:00
zhiweijian
950fe25120
Component/bt: fix get attr value API error
2018-10-30 15:00:23 +08:00
baohongde
df5839420d
components/bt: Reduce IRAM size
...
libbtdm: 2608B
idf: 924B
2018-10-29 16:54:32 +08:00
baohongde
67e62aa105
components/bt: Set default Class of Device of BT profile
...
The CoD of each profile both are 0x2c0414, now they are as follow:
A2DP sink: 0x240414
A2DP source: 0x280400
HFP: 0x200408
SPP: 0x001F00
2018-10-26 17:03:39 +08:00
Jiang Jiang Jian
93dbf2f3ba
Merge branch 'bugfix/btdm_read_multiple_return_callback_status_ESP_GATT_STACK_RSP' into 'master'
...
Component/bt: fix read multiple return callback status: ESP_GATT_STACK_RSP
See merge request idf/esp-idf!3437
2018-10-26 11:41:18 +08:00
Jiang Jiang Jian
0bc364f7ea
Merge branch 'bugfix/btdm_add_sniff_mode_to_spp' into 'master'
...
components/bt: Add sniff mode to SPP
See merge request idf/esp-idf!3472
2018-10-26 11:38:50 +08:00
Jiang Jiang Jian
762c04bd61
Merge branch 'bugfix/btdm_disconnect_ble_when_ESP_BLE_SM_ONLY_ACCEPT_SPECIFIED_SEC_AUTH_failed' into 'master'
...
Component/bt: add ble disconnect when ACCEPT_SPECIFIED_SEC_AUTH failed
See merge request idf/esp-idf!3465
2018-10-26 11:34:26 +08:00
zhiweijian
4e81705ca2
Component/bt: support OOB in SMP
2018-10-25 07:09:59 +00:00
zhiweijian
6b96a3c23b
Component/bt: add ble disconnect when ACCEPT_SPECIFIED_SEC_AUTH failed
2018-10-25 06:03:16 +00:00
zwj
501ebabc4e
component/bt: fix remove bond list failed
2018-10-24 23:23:50 +00:00
Renz Bagaporo
cc774111bf
cmake: Add support for test build
2018-10-20 12:07:24 +08:00
zhiweijian
44827bb681
Component/bt: add attr_handle for ESP_GATTS_CONF_EVT
2018-10-19 08:19:36 +00:00
Tian Hao
6934a739d7
coexist : fix coexist bugs related to coex hw blocking
...
1. fix some bugs by previous coex hw blocking bugfix,
such like, rwble.c (64, 0) line 222
2. fix bug that ble scan performance is very low when software coexist
is working.
3. update libcoexist version to v1.1.0
2018-10-18 11:49:10 +08:00
zhiweijian
30ea8c7048
Component/bt: read multiple return callback status: ESP_GATT_STACK_RSP
2018-10-17 12:34:34 +00:00
island
024f27f3d5
component/bt: modify the BLE example to make it run with "numeric comparison" mode
2018-10-17 16:55:11 +08:00
baohongde
a6d054b079
components/bt: Add sniff mode to SPP
...
In idle state for a while, SPP will enter sniff mode.
2018-10-12 11:22:28 +08:00
zhiweijian
fe7fd3bf4d
Component/bt: fix connection interval error in slave adv params
2018-09-30 11:14:27 +00:00
Jiang Jiang Jian
fda865b002
Merge branch 'bugfix/btdm_watchdog_timeout_after_pair_with_iphone' into 'master'
...
component/bt: Fix BTU task watchdog timeout after pair with iphone
See merge request idf/esp-idf!3366
2018-09-30 14:39:00 +08:00
Jiang Jiang Jian
42a9f99bc8
Merge branch 'bugfix/btdm_controller_stuck_on_waking_up' into 'master'
...
bugfix/btdm_controller_stuck_on_waking_up
See merge request idf/esp-idf!3395
2018-09-30 14:25:58 +08:00
Zhi Wei Jian
5d71940178
component/bt: add sequential check when add include service
2018-09-30 14:19:54 +08:00
Jiang Jiang Jian
d6bc6fad8b
Merge branch 'bugfix/btdm_add_ESP_BLE_SM_ONLY_ACCEPT_SPECIFIED_SEC_AUTH_in_set_security_param_API' into 'master'
...
Component/bt: add only accept sepecified authentication function for SMP
See merge request idf/esp-idf!3385
2018-09-30 14:18:23 +08:00
zhiweijian
3050e55801
Component/bt: add only accept sepecified Authentication
2018-09-29 21:23:55 +08:00
Jiang Jiang Jian
7014c14537
Merge branch 'bugfix/btdm_add_service_source_param_for_ESP_GATTC_SEARCH_CMPL_EVT' into 'master'
...
Component/bt: add “service from” param for ESP_GATTC_SEARCH_CMPL_EVT
See merge request idf/esp-idf!3399
2018-09-29 20:18:26 +08:00
zhiweijian
e6d737780a
Component/bt: add “service from” param for ESP_GATTC_SEARCH_CMPL_EVT
2018-09-28 12:59:01 +00:00
zhiweijian
54b841dc30
Component/bt: fix service change char can’t read and write and no descr
2018-09-28 19:57:25 +08:00
wangmengyang
334cb88256
component/bt: bugfix that hci down stream datapath is unblocked too early on waking up from sleep
...
This issue can cause the controller to stuck after sleep interrupt happens and clock interrupt enabled
2018-09-28 03:45:52 +00:00
Tian Hao
337960338d
component/bt : fix coexist hardware blocking bug
...
fix the bug following:
1. after disable bluetooth controller, wifi cannot TX/RX any packets.
2. when software coexist working, there's a little ratio cause wifi task watchdog timeout
3. when software coexist working, there's a little ratio cause bluetooth cannot receive anything.
feature:
1. add libbtdm_app.a git commit local and remote checking
Known issues:
1. there's still a bug occurs with a very very low ratio cause bluetooth
cannot receive anything. The reproduce interval may great than 3days ~ 1week via
7x24 hours heavy testing.
2018-09-26 21:24:46 +08:00
Jiang Jiang Jian
fa784476ba
Merge branch 'bugfix/btdm_fix_get_bond_list_error_sometimes' into 'master'
...
Component/bt: fix get bond list error sometimes
See merge request idf/esp-idf!3288
2018-09-26 18:06:23 +08:00
baohongde
15fae990c1
component/bt: Fix BTU task watchdog timeout after pair with iphone
...
Create a new pending queue, then re-submit pending requests in old pending queue,preventing new events being inserted into it.
Closes https://github.com/espressif/esp-idf/issues/2191
2018-09-26 11:59:54 +08:00
zhiweijian
9fb188a1d9
Component/bt: add gatts send service change indication API
2018-09-25 08:26:55 +00:00
zhiweijian
81e7689bf3
Component/bt: fix get bond list error sometimes
2018-09-21 02:44:16 +00:00
Anton Maklakov
0d1285ebcf
bluetooth: fix indentation warning
2018-09-20 18:53:15 +08:00
Anton Maklakov
d4cbfd34cc
cmake: silence some warnings in coap, bt, expat, libsodium, lwip and examples/bluetooth
2018-09-20 18:53:15 +08:00
Anton Maklakov
9a55557ad8
build system: Add a compatible old GCC flag
2018-09-20 18:53:14 +08:00
Ivan Grokhotkov
51c9b6b82d
bt: disable implicit fall through warnings
2018-09-20 18:53:14 +08:00
Ivan Grokhotkov
dd5d01a83e
bt: silence unused const variables warning
2018-09-20 18:53:14 +08:00
Jiang Jiang Jian
7657c1c7d4
Merge branch 'bugfix/btdm_fix_crash_when_test_multi_connect' into 'master'
...
Component/bt: fix crash when test multi_connect
See merge request idf/esp-idf!3274
2018-09-20 12:04:18 +08:00
Jiang Jiang Jian
ffbe5b7ae5
Merge branch 'bugfix/btdm_fix_iphoneX_error_when_get_wifi_list' into 'master'
...
Component/bt: fix iPhoneX error when getting wifi list
See merge request idf/esp-idf!3303
2018-09-20 10:54:43 +08:00
Jiang Jiang Jian
57573d0ed7
Merge branch 'feature/btdm_add_clear_rand_addr_API' into 'master'
...
component/bt: add clear rand address API
See merge request idf/esp-idf!3137
2018-09-20 10:47:37 +08:00
zhiweijian
fdc352d090
Component/bt: fix iPhoneX error when getting wifi list
2018-09-19 15:17:57 +08:00
Jiang Jiang Jian
72aaeb26ac
Merge branch 'bugfix/btdm_fix_save_error_key_in_smp_when_reconnect' into 'master'
...
Component/bt: fix save error key in smp when reconnect
See merge request idf/esp-idf!3251
2018-09-18 20:06:38 +08:00
zwj
fa00e6d4f7
component/bt: add clear rand address API
2018-09-17 20:09:03 +08:00
Jiang Jiang Jian
d41ee5c628
Merge branch 'bugfix/btdm_enable_modem_sleep_by_default' into 'master'
...
bugfix/btdm_enable_modem_sleep_by_default
See merge request idf/esp-idf!3284
2018-09-17 16:17:34 +08:00
wangmengyang
bca2e110fc
component/bt: enable bluetooth modem sleep as default setting
2018-09-17 10:38:13 +08:00
Jiang Jiang Jian
18a893bd35
Merge branch 'bugfix/btdm_unreserve_scn1_for_hfp' into 'master'
...
component/bt: Unlock reserve of SCN 1 for HFP
See merge request idf/esp-idf!3269
2018-09-14 19:49:47 +08:00
Jiang Jiang Jian
8001737d3e
Merge branch 'bugfix/ble_adv_data_tx_power' into 'master'
...
fix TX power value in ble adv data is incorrect
See merge request idf/esp-idf!3185
2018-09-14 19:46:16 +08:00
baohongde
738522f1a3
component/bt: Unlock reserve of SCN 1 for HFP
2018-09-14 06:22:58 +00:00
zhiweijian
d0721e8f6d
Component/bt: fix crash when test multi_connect
2018-09-14 11:18:44 +08:00
Renz Bagaporo
454d65bbab
bt: remove non-existing source file from cmakelists
2018-09-14 08:47:22 +08:00
Jiang Jiang Jian
e6e2d7ebee
Merge branch 'feature/btdm_add_adv_packet_duplicate_in_scan_duplicate' into 'master'
...
component/bt: add adv packet duplicate in scan duplicate
See merge request idf/esp-idf!2939
2018-09-13 18:16:22 +08:00
Jiang Jiang Jian
60a9462f6e
Merge branch 'bugfix/optimize_BLE_memory_debug' into 'master'
...
component/bt: optimize bluetooth memory debug
See merge request idf/esp-idf!3047
2018-09-13 10:49:26 +08:00
Tian Hao
b9382b29fa
fix TX power value in ble adv data is incorrect
...
refence to https://github.com/espressif/esp-idf/issues/2284
Before fixing, the tx power in adv data is always 0xeb(-21dbm).
restriction:
If change BLE advertising TX power, please call esp_ble_gap_config_adv_data()
after BLE adv TX power changed.
Later, will implement set BLE advertising TX power via HCI, then the
TX power value in adv data can be update automatically after BLE adv
TX power changed.
2018-09-12 20:23:45 +08:00
zhiweijian
c462a66726
Component/bt: fix save error key in smp when reconnect
2018-09-12 19:51:59 +08:00
Jiang Jiang Jian
36337da8b2
Merge branch 'bugfix/btdm_a2dp_role_mixed_up' into 'master'
...
component/bt: bugfix that A2DP sink device can be connected by another A2DP sink device
See merge request idf/esp-idf!3191
2018-09-12 16:44:53 +08:00
zhiweijian
9103a04793
component/bt: add adv packet duplicate in scan duplicate
2018-09-11 02:31:11 +00:00
Renz Christian Bagaporo
d9939cedd9
cmake: make main a component again
2018-09-11 09:44:12 +08:00
zhiweijian
469b8c7e8e
component/bt: optimize bluetooth memory debug
2018-09-10 09:19:19 +00:00
Jiang Jiang Jian
892fc4ac3f
Merge branch 'feature/btdm_add_set_default_passkey_function' into 'master'
...
Component/bt: add set/clear static passkey function
See merge request idf/esp-idf!3128
2018-09-10 16:08:05 +08:00
wangmengyang
36a8cd1bf5
component/bt: stop to inititate AVRC connection when A2DP connection fails to set up
...
AVRCP connection binds to A2DP in current implementation, despite the two profiles are\
independent according to specification. AVRCP connection is not necessary to set-up \
if A2DP connection fails to establish
2018-09-10 03:35:58 +00:00
wangmengyang
9621904cdc
component/bt: stop to initiate AVDTP connection on failure of A2DP service discovery
...
In opening state of AVDTP connection, if SDP client fails to get valid A2DP service record\
from peer SDP server, then do not initiate AVDTP connection request
2018-09-10 03:35:58 +00:00
wangmengyang
e9e3bc492b
component/bt: bugfix that A2DP sink device can be connected by another A2DP sink device
...
In pevious implementation, A2DP sink will register an A2DP source Stream End Point(SEP) although the SEP is not\
supposed to be used. Now remove the unused SEP for source so that only one role of A2DP can be supported at one
time. Service record in local SDP server only includes at most one service for A2DP sink role or source
2018-09-10 03:35:58 +00:00
Angus Gratton
4eeed31a04
Merge branch 'feature/cmake' into 'master'
...
Merge experimental CMake support to master
See merge request idf/esp-idf!3024
2018-09-07 13:44:17 +08:00
zhiweijian
d12982dc6e
Component/bt: add set default passkey function
2018-09-07 10:55:44 +08:00
Jiang Jiang Jian
8484b9cfd3
Merge branch 'feature/btdm_legacy_paring' into 'master'
...
component/bt: Add Legacy Pairing
See merge request idf/esp-idf!3057
2018-09-07 10:15:52 +08:00
Angus Gratton
cff2ef695a
Merge branch 'master' into feature/cmake
2018-09-06 20:23:04 +08:00
Jiang Jiang Jian
affe75a102
Merge branch 'bugfix/btdm_hfp_invalid_hci_sync_pkt_len' into 'master'
...
bugfix/btdm_hfp_invalid_hci_sync_pkt_len
See merge request idf/esp-idf!3186
2018-09-06 19:51:42 +08:00
Angus Gratton
b355854d4d
Merge branch 'master' into feature/cmake
2018-09-05 10:35:04 +08:00
baohongde
bd8b9960d5
component/bt: Add Legacy Pairing
2018-09-04 21:11:03 +08:00
wangmengyang
4e6b3936c0
component/bt: bugfix for incorrect length of HCI SCO packet size in HFP resulted from uninitialized data buffer length
2018-09-04 20:09:07 +08:00
Tian Hao
069f495006
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 17:07:10 +08:00
Hrishikesh Dhayagude
4abe47437f
components/bt: Fix broken API esp_bt_mem_release() for parameter ESP_BT_MODE_BTDM
...
Problem:
The new API esp_bt_mem_release() that was added freed BTDM data to heap from esp_bt_controller_mem_release().
Now with the BT memory optimization commit ee787085f9
,
the BTDM data is optimized and reduced to only 32 bytes which is not sufficient amount to be added to heap.
So, using the API leads to assert saying that the region is too small.
Solution:
Modify heap_caps_add_region_with_caps to return ESP_ERR_INVALID_SIZE in case the range is too small to create a new heap.
Do not assert if return value is ESP_ERR_INVALID_SIZE
This also fixes using API esp_bt_controller_mem_release() with ESP_BT_MODE_BTDM
Signed-off-by: Hrishikesh Dhayagude <hrishi@espressif.com>
2018-08-31 14:28:23 +00:00
Jiang Jiang Jian
a557e8cc14
Merge branch 'bugfix/fix_bt_hdr_files' into 'master'
...
components/bt: Make a pass through Bluetooth header files
See merge request idf/esp-idf!3093
2018-08-31 22:04:39 +08:00
Jiang Jiang Jian
2d0124698e
Merge branch 'bugfix/btdm_update_private_address' into 'master'
...
component/bt: Update BLE private address after it's private address interval
See merge request idf/esp-idf!2987
2018-08-31 21:33:54 +08:00
Jiang Jiang Jian
4542bf19f7
Merge branch 'bugfix/btdm_rfcomm_test_command_cause_crash' into 'master'
...
component/bt: Fix bug rfcomm test command cause crash
See merge request idf/esp-idf!3080
2018-08-31 21:33:39 +08:00
Jiang Jiang Jian
e3778d7bd9
Merge branch 'bugfix/btdm_find_remote_service_by_uuid_always_return_success' into 'master'
...
component/bt: Fix bug of SDP find services by uuid always return success
See merge request idf/esp-idf!3036
2018-08-31 21:27:21 +08:00
Angus Gratton
a9c4ed7139
Merge branch 'master' into feature/cmake
2018-08-30 18:51:01 +08:00
Tian Hao
5a8917c337
fix bluetooth security vulnerability of ECDH publick key checking
2018-08-30 11:39:19 +08:00
Jiang Jiang Jian
9be09692b1
Merge branch 'bugfix/btdm_get_acl_num' into 'master'
...
component/bt : fix get acl number incorrect due to memory release
See merge request idf/esp-idf!3090
2018-08-30 11:12:46 +08:00
Angus Gratton
393c29b656
cmake: Fix bt component dependencies
2018-08-29 19:37:25 +08:00
Anton Maklakov
8c040e749f
bluetooth: fix format overflow warnings
2018-08-29 14:40:28 +08:00
Anton Maklakov
779bce7681
bluetooth: fix incorrect memset size
2018-08-29 14:40:28 +08:00
Anton Maklakov
e8eb8cb2a4
bluetooth: fix missing braces and indentation
2018-08-29 14:40:28 +08:00
Ivan Grokhotkov
033b694128
bt/a2dp: fix incorrect return type
...
res was declared as “bool” so expression
((count == 0) ? A2D_SET_ONE_BIT : A2D_SET_MULTL_BIT)
always evaluated to “true”, and was implicitly converted to
A2D_SET_ONE_BIT.
2018-08-29 14:40:28 +08:00
Ivan Grokhotkov
9fbe42c0f1
bt/bta: fix returning value from function returning void
2018-08-29 14:40:28 +08:00
Ivan Grokhotkov
536df958ad
bt/btm: fix misplaced debug statement
2018-08-29 14:40:28 +08:00
Tian Hao
eb3f280cd3
component/bt : fix get acl number incorrect due to memory release
...
1. after memory release MR merged, due to the get acl number condition is not completed, it will cause get acl number value incorrect
2. It may cause set Security Mode (BR/EDR) enable failed
2018-08-28 15:35:40 +08:00
Jiang Jiang Jian
26850880b2
Merge branch 'bugfix/btdm_fix_crash_when_BLE_do_SMP_con_discon_stress_test' into 'master'
...
component/bt: fix crash when BLE do SMP connect and disconnect stress test
See merge request idf/esp-idf!3077
2018-08-28 13:40:20 +08:00
Jiang Jiang Jian
f5b699cee7
Merge branch 'bugfix/btdm_a2dp_sink_pcm_buf_size' into 'master'
...
bugfix/btdm_a2dp_sink_pcm_buffer_size
See merge request idf/esp-idf!3052
2018-08-28 10:42:36 +08:00
Jiang Jiang Jian
6519f1833a
Merge branch 'bugfix/fix_probable_mem_leak' into 'master'
...
components/bt: Fix a probable memory leak for BTA_GATTS_CONF_EVT event
See merge request idf/esp-idf!2962
2018-08-27 14:10:22 +08:00
Jiang Jiang Jian
1c676300f0
Merge branch 'bugfix/btdm_fix_get_error_adv_sometimes' into 'master'
...
Component/bt: fix get error adv packet sometimes
See merge request idf/esp-idf!3035
2018-08-27 12:17:23 +08:00
zwj
430d3da089
component/bt: fix crash when BLE do SMP connect and disconnect stress test
2018-08-27 11:09:29 +08:00
wangmengyang
3faee500bb
component/bt: bugfix for incorrect computation of PCM data buffer size in A2DP sink
2018-08-27 02:53:59 +00:00
Jiang Jiang Jian
df78612896
Merge branch 'bugfix/btdm_fix_memory_leak_in_security_server' into 'master'
...
component/bt: fix memory leak in security server
See merge request idf/esp-idf!3014
2018-08-27 10:19:27 +08:00
baohongde
588e006256
component/bt: Fix bug of SDP find services by uuid always return success
2018-08-27 02:14:45 +00:00
Hrishikesh Dhayagude
29ec0339f6
components/bt: Fix a probable memory leak for BTA_GATTS_CONF_EVT event
...
Multiple modules register their callback BTA_GATTS_AppRegister().
If any of the callbacks do not free the allocated pointer in
BTA_GATTS_CONF_EVT event, then this can result in memory leak.
So, free the pointer after the callback function is called and remove
the calls to free in the callback functions as it is now not required
Signed-off-by: Hrishikesh Dhayagude <hrishi@espressif.com>
2018-08-25 16:26:37 +00:00
Hrishikesh Dhayagude
739b4aadf7
components/bt: Make a pass through Bluetooth header files
...
This is just a quick glance at all the header files exposed to the
users from cleanup point of view.
Signed-off-by: Hrishikesh Dhayagude <hrishi@espressif.com>
2018-08-25 21:21:42 +05:30
zhiweijian
f74b041288
Component/bt: fix memory leak in security server
2018-08-25 15:47:47 +00:00
wangmengyang
6b0a1bd700
component/bt: check support of AFH in remote slave device's LM feature then determine whether to send LMP_set_AFH
2018-08-24 11:48:12 +00:00
zhiweijian
1ca5b70803
Component/bt: fix get error adv packet sometimes
2018-08-24 09:24:49 +00:00
baohongde
9eefd8c1aa
component/bt: Fix bug rfcomm test command cause crash
...
find when BQB
2018-08-24 14:49:33 +08:00
Jiang Jiang Jian
eb18122038
Merge branch 'bugfix/esp_bt_controller_mem_release' into 'master'
...
BT/BTDM memory release might fail if any of the memory regions is empty
See merge request idf/esp-idf!3031
2018-08-23 11:02:17 +08:00
Jiang Jiang Jian
33f0eadac9
Merge branch 'bugfix/timer_oneshot_timeout_twice' into 'master'
...
component/bt: Some timer oneshot will timeout twice
See merge request idf/esp-idf!2979
2018-08-23 10:41:53 +08:00
baohongde
4fe04ae14d
component/bt: Update BLE private address after it's private address interval
2018-08-21 11:01:44 +08:00
me-no-dev
afa091fe79
prevent heap_caps_add_region exception if region is empty
...
Calling `esp_bt_controller_mem_release` or `esp_bt_mem_release` might result in exception if any of the regions returned to heap are empty. This happens usually if BT/BLE is enabled, but not used/linked in the final firmware.
2018-08-17 08:49:48 +02:00
Jiang Jiang Jian
5ba0d6bde6
Merge branch 'bugfix/ut_bt_build_fix' into 'master'
...
bt: build unit tests only when CONFIG_BT_ENABLED=1
See merge request idf/esp-idf!3000
2018-08-16 19:49:14 +08:00
Angus Gratton
ff2404a272
Merge branch 'master' into feature/cmake
2018-08-16 17:14:17 +10:00
Tian Hao
ab73e0ff13
tools: fix ci example build report reassign warnning
2018-08-16 11:12:22 +08:00
Tian Hao
ee787085f9
component/bt : decrease memory consumption by conn number
...
1. BLE only with 9(max) connection will decrease 3K DRAM
2. BR/EDR only with 7(max) connection will decrease 16K DRAM
3. Any of BLE or BR/EDR connection number decrease will also decrease DRAM consumption
4. Decrease one BLE connection will save about 1KB DRAM
5. Decrease one BR/EDR ACL connection will save about 1.2KB DRAM
6. Decrease one BR/EDR SCO/eSCO will save 2KB DRAM.
7. fix some definition and kconfig
8. remove 1.2k of vhci tx cache and make .bss & .data to heap about 1.4K
9. modify BT Reserved Memory size and modify example to support new bt kconfig
2018-08-14 02:29:17 +00:00
Ivan Grokhotkov
7fca027355
bt: build unit tests only when CONFIG_BT_ENABLED=1
2018-08-13 17:38:37 +03:00
Jiang Jiang Jian
886bf4b88e
Merge branch 'bugfix/btdm_ecdh_public_key_not_check' into 'master'
...
component/bt: Fixed the vulnerability released by Bluetooth org when using…
See merge request idf/esp-idf!2933
2018-08-13 15:44:13 +08:00
yulong
72eaaff9fe
component/bt: Fixed the vulnerability released by Bluetooth org when using public key not check in the process of ECDH encryption.
...
1. Add the 100 times test when the private key is generated by the random number;
2. Add the bt components to the unit-test-app/config directory.
3. Added the bt unit test case to CI.
2018-08-13 14:08:11 +08:00
baohongde
31c66af560
component/bt: Some timer oneshot will timeout twice
...
Find when BQB
2018-08-13 06:00:11 +00:00
zhiweijian
57355d7154
Component/bt: fix get bond list error when connection with no bond
2018-08-08 14:44:22 +08:00
Jiang Jiang Jian
212e25760b
Merge branch 'bugfix/btdm_spp_crash_on_reset' into 'master'
...
component/bt: Fix bug of SPP crash on reset
See merge request idf/esp-idf!2801
2018-08-06 18:39:21 +08:00
Jiang Jiang Jian
744d703dba
Merge branch 'bugfix/btdm_hfp_invalid_sco_param' into 'master'
...
bugfix/btdm_hfp_invalid_sco_param
See merge request idf/esp-idf!2915
2018-08-06 15:35:27 +08:00
wangmengyang
d4cecc5a04
component/bt: modify the invalid retransmission setting for SCO link in HFP
2018-08-06 06:20:51 +00:00
Angus Gratton
a5ae5ac4b3
soc: Allow components to reserve fixed memory ranges that they need
...
No longer necessary to keep all reserved addresses in 'soc'.
Means 'soc' does not need to know about 'bt', for example.
Also means that Bluetooth can be enabled in config without any memory being reserved for BT
controller. Only if code calling the BT controller is linked in, will this memory be reserved...
2018-08-06 01:37:55 +00:00
baohongde
2cd9eaccc7
component/bt: Fix bug of SPP crash on reset
...
In response to: https://github.com/espressif/esp-idf/issues/1998
2018-08-05 00:36:51 +00:00
zhiweijian
163dbc3200
Component/bt: fix SC_MITM_BOND failed in smp for iphones
2018-08-04 16:52:53 +00:00
Jiang Jiang Jian
4f1e8df367
Merge branch 'bugfix/btdm_a2dp_disconnect_reason' into 'master'
...
bugfix/btdm_a2dp_disconnect_reason
See merge request idf/esp-idf!2914
2018-08-03 15:30:30 +08:00