Commit Graph

5807 Commits

Author SHA1 Message Date
shenmengjing
acbf7ac735 docs: Provide CN Translation for four docs in api-guides 2024-05-16 14:32:13 +08:00
shenmengjing
2dc3068a21 docs: Provide translation for jpeg&override_driver&arch in peripherals 2024-05-16 14:30:58 +08:00
Konstantin Kondrashov
c3b0418a4e feat(log): Refactoring tag level check APIs 2024-05-16 09:26:08 +03:00
Konstantin Kondrashov
28e592563c Merge branch 'feature/unuse_old_log_apis' into 'master'
feat(all): Remove usage old log macros

See merge request espressif/esp-idf!30598
2024-05-16 13:57:06 +08:00
morris
3b376b03df feat(pcnt): add driver support on esp32c5 2024-05-16 11:09:48 +08:00
Jakob Hasse
7c281c0380 Merge branch 'docs/p4_hw_design' into 'master'
docs(sys-time): update link to hw design guidelines

Closes IDF-8780

See merge request espressif/esp-idf!30795
2024-05-16 00:18:50 +08:00
Wang Ning
e59446e652 Docs: Added missing USB functions to ESP32-C3 DevKit User Guides 2024-05-15 19:06:26 +08:00
shenmengjing
5a2836c6bb docs: Edit the CN Translation for idf-py 2024-05-15 15:28:24 +08:00
Konstantin Kondrashov
668886842f feat(all): Remove usage old log macros 2024-05-15 15:25:30 +08:00
shenmengjing
29350a2d99 docs: Provide CN Translation for usb-otg-console 2024-05-15 14:21:17 +08:00
Ondrej Kosta
d15a9c2c48 feat(esp_eth): a new folder structure of the driver and other improvements
Fixed memory leak in emac_esp_new_dma function.

Polished ESP EMAC cache management.

Added emac_periph definitions based on SoC features and improved(generalized) ESP EMAC GPIO
initialization.

Added ESP EMAC GPIO reservation.

Added check for frame error condition indicated by EMAC DMA and created a target test.
2024-05-14 08:23:31 +02:00
gaoxu
1138d7d56a feat(gpio): update c5 mp gpio docs 2024-05-13 16:19:28 +08:00
Marius Vikhammer
7b61598e5b docs(sys-time): update link to hw design guidelines 2024-05-13 14:51:47 +08:00
morris
6a57c26469 Merge branch 'feature/esp32c5_mp_gpio_support' into 'master'
esp32c5 mp gpio support

Closes IDF-9649

See merge request espressif/esp-idf!30474
2024-05-11 22:50:23 +08:00
C.S.M
15cf203632 feature(usb_serial_jtag): add usb serial jtag support for esp32p4 2024-05-11 14:16:57 +08:00
gaoxu
3db559ab21 feat(gpio): update gpio docs on ESP32C5 MP version 2024-05-11 10:49:42 +08:00
Wang Fang
937b290bee docs: Updated Getting Started for ESP32-P4 support 2024-05-10 17:57:57 +08:00
shenmengjing
60cd5933d6 docs: Edit the CN Translation and EN Source 2024-05-10 15:30:16 +08:00
Martin Vychodil
079138ce6b Merge branch 'docs/make_fatfsgen_docs_more_visible' into 'master'
docs(storage): Make "Generating and Parsing FATFS on Host" doc more visible

Closes IDF-9891

See merge request espressif/esp-idf!30686
2024-05-10 15:24:35 +08:00
Erhan Kurubas
5f5f8c2d23 Merge branch 'docs/esp32p4_apptrace' into 'master'
docs(app_trace): Update docs for ESP32-P4

Closes IDF-7753

See merge request espressif/esp-idf!30608
2024-05-09 19:26:39 +08:00
Erhan Kurubas
bd9b376c3b Merge branch 'docs/esp32c5_update' into 'master'
docs(esp32c5): update docs_not_updated.txt

Closes IDF-9486 and IDF-9489

See merge request espressif/esp-idf!30642
2024-05-09 19:24:30 +08:00
David Čermák
8c97b7f548 Merge branch 'fix/docs_wifi_get_sta_list' into 'master'
fix(docs): tcpip_adapter: Document replacement of tcpip_adapter_get_sta_list

Closes DOC-7657

See merge request espressif/esp-idf!30472
2024-05-09 19:06:05 +08:00
Wang Meng Yang
7ad17816d6 Merge branch 'doc/update_bt_sleep_process' into 'master'
docs: Update the process of Bluetooth entering sleep in the sleep_modes.rst

Closes BT-3708

See merge request espressif/esp-idf!30381
2024-05-09 09:28:05 +08:00
Adam Múdry
15b31001a0 docs(storage): Make "Generating and Parsing FATFS on Host" doc more visible 2024-05-08 11:57:36 +02:00
shenmengjing
a89e354f9d docs: Update the CN Translation for idf-py and spiffs 2024-05-08 17:15:06 +08:00
Kirill Chalov
40ec44473c Merge branch 'docs/update_alerts_in_readmes_to_gfm_format' into 'master'
docs: Update alerts in READMEs to GFM format

See merge request espressif/esp-idf!30628
2024-05-08 10:38:42 +08:00
Ivan Grokhotkov
1680c2fe33 Merge branch 'bugfix/pytest_build_dir_arg' into 'master'
fix(pytest): respect --build-dir argument from pytest-embedded

See merge request espressif/esp-idf!30609
2024-05-07 21:12:57 +08:00
Shen Meng Jing
ebeff9aef1 Merge branch 'docs/translate_esp_eth' into 'master'
docs: Provide CN translation for esp_eth

Closes IDF-9057

See merge request espressif/esp-idf!30080
2024-05-07 19:34:39 +08:00
shenmengjing
8815d1a8be docs: Provide CN translation for esp_eth 2024-05-07 18:05:10 +08:00
Linda
52cfd1bf24 docs: fix clock sources for esp32c6 2024-05-07 17:35:39 +08:00
morris
797ce920a7 Merge branch 'test/gdma_fetch_data_in_flash' into 'master'
test(gdma): can read data from flash rodata

See merge request espressif/esp-idf!30479
2024-05-07 12:23:45 +08:00
Erhan Kurubas
7b3b1f4d5f docs(esp32c5): update docs_not_updated.txt 2024-05-06 17:46:26 +02:00
Mo Fei Fei
0de1efcef9 Merge branch 'docs/update_cn_trans_esp_https_ota' into 'master'
docs: update cn trans for esp_https_ota

Closes DOC-7732

See merge request espressif/esp-idf!30579
2024-05-06 18:44:57 +08:00
morris
2352f17e63 test(gdma): can read data from flash rodata 2024-05-06 18:03:17 +08:00
mofeifei
a4d0b370b5 docs: update cn trans for esp_https_ota 2024-05-06 17:48:00 +08:00
kirill.chalov
6cefbfd395 docs: Update alerts in READMEs to GFM format
For details, see https://github.com/orgs/community/discussions/16925
2024-05-06 15:19:15 +08:00
Jakob Hasse
7100c6cf7e docs(esp_ringbuf): Corrected example code block
* Closes https://github.com/espressif/esp-idf/issues/13730
2024-05-02 17:56:02 +02:00
Ivan Grokhotkov
087d055090
fix(pytest): respect --build-dir argument from pytest-embedded 2024-05-02 15:18:34 +02:00
Alexey Gerenkov
57b42fc6a2 docs(app_trace): Update docs for ESP32-P4 2024-05-02 15:24:55 +03:00
David Cermak
97dfde1442 fix(docs): tcpip_adapter: Document replacement of tcpip_adapter_get_sta_list 2024-05-02 14:07:24 +02:00
shenmengjing
a55e6c0eb6 docs: Update the CN Translation for ram-usage.rst 2024-04-30 23:32:22 +08:00
Alexey Lapshin
e1946b6446 feat(docs): update reducing stack size article 2024-04-30 23:32:22 +08:00
Konstantin Kondrashov
a8ba5e86d7 Merge branch 'feature/log_buffer' into 'master'
feat(log): Refactoring buffer log APIs

Closes IDF-8092

See merge request espressif/esp-idf!29559
2024-04-30 20:25:06 +08:00
Marius Vikhammer
baa11d25b0 docs(programming-guide): clean up misc leftover doc updates for P4 2024-04-29 17:52:07 +08:00
Roland Dobai
bc193e6ba9 Merge branch 'fix/docs_p4_tools' into 'master'
change(docs): Update checked tools doc pages for ESP32-P4 programming guide

See merge request espressif/esp-idf!30553
2024-04-29 17:44:51 +08:00
Kevin (Lao Kaiyao)
3e15e7f46e Merge branch 'refactor/isp_af_interrupt_and_callback' into 'master'
refactor(isp): refactor the interrupt and callback solution

See merge request espressif/esp-idf!30176
2024-04-29 17:09:05 +08:00
Roland Dobai
7b0eb8216f change(docs): Update checked tools doc pages for ESP32-P4 programming guide 2024-04-29 09:11:57 +02:00
Dai Zi Yan
1b95af2096 Merge branch 'docs/udpate_cn_trans' into 'master'
docs: update the EN version of size.rst

Closes DOC-7598

See merge request espressif/esp-idf!30166
2024-04-29 15:04:53 +08:00
Mo Fei Fei
1c9a80871a Merge branch 'docs/update_cn_trans_etm' into 'master'
docs: update cn trans for etm.rst

Closes DOC-6622

See merge request espressif/esp-idf!30501
2024-04-29 14:54:09 +08:00
C.S.M
f663c9fa6d Merge branch 'docs/remove_not_update' into 'master'
docs(periph): Remove docs not update for flash, i2c, usj, tsens

Closes IDF-7715, IDF-7727, IDF-7728, and IDF-7739

See merge request espressif/esp-idf!30549
2024-04-29 14:50:52 +08:00
Marius Vikhammer
76b7d12329 Merge branch 'feature/lp_core_interrupts' into 'master'
feat(ulp): support interrupts for C6/P4 LP core

Closes IDFGH-11986 and IDF-7200

See merge request espressif/esp-idf!30399
2024-04-29 14:36:54 +08:00
mofeifei
f5bace9f4d docs: update cn trans for etm.rst 2024-04-29 14:06:57 +08:00
Cao Sen Miao
d41945b585 docs(periph): Remove docs not update for flash, i2c, usj, tsens 2024-04-29 14:03:46 +08:00
Shen Meng Jing
02a3ac37e9 Merge branch 'docs/update_translation' into 'master'
docs: Update the CN translation with the label missing

Closes DOC-7362

See merge request espressif/esp-idf!30131
2024-04-28 17:16:52 +08:00
Marius Vikhammer
c5a513cf49 feat(ulp): support interrupts for C6/P4 LP core
Closes https://github.com/espressif/esp-idf/issues/13059
2024-04-28 17:03:23 +08:00
laokaiyao
2237633ab3 refactor(isp): refactor the interrupt and callback solution
- Added async API
- Replaced the polling API
- Supported one more callback and event data
2024-04-28 16:23:22 +08:00
Armando (Dou Yiwen)
7e9b9d5ee8 Merge branch 'change/rename_csi_api' into 'master'
change(camera): change esp_cam_del_ctlr to esp_cam_ctlr_del

See merge request espressif/esp-idf!30516
2024-04-28 11:54:29 +08:00
shenmengjing
f0ef081d0a docs: Update the CN translation with the label missing 2024-04-28 11:24:37 +08:00
Kirill Chalov
13effc7f23 Merge branch 'docs/improve_sample_project_example' into 'master'
docs: Improve sample project example

See merge request espressif/esp-idf!30270
2024-04-26 16:46:29 +08:00
Armando
0113b39a54 change(camera): change esp_cam_del_ctlr to esp_cam_ctlr_del 2024-04-26 16:04:18 +08:00
Shen Meng Jing
2b0c130a2e Merge branch 'docs/translate_mm_sync' into 'master'
docs: Provide CN Translation for mm_sync.rst in api-reference

Closes DOC-7622

See merge request espressif/esp-idf!30209
2024-04-26 15:42:37 +08:00
Shen Meng Jing
554179609f Merge branch 'docs/translate_spi_flash' into 'master'
Docs/translate spi flash & ulp_macros

Closes DOC-7532

See merge request espressif/esp-idf!29897
2024-04-26 15:31:23 +08:00
Shen Meng Jing
3a0ad2b17e Merge branch 'docs/translate_c_support' into 'master'
docs: Provide translation for c.rst

Closes DOC-7522

See merge request espressif/esp-idf!29863
2024-04-26 15:18:39 +08:00
Shen Meng Jing
57e8d17c45 Merge branch 'docs/translate_system' into 'master'
docs: Provide translation for system.rst (5.3) in migration-guides

Closes DOC-7524

See merge request espressif/esp-idf!29873
2024-04-26 15:18:04 +08:00
kirill.chalov
9bc7e04e1f docs: Improve sample project example 2024-04-26 13:42:30 +08:00
Jakob Hasse
9c965073d4 Merge branch 'feature/linux_backtraces' into 'master'
refactor(linux): Improved error reporting

See merge request espressif/esp-idf!30387
2024-04-25 15:57:07 +08:00
Konstantin Kondrashov
0f4fc2bf55 feat(log): Refactoring buffer log APIs 2024-04-25 08:45:27 +03:00
shenmengjing
7ddc3755ac docs: Provide CN Translation for mm_sync.rst in api-reference 2024-04-25 11:44:08 +08:00
shenmengjing
3b76cae7e7 docs: Provide translation for c.rst 2024-04-25 11:01:13 +08:00
shenmengjing
49ba4c0268 docs: Provide translation for system.rst in migration-guides 2024-04-25 11:00:34 +08:00
Kevin (Lao Kaiyao)
95ab3ccf96 Merge branch 'feature/support_gpio_on_c61' into 'master'
feat(gpio): support GPIO on ESP32C61

Closes IDF-9316

See merge request espressif/esp-idf!30380
2024-04-25 11:00:32 +08:00
shenmengjing
59644bccc2 docs: Provide CN translation for documents under api-reference 2024-04-25 10:59:40 +08:00
xiongweichao
3237cce6b5 docs: Update the process of Bluetooth entering sleep in the sleep_modes.rst 2024-04-25 10:19:41 +08:00
Jakob Hasse
4c5cded945 refactor(linux): Improved error reporting
* Without using GDB, segfaults and aborts are reported
  clearly now
* Without using GDB, segfaults produce a rudimentary
  backtrace now
2024-04-24 18:12:45 +02:00
morris
e8e975112a feat(rmt): support sleep retention
by back up the registers
2024-04-24 22:10:42 +08:00
Mahavir Jain
715d733b15 Merge branch 'example/update_readme_of_pre_encrypted_ota' into 'master'
docs: Update pre_encrypted_ota example README

See merge request espressif/esp-idf!30375
2024-04-24 15:58:02 +08:00
Darian
c9ffd9ddaa Merge branch 'refactor/usb_host_usbh_api' into 'master'
refactor(usb/host): Refactor USBH API

See merge request espressif/esp-idf!30029
2024-04-24 14:50:25 +08:00
laokaiyao
2c90b71d45 feat(gpio): support GPIO on ESP32C61 2024-04-24 14:27:40 +08:00
Song Ruo Jing
0733fa1267 Merge branch 'bugfix/fix_gpio_etm_multi_task' into 'master'
fix(gpio_etm): allow one GPIO binds to multiple ETM tasks

See merge request espressif/esp-idf!30319
2024-04-24 11:35:52 +08:00
Erhan Kurubas
5bac46d996 Merge branch 'coredump_save_all_regions' into 'master'
Save .bss, .data and .heap sections in to the coredump

Closes IDF-2354 and IDFGH-11603

See merge request espressif/esp-idf!29028
2024-04-24 02:49:01 +08:00
Wang Fang
f5e34f6c14 Update CN translation for coredump 2024-04-23 20:13:28 +03:00
Erhan Kurubas
3b8191cf5d feat(coredump): save .bss, .data and .heap sections to the elf file 2024-04-23 19:07:51 +03:00
Song Ruo Jing
bf3067fa8a fix(gpio_etm): allow one GPIO binds to multiple ETM tasks 2024-04-23 20:37:34 +08:00
Abhik Roy
3cb622cbf6 Merge branch 'contrib/github_pr_13348' into 'master'
feat(esp_netif): Allow traffic reporting (GitHub PR)

Closes IDFGH-12314

See merge request espressif/esp-idf!30040
2024-04-23 18:26:59 +08:00
Darian Leung
aa8939e7cc
docs(usb): Add USBH maintainer notes 2024-04-23 17:18:56 +08:00
Mahavir Jain
f2a03f27cf
docs: add more details about pre-encrypted OTA scheme 2024-04-23 14:35:09 +05:30
daiziyan
16bd72bebe docs: update the CN version of size.rst 2024-04-23 14:55:39 +08:00
Darian
9a24782dd2 Merge branch 'contrib/github_pr_13669' into 'master'
docs: clarify ESP_RETURN_ON_ERROR result (GitHub PR)

Closes IDFGH-12678

See merge request espressif/esp-idf!30397
2024-04-23 14:30:00 +08:00
Darian Leung
d2ea044e49
docs(esp_common): Fix formatting issues in error-handling.rst
This commit fixes the following formatting issues in error-handling.rst:

- Incorrect indentation (3 spaces to 4 spaces)
- Fixed some italics that were supposed to be inline literals
- Used code-block directive for language highlighting
2024-04-23 02:34:25 +08:00
Richard Allen
4226d13b01 docs: clarify ESP_RETURN_ON_ERROR result 2024-04-22 09:56:58 -05:00
Roland Dobai
af302c0bee Merge branch 'feat/add_merged_bin_cmd' into 'master'
feat(tools): Add idf.py merge-bin command and cmake target

See merge request espressif/esp-idf!29996
2024-04-22 17:55:36 +08:00
Mo Fei Fei
19471852af Docs: update cn trans for ulp-lp-core.rst 2024-04-22 16:44:44 +08:00
Abhik Roy
ad9787bb4d feat(esp_netif): Allow traffic reporting runtime enable/disable 2024-04-22 11:27:43 +10:00
Shen Meng Jing
ed366b55c2 Merge branch 'docs/translate_configure-builtin-jtag' into 'master'
docs: Provide translation for cofigure-builtin-jtag.rst in jtag-debugging

Closes DOC-7523

See merge request espressif/esp-idf!29867
2024-04-19 19:46:31 +08:00
shenmengjing
6d81e702d9 docs: Provide translation for cofigure-builtin-jtag.rst in jtag-debugging 2024-04-19 18:53:17 +08:00
Wang Zi Yan
020c6931ee docs: Update CN for esp_https_server.rst and tips-and-quirks.rst 2024-04-19 17:37:05 +08:00
Aditya Patwardhan
530fdacd88
fix(docs): Fix DIS_ICACHE related information in host security workflow 2024-04-19 11:29:21 +05:30
Aditya Patwardhan
1366949c8a
feat(docs): Add workflow for externally enabling NVS Encryption
Fix documentation for host based workflows for flash encryption and
    secure boot v2
2024-04-19 11:29:21 +05:30
Kevin (Lao Kaiyao)
7835ce48f1 Merge branch 'ci/enable_doc_build_for_esp32c5' into 'master'
ci(doc): enable doc build for esp32c5

See merge request espressif/esp-idf!30338
2024-04-19 11:50:10 +08:00
Roland Dobai
9b8e2c72ba Merge branch 'docs/coredump_standalone' into 'master'
docs(tools/coredump): add information about standalone tool for advanced users

Closes IDFGH-12407 and IDFGH-12462

See merge request espressif/esp-idf!30039
2024-04-18 21:20:08 +08:00
laokaiyao
fc000cd7b7 ci(doc): enable doc build for esp32c5 2024-04-18 19:39:29 +08:00
Zhi Wei Jian
713e36e776 Merge branch 'bugfix/remove_ble_func_discard_declaration' into 'master'
fix(ble/bluedroid): Remove BLE functions discard declaration

Closes BLERP-663

See merge request espressif/esp-idf!30011
2024-04-18 19:00:55 +08:00
Marius Vikhammer
842b6a1dc4 Merge branch 'bugfix/p4_ulp_wakeup' into 'master'
fix(ulp): fixed lp-core not booting during sleep

Closes IDF-9407

See merge request espressif/esp-idf!30296
2024-04-18 16:23:16 +08:00
zhiweijian
b9a1756202 fix(ble/bluedroid): Remove BLE functions discard declaration
fix(nt/bluedroid): Split the device name set functions

feat(bt/bluedroid): added APIs to get/set device name on BT GAP side

change(bt/common): Marked some APIs in device module as deprecated

1. esp_bt_dev_set_device_name
2. esp_bt_dev_get_device_name

change(bt/bluedroid): use BT GAP APIs to set/get device name in bluetooth classic examples

change(bt/bluedroid): use BT/BLE GAP APIs to set/get device name in coexist examples
2024-04-18 15:53:54 +08:00
zhiweijian
5725595d84 fix(ble/bluedroid): Remove esp_bluedroid_init() discard declaration 2024-04-18 15:53:30 +08:00
shenmengjing
4e0c5d3e8e docs: Provide translation for ecdsa.rst and qemu.rst 2024-04-18 14:58:39 +08:00
Marius Vikhammer
1fa59c442b fix(ulp): fixed lp-core not booting during sleep
LP core was unable to boot when system was in deepsleep.
This was due to lp uart init in LP rom using XTAL as clk source,
which is normally powered down during sleep.

This would cause lp uart to get stuck while printing ROM output,
and the app would never boot.

Also fixed wrong wakeup cause used by HP core for ULP wake up
2024-04-18 11:36:30 +08:00
Cao Sen Miao
ea8be1533a docs(jpeg): Add docs for explain pixel order supported in jpeg driver 2024-04-17 19:16:44 +08:00
Wang Fang
c86952ed9d docs: Updated CN translation for coredump 2024-04-17 14:56:02 +08:00
Zhang Xiao Yan
36c860a588 Merge branch 'docs/add_description_configure_usb_pins_to_gpio' into 'master'
docs: add code snippet showing how to configure usb pins to gpio

See merge request espressif/esp-idf!30236
2024-04-17 14:03:07 +08:00
Jiang Jiang Jian
64c41c82cb Merge branch 'docs/update_build_system' into 'master'
docs: update a typo in the build system document

Closes DOC-6637

See merge request espressif/esp-idf!29969
2024-04-17 10:41:55 +08:00
Jan Beran
0dec6fe65d feat(tools): Add idf.py merge-bin command and cmake target 2024-04-16 12:49:18 +02:00
Linda
3b7e16f182 docs: add code snippet showing how to configure usb pins to gpio 2024-04-16 14:53:12 +08:00
Kirill Chalov
ddb6db4bb4 Merge branch 'docs/update_example_readme_template' into 'master'
docs: Update ESP Timer example README

See merge request espressif/esp-idf!29844
2024-04-16 10:40:11 +08:00
Michael (XIAO Xufeng)
a30375f335 Merge branch 'doc/auto_suspend_disabled_by_default' into 'master'
doc(flash): fix auto suspend enabled by default issue

See merge request espressif/esp-idf!30086
2024-04-15 23:48:37 +08:00
Xiao Xufeng
ca93d4e1eb doc(flash): fix auto suspend enabled by default issue 2024-04-15 17:47:31 +08:00
kirill.chalov
0dfd78800f docs: Update example README template and other related docs 2024-04-15 17:17:27 +08:00
morris
c5389ac2fd Merge branch 'feature/rmt_simple_encoder' into 'master'
RMT simple encoder

See merge request espressif/esp-idf!29874
2024-04-15 15:23:18 +08:00
Zhang Xiao Yan
69972b2a1e Merge branch 'docs/update_deep_sleep_stub' into 'master'
docs: update api-guides/deep-sleep-stub

See merge request espressif/esp-idf!25258
2024-04-15 12:45:35 +08:00
Linda
2dc0be81fb docs: update api-guides/deep-sleep-stub 2024-04-15 11:43:19 +08:00
Erhan Kurubas
72f463afc6 Merge branch 'doc_update_esp32p4_jtag' into 'master'
Update esp32p4 jtag debugging guide

Closes IDF-7758

See merge request espressif/esp-idf!26527
2024-04-13 02:10:21 +08:00
Zhang Xiao Yan
4018c719e9 Merge branch 'docs/add_example_code_snippet_ota' into 'master'
docs: add code snippet for checking OTA state

See merge request espressif/esp-idf!30157
2024-04-11 18:23:20 +08:00
Linda
b4be134ca3 docs: add code snippet for checking OTA state 2024-04-11 16:04:07 +08:00
Jeroen Domburg
0078680e88 feat(rmt): Add simple callback encoder 2024-04-11 15:54:52 +08:00
Cao Sen Miao
896cebaf8b docs(jpeg): Add full-content of jpeg decoder and encoder programming guide 2024-04-11 10:22:01 +08:00
Xu Xiao
f0365ba6b5 Merge branch 'chip/esp32c5_beta3_support_wifi_rebase_master' into 'master'
feat(wifi): add esp32c5 beta3 wifi support

See merge request espressif/esp-idf!29296
2024-04-10 20:21:47 +08:00
Linda
28f12230ae docs: update description of USB-JTAG GPIOs 2024-04-10 15:58:01 +08:00
xuxiao
27f61966cd feat(wifi): add esp32c5 beta3 wifi support 2024-04-10 14:09:40 +08:00
Zhang Xiao Yan
96c81c87bf Merge branch 'docs/add_two_terms_flash_psram_config' into 'master'
docs: add two terms to api-guides/flash_psram_config

See merge request espressif/esp-idf!30100
2024-04-09 18:45:06 +08:00
Shen Meng Jing
4050927f5f Merge branch 'docs/translate_cloud-framework' into 'master'
docs: Provide translation for cloud-framework.rst

Closes DOC-7507

See merge request espressif/esp-idf!29807
2024-04-09 18:37:09 +08:00
Shen Meng Jing
35c4b059e4 Merge branch 'docs/translate_usb_host_notes_index' into 'master'
docs: Provide translation for usb_host_notes_index.rst in api-reference

Closes DOC-7527

See merge request espressif/esp-idf!29877
2024-04-09 17:38:04 +08:00
shenmengjing
e445141b10 docs: Provide translation for cloud-framework.rst 2024-04-09 17:37:00 +08:00
Zhang Xiao Yan
d7de67bd36 Merge branch 'docs/update_description_uart_interrupt' into 'master'
docs: update the description of UART interrupt

See merge request espressif/esp-idf!30118
2024-04-09 16:34:55 +08:00
Cao Sen Miao
ca23d58cf3 change(jpeg): Clean up some mess code in jpeg encoder 2024-04-09 11:33:29 +08:00
Linda
8d36c6257e docs: add two terms to api-guides/flash_psram_config 2024-04-09 11:09:28 +08:00
Linda
544b655a40 docs: update the description of UART interrupt 2024-04-09 10:52:53 +08:00
Linda
0866b63aa9 docs: fix a typo in api-reference/system/freertos_idf 2024-04-08 16:11:39 +08:00
Mahavir Jain
b185b2b3c2 Merge branch 'feature/mbedtls_error_str_config' into 'master'
feat(mbedtls): add kconfig option for MBEDTLS_ERROR_C

See merge request espressif/esp-idf!30031
2024-04-08 11:10:59 +08:00
C.S.M
6224fca8a0 Merge branch 'feature/support_lp_i2c_in_drv' into 'master'
feat(i2c_master): Add feature for support using lp_i2c in i2c_master driver

See merge request espressif/esp-idf!29907
2024-04-07 19:27:04 +08:00
morris
d908150adc fix(rmt): calarify partial receive is not support on esp32
because of lack hardware support
2024-04-07 14:33:39 +08:00
Roland Dobai
54fd736bcd Merge branch 'docs/external_flash' into 'master'
docs(idf_py): Describe the option to configure esptool.py with --extra-args

Closes IDFGH-4513

See merge request espressif/esp-idf!29851
2024-04-07 13:50:05 +08:00
Shen Meng Jing
328247d89c Merge branch 'docs/translate_system.rst' into 'master'
Provide translation for system.rst in migration-guides

Closes DOC-7488

See merge request espressif/esp-idf!29793
2024-04-07 13:37:34 +08:00
shenmengjing
ce709de0f4 docs: Edit the CN Translation of usb_host_notes_index 2024-04-07 12:19:18 +08:00
shenmengjing
fb7823f7f3 docs: Provide translation for system.rst in migration-guides 2024-04-07 12:11:44 +08:00
Peter Dragun
1830f58920 docs(tools/coredump): add warning about core dump usage with encrypted parttion
Closes https://github.com/espressif/esp-coredump/issues/8
2024-04-05 15:41:00 +02:00
Erhan Kurubas
9e80e127ac doc(jtag): update esp32p4 jtag debugging guide 2024-04-04 21:37:56 +03:00
Peter Dragun
e5760b35a5 docs(tools/coredump): add information about standalone tool for advanced users
Closes https://github.com/espressif/esp-idf/issues/13433
2024-04-04 16:47:32 +02:00
Mahavir Jain
78ff15602e
docs: add note about newly added mbedtls config to reduce app size footprint 2024-04-04 09:23:05 +05:30
Cao Sen Miao
d16e890993 docs(i2c_master): Add docs for lp_i2c support in i2c master driver 2024-04-03 11:39:10 +08:00
shenmengjing
b8808f4211 docs: Edit the CN Translation and EN Source of usb-host 2024-04-03 10:45:06 +08:00
Gao Xu
db3e43908a Merge branch 'feat/add_esp_dma_capable_malloc' into 'master'
dma_utils: add esp dma capable malloc function

Closes IDF-9638

See merge request espressif/esp-idf!29869
2024-04-02 21:31:45 +08:00
Aditya Patwardhan
0dcd692d59 Merge branch 'fix/fix_esp32p4_flash_encryption' into 'master'
fix(bootloader_support): Fix default key usage for flash encryption

See merge request espressif/esp-idf!29968
2024-04-02 19:57:38 +08:00
Aditya Patwardhan
727d99e2a7 Merge branch 'docs/update_esp32p4_security_docs' into 'master'
docs(security): Update security-related docs for ESP32-P4

See merge request espressif/esp-idf!29970
2024-04-02 19:50:44 +08:00
Aditya Patwardhan
51a91259d7
fix(bootloader_support): Fix default key usage for flash encryption 2024-04-02 12:27:53 +05:30
gaoxu
40f38bea6f feat(dma): refactor dma calloc function 2024-04-02 14:30:14 +08:00
Armando
f0518b3c16 feat(dma): advanced dma malloc helper 2024-04-02 14:30:14 +08:00
Shen Meng Jing
4494fc9829 Merge branch 'doc/translate_visualgdb.rst' into 'master'
Doc/translate visualgdb.rst

Closes DOC-7490

See merge request espressif/esp-idf!29801
2024-04-02 11:51:20 +08:00
Shen Meng Jing
023c17c49a Merge branch 'docs/translate_clion.rst' into 'master'
docs: Provide translation for clion.rst

Closes DOC-7489

See merge request espressif/esp-idf!29794
2024-04-02 11:21:16 +08:00
daiziyan
fbebfcb119 docs: update the CN version in the build system document 2024-04-02 11:04:44 +08:00
Dai Zi Yan
2545edc255 Merge branch 'docs/sync_up_trans' into 'master'
docs: sync up translation for several documents

Closes DOC-7456 and DOC-7534

See merge request espressif/esp-idf!29908
2024-04-02 10:46:49 +08:00
shenmengjing
63df2749c6 docs: Provide translation for visualgdb.rst 2024-04-02 10:31:15 +08:00
shenmengjing
6e3eab1b7c docs: Provide translation for clion.rst 2024-04-02 10:11:14 +08:00
Jiang Jiang Jian
d885808b9f Merge branch 'feature/advanced_roaming_support' into 'master'
Add advanced Wi-Fi roaming support through Wi-Fi app

Closes WIFI-6169, WIFI-4212, WIFIBUG-314, and IDFGH-10713

See merge request espressif/esp-idf!26126
2024-04-02 00:02:41 +08:00
C.S.M
4921c63b70 Merge branch 'feature/jpeg_encoder' into 'master'
feat(jpge): Add basic support for jpeg encoder 🖼️

See merge request espressif/esp-idf!29411
2024-04-01 23:24:21 +08:00
Jiang Jiang Jian
b18a039263 Merge branch 'doc/update_espnow_example' into 'master'
docs(wifi): change the magic varible from int to uint32_t on the receiving side

Closes IDFGH-9560 and IDFGH-9366

See merge request espressif/esp-idf!29845
2024-04-01 23:13:13 +08:00
jgujarathi
9a88dab748 feat(esp_wifi): Add support for advanced roaming as a wifi app
- Adds support for advanced roaming as a wifi app.
2024-04-01 23:00:01 +08:00
harshal.patil
1975c1c69e
docs(security): Update security-related docs for ESP32-P4 2024-04-01 17:34:28 +05:30
Cao Sen Miao
69835ebaac docs(jpeg_encoder): Add the documents support for jpeg encoder 2024-04-01 20:03:41 +08:00
daiziyan
178f80a170 docs: update a typo in the build system document 2024-04-01 19:29:05 +08:00
Jiang Jiang Jian
7347042d9a Merge branch 'feat/multi_antenna_support' into 'master'
feat(phy): refactor multiple antenna, support for WIFI/BT/BLE

Closes FCS-1279

See merge request espressif/esp-idf!26534
2024-04-01 17:36:11 +08:00
daiziyan
5fb96ec687 docs: sync up translation for several documents 2024-04-01 17:13:47 +08:00
Mahavir Jain
999f3f69c0 Merge branch 'esp32p4/deterministic_ecdsa_support' into 'master'
Add deterministic ECDSA support

Closes IDF-8507

See merge request espressif/esp-idf!29010
2024-04-01 16:45:14 +08:00
alanmaxwell
565660db87 docs: disable build phy.rst for esp32p4 2024-04-01 14:59:57 +08:00
alanmaxwell
1d763691ea docs(phy): rewrite multi antenna docs 2024-04-01 14:59:57 +08:00
alanmaxwell
a6cc70e6e7 docs: seperate multiple antennas from Wi-Fi to PHY 2024-04-01 14:59:27 +08:00
alanmaxwell
0f73cf50fb refactor(wifi): Add deprecated attribute for WiFi multiple antennas api 2024-04-01 14:59:27 +08:00
Armando
e62e8844c7 doc(isp): updated isp evn detector doc 2024-04-01 12:00:54 +08:00
Armando (Dou Yiwen)
9e8f5364eb Merge branch 'feat/isp_af_driver' into 'master'
isp: added isp driver framework and isp af driver

See merge request espressif/esp-idf!27937
2024-04-01 10:44:48 +08:00
Armando
da1550d074 change(codespell): fix some wrong spell 2024-04-01 09:30:07 +08:00
Armando
c50e42b7d5 doc(isp): added isp programming guide 2024-04-01 09:30:07 +08:00
shenmengjing
dbfc2bff84 docs: Provide translation for usb_host_notes_index.rst in api-reference 2024-03-29 17:33:10 +08:00
shenmengjing
0689c8e233 docs: Provide translation for parlio.rst 2024-03-29 16:13:05 +08:00
harshal.patil
70ef80d974
feat(mbedtls/ecdsa): Add support for deterministic ECDSA signature generation 2024-03-29 12:14:11 +05:30
laokaiyao
94ea9e398e fix(i2s): rollback the breaking change of callback event data
`i2s_event_data_t::data` is deprecated due to the cumbersome usage of secondary pointer
Please use the newly added first-level pointer `i2s_event_data_t::dma_buf` instead
2024-03-29 14:33:25 +08:00
Shen Meng Jing
fc9484785b Merge branch 'docs/translate_a' into 'master'
docs: Provide translation for security.rst in migration-guides

Closes DOC-7475

See merge request espressif/esp-idf!29773
2024-03-29 12:56:15 +08:00
Aditya Patwardhan
43d934ffb2 Merge branch 'feature/ota_buffer_cap_config' into 'master'
feat(esp_https_ota): Add config to configure memory capability for OTA buffer

Closes IDF-8836

See merge request espressif/esp-idf!27927
2024-03-29 12:51:25 +08:00
Shen Mengjing
57877a682e docs: Provide translation for security.rst in migration-guides 2024-03-29 11:59:22 +08:00
Roman Leonov
d734f150ee docs(usb_device): Added HighSpeed description for tinyusb config structure 2024-03-28 16:40:55 +01:00
Radim Karniš
cb4b433ddc docs(idf_py): Describe the option to configure esptool.py with --extra-args
Closes https://github.com/espressif/esp-idf/issues/6337
2024-03-28 12:09:50 +01:00
Harshit Malpani
8f8528a10c
feat(esp_https_ota): Add config to configure memory capability for OTA buffer
Add `Tuning OTA Performance` section in OTA documentation
2024-03-28 11:11:07 +05:30
Marius Vikhammer
f1e65b8373 docs(misc): fixed typos found with codespell 2024-03-28 11:50:58 +08:00
Armando (Dou Yiwen)
8d6e8f6051 Merge branch 'doc/csi_programming_guide_change' into 'master'
doc(camera): camera_driver.rst change

See merge request espressif/esp-idf!29864
2024-03-28 09:21:22 +08:00
C.S.M
333e8aa19e Merge branch 'feature/support_i2c_timeout' into 'master'
feature(i2c_master): Add a parameter for config the scl await value

See merge request espressif/esp-idf!29787
2024-03-27 18:14:58 +08:00
Armando
38d6e84ec2 doc(camera): camera_driver.rst change 2024-03-27 16:41:20 +08:00
zhangyanjiao
ff2862b747 docs(wifi): update the docmentation for sniffer API
Closes https://github.com/espressif/esp-idf/issues/10740
2024-03-27 12:15:09 +08:00
Armando
699f3e1245 fix(jpeg): fixed lack of the jpeg_types.h include in Doxyfile_esp32p4 file 2024-03-27 10:40:59 +08:00
Armando
bdceef252b doc(camera): added camera controller driver programming guide 2024-03-27 10:40:58 +08:00
Cao Sen Miao
ede1df51b0 feat(i2c_master): Add parameter to config I2C scl await time 2024-03-27 10:35:11 +08:00
morris
cf59c00564 change(mpll): clean up mpll clock acquire with ldo driver 2024-03-25 22:03:49 +08:00
morris
7de228d0a3 docs(ldo): add api reference for ldo regulator driver 2024-03-25 21:19:12 +08:00
Armando
ec44556a07 feat(sd): added power control driver and implementation layer with ldo 2024-03-25 11:32:56 +08:00
morris
79897ccd10 Merge branch 'feature/fast_gpio_esp32p4' into 'master'
feat(fast_gpio): support fast GPIO and glitch filter on esp32p4

Closes IDF-7552, IDF-8974, IDF-7721, and IDF-7481

See merge request espressif/esp-idf!28642
2024-03-23 22:25:58 +08:00
Mo Fei Fei
6f5c960684 Merge branch 'docs/update_cn_trans_spiffs' into 'master'
docs: update cn trans for spiffs.rst

Closes DOC-7305

See merge request espressif/esp-idf!29758
2024-03-22 18:55:45 +08:00
morris
f71044c877 feat(fast_gpio): support CPU controlled fast GPIO driver on esp32p4 2024-03-22 17:13:19 +08:00
mofeifei
0a274639a8 docs: update cn trans for spiffs.rst 2024-03-22 16:13:45 +08:00
morris
5126526ffc Merge branch 'bugfix/mipi_dsi_write_back_size_check' into 'master'
docs: Add MIPI DSI API reference

Closes IDF-7714

See merge request espressif/esp-idf!29768
2024-03-22 14:17:45 +08:00
morris
7d37e5655c docs(lcd): add api reference for mipi dsi lcd
docs(lcd): add api reference for mipi dsi lcd
2024-03-21 18:19:58 +08:00
laokaiyao
c9d6a11d1d feat(esp32c5mp): support to run hello world on esp32c5 mp 2024-03-21 16:18:03 +08:00
Roland Dobai
5da7c6e3b2 Merge branch 'docs/docker_groupid' into 'master'
docs(docker): add note about group ID when host device is added to container

Closes IDFGH-12342

See merge request espressif/esp-idf!29717
2024-03-20 19:54:39 +08:00
Frantisek Hrbata
6554cac7dc docs(docker): add note about group ID when host device is added to container
Closes https://github.com/espressif/esp-idf/issues/13373

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
2024-03-20 11:15:36 +01:00
Ondrej Kosta
9d0b8d62b0 Merge branch 'feature/emac_intr_prio' into 'master'
feat(esp_eth): added option to configure interrupt priority

Closes IDF-7969

See merge request espressif/esp-idf!29300
2024-03-19 21:09:30 +08:00
C.S.M
5e47ed70c2 Merge branch 'bugfix/i2c_no_pull_up' into 'master'
fix(i2c_master): Fix issue that initialize esp32 fails and using i2c_master_probe issue IF NO PULL-UP ON PINS. And add nack check

Closes IDFGH-11838, IDFGH-13142, and IDFGH-13398

See merge request espressif/esp-idf!29667
2024-03-19 12:25:34 +08:00
Marius Vikhammer
4700f709ca Merge branch 'feature/c5_ulp' into 'master'
feat(ulp): add basic support for running lp core on C5

Closes IDF-8637

See merge request espressif/esp-idf!29496
2024-03-19 11:33:51 +08:00
Cao Sen Miao
016877b7ce fix(i2c_master): Fix issue that initialize esp32 and using i2c_master_probe issue,
and probe might failed.
Fixed I2C cannot return err code when nack detected
Closes https://github.com/espressif/esp-idf/issues/13213,
Closes https://github.com/espressif/esp-idf/issues/12929,
Closes https://github.com/espressif/esp-idf/issues/13398,
2024-03-19 11:07:13 +08:00
C.S.M
61bb752cdb Merge branch 'bugfix/improve_jpeg_dec' into 'master'
fix(jpeg_decoder): Improve apis for better align strategy and provide buffer size parameter

See merge request espressif/esp-idf!29687
2024-03-19 10:10:52 +08:00
Nachiket Kukade
4971764917 feat(esp_wifi): Refactor and improve FTM code
Enable FTM Responder mode for ESP32C6. Update wifi libs with below -

1. Break FTM State Machine code into separate functions
2. Use dynamic allocation for FTM session to save memory
3. Add API to get FTM report instead of event based mechanism
4. Add FTM Request retry and comeback support

Closes https://github.com/espressif/esp-idf/issues/6810
2024-03-18 22:01:36 +08:00
Cao Sen Miao
ba6a0d59b0 fix(jpeg_decoder): Improve apis for better align strategy and provide buffer size parameter 2024-03-18 18:32:22 +08:00
Alexey Lapshin
994b4ed459 Merge branch 'feature/update-toolchain-to-esp-13.2.0_20240305' into 'master'
feat(tools): update toolchain version to esp-13.2.0_20240305

Closes IDFGH-2549

See merge request espressif/esp-idf!29430
2024-03-18 16:58:39 +08:00
Marius Vikhammer
cd1b0dafa7 Merge branch 'docs/p4_misc_docs' into 'master'
docs(ulp): updated lp core docs with P4 related info

Closes IDF-7752, IDF-7741, IDF-7740, IDF-9485, IDF-9473, and IDF-9474

See merge request espressif/esp-idf!29592
2024-03-18 14:12:26 +08:00
Song Ruo Jing
90bf2772ac fix(uart): Fix mismatch wakeup rising edges required with the threshold configured
Closes https://github.com/espressif/esp-idf/issues/12586
2024-03-15 16:58:33 +08:00
Alexey Lapshin
31a951268a feat(newlib): get rid of dirent.h in favor of toolchain 2024-03-15 12:36:00 +04:00
morris
61a283fdb5 Merge branch 'docs/sync_up_trans' into 'master'
docs:sync up CN translation for several documents

Closes DOC-7339

See merge request espressif/esp-idf!29553
2024-03-15 10:49:29 +08:00
Dai Zi Yan
f3686dcc73 Merge branch 'docs/add_Chinese_translation_for_api-reference/peripherals/usb_device.rst' into 'master'
docs: provide CN translation for api-reference/peripherals/usb_device.rst

Closes DOC-5759

See merge request espressif/esp-idf!24835
2024-03-15 10:31:59 +08:00
morris
7bd5c62659 Merge branch 'feature/specify_rmt_intr_cpu_affinity' into 'master'
doc(rmt): clarification on payload memory management and isr latency impact

Closes IDFGH-10396 and IDFGH-12068

See merge request espressif/esp-idf!24755
2024-03-15 10:05:58 +08:00
caixinying-git
cb9df99073 docs: provide CN translation for api-reference/peripherals/usb_device.rst 2024-03-14 17:38:43 +08:00
morris
7b135c4b8a docs(rmt): clarification on memory and isr lantency
Closes https://github.com/espressif/esp-idf/issues/11651
Closes https://github.com/espressif/esp-idf/issues/13129
2024-03-14 14:23:12 +08:00
zhangyanjiao
68c887ead7 docs(wifi): Updated the LMK description in ESP-NOW
Closes https://github.com/espressif/esp-idf/issues/12976
2024-03-14 10:39:47 +08:00
Marius Vikhammer
a32fb07e7b feat(ulp): add basic support for running lp core on C5 2024-03-13 17:37:29 +08:00
daiziyan
9ab87226fe docs:sync up CN translation for several documents 2024-03-13 17:19:32 +08:00
Island
222f066691 Merge branch 'feature/ble_mesh_update_document_link' into 'master'
feat(ble_mesh): update the link of BLE-MESH 1.1 specification and model specification

See merge request espressif/esp-idf!26042
2024-03-13 17:16:03 +08:00
Mahavir Jain
6dd040a61b Merge branch 'update/update_certs_bundle' into 'master'
Update esp_crt_bundle certificates

See merge request espressif/esp-idf!29562
2024-03-13 15:42:31 +08:00
wangjialiang
ae97d9aecf feat(ble_mesh): update the link of BLE-MESH 1.1 specification and model specification 2024-03-13 15:36:18 +08:00
Marius Vikhammer
1e64c458b2 docs(ulp): updated lp core docs with P4 related info 2024-03-13 12:01:30 +08:00
Jakob Hasse
1deef8bee9 docs(heap): Fixed mistake in the heap allocator docs
Closes https://github.com/espressif/esp-idf/issues/13353
2024-03-12 10:24:35 +08:00
Espressif BOT
bebdf7b989 change(mbedtls/crt_bundle): Update esp_crt_bundle certificates 2024-03-12 10:00:36 +08:00
Ethan Bowering
6ed5e98787 docs(kconfig): Correct typo "boolens" to "Booleans" 2024-03-10 12:25:44 -04:00
Ren Pei Ying
3a9dd08979 docs: Provide Chinese translation for api-reference/system/ulp_instruction_set.rst 2024-03-08 17:43:36 +08:00
Wan Lei
966f47f5c1 Merge branch 'feat/c5_spi_support' into 'master'
feat(spi): bring up c5 spi master/slave/hd driver

Closes IDF-8698, IDF-8699, and IDF-8700

See merge request espressif/esp-idf!29133
2024-03-08 09:41:21 +08:00
Anton Maklakov
686a0e4f0f docs(qemu): add system dependencies list 2024-03-07 20:37:24 +08:00
Mo Fei Fei
e9241fd269 Merge branch 'docs/update_cn_trans_intr_alloc.rst' into 'master'
doc: update cn trans intr_alloc.rst

Closes DOC-7265

See merge request espressif/esp-idf!29103
2024-03-07 19:12:31 +08:00
Mo Fei Fei
3812d314d2 doc: update cn trans intr_alloc.rst 2024-03-07 19:12:31 +08:00
wanlei
0cf11e5b87 feat(spi): add esp32c5 spi support 2024-03-07 18:11:48 +08:00
Ondrej Kosta
6a09d98089 feat(esp_eth): added option to configure interrupt priority 2024-03-07 10:30:32 +01:00
Sudeep Mohanty
0de2912f91 Merge branch 'fix/esp_system_requires_esp_gdbstub' into 'master'
fix(esp_system): Updated the CMakeLists.txt to add requirement for esp_gdbstub component

Closes IDFGH-12162

See merge request espressif/esp-idf!29132
2024-03-07 16:24:46 +08:00
C.S.M
831c354cf6 Merge branch 'contrib/github_pr_13090' into 'master'
Update temp_sensor.rst documentation to match example (GitHub PR)

Closes IDFGH-12025

See merge request espressif/esp-idf!28846
2024-03-06 10:11:40 +08:00
BOT
c07862cee8 Update temp_sensor.rst documentation to match example (GitHub PR) 2024-03-06 10:11:40 +08:00
Mahavir Jain
842a658322 Merge branch 'feature/add_jtag_re_enable_example' into 'master'
feat: add example to re-enable jtag using hmac peripheral

Closes IDF-6909 and IDF-6910

See merge request espressif/esp-idf!26672
2024-03-05 17:52:59 +08:00
Mahavir Jain
c8651c1041 Merge branch 'docs/custom_endpoint_response_memory_allocation' into 'master'
docs(wifi_provisioning): Use heap to allocate memory for the response

Closes IDFGH-12210

See merge request espressif/esp-idf!29402
2024-03-05 16:30:36 +08:00
mofeifei
3dc5bfd58b docs: update cn trans fatal-errors 2024-03-05 15:52:37 +08:00
Shang Zhou
c3d7ef1a0f Merge branch 'docs/sync_api-guides_files' into 'master'
docs: sync low-power-mode and usb-serial-jtag-console

Closes DOC-7008

See merge request espressif/esp-idf!29368
2024-03-05 11:48:56 +08:00