alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
27,402 Commits 20 Branches 148 Tags 384 MiB
68fb038f43
Commit Graph

2739 Commits

Author SHA1 Message Date
Island
f25af53077 Merge branch 'bugfix/relay_friend_cred_message' into 'master' 
ble_mesh: stack: Fix friend relay lpn message when relay disable.

See merge request espressif/esp-idf!19753
 2022-09-18 14:31:05 +08:00
zwj
f95c347013 update BLE lib for ESP32C3 and ESP32S3 
Fixed BLE disconnection issue when channel map update failed due to bad channels
 2022-09-16 21:25:22 +08:00
chenjianhua
8598610ccd bluedroid: fix ble rpa generate and update by host 2022-09-16 16:54:58 +08:00
zwj
e9f4a4e92d Fixed extend adv tx power range error 2022-09-16 15:45:40 +08:00
Jiang Jiang Jian
f03ec22327 Merge branch 'bugfix/fix_vhci_hack_for_external_bt' into 'master' 
Nimble: Added check to not include VHCI buffer handling code if controller support is disabled

See merge request espressif/esp-idf!19876
 2022-09-16 14:16:52 +08:00
wangjialiang
5242f63080 ble_mesh: stack: Add option for lpn auto sub all-nodes. 2022-09-15 09:34:13 +00:00
wangjialiang
f736d9cb3f ble_mesh: stack: Fix friend relay lpn message when relay disable. 2022-09-15 09:27:10 +00:00
zwl
9f940f14f6 change block1 size and num for esp ble controller 2022-09-14 20:02:09 +08:00
Island
71bc1a28cc Merge branch 'fix/DOC_3566' into 'master' 
Updating doc for the issue doc_3566

Closes DOC-3566

See merge request espressif/esp-idf!19971
 2022-09-08 19:27:18 +08:00
Jiang Jiang Jian
e2f57ecff1 Merge branch 'bugfix/fix_some_ble_bugs_on_esp32c3_and_esp32s3' into 'master' 
Fixed some BLE controller bugs on ESP32-C3 and ESP32-S3

Closes BT-2760, BT-2733, BT-2687, BT-2588, BT-2574, BT-2470, and BT-2355

See merge request espressif/esp-idf!19970
 2022-09-08 18:52:40 +08:00
Rahul Tank
95c057861d Nimble: Added check to not include VHCI buffer handling code if 
controller support is disabled
 2022-09-08 05:52:34 +00:00
Island
a3b7751981 Merge branch 'bugfix/adapt_new_btc' into 'master' 
ble_mesh: stack: Corrected parameter size when the btc_transfer_context is used

See merge request espressif/esp-idf!19964
 2022-09-08 11:27:22 +08:00
Jiang Jiang Jian
735063c508 Merge branch 'bugfix/fix_ble_get_cur_pkt_num_crash_sometimes_when_bluetooth_is_disconnecting' into 'master' 
Fixed calling esp_ble_get_cur_sendable_packets_num() sometimes crashes when bluetooth is disconnecting

Closes BT-2699

See merge request espressif/esp-idf!19993
 2022-09-08 10:41:47 +08:00
satish.solanke
50ec07c45d updating doc for the issue doc_3566 2022-09-07 15:05:49 +05:30
zwj
c6b7bbdab9 Update ESP32-C3 and ESP32-S3 BLE lib 
- Fixed the performance issue of usage of PLL track related baseband IRQsFixed the performance issue of BLE sync scan in coexistence scenario when PLL track is enabled
    - Fixed connect failed due to error sync found signal
    - Fixed BLE disconnect failed due to terminate_ind have sent but no ACK is received
    - Added ADV mode error check in ADV rx isr handler function
    - Fixed BLE RAL_UNDERRUN and TX_CRYPT_ERR assert
    - Disable scan continue
    - Fixed scan forever if scan continue is disable
 2022-09-07 12:20:01 +08:00
Wang Meng Yang
a026d9816a Merge branch 'feature/sink_support_mono' into 'master' 
bt: Fixed sink not being able to output mono audio because it can only decode dual channel audio data

Closes BT-2698

See merge request espressif/esp-idf!19759
 2022-09-07 11:59:57 +08:00
zwj
2942a98f5d fix calling esp_ble_get_cur_sendable_packets_num() sometimes crashes when bluetooth is disconnecting 2022-09-06 21:12:30 +08:00
Rahul Tank
730b932de0 Nimble: Add extra allocation for data pointer returned by controller for ESP IP 2022-09-06 15:15:21 +05:30
wangjialiang
289ed8bca8 ble_mesh: stack: added the judgment that the parameter is NULL but the parameter len is not zero to avoid btc_transfer_context failed 2022-09-05 20:27:57 +08:00
Wang Meng Yang
4eb98adf43 Merge branch 'bugfix/deadlock_after_call_esp_bluedroid_disable' into 'master' 
bt:Fixed deadlock due to wrong parameter when calling btc_transfer_context() after calling esp_bluedroid_disable()

Closes IDFGH-8175 and BT-2744

See merge request espressif/esp-idf!19859
 2022-09-05 13:38:18 +08:00
Roshan Bangar
c401efa7bb Nimble : updated debug level for a print to avoid unwanted console log. 2022-09-01 05:03:40 +00:00
xiongweichao
80e3d965ae Fixed deadlock due to wrong parameter when calling btc_transfer_context() after calling esp_bluedroid_disable() 
Closes https://github.com/espressif/esp-idf/issues/9672
 2022-09-01 11:47:46 +08:00
Wang Meng Yang
cf8abdb554 Merge branch 'bugfix/remove_bt_dft_init_semicolon' into 'master' 
bt: Remove trailing semicolon from bt dft initializer

Closes IDFGH-8058

See merge request espressif/esp-idf!19773
 2022-09-01 11:30:21 +08:00
jincheng
1282eda148 fixed the exhaustion of ACL buffer 
fixed the duplication of connection request from the same device
 2022-08-31 16:24:59 +08:00
Jiang Jiang Jian
8d9c51f76d Merge branch 'feature/add_txpwr_api_on_esp32c2' into 'master' 
add set/get txpwr api for esp32c2

See merge request espressif/esp-idf!19520
 2022-08-29 23:35:25 +08:00
Zhi Wei Jian
4a5662bc25 Merge branch 'feature/add_qa_test_funcs' into 'master' 
Add QA test Functions for esp32

See merge request espressif/esp-idf!19735
 2022-08-29 21:04:02 +08:00
zwl
30e47072f9 add set/get txpwr api and fix issues such as disconnect and abnormal tx behavior for esp32c2 2022-08-29 11:32:18 +08:00
Wang Meng Yang
6f677de11c Merge branch 'bugfix/ble_disconnect_enable_light_sleep_and_bb_pd_master' into 'master' 
bt: Fixed bluetooth disconnection issue when light sleep and baseband power down are enabled

Closes BT-1915

See merge request espressif/esp-idf!19671
 2022-08-26 13:34:11 +08:00
xiongweichao
697755dfe5 Fixed sink not being able to output mono audio because it can only decode dual channel audio data 2022-08-25 11:36:28 +08:00
Rahul Tank
6e5389b1f8 Nimble: Fix memory corruption in reconnection attempt code 2022-08-24 13:39:27 +05:30
Rahul Tank
84bbb2ac7f Merge branch 'bugfix/increase_leading_space_for_alloc' into 'master' 
Nimble: Add extra space for buffer allocation for ESP IP

See merge request espressif/esp-idf!19574
 2022-08-24 11:42:48 +08:00
zhiweijian
0b4122ecee Add QA test Functions 2022-08-23 21:20:43 +08:00
Chen Jian Hua
7908025c2d Merge branch 'bugfix/fix_ble_rpa_gen_for_esp32' into 'master' 
Revert "Fixed ESP32 BLE can't resolve the peer address when enable white list"

Closes BT-2543

See merge request espressif/esp-idf!19641
 2022-08-23 16:50:41 +08:00
Rahul Tank
5d087feb6e Nimble: Add extra space for buffer allocation for ESP IP 2022-08-23 09:48:23 +05:30
xiongweichao
9ee49832ea Fix bluetooth disconnection issue when light sleep and baseband power down are enabled 2022-08-22 15:06:48 +08:00
Wei Tian Hua
7c2b137ffe Merge branch 'contrib/github_pr_9529_mr_master' into 'master' 
bt:No need to use local copy of btc_msg_t in btc_transfer_context, create it on heap and pass to osi_thread_post()

Closes IDFGH-8021

See merge request espressif/esp-idf!19577
 2022-08-22 14:46:16 +08:00
songruojing
304a8f142d esp32c6: introduce the target 
Add esp32c6 target to tools and Kconfig
Create directories and files that are essential for `idf.py --preview set-target esp32c6`
 2022-08-19 11:13:02 +08:00
chenjianhua
0067c28013 Revert "component/bt: add local irk to controller" 
This reverts commit 95c35288bc.
 2022-08-19 11:03:15 +08:00
chenjianhua
eaa9897386 Revert "Fixed ESP32 BLE can't resolve the peer address when enable white list" 
This reverts commit 1cc0f6aac5.
 2022-08-19 11:03:15 +08:00
chenjianhua
e29170bce9 Bluedroid: Configurable option to modify max gatt service attributes count 2022-08-17 14:36:12 +08:00
Pedro
792186a3da
Remove trailing semicolon from bt dft initializer 
Similar to espressif#6554
 2022-08-16 11:48:17 -03:00
Wang Meng Yang
4f4edef113 Merge branch 'bugfix/fix_ble_sch_arb_assert' into 'master' 
Fixed BLE sch_arb assert on ESP32-C3 and ESP32-S3

Closes IDFGH-7620, IDFGH-7694, and BT-2637

See merge request espressif/esp-idf!19519
 2022-08-15 21:54:07 +08:00
tgotic
60bdc4a023 update code to use osi_free() 2022-08-11 18:14:35 +02:00
zwj
788f7265c0 Update BLE lib for ESP32-C3 and ESP32-S3 
- update ble tx power level mapping
- Fixed ble sch_arb assert
 2022-08-11 21:29:26 +08:00
zwj
e414dd7e07 fix extend adv set remove failed 2022-08-11 20:50:15 +08:00
wangmengyang
9a6101bfed components/bt: fixed the invalid workqueue number for BTU thread in Bluedroid 
There should be only one workqueue for BTU task. The queue length for the second workqueue of BTU can be uninitialized and caused memory overflow and corruption.

Closes https://github.com/espressif/esp-idf/issues/9507
 2022-08-11 16:09:44 +08:00
wangjialiang
e814f57b0f ble_mesh: stack: Fix kr from non-primary subnet shouldn't ignore 
For case MESH/NODE/KR/BV-02-C
 2022-08-10 14:12:37 +00:00
wangjialiang
3632250884 ble_mesh: stack: Add a check if the appkey is bound to the model. 
For case MESH/NODE/CFG/MP/BI-03-C
 2022-08-10 14:12:37 +00:00
wangjialiang
59c1e9a25d ble_mesh: stack: the count_log field should be set to 0 when HBS is sent. 
For MESH/NODE/CFG/HBS/BV-02-C
 2022-08-10 14:12:37 +00:00
wangjialiang
0cb883b407 ble_mesh: stack: The Heartbeat Publication Period Log value can set to 0x11, range: [0, 0x11] 2022-08-10 14:12:37 +00:00
wangjialiang
ee7d448e3c ble_mesh: stack: The value of expect_ack_for will be rewrited after send_pub_key(). 
For case MESH/PVNR/PROV/BV-04-C
 2022-08-10 14:12:37 +00:00
wangjialiang
5830ac8b12 ble_mesh: stack: Fix ignore connectable PB-ADV PDU containing a Link Open message. 
For case MESH/NODE/PBADV/BI-04-C
 2022-08-10 14:12:37 +00:00
wangjialiang
fc9edce9bc ble_mesh: stack: Fix PB-GATT not check invalid link flag 
For case MESH/NODE/PROV/BI-03-C
 2022-08-10 14:12:37 +00:00
wangjialiang
bd418e7a76 ble_mesh: stack: Fix invalid provisioning pdu type check 
For case MESH/NODE/PROV/BI-15-C
 2022-08-10 14:12:37 +00:00
satish.solanke
42743a7189 Update_sdkdefaultconfig_BLE_only_flag ESP32C2 2022-08-09 16:28:01 +00:00
Island
ee10f25b89 Merge branch 'bugfix/friend_and_lpn_issues' into 'master' 
ble_mesh: stack: Fix friend and lpn issues

See merge request espressif/esp-idf!19378
 2022-08-09 14:39:58 +08:00
Lin Rui Hao
68bd2badf4 Merge branch 'contrib/github_pr_9498' into 'master' 
bluedroid: fix member typo

Closes IDFGH-7987

See merge request espressif/esp-idf!19436
 2022-08-09 11:13:33 +08:00
tgotic
f78298b04a local copy of btc_msg_t 
No need to use local copy of btc_msg_t in btc_transfer_context, create it on heap and pass to osi_thread_post().
 2022-08-08 16:18:16 +02:00
wangjialiang
8f640a3e82 ble_mesh: stack: Fix add continuously secure update into friend queue. 
For MESH/NODE/FRND/FN/BV-20-C
 2022-08-08 12:30:44 +00:00
wangjialiang
e797cb54dc ble_mesh: stack: Fix friend relay lpn message when relay feature is disable 
For MESH/NODE/FRND/FN/BV-23-C
 2022-08-08 12:30:44 +00:00
linruihao
fe04cdb88c Fixd union member access typo 
Closes https://github.com/espressif/esp-idf/pull/9498
 2022-08-08 19:40:25 +08:00
jingli
ee3423834e kconfig: refactor xtal freq kconfig to common configuration item 2022-08-05 19:12:29 +08:00
Island
74abb42053 Merge branch 'feature/update_to_the_latest_controller_lib' into 'master' 
Feature/update to the latest controller lib

See merge request espressif/esp-idf!19372
 2022-08-05 17:51:16 +08:00
Island
bd0904c1f3 Merge branch 'document/support_header_defination' into 'master' 
Support of Micro definition in header file

Closes DOC-3386

See merge request espressif/esp-idf!19211
 2022-08-05 17:19:44 +08:00
tgotic
b513ad9df0 bt member typo 
Terminate sec_event.cfm_req.bd_name string, not sec_event.pin_req.bd_name
 2022-08-04 16:49:55 +02:00
zwl
dd05a3754a update ble controller lib for ble issues fixed on esp32c2(8dbbbf0269) 2022-08-04 15:19:51 +08:00
Li Shuai
4f2cec8495 1. Wi-Fi: update tsf tick interval when lpclk is modified 
2. Move register_lpclk_callback to coexistence
 2022-08-04 14:11:25 +08:00
xiongweichao
bb5e7004b9 make bluetooth and wifi use the same low power clock 2022-08-04 14:01:34 +08:00
xiongweichao
1fec2b9529 ESP32S3:bluetooth support use main XTAL in light sleep mode 2022-08-04 14:01:34 +08:00
xiongweichao
d85d927bb0 ESP32C3:bluetooth support use main XTAL in light sleep mode 2022-08-04 14:01:34 +08:00
Island
6c8375e2d2 Merge branch 'feature/support_ble_on_esp32c2_26M' into 'master' 
support BLE with 26M xtal for esp32c2

See merge request espressif/esp-idf!19300
 2022-08-04 11:07:20 +08:00
satish.solanke
bedea8b265 Support of Micro defination in header file 2022-08-03 14:56:44 +00:00
Ivan Grokhotkov
401c10ecfb build system: re-add -Wno-format as private flag for some components 2022-08-03 16:42:47 +04:00
Jiang Jiang Jian
373524cec2 Merge branch 'opt/bluedroid_adv_report_datapath' into 'master' 
component/bt: optimize BLE adv report datapath and adv report flow control mechanism

Closes BT-2561

See merge request espressif/esp-idf!19171
 2022-08-03 16:31:23 +08:00
Karl Wang
2462003fde component/bt: use OSI utility "osi_event" for HCI downstream data processing 2022-08-02 17:40:00 +08:00
wangmengyang
f402778320 component/bt: consider to handle HCI LE Direct Advertising Report 2022-08-02 17:40:00 +08:00
Karl Wang
8c756dad23 component/bt: allocate and use one static buffer for HCI adv flow control command 2022-08-02 17:40:00 +08:00
wangmengyang
85fc8321c8 component/bt: use fixed_pkt_queue instead of fixed_queue for hci commands 
some fixes after modifications:
  1. removed the use of waiting_command_t
  2. fix assert for HCI write_eir command
  3. fixed the crash upon handling command status event when trying to free to the HCI command buffer
  4. fixed the issue in transmitting HCI vendor specific commands
  5. fixed the lost command complete callbacks for HCI commands LE_RAND and LE_ENCRYPT
 2022-08-02 17:37:24 +08:00
Jiang Jiang Jian
c47c0097e2 Merge branch 'bugfix/memory_debug_not_work' into 'master' 
bugfix/fix the dependency error of macro for memory debug

Closes IDFGH-9248

See merge request espressif/esp-idf!19233
 2022-08-02 15:48:58 +08:00
wangmengyang
9bda2381ea component/bt: add a timer to monitor the adv flow control credits downwards procedure 2022-08-02 14:14:07 +08:00
wangmengyang
5f074e1336 component/bt: fix adv report flow control logic, give ADV report credits every 10 packets 2022-08-02 14:14:07 +08:00
wangmengyang
0a1fa3e204 component/bt: add simple ADV flow control mechanism -- drop the packets when the adv report queues are considered full 2022-08-02 14:14:07 +08:00
wangmengyang
9a5f854760 component/bt: use the OSI utility "osi_event" to handle adv report in btc_layer 2022-08-02 14:14:07 +08:00
Karl Wang
a075aa564f component/bt: use the OSI utility "pkt_queue" to store ADV report packet in btu layer 2022-08-02 14:14:07 +08:00
wangmengyang
57336e0a0e component/bt: use the OSI utility "osi_event" for hci_hal_h4 upstream data packets handling 2022-08-02 14:14:07 +08:00
wangmengyang
3c8671f592 component/bt: use the OSI utility "osi_event" to handle A2DP source data Tx processing 2022-08-02 14:14:07 +08:00
wangmengyang
578bfa3600 component/bt: use the OSI utility "osi_event" to handle A2DP sink data Rx processing 2022-08-02 14:14:07 +08:00
wangmengyang
c0b86fefc6 component/bt: add new OSI utility "fixed_pkt_queue", which has same functionality with "fixed_queue" 2022-08-02 14:14:07 +08:00
Karl Wang
eea8a285e3 component/bt: add new OSI utility "pkt_queue" which acts as a mutex-protected linked list, to be used as data queue between tasks 2022-08-02 14:14:07 +08:00
wangmengyang
7c1ee339bc component/bt: add new OSI utility "osi_event" to support the scenario that event need only to be handle once. 2022-08-02 14:14:07 +08:00
wangmengyang
81c87cf4ca component/bt: make OSI thread workqueue length configurable through API 
reduce the length of workqueue1 for BTC and HCI task

# Conflicts:
#	components/bt/common/osi/thread.c
 2022-08-02 14:14:07 +08:00
wangmengyang
77e98e468d component/bt: modify the implementation of osi_thread using freeRTOS queue 2022-08-02 14:14:07 +08:00
Wei Tian Hua
b9b047399d Merge branch 'bugfix/fix_legacy_pair_not_send_link_key_host' into 'master' 
component_bt: fix legacy pair controller does not send the link key to the host

Closes BTCI-107

See merge request espressif/esp-idf!14670
 2022-08-01 16:59:49 +08:00
weitianhua
e51df179ad components_bt/bluedroid: Fix Memory&String Copy Build Err 
1. When setting compilier into -O2 optimization, build for classic bt demo will get wrong
   2. Fix a memcpy bug that maybe get memory truncated

Closes https://github.com/espressif/esp-idf/issues/9398
 2022-08-01 11:37:46 +08:00
Shen Weilong
028d071e84 support BLE with 26M xtal for esp32c2 2022-07-29 21:36:33 +08:00
jincheng
ca0d8be5b8 fix the dependency error of macro for memory debug 2022-07-29 17:03:59 +08:00
Rahul Tank
7ed3157351 Merge branch 'bugfix/add_max_procs_config' into 'master' 
Nimble: Configurable option to modify max gatt procedures allowed for GATT client

See merge request espressif/esp-idf!19197
 2022-07-28 14:38:41 +08:00
xiongweichao
7eedd710c2 fix legacy pair controller does not send the link key to the host 
Closes https://github.com/espressif/esp-idf/issues/5850
 2022-07-28 14:21:48 +08:00
jincheng
44607e10ea add protect for bt_util_buf_env buffers when access by task and interrupt 
ignore the assert_err in rm_bt_clkoff1_setf
 2022-07-27 17:56:08 +08:00
Rahul Tank
2be66a6151 Nimble: Configurable option to modify max gatt procedures allowed for GATT 
client
 2022-07-27 08:59:37 +00:00
Jiang Jiang Jian
9a6ccb7f57 Merge branch 'bugfix/make_sure_sempher_and_queue_used_in_isr_is_in_DRAM' into 'master' 
Bugfix/make sure sempher and queue used in isr is in dram

Closes WIFI-3571, IDFGH-7458, IDFGH-7342, and IDFGH-7569

See merge request espressif/esp-idf!19160
 2022-07-22 14:04:27 +08:00
Jiang Jiang Jian
22b17a3471 Merge branch 'bugfix/schm_process_in_active_crash' into 'master' 
Coex: fixed crash when calculating end transfer time

See merge request espressif/esp-idf!18330
 2022-07-22 11:02:08 +08:00
David Čermák
36f49f361c Merge branch 'bugfix/esp_netif_clean_deps_lwip' into 'master' 
esp-netif/lw-ip: Make dependencies one-directional

Closes IDF-4459, IDF-4460, IDF-1099, and IDFGH-6287

See merge request espressif/esp-idf!18084
 2022-07-21 20:18:05 +08:00
Jiang Jiang Jian
92b4e134bb Merge branch 'bugfix/remove_inappropriate_bluetooth_init_api' into 'master' 
Remove unused bluetooth init api

See merge request espressif/esp-idf!18923
 2022-07-21 14:53:44 +08:00
baohongde
6d631d14de components/bt: Make sure sempher and queue used in isr is in DRAM 2022-07-21 13:50:29 +08:00
David Cermak
5c383d7b73 esp_netif/lwip: Fix deps cycles to "lwip -> esp_netif -> phy-drivers" 
Fix dependency tree so that lwip doesn't depend on any specific network
interface component.
Network interface drivers shall depend on esp_netif.
esp_netif shall depend on lwip (but not on any specific interface
driver) -- it optionally depends on vfs and esp_eth (need ethernet
header for L2/bridge mode)
 2022-07-20 14:59:07 +02:00
GengYuchao
964304b751 Change the selection based on target to function selection 2022-07-20 13:06:56 +08:00
GengYuchao
298583b116 Fix nimble port api adapt remove esp_nimble_hci_and_controller_init 2022-07-20 11:44:00 +08:00
GengYuchao
fd055d3ba6 Fix example after removing API esp_nimble_hci_and_controller_init 2022-07-20 11:44:00 +08:00
GengYuchao
5430ad0519 Remove esp_nimble_hci_and_controller_init function 2022-07-20 11:44:00 +08:00
Mahavir Jain
a94c74c26b
mbedtls: remove dependency on driver component 
- keep `esp_pm` dependency conditional in mbedtls
- refactor `bt` cmakelist to keep dependencies as private

Related: IDF-1265
 2022-07-18 21:10:51 +05:30
Jiang Jiang Jian
7497a5287c Merge branch 'bugfix/fix_bluedroid_host_memory_overflow' into 'master' 
Fixed bluedroid host memory overflow

Closes BT-2397

See merge request espressif/esp-idf!18897
 2022-07-15 11:52:33 +08:00
zhiweijian@espressif.com
4bd267ac9a Fixed bluedroid host memory overflow 2022-07-14 19:35:22 +08:00
Isha Pardikar
183100fc28 Nimble: Fixed compilation error for esp32c2 and esp32h2 when os_mbuf_free is called. 2022-07-14 09:41:05 +05:30
Jiang Jiang Jian
8d98fbe26a Merge branch 'bugfix/remove_unused_ble_rtc_source_sel' into 'master' 
Remove can not use wake up source for esp32h2

See merge request espressif/esp-idf!18966
 2022-07-13 13:50:26 +08:00
Jiang Jiang Jian
258585f50a Merge branch 'bugfix/correct_blecmd_for_rf_path' into 'master' 
Bluedroid: Fixed compilation error due to incorrect macro name

See merge request espressif/esp-idf!18983
 2022-07-12 19:35:40 +08:00
Jiang Jiang Jian
4c1f114eab Merge branch 'bugfix/ble_50_sync_periodic_adv_lost_data' into 'master' 
components/bt: Fix ble sync periodic adv report will lost data

See merge request espressif/esp-idf!18957
 2022-07-12 16:18:01 +08:00
Jiang Jiang Jian
1523a1bdef Merge branch 'bugfix/fix_esp32_c3_s3_adv_report_duplicate_check' into 'master' 
Fix esp32c3/s3 adv report duplicate check

Closes BT-2440

See merge request espressif/esp-idf!18961
 2022-07-12 14:00:33 +08:00
GengYuchao
df6d3eb602 Remove can not use wake up source for esp32h2 2022-07-12 11:23:59 +08:00
Rahul Tank
ac54468d1b Bluedroid: Fixed compilation error due to incorrect macro name 2022-07-11 16:40:51 +05:30
xiewenxiang
947d082b44 components/bt: Fix ble sync periodic adv report lost data issue 2022-07-11 16:51:22 +08:00
Wang Meng Yang
13d141de27 Merge branch 'bugfix/fix_osi_men_dbg_xxx_not_defined_when_enable_mem_dbg' into 'master' 
bugfix/fix the issue of functions not defined when enable memory debug

Closes IDFGH-9248

See merge request espressif/esp-idf!18802
 2022-07-11 15:36:46 +08:00
xiongweichao
b0b6ad21f8 coex: fixed crash when calculating end transfer time 2022-07-11 15:26:53 +08:00
Jiang Jiang Jian
4644e2c302 Merge branch 'bugfix/fix_esp32_ke_mem_c_assert' into 'master' 
Fixed esp32 BLE ke_mem.c assert

See merge request espressif/esp-idf!18916
 2022-07-11 14:02:39 +08:00
chenjianhua
42667adf70 fix esp32c3/s3 adv report duplicate check 2022-07-11 10:25:32 +08:00
Jiang Jiang Jian
7087449d43 Merge branch 'doc/ble_deinit' into 'master' 
components/bt: Add description for de-initialize bt controller

See merge request espressif/esp-idf!17431
 2022-07-10 15:37:13 +08:00
Jiang Jiang Jian
9ec829f352 Merge branch 'bugfix/wifi_sta_and_ble_disconnect_BCI-303_master' into 'master' 
component_bt: Fix wifi is initialized before bluetooth initialization, bluetooth can't stay connected

Closes BCI-303

See merge request espressif/esp-idf!18643
 2022-07-08 19:43:10 +08:00
Wei Tian Hua
8699a10929 Merge branch 'bugfix/redesign_hf_ag_init_deinit_api_param' into 'master' 
component_bt: Change HF AG API

See merge request espressif/esp-idf!18592
 2022-07-08 16:57:20 +08:00
Jiang Jiang Jian
a7bf3af687 Merge branch 'bugfix/reset_ble_hw_on_inititalization' into 'master' 
component/bt: reset Bluetooth hardware during controller inititalization on ESP32-C3/ESP32-S3

Closes BT-2402

See merge request espressif/esp-idf!18831
 2022-07-08 16:21:41 +08:00
xiewenxiang
451a1dd937 doc(bt): Add description for de-initialize bt controller 2022-07-08 10:58:32 +08:00
jincheng
3de3a8b354 fix the issue of functions not defined when enable memory debug 
Closes https://github.com/espressif/esp-idf/issues/9248
 2022-07-08 10:57:29 +08:00
zwj
9a46d06532 fix esp32 BLE ke_mem.c assert 2022-07-07 11:23:11 +00:00
Rahul Tank
020dc7b2ec Merge branch 'bugfix/fix_extra_event_init_periodic' into 'master' 
NimBLE: Removed extra event init done during periodic_sync_alloc

See merge request espressif/esp-idf!18494
 2022-07-07 13:02:53 +08:00
Island
0d86ca59a6 Merge branch 'update/esp32h2_h2_beta2_controller_lib_to_cd9dd20' into 'master' 
Update esp32h2 beta2 lib to controller master

See merge request espressif/esp-idf!18876
 2022-07-06 22:13:05 +08:00
Jiang Jiang Jian
7b3ee47c67 Merge branch 'bugfix/fix_ble_ke_mem_c_assert_on_c3_s3' into 'master' 
Fixed BLE ke_mem.c assert on esp32c3 and esp32s3

Closes BT-2405, BT-2406, and BCI-302

See merge request espressif/esp-idf!18863
 2022-07-06 16:58:07 +08:00
wangmengyang
1d55f12c2d component/bt: reset Bluetooth hardware during controller inititalization on ESP32-C3/ESP32-S3 
1. Rename MACROs SYSTEM_WIFI_RST_EN register bit fields to be more recognizable
2. reset Bluetooth baseband and clock bits to fix the issue of task watchdog triggered during controller initialization due to invalid hardware state
 2022-07-06 16:23:48 +08:00
morris
627b171a3c Merge branch 'feature/enable_rpa_modem_reset_function_in_esp32h2' into 'master' 
Enable rpa_moudle reset function

See merge request espressif/esp-idf!18891
 2022-07-06 14:47:37 +08:00
xiongweichao
155c4a5cb3 Fix wifi is initialized before bluetooth initialization, bluetooth can't stay connected 2022-07-06 14:42:46 +08:00
Rahul Tank
d3e7d9b090 NimBLE: Removed extra event init done during periodic_sync_alloc 2022-07-06 09:50:17 +05:30
GengYuchao
d145c337e0 Enable rpa_moudle reset function 2022-07-05 20:50:31 +08:00
chenjianhua
3a1a5e284a Bluedroid: fix channel map of ext adv params check 2022-07-05 16:02:37 +08:00
GengYuchao
509ac4e748 Update esp32h2 beta2 lib to master 2022-07-05 15:15:41 +08:00
zwj
f15d7d28b5 fix ble ke_mem.c assert on esp32c3 and esp32s3 2022-07-05 03:18:14 +00:00
GengYuchao
3be5ab7268 Update nimble port init changes 2022-07-05 02:40:49 +00:00
GengYuchao
ee13e58b16 update head files for nimble 
Remove some useless error printing display
 2022-07-05 02:40:49 +00:00
GengYuchao
9e1466a34d move init func to nimble 2022-07-05 02:40:49 +00:00
Jiang Jiang Jian
8ab78803d4 Merge branch 'bugfix/s3_wakeup_light_sleep_rtc_wdt_timeout' into 'master' 
component_bt: Fixed rtc watchdog timeout when waking up light sleep due to some functions not in IRAM

See merge request espressif/esp-idf!18757
 2022-07-04 18:21:29 +08:00
morris
7863c1bc45 Merge branch 'bugfix/fix_rtc_freq_err_for_h2_beta1' into 'master' 
Bugfix/fix rtc freq err for h2 beta1

See merge request espressif/esp-idf!18682
 2022-07-04 16:46:17 +08:00
Wang Meng Yang
cb74a64768 Merge branch 'feature/support_for_wr_sugg_data_len_cmd' into 'master' 
feature/added read-write sugg default datalen cmds

See merge request espressif/esp-idf!17863
 2022-07-04 15:17:44 +08:00
Jiang Jiang Jian
c154d09c52 Merge branch 'bugfix/resolve_redefinition_in_spp_and_hid' into 'master' 
resolve redefinition in btc_spp.h and btc_hd.h/btc_hh.h

Closes IDFGH-7647

See merge request espressif/esp-idf!18617
 2022-07-04 14:12:35 +08:00
Onkar
731a8d357f feature/added read-write sugg default datalen cmds 2022-07-03 13:50:12 +05:30
Wang Meng Yang
73cfc078a0 Merge branch 'bugfix/restore_edr_en_and_protect_for_vhci_env' into 'master' 
bugfix/restore edr_en and add protect for vhci_env

Closes IDFGH-6254, IDFGH-6766, IDFGH-7605, and AUD-3629

See merge request espressif/esp-idf!18388
 2022-07-01 19:31:01 +08:00
Li Qi Gan
22c76baaec Merge branch 'bugfix/fix_sink_wrong_sniff_params' into 'master' 
Fix A2DP Sink Wrong Sniff Parameters which Caused by HID Porting

See merge request espressif/esp-idf!18730
 2022-07-01 14:35:44 +08:00
Island
c6fc5038eb Merge branch 'bugfix/no_proxy_beacon_send_after_deinit' into 'master' 
ble_mesh: stack: Bugfix for proxy beacon send after reinit mesh

See merge request espressif/esp-idf!18079
 2022-07-01 11:35:21 +08:00
GengYuchao
95c8d775d0 Update lib for h2 beta2 2022-06-30 17:02:00 +08:00
GengYuchao
b474c83840 Add support for esp32h2 beta2 2022-06-30 17:02:00 +08:00
GengYuchao
e1d07c0cf2 Support H2 periodic advertiser list option on h2 2022-06-30 17:02:00 +08:00
GengYuchao
07a470bccc Update ble lib for h2 beta1 2022-06-30 17:02:00 +08:00
GengYuchao
29a2c83173 Fix default option value 2022-06-30 17:02:00 +08:00
Jiang Jiang Jian
af83290002 Merge branch 'bugfix/fix_some_c2_ble_bugs' into 'master' 
Fixed ESP32C2 BLE  bugs

See merge request espressif/esp-idf!18693
 2022-06-30 16:39:50 +08:00
wangjialiang
45adb0ef24 ble_mesh: stack: Bugfix for proxy beacon send after reinit mesh 2022-06-30 07:41:23 +00:00
xiongweichao
9531fae1d3 Fixed rtc watchdog timeout when waking up light sleep due to some functions not in IRAM 2022-06-29 19:56:47 +08:00
liqigan
3e3a0cdfdb fix sink wrong sniff params which caused by HID porting 2022-06-29 10:11:56 +08:00
zwj
ed593ba168 update ble lib (444e4a2b) 
- fix rpa entry err if addr resol is disabled
- fix aux connect crash
 2022-06-27 14:50:26 +08:00
zwj
004918adbe fix BLE sleep can not be enabled 2022-06-27 14:21:11 +08:00
wangjialiang
b905789dd0 ble_mesh: stack: Add filter old seq_auth packet menuconfig 2022-06-22 08:08:28 +00:00
weitianhua
b4aa3269e7 Change HF AG APIs' NamingMethod 
1. Remove parameter of esp-bt_hf_init & esp_bt_hf_deinit API
2. Change API names
 2022-06-22 15:34:05 +08:00
Darian
e9385aa5c0 Merge branch 'bugfix/bluedroid_typos' into 'master' 
Bluedroid: Fix breaking and non-breaking typos

Closes IDFGH-5103

See merge request espressif/esp-idf!18596
 2022-06-22 14:31:50 +08:00
jincheng
b5d1464180 resolve redefinition in btc_spp.h and btc_hd.h/btc_hh.h 
Closes https://github.com/espressif/esp-idf/issues/9199
 2022-06-22 11:33:04 +08:00
Onkar
f2384a4b83 Bugfix: bond not saved properly after re-pairing 2022-06-21 19:36:35 +08:00
jincheng
70d892fbb8 restore edr_en which was wrongly cleared by role switch 
add critical protection for vhci_env_p->vhci_intr_st
ignore max_page when handle remote features

Closes https://github.com/espressif/esp-idf/issues/7923
Closes https://github.com/espressif/esp-idf/issues/8394
Closes https://github.com/espressif/esp-idf/issues/1921
 2022-06-21 19:23:41 +08:00
Darian Leung
a8805e5b01 bluedroid: Fix non breaking typos 2022-06-21 19:07:25 +08:00
Darian Leung
c2e098c10e bluedroid: Fix breaking change typos 
This commit fixes typos that are breaking changes (i.e., macros, types, and functions)
in the bluedroid API. Migration notes for v5.0 have also been added.

Closes https://github.com/espressif/esp-idf/issues/6887
 2022-06-21 19:07:25 +08:00
Jiang Jiang Jian
3cc134672b Merge branch 'feature/optimize_bluetooth_architecture_0616' into 'master' 
Feature/optimize bluetooth architecture

See merge request espressif/esp-idf!18553
 2022-06-21 01:35:12 +08:00
GengYuchao
d0a1fb1802 Fix nimble repo for timer and co_count 2022-06-20 21:18:54 +08:00
GengYuchao
0184d892ef Fix for prototype 2022-06-20 21:18:20 +08:00
xiongweichao
90510fb597 Fix crash when sending data by spp 2022-06-20 17:12:07 +08:00
GengYuchao
1dabebf771 Fix Kconfig format issue and add option 2022-06-20 17:00:12 +08:00
GengYuchao
42d70086ae Sync nimble fix for bt component 2022-06-20 17:00:12 +08:00
GengYuchao
6658a46478 Move tinycrypt function 2022-06-20 17:00:12 +08:00
GengYuchao
61ee34f713 Add new porting file 2022-06-20 17:00:12 +08:00
GengYuchao
7916f45d58 Update the host configuration options file. Update the osi malloc function. 2022-06-20 17:00:12 +08:00
GengYuchao
b2f8a3c694 Update bt controller interface file 2022-06-20 17:00:12 +08:00
GengYuchao
633e9282b7 Update the CMake compilation architecture and update the controller configuration options 2022-06-20 17:00:12 +08:00
GengYuchao
d1afa7f8d5 Update ble controller lib for esp32c2 2022-06-20 17:00:12 +08:00
Jack
cb0dd5cc75 fix the bug that some memory leaked in phy after wifi/ble deinit 2022-06-16 20:42:20 +08:00
Jiang Jiang Jian
20e5a989a2 Merge branch 'feature/esp32c2_support_ble_sleep' into 'master' 
Support ESP32C2 BLE modem sleep and lightsleep

See merge request espressif/esp-idf!18432
 2022-06-15 15:39:55 +08:00
Jiang Jiang Jian
60327aeea4 Merge branch 'bugfix/avdtp_genreal_reject_format_error' into 'master' 
component_bt: Fix AVDTP general reject format error

See merge request espressif/esp-idf!17636
 2022-06-15 11:07:55 +08:00
Jiang Jiang Jian
49c53dbe03 Merge branch 'feature/update_hfp_ag_version' into 'master' 
component_bt:  Update hfp_ag version to 1.7.2

Closes BT-2082

See merge request espressif/esp-idf!18329
 2022-06-15 11:05:36 +08:00
zwj
a9509ec34c disable BT_BLE_RPA_SUPPORTED by default and enabled by default for other chips 2022-06-14 19:57:07 +08:00
zwj
fd90341138 support ble modem sleep and light sleep 2022-06-14 19:52:50 +08:00
Rahul Tank
835aec1152 Merge branch 'bugfix/mbedtls_free_keypair' into 'master' 
Nimble: Fixed memory leak while generating keypair using embedtls

See merge request espressif/esp-idf!18322
 2022-06-13 17:50:34 +08:00
Wang Meng Yang
e2bc3f865e Merge branch 'bugfix/uninitialized-element' into 'master' 
component_bt:initialize all elements of esp_bt_controller_config_t

Closes IDFGH-7506

See merge request espressif/esp-idf!18343
 2022-06-07 17:24:39 +08:00
xiongweichao
d52cb7d6e4 update hfp_ag version to 1.7.2 2022-06-07 17:17:03 +08:00
Rahul Tank
27b34d60c1 Nimble: Added check to free keypair if already allocated to avoid memory 
leak. Added an API that allows to free keypair
 2022-06-07 13:38:15 +05:30
xiongweichao
a2ea4f5bc9 Fix AVDTP general reject format error. 2022-06-07 02:45:46 +00:00
Jiang Jiang Jian
b617ccfb4c Merge branch 'feature/esp32c2_eco1_bluetooth_update_0525_for_MR' into 'master' 
Support bluetooth for esp32c2 chip

See merge request espressif/esp-idf!18243
 2022-06-04 17:35:17 +08:00
Geng Yuchao
cef8c506fd Synchronously modify the nibmle repo 2022-06-04 12:11:31 +08:00
Geng Yuchao
910b296d72 Add missing configuration items for BLE controller 2022-06-04 11:35:18 +08:00
Geng Yuchao
3ee9ce9d06 Sync nimble repo 2022-06-04 01:00:04 +08:00
Geng Yuchao
8533457208 Add bluetooth controller lib for esp32c2 2022-06-04 01:00:04 +08:00
Geng Yuchao
0722e6a0b7 Update controller lib for esp32h2 2022-06-04 01:00:04 +08:00
Geng Yuchao
5bba3ebed9 Fix esp32h2 controller support. 2022-06-04 00:59:56 +08:00
Geng Yuchao
5c3f0bfe7c Add esp32c2 controller support. 2022-06-04 00:59:21 +08:00
Geng Yuchao
a692abd423 Optimize the Cmake file structure, support esp32c2. 
Follow Kconfig to update the nimble config macro name.
 2022-06-03 22:41:33 +08:00
Geng Yuchao
50b762af1f Add Bluetooth controller menuconfig option for esp32c2 and esp32h2 2022-06-03 22:41:33 +08:00
Geng Yuchao
02636688eb Refactor Kconfig options structure 2022-06-03 22:41:20 +08:00
xiongweichao
d888665160 Bluetooth build fail when power management is enabled 
Closes https://github.com/espressif/esp-idf/issues/9081
 2022-06-02 10:46:19 +08:00
xiongweichao
a48cb2c5e7 initialize all elements of esp_bt_controller_config_t 
Closes https://github.com/espressif/esp-idf/pull/9073
 2022-06-01 18:10:25 +08:00
satish.solanke
3a42007680 Bluedroid porting changes for esp32h2 
created common Kconfig for common flag of nimbble and Bluedroid

fix compile error

created common cfg file for controller

fix the compilation error on tip of master

added common controller flags and fixed compilation error

sdkconfig rename for target specific
 2022-05-30 08:42:45 +00:00
Jiang Jiang Jian
0e94779b2e Merge branch 'feature/support_esp32c2_wifi_new' into 'master' 
Bringup ESP32C2 Wi-Fi

Closes IDF-3905

See merge request espressif/esp-idf!18136
 2022-05-29 18:25:24 +08:00
Jiang Jiang Jian
4ed2e6130a Merge branch 'feature/add_l2cap_ertm_api' into 'master' 
Component_bt:Add l2cap and sdp api

Closes IDF-4487

See merge request espressif/esp-idf!18034
 2022-05-29 17:34:38 +08:00
Jiang Jiang Jian
ffbc25056c Merge branch 'feature/add_avdtp_delay_reporting' into 'master' 
component_bt: add avdtp delay reporting

Closes BT-2308

See merge request espressif/esp-idf!17475
 2022-05-29 17:03:36 +08:00
Anton Maklakov
70c12407d3 Merge branch 'bugfix/bt_fix_int_arguments' into 'master' 
bt: make int types consistent

See merge request espressif/esp-idf!18223
 2022-05-29 16:56:00 +08:00
Jiang Jiang Jian
6884d98c23 Merge branch 'bugfix/add_bda_to_read_rmt_name_param' into 'master' 
Bugfix/add bda to read rmt name param

Closes IDFGH-7459

See merge request espressif/esp-idf!18279
 2022-05-29 14:13:39 +08:00
xiongweichao
b777a53fe8 support add and search raw sdp record 2022-05-28 23:34:21 +00:00
xiongweichao
4faf4e760a sdp support create and search PBAPC record 2022-05-28 23:34:21 +00:00
xiongweichao
a317cb1b0a Split jv_rfcomm and jv_l2cap 2022-05-28 23:34:21 +00:00
xiongweichao
740dc8795d rfcomm supports the use of ERTM 2022-05-28 23:34:21 +00:00
xiongweichao
1d9fd4707a add sdp api 2022-05-28 23:34:21 +00:00
xiongweichao
4719db7047 add l2cap api 2022-05-28 23:34:21 +00:00
xiongweichao
e2e74e2b8b Modify the format of esp_a2dp_api.h comments 2022-05-28 23:31:45 +00:00
xiongweichao
b0551ef456 add source handle the delay report 2022-05-28 23:31:45 +00:00
xiongweichao
9126e4f07b add sink send delay reporting 2022-05-28 23:31:45 +00:00
Jack
7a8b63869f deinit BB MAC back memory when they are not used 2022-05-29 00:13:32 +08:00
Anton Maklakov
cfa3e68d1b bt: esp32s3, make int types consistent 2022-05-27 08:03:54 +00:00
Anton Maklakov
877dc3e304 bt: make int types consistent 2022-05-27 08:03:54 +00:00
keymoon
3027aa84be
assign value to uninitialized bt_addr field 2022-05-27 01:07:06 +09:00
keymoon
2c4b135be6
add address field to read_rmt_name_param 2022-05-26 23:24:56 +09:00
Song Ruo Jing
cf32e49aeb Merge branch 'refactor/cleanup_rtc_h' into 'master' 
clk_tree: Prework2 of introducing clock subsystem control

Closes IDF-4934

See merge request espressif/esp-idf!17861
 2022-05-26 09:16:47 +08:00
Rahul Tank
b45723b92e Merge branch 'bugfix/fix_esp_timer_crash_on_esp32h2' into 'master' 
NimBLE: Enabled ESP Timer support for esp32h2

See merge request espressif/esp-idf!18072
 2022-05-25 00:22:30 +08:00
songruojing
a5b09cf015 rtc_clk: Clean up some clock related enum and macro in soc/rtc.h, replace with new ones in 
soc/clk_tree_defs.h
 2022-05-24 22:59:41 +08:00
Marius Vikhammer
0687daf2c8 kconfig: move remaining kconfig options out of target component 
The kconfig options are moved to the component where they are used,
mostly esp_hw_support and esp_system.
 2022-05-23 17:57:45 +08:00
Marius Vikhammer
030e52f5d4 Merge branch 'feature/improve_doc_link_check' into 'master' 
docs: fix broken links and re-enable linkchecker

Closes IDF-2640

See merge request espressif/esp-idf!17919
 2022-05-19 15:52:17 +08:00
Karl Wang
777dbb6c83 components/bt: disable Bluetooth PLL track function for ESP32-C3/ESP32-S3 as it introduced coexistence issues 2022-05-17 20:00:23 +08:00
Rahul Tank
95db4bbf05 NimBLE: Enabled ESP Timer support for esp32h2 2022-05-17 12:49:40 +05:30
Jiang Jiang Jian
8377a3fff1 Merge branch 'bugfix/fix_ble_ext_adv_parameter_detection' into 'master' 
component/bt: check the ble ext adv parameters

See merge request espressif/esp-idf!15977
 2022-05-16 16:13:56 +08:00
Anton Maklakov
39146a1d85 ble_mesh: correct function declaration 2022-05-13 15:24:17 +07:00
Anton Maklakov
b69efa20ad bluedroid: fix -Wchar-subscripts warning 
'unsigner char' cast recommended, https://stackoverflow.com/a/60696378
 2022-05-13 06:55:22 +00:00
Anton Maklakov
bcfec4ad74 bluedroid: suppress some -Waddress-of-packed-member warnings 2022-05-13 06:55:22 +00:00
Anton Maklakov
e44d7fbaed bluedroid: fix argument type according its usage 2022-05-13 06:55:22 +00:00
Anton Maklakov
9a5f0f6c53 bluedroid: fix argument type to correct narrow one 2022-05-13 06:55:22 +00:00
Anton Maklakov
29b2beffc0 bluedroid: fix type for passing argument in function 2022-05-13 06:55:22 +00:00
Anton Maklakov
87bf3260dd bluedroid: fix argument type in functions 2022-05-13 06:55:22 +00:00
Marius Vikhammer
34910bee07 Merge branch 'bugfix/fix_doxygen_warnings' into 'master' 
docs: fix  doxygen warnings

See merge request espressif/esp-idf!18071
 2022-05-12 16:54:52 +08:00
Marius Vikhammer
c8617fe965 docs: fix all doxygen warnings 
Doxygen warnings would previously not result in a failed pipeline.
Fixed this as well as all current warnings.
 2022-05-12 14:50:03 +08:00
weitianhua
4c370cc437 component_bt: Fix build doc errors of bt 
1. bluedroid: use standard function pointer define.
   2. blufi: Change ESP_BD_ADDR_LEN into ESP_BLUFI_BD_ADDR_LEN
   3. doc/sphinx_known_warnings: Remove fixed parts.
 2022-05-11 14:30:20 +00:00
Marius Vikhammer
d7053c38cc docs: fix broken links 2022-05-07 13:09:41 +08:00
Jiang Jiang Jian
34211f898c Merge branch 'docs/update_esp_hid_device' into 'master' 
[docs] fix documents for Bluetooth HID Device API reference and example

See merge request espressif/esp-idf!17558
 2022-05-05 23:58:07 +08:00
Jiang Jiang Jian
baa5b8ed7d Merge branch 'bufix/esp32c3_s3_build_err' into 'master' 
component_bt: Fix ESP32C3/S3 build error after enabled light sleep

Closes BT-2086

See merge request espressif/esp-idf!17546
 2022-05-01 17:48:18 +08:00