alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-21 06:56:11 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
33,489 Commits 19 Branches 147 Tags 378 MiB
3c8cccc73b
Commit Graph

1838 Commits

Author SHA1 Message Date
Cai Xin Ying
03c15adc94 docs: update format issues for EN and CN files under api-reference/system and... 2023-08-03 11:32:07 +08:00
morris
23585c9af4 Merge branch 'docs_provide_CN_trans_for_contribute_index.rst' into 'master' 
docs:Provide CN translation for contribute/index.rst

Closes DOC-5844

See merge request espressif/esp-idf!25019
 2023-08-03 10:32:46 +08:00
renpeiying
8163dbbbb4 docs:Provide CN translation for contribute/index.rst 2023-08-02 14:34:00 +08:00
Alexey Lapshin
a120ea823e Merge branch 'contrib/github_pr_11569' into 'master' 
[GDBStub] kconfig gdbstub runtime should be separate bool (GitHub PR)

Closes IDF-7846 and IDFGH-10309

See merge request espressif/esp-idf!24775
 2023-08-02 07:50:47 +08:00
Lou Tian Hao
3f6be5938b Merge branch 'docs/rewrite_all_low_to_any_low_when_not_esp32' into 'master' 
Docs: rewrite_all_low_to_any_low_when_not_esp32

See merge request espressif/esp-idf!24997
 2023-08-01 20:56:36 +08:00
Alexey Lapshin
47e400c296 feature(gdbstub): Move runtime gdbstub out of panic config 
Closes https://github.com/espressif/esp-idf/pull/11569
 2023-08-01 14:28:07 +04:00
Lou Tianhao
f33188fb35 docs(pm/sleep): rewrite_all_low_to_any_low_when_not_esp32 2023-08-01 11:53:14 +08:00
morris
4478c13ea4 Merge branch 'docs_add_Chinese_translation_for_api-reference_peripherals/sdm.rst' into 'master' 
docs: provide CN translation for api-reference/peripherals/sdm.rst

Closes DOC-5813

See merge request espressif/esp-idf!24986
 2023-07-31 11:39:50 +08:00
Dai Zi Yan
8b9610b94f Merge branch 'docs/udpate_memory-types' into 'master' 
Docs/udpate memory types

Closes DOC-5388 and DOC-5157

See merge request espressif/esp-idf!24392
 2023-07-31 10:45:12 +08:00
Ivan Grokhotkov
cfa1896780 Merge branch 'contrib/github_pr_11535' into 'master' 
Replace deprecated flushregs alias with full gdb command (GitHub PR)

Closes IDFGH-10272

See merge request espressif/esp-idf!24752
 2023-07-28 22:40:22 +08:00
Marius Vikhammer
c5427cdb07 docs: add H2 to list of supported series to front page doc 2023-07-28 11:43:10 +08:00
caixinying-git
0ae5e9afcd docs: provide CN translation for api-reference/peripherals/sdm.rst 2023-07-28 11:26:15 +08:00
daiziyan
1037135761 docs: provided translation for storage.rst and system.rst and updated a typo for memory-types.rst 2023-07-27 16:24:29 +08:00
Cai Xin Ying
02a9be9292 Merge branch 'docs/add_Chinese_translation_for_api-guides/performance/ram-usage.rst' into 'master' 
docs: provide CN translation for api-guides/performance/ram-usage.rst

Closes DOC-5170

See merge request espressif/esp-idf!23721
 2023-07-26 10:38:06 +08:00
caixinying-git
d47457b29b docs: provide CN translation for api-guides/performance/ram-usage.rst 2023-07-25 19:04:41 +08:00
morris
ed36b91517 Merge branch 'feature/mcpwm_trigger_driver' into 'master' 
feature(MCPWM): Add MCPWM trigger driver

Closes IDF-3613

See merge request espressif/esp-idf!24829
 2023-07-25 18:50:57 +08:00
Chen Jichang
5ab755915b feature(MCPWM): Add MCPWM trigger driver and test 
Each MCPWM operator has two Trigger (named T0 and T1), and they can be
routed to GPIO fault signal or timer sync event.Generator can be set up
to perform different action on Trigger event.
This commit add a trigger driver and a test for the driver.
 2023-07-25 14:44:41 +08:00
caixinying-git
a67b37330d docs: update format issues for EN and CN files under api-reference/provisioning and api-reference/storage 2023-07-24 17:21:09 +08:00
Cai Xin Ying
fcaaf885ab Merge branch 'docs/add_Chinese_translation_for_api-guides_hardware-abstraction.rst' into 'master' 
docs: provide CN tranlsation for api-guides/hardware-abstraction.rst

Closes DOC-5451

See merge request espressif/esp-idf!24147
 2023-07-24 10:02:11 +08:00
Cai Xin Ying
e9ba6b611e Merge branch 'docs/add_Chinese_translation_for_api-guides/host-apps.rst' into 'master' 
docs: provide CN translation for api-guides/host-apps.rst

Closes DOC-5461

See merge request espressif/esp-idf!24260
 2023-07-24 10:01:35 +08:00
Cai Xin Ying
b7cc28f6f1 Merge branch 'docs/update_api-reference/network' into 'master' 
docs: update format issues for EN and CN files under api-reference/network  folder and api-reference folder

Closes DOC-5656

See merge request espressif/esp-idf!24542
 2023-07-21 18:51:21 +08:00
Cai Xin Ying
59bac4de3c docs: update format issues for EN and CN files under api-reference/network folder and api-reference folder 2023-07-21 18:51:21 +08:00
Cai Xin Ying
9667318a67 docs: provide CN translation for api-guides/openthread.rst 2023-07-21 18:45:58 +08:00
caixinying-git
6f9dad8100 docs: provide CN translation for api-guides/host-apps.rst 2023-07-21 16:38:44 +08:00
caixinying-git
fa7a6a6636 docs: provide CN tranlsation for api-guides/hardware-abstraction.rst 2023-07-21 16:33:36 +08:00
Wang Tao
0ac1ee4358 Merge branch 'contrib/github_pr_9694' into 'master' 
add low power doc and picture (GitHub PR)

Closes IDFGH-8201

See merge request espressif/esp-idf!20675
 2023-07-19 17:54:29 +08:00
morris
b488cb70e7 Merge branch 'contrib/github_pr_11878' into 'master' 
feat(mcpwm): Allow for pull up/down to be configurable on generators (GitHub PR)

Closes IDFGH-10647 and IDFGH-10646

See merge request espressif/esp-idf!24825
 2023-07-19 15:01:27 +08:00
morris
b589355a10 feat(mcpwm): support open drain output for generator IO 
Closes https://github.com/espressif/esp-idf/issues/11877
 2023-07-19 11:32:35 +08:00
Roland Dobai
30672c7c65 Merge branch 'docs/monitor_rom_address_decoding' into 'master' 
esp_idf_monitor: ROM ELF address decoding docs and tests

Closes IDF-372

See merge request espressif/esp-idf!24271
 2023-07-17 18:52:29 +08:00
Armando (Dou Yiwen)
2d4dabda25 Merge branch 'feature/added_cache_msync_behaviour_per_direction' into 'master' 
feat(cache): added direction selection to esp_cache_msync API

Closes IDF-7674

See merge request espressif/esp-idf!24614
 2023-07-17 18:04:42 +08:00
Xiong Wei Chao
12d6268095 Merge branch 'docs/update_bluetooth_power_save_readme' into 'master' 
Docs: update bluetooth power save readme

Closes FCS-1258

See merge request espressif/esp-idf!24562
 2023-07-17 12:14:39 +08:00
Wang Zi Yan
3e4152cdcf docs: Update CN for nvs_flash.rst and flash-encryption.rst 2023-07-14 04:05:53 +00:00
Daniel Mangum
647e7a2a71
fix: Replace deprecated flushregs alias with full gdb command 
Usage of `flushregs` in gdb will result in the following warning:

```
Warning: 'flushregs', an alias for the command 'maintenance flush register-cache', is deprecated.
Use 'maintenance flush register-cache'.
```

This patch updates to use the recommend command.

Signed-off-by: Daniel Mangum <georgedanielmangum@gmail.com>
Merges https://github.com/espressif/esp-idf/pull/11535
 2023-07-13 09:26:47 +02:00
Jiang Jiang Jian
60fd11dbf7 Merge branch 'doc/update_wifi_security_mode' into 'master' 
docs: update wifi security mode

Closes IDFGH-8565, IDFGH-8232, WIFI-6124, and WIFI-6125

See merge request espressif/esp-idf!23943
 2023-07-12 15:06:14 +08:00
muhaidong
49bb7bb35e esp_wifi: update multi antenna switch docs 2023-07-12 12:54:02 +08:00
zhangyanjiao
7ae5822f0e fix(wifi): Add bugfixes and improvements 
1. Update wifi security mode
2. Add check for memory allocation in tx buffers
3. Fix association refused temporarily comeback time set to zero issue
 2023-07-11 21:25:24 +08:00
Cai Xin Ying
9de7cbdc18 Docs: Update format issues for EN and CN files under get-started folder 2023-07-11 15:03:50 +08:00
Rotzbua
08019c93bc doc: remove WEP as security mode 
Signed-off-by: zhangyanjiao <zhangyanjiao@espressif.com>

Closes https://github.com/espressif/esp-idf/pull/10015
 2023-07-11 14:33:53 +08:00
Armando
c8f8490a56 doc: remove leading / 2023-07-11 11:19:10 +08:00
Armando
3625db723c doc(mm): added cache msync API direction related descriptions 2023-07-11 11:19:10 +08:00
xiongweichao
d26ad599c4 docs(sleep_modes): Updated Wi-Fi/Bluetooth and Sleep Modes in docs 2023-07-11 11:14:31 +08:00
Doc-intern2
37af2b7a22 Docs: add CN translation for security/security.rst 2023-07-07 17:16:37 +08:00
Song Ruo Jing
ea48030514 Merge branch 'refactor/rtcio_caps_responsibility' into 'master' 
refactor(driver/rtcio): Re-wrap RTCIO APIs with more accurate soc_caps

Closes IDF-7406

See merge request espressif/esp-idf!24522
 2023-07-07 14:25:47 +08:00
Mahavir Jain
c3e5f05622 Merge branch 'example/remove_http2_example' into 'master' 
remove(http2_request): Move http2_request example to idf-extra-components repository

Closes IDF-7659

See merge request espressif/esp-idf!24561
 2023-07-07 13:25:02 +08:00
Cai Xin Ying
0f31b73e9c Merge branch 'docs/add_protocomm_trans' into 'master' 
Docs: add CN translation for api-reference/provisioning/protocomm.rst

Closes DOC-5320

See merge request espressif/esp-idf!24069
 2023-07-07 10:31:18 +08:00
chenjianxing
b24bc1c0d6 docs: update power save part 2023-07-06 11:57:38 +00:00
wang tao
366ae76812 add low power doc and picture 
Merges https://github.com/espressif/esp-idf/pull/9694
 2023-07-06 11:57:38 +00:00
caixinying-git
386d408868 docs: Provide CN translation for api-reference/protocols/esp_tls.rst and update both EN and CN texts for api-reference/error-codes.rst 2023-07-06 18:50:44 +08:00
Li Xiaoyi
6e987afabe Docs: add CN translation for api-reference/provisioning/protocomm.rst 2023-07-06 15:56:21 +08:00
Jakob Hasse
47bcee11b7 Merge branch 'refactor/secondary_console_usb_serial_improvement' into 'master' 
refactor(console): Warn if secondary console is active

Closes IDFGH-10484

See merge request espressif/esp-idf!24494
 2023-07-06 15:08:01 +08:00
Wang Fang
6ae9acb345 docs: fixed formatting issues in spi_flash_concurrency document 2023-07-06 11:15:31 +08:00
caixinying-git
caf3f6b5fb docs: provide CN translation for api-guides/tools/idf-docker-image.rst 2023-07-05 16:39:14 +08:00
Song Ruo Jing
4985caa38f refactor(driver/rtcio): Re-wrap RTCIO APIs with more accurate soc_caps 2023-07-05 11:47:51 +08:00
Krzysztof Budzynski
b10e69985f Merge branch 'contrib/github_pr_11743' into 'master' 
docs(jtag): Update chip revisions to follow ESP32-C3 errata (GitHub PR)

Closes IDFGH-10497

See merge request espressif/esp-idf!24467
 2023-07-04 19:20:42 +08:00
daiziyan
4a5600fdd2 docs: update CN translation for console.rst 2023-07-04 14:46:32 +08:00
Krzysztof
d552d61abf docs(jtag): Update CN translation of 'api-guides/jtag-debugging/index.rst' 2023-07-04 12:28:12 +08:00
Zhang Xiao Yan
b5bc96693e Merge branch 'docs/fix_typo_in_get_started_start_project' into 'master' 
docs: fix a typo in get-started/start-project

See merge request espressif/esp-idf!24526
 2023-07-04 10:14:29 +08:00
Chen Ji Chang
88d6e3e896 Merge branch 'docs/add_a_note_about_RMT_preipheral_in_the_programming_guide' into 'master' 
rmt: add a note about binding channels to the same GPIO

Closes IDFGH-10524

See merge request espressif/esp-idf!24524
 2023-07-03 23:29:42 +08:00
Alexey Lapshin
e270427367 Merge branch 'feature/hw_stack_guard_for_riscv' into 'master' 
esp_system: implement hw stack guard for riscv chips

Closes IDF-7124 and IDF-3839

See merge request espressif/esp-idf!23808
 2023-07-03 20:17:09 +08:00
Harshit Malpani
c24d012808
remove(http2_request): Move http2_request example to idf-extra-components repository 
Related: https://github.com/espressif/idf-extra-components/pull/193/
 2023-07-03 17:46:16 +05:30
Chen Jichang
3f0b46da54 docs(rmt): add a note about binding channels to the same GPIO 
Added a note about RX Channel and TX Channel initialization order when
bound RX and TX to the same gpio.

Closes https://github.com/espressif/esp-idf/issues/11768
 2023-07-03 17:11:22 +08:00
Cai Xin Ying
f30a420a74 Merge branch 'docs/add_Chinese_translation_for_api-reference/peripherals/rmt.rst' into 'master' 
docs: provide CN translation for api-reference/peripherals/rmt.rst

Closes DOC-5219

See merge request espressif/esp-idf!23915
 2023-07-03 10:06:36 +08:00
Alexey Lapshin
4df3ff619e feat(esp_system): implement hw stack guard for riscv chips 
- add hardware stack guard based on assist-debug module
- enable hardware stack guard by default
- disable hardware stack guard for freertos ci.release test
- refactor rtos_int_enter/rtos_int_exit to change SP register inside them
- fix panic_reason.h header for RISC-V
- update docs to include information about the new feature
 2023-07-01 16:27:40 +00:00
Krzysztof Budzynski
ce9b60ca3a Merge branch 'contrib/github_pr_11692' into 'master' 
docs : fix a typo in docs/zh_CN/api-reference/storage/sdmmc.rst (GitHub PR)

Closes IDFGH-10441

See merge request espressif/esp-idf!24288
 2023-06-30 20:09:47 +08:00
caixinying-git
a6c7b52dd6 docs: provide CN translation for api-reference/peripherals/rmt.rst 2023-06-30 18:40:24 +08:00
Linda
b730910a9c docs: fix a typo in get-started/start-project 2023-06-30 17:48:50 +08:00
laokaiyao
8f691d925b ci(network_doc): Fixed the incorrect example path 2023-06-30 11:07:03 +08:00
Cai Xin Ying
9a1d6281c5 Merge branch 'docs/add_provisioning_CN_trans' into 'master' 
Docs: add CN translation for api-reference/provisioning/provisioning.rst

Closes DOC-5384

See merge request espressif/esp-idf!24123
 2023-06-29 11:12:51 +08:00
daiziyan
573fadd5be docs:provide CN translation for idf-monitor 2023-06-28 15:42:05 +02:00
Cai Xin Ying
29f3221b56 Merge branch 'docs/add_Chinese_translation_for_linux-host-requirements.rst_and_external-ram-esp32-notes.rst' into 'master' 
docs: provide CN translation for linux-host-requirements.rst and external-ram-esp32-notes.rst

Closes DOC-5412

See merge request espressif/esp-idf!24115
 2023-06-28 20:03:49 +08:00
caixinying-git
a33b276671 docs: provide CN translation for linux-host-requirements.rst and external-ram-esp32-notes.rst 2023-06-28 16:42:17 +08:00
Lou Tian Hao
7c2ac1feb6 Merge branch 'bringup/esp32h2_light_sleep_for_rebase' into 'master' 
esp32h2: support light_sleep

Closes IDF-6266 and IDF-7359

See merge request espressif/esp-idf!23567
 2023-06-28 10:37:18 +08:00
Jiang Jiang Jian
93fcfbeb54 Merge branch 'bugfix/fix_wifi_espnow_coexist_API_doc' into 'master' 
esp_wifi: fix ret when setting channel at wifi not started, fix timer callback

Closes IDF-7270, WIFI-5607, WIFI-5736, and WIFI-3607

See merge request espressif/esp-idf!23782
 2023-06-27 21:34:53 +08:00
Liu Ning
8514469092 esp_wifi: fix ret when setting channel at wifi not started, fix timer callback 2023-06-27 21:34:53 +08:00
Li Xiaoyi
233d494a06 Docs: add CN translation for api-reference/provisioning/provisioning.rst 2023-06-27 15:44:37 +08:00
Harshit Malpani
d9e8aca7ee
remove(coap)!: Move CoAP examples to idf-extra-components repository 
Related:
https://github.com/espressif/idf-extra-components/pull/188
 2023-06-27 11:16:21 +05:30
Cai Xin Ying
cefbecd41b Merge branch 'docs/trans_wifi_provisioning' into 'master' 
Docs: add CN translation for api-reference/provisioning/wifi_provisioning.rst

Closes DOC-5319

See merge request espressif/esp-idf!24039
 2023-06-27 11:19:08 +08:00
Lou Tianhao
63d32ab620 Power Management: support DFS and PMU feature for esp32h2 2023-06-26 20:57:55 +08:00
Li Xiaoyi
859dfbefcd Docs: add CN translation for api-reference/provisioning/wifi_provisioning.rst 2023-06-26 17:22:08 +08:00
Darian Leung
1ebec10d48 wifi: Fix typos and formatting issues with wifi.rst 
- Used code-blocks for correct highlighting
- Use inline literals for macros
- Fixed some typos
 2023-06-26 16:29:09 +08:00
Cai Xin Ying
87a893dfd2 Merge branch 'docs/update_CN_translation_for_api-reference/network/esp_eth' into 'master' 
Docs: update CN translation for api reference/network/esp-eth

Closes DOC-5522

See merge request espressif/esp-idf!24282
 2023-06-25 16:49:49 +08:00
Cai Xin Ying
c9a60f3919 Docs: update CN translation for api reference/network/esp-eth 2023-06-25 16:49:49 +08:00
Mahavir Jain
62634fcced Merge branch 'feature/add_documentation_for_external_flash_encryption' into 'master' 
flash_encryption_docs: Add documentation regarding enabling flash encryption externally through espefuse tool

Closes IDF-7107

See merge request espressif/esp-idf!23220
 2023-06-23 12:36:12 +08:00
Aditya Patwardhan
d9b66226cd docs/security: Separate documents under different subsection 2023-06-23 08:15:13 +05:30
Gong Yan Tao
d2fb7240a7 Merge branch 'docs/update_esp_hid_host' into 'master' 
[docs] fix documents for Bluetooth HID Host API reference

Closes BT-3328

See merge request espressif/esp-idf!17602
 2023-06-21 15:01:32 +08:00
wangmengyang
d4ac2380e7 component/docs: enable generation of API-reference documents for Bluetooth HID host 2023-06-21 12:02:58 +08:00
Mo Fei Fei
85970f8cf7 Docs: update CN translation for external-ram.rst 2023-06-20 10:45:23 +08:00
Zhang Xiao Yan
4a545a5a0f Merge branch 'docs/format_ap_basic_configuration_tables' into 'master' 
docs: format AP basic configuration tables in wifi.rst

See merge request espressif/esp-idf!23945
 2023-06-19 10:27:19 +08:00
Legend
41bda170b8
Update sdmmc.rst 2023-06-18 01:00:00 +08:00
Aditya Patwardhan
253d80f560 docs/security: Move security related docs in a separate section 2023-06-17 10:04:01 +05:30
Aditya Patwardhan
b078541ca5 docs/Flash encryption: Add encrypted partitions section 2023-06-17 10:04:01 +05:30
Aditya Patwardhan
6d4a116625 docs: Added documentation about enabling the Security Features 
externally with help of espefuse tool

flash_encryption_doc: Fix the document to also inform users about what
happens in case of host generated private key in the Flash encryption process
 2023-06-17 10:04:01 +05:30
Song Ruo Jing
03d4fa2869 Merge branch 'feature/support_lp_uart_for_uart_driver' into 'master' 
uart: Support LP_UART port with UART driver for esp32c6

Closes IDF-7061 and IDF-7374

See merge request espressif/esp-idf!22914
 2023-06-16 20:45:43 +08:00
Li Xiao Yi
2dc7f62974 Merge branch 'docs/add_speed_CN_trans' into 'master' 
Docs: add translation for api-guides/performance/speed.rst

Closes DOC-5229

See merge request espressif/esp-idf!23868
 2023-06-16 17:09:23 +08:00
Song Ruo Jing
921713fff4 uart: Support LP_UART port with UART driver on esp32c6 2023-06-16 07:31:40 +00:00
Li Xiaoyi
a9d0825b1b Docs: add CN translation for api-guides/performance/speed.rst 2023-06-16 15:18:29 +08:00
Konstantin Kondrashov
c350c3c504 Merge branch 'feature/cleanup_wrong_log_use' into 'master' 
all: Removes unnecessary newline character in logs

Closes IDFGH-10197

See merge request espressif/esp-idf!24131
 2023-06-15 21:49:49 +08:00
laokaiyao
7b64de7c20
migration_guide: update adc calibration api part 2023-06-14 13:18:34 +08:00
Radim Karniš
c18cdd8859 Merge branch 'docs/uf2' into 'master' 
docs: Add idf.py uf2 command description

Closes IDF-2589

See merge request espressif/esp-idf!24010
 2023-06-12 18:41:17 +08:00
Li Xiao Yi
38d679c0bd Merge branch 'docs/translate_api-guides_performance' into 'master' 
docs: add translation for docs/zh_CN/api-guides/performance/size.rst

Closes DOC-5208

See merge request espressif/esp-idf!23773
 2023-06-12 12:44:19 +08:00
Doc-intern2
c166bcd6c6 Docs: add translation for api-guides/performance/size.rst 2023-06-12 10:55:37 +08:00
Wang Fang
9549dfc399 Merge branch 'docs/update_documentation_for_spi_driver' into 'master' 
docs: update the description for general purpose spi

Closes DOC-5186

See merge request espressif/esp-idf!23920
 2023-06-12 10:54:25 +08:00
Mo Fei Fei
c78436e796 Docs: Update CN translation for idf-py.rst 2023-06-09 15:53:28 +08:00
Linda
29f68ae5aa docs: format AP basic configuration tables in wifi.rst 2023-06-09 15:04:47 +08:00
Marius Vikhammer
3cabd18133 Merge branch 'docs/h2_timer_docs' into 'master' 
docs: updated misc docs with H2 specific information.

Closes IDF-6682, IDF-6683, and IDF-6694

See merge request espressif/esp-idf!24068
 2023-06-09 12:12:58 +08:00
KonstantinKondrashov
e72061695e all: Removes unnecessary newline character in logs 
Closes https://github.com/espressif/esp-idf/issues/11465
 2023-06-09 03:31:21 +08:00
Wang Zi Yan
8eea8b70aa Docs: Update CN for /api-reference/api-conventions.rst 2023-06-08 07:36:45 +00:00
Cai Xin Ying
d25b5e45aa Merge branch 'docs/add_Chinese_translation_for_api-guides/tools/idf-tools.rst' into 'master' 
docs: provide CN translation for api-guides/tools/idf-tools.rst

Closes DOC-5217

See merge request espressif/esp-idf!23774
 2023-06-08 12:55:42 +08:00
caixinying-git
ec1e03e132 docs: provide CN translation for api-guides/tools/idf-tools.rst 2023-06-08 11:44:07 +08:00
Marius Vikhammer
ccda256058 Merge branch 'docs/ulp_lp_core' into 'master' 
ulp: add lp core docs

Closes IDF-5816

See merge request espressif/esp-idf!24013
 2023-06-07 10:43:23 +08:00
Zhang Xiao Yan
60441881a5 Merge branch 'docs/add_power_measure_module_deep_sleep_mode' into 'master' 
docs: add a chapter to describe how to measure current of modules in deep sleep mode

Closes DOC-517

See merge request espressif/esp-idf!21438
 2023-06-06 18:29:41 +08:00
Marius Vikhammer
d19600e0a7 ulp/lp-core: added docs describing the lp core 2023-06-06 17:42:03 +08:00
Marius Vikhammer
aeeee67164 docs: updated misc docs with H2 specific information. 2023-06-06 09:48:47 +08:00
Michael (XIAO Xufeng)
c5d4abfba1 Merge branch 'docs/sleep_modes_refactor' into 'master' 
doc_sleep: refactor the documentation of power modes

See merge request espressif/esp-idf!23146
 2023-06-05 23:34:15 +08:00
Cai Xin Ying
e93672bc7b docs: Provide CN translation for api-reference/system/heap_debug.rst 2023-06-05 11:12:19 +08:00
Xiao Xufeng
3de91820d7 doc_sleep: refactor the documentation of power modes 2023-06-03 01:50:24 +08:00
morris
7eaf317e60 Merge branch 'contrib/github_pr_11576' into 'master' 
fixing typo: update libs-frameworks.rst  (GitHub PR)

Closes IDFGH-10316

See merge request espressif/esp-idf!24030
 2023-06-02 11:06:01 +08:00
Wang Fang
ed63cbe9cd docs: update the description for general purpose spi 2023-06-02 10:45:44 +08:00
Wang Kai
2a2bfe32db
Update libs-frameworks.rst to fix a typo 2023-06-02 09:35:35 +08:00
Cai Xin Ying
4df1319ecb Provide Chinese Translation for api-reference/system/esp_event.rst 2023-06-01 17:45:22 +08:00
Zheng Zhong
b38e5e1b3c Merge branch 'docs/update_CN_trans_Flash-encryption' into 'master' 
docs: update CN trans for flash-encryption

See merge request espressif/esp-idf!23887
 2023-06-01 10:40:20 +08:00
Marius Vikhammer
9f31c65458 Merge branch 'feature/c6_ulp_gpio' into 'master' 
ulp: added gpio API for lp core

Closes IDF-6834

See merge request espressif/esp-idf!23766
 2023-06-01 09:50:33 +08:00
liuning
ae425ec0b8 docs: update for esp32c6 2023-05-31 15:21:09 +08:00
xuxiao
843107e9d6 docs: update esp32c6 api guides about wifi part 2023-05-31 15:20:40 +08:00
Marius Vikhammer
bb5ea35f01 Merge branch 'docs/c6_misc_updates' into 'master' 
docs: updated misc C6 programming guide docs with minor changes.

See merge request espressif/esp-idf!23962
 2023-05-31 14:45:13 +08:00
Marius Vikhammer
3da38a603a docs: updated misc C6 programming guide docs with minor changes. 2023-05-31 11:17:24 +08:00
Linda
af65960d1c docs: add a chapter to describe how to measure current of modules in deep sleep mode 2023-05-30 18:11:53 +08:00
Linda
e6c3ac2511 docs: update code of how to configure multiple antennas of wifi 2023-05-29 17:01:41 +08:00
Marius Vikhammer
dacc51dd2b ulp/lp-core: added gpio API for lp core as well as an example showcasing it. 2023-05-29 11:13:47 +08:00
KonstantinKondrashov
56b966829d docs: update CN trans for flash-encryption 2023-05-26 16:06:49 +08:00
Laukik Hase
a06118012e
docs: Update nvs_flash docs for the HMAC-based NVS encr-keys protection scheme 
- Also updated the `nvs_partition_generator` and `mass_mfg` tools
  documentation
 2023-05-23 13:55:57 +05:30
Konstantin Kondrashov
1cf46bd0f0 Merge branch 'doc/update_efuse_info' into 'master' 
doc: Update all efuse info files

Closes IDF-5919

See merge request espressif/esp-idf!23824
 2023-05-23 14:47:52 +08:00
Li Xiao Yi
dab0e5230e Merge branch 'docs/add_index_CN_trans' into 'master' 
Docs: add CN translation for api-guides/perfomance/index.rst

Closes DOC-5207

See merge request espressif/esp-idf!23716
 2023-05-22 19:42:31 +08:00
Li Xiao Yi
ff16ce8d7b Docs: add CN translation for api-guides/perfomance/index.rst 2023-05-22 19:42:31 +08:00
Island
72bf74f904 Merge branch 'feature/update_ble_doc_for_esp32c6_esp32h2' into 'master' 
ble docs: Update ble doc for esp32c6 and esp32h2

Closes IDF-5926 and IDF-6686

See merge request espressif/esp-idf!23796
 2023-05-22 18:50:55 +08:00
Cai Xin Ying
60a1f8b5b9 docs: provide CN translation for api-reference/system/esp_err and api-reference/bluetooth/esp_gatts 2023-05-22 11:13:48 +08:00
KonstantinKondrashov
8817760628 doc: Update efuse info files 2023-05-19 15:13:21 +08:00
Shen Weilong
2900ed4858 ble docs: Update the ble docs for esp32c6 and esp32h2 2023-05-19 11:01:11 +08:00
Cai Xin Ying
0cccbc39a3 Merge branch 'docs/add_Chinese_translation_for_api-reference/system/mem_alloc' into 'master' 
Provided Chinese translation for api-reference/system/mem_alloc.rst

Closes DOC-4894

See merge request espressif/esp-idf!23487
 2023-05-16 20:05:05 +08:00
Cai Xin Ying
21f5cb8144 Provided Chinese translation for api-reference/system/mem_alloc.rst 2023-05-16 20:05:04 +08:00
Zhang Xiao Yan
81558fb77d Merge branch 'docs/update_algorithm_and_key_from_aes-xts_to_xts-aes' into 'master' 
docs: update the algorithm and key name from AES-XTS to XTS-AES

See merge request espressif/esp-idf!23742
 2023-05-16 17:39:58 +08:00
Konstantin Kondrashov
adf3142880 docs: Adds a note that a GPIO level of test app boot is configurable 2023-05-16 13:59:19 +08:00
Linda
65ee4992ce docs: update the algorithm and key name from AES-XTS to XTS-AES 2023-05-15 17:54:50 +08:00
Zim Kalinowski
bd1ac6a566 Merge branch 'feature/adds_esp_bootloader_desc_t' into 'master' 
esp_bootloader_format: Adds bootloader description structure to read bootloader version from app

Closes IDFGH-7206 and IDFGH-7573

See merge request espressif/esp-idf!21592
 2023-05-15 17:54:43 +08:00
Jakob Hasse
6f7229975a Merge branch 'doc/improve_prixx_doc' into 'master' 
doc: clarified migration guide regarding PRIxx usage

Closes IDFGH-10042

See merge request espressif/esp-idf!23675
 2023-05-12 17:14:29 +08:00
Mo Fei Fei
d7550703ce Docs: Update CN translation for gcc.rst 2023-05-12 15:02:00 +08:00
C.S.M
12190809f9 Merge branch 'feature/flash_suspend_support' into 'master' 
spi_flash: One more step for supporting flash suspend. 1. Support more esp chips 2. Improve real-time performance 3. Make timing more stable

See merge request espressif/esp-idf!22755
 2023-05-12 14:16:11 +08:00
Cai Xin Ying
fd8cf21e4b Merge branch 'docs/add_Chinese_translation_for_api-guides/tools/idf-py' into 'master' 
docs: add CN translation for api-guides/tools/idf-py.rst

Closes DOC-5123

See merge request espressif/esp-idf!23568
 2023-05-12 10:35:37 +08:00
Cao Sen Miao
15153b5598 spi_flash: Update documents for flash-suspend 2023-05-11 20:12:22 +08:00
Jiang Jiang Jian
fe29531350 Merge branch 'bugfix/fix_doc_blufi_eror' into 'master' 
fix blufi doc error

See merge request espressif/esp-idf!23654
 2023-05-11 11:00:49 +08:00
KonstantinKondrashov
69838403f9 esp_bootloader_format: Adds bootloader description structure to read bootloader version from app 
Closes https://github.com/espressif/esp-idf/issues/8800
Closes https://github.com/espressif/esp-idf/issues/9132
 2023-05-10 21:39:52 +08:00
Wang Ning
2c1f2ad02b docs/add link to esp32-c6 devkit user guide 2023-05-10 16:58:47 +08:00
caixinying-git
3fbd692de8 docs: add CN translation for api-guides/tools/idf-py.rst 2023-05-10 14:14:12 +08:00
Zhang Xiao Yan
7e5d3fb172 Merge branch 'docs/update_installation_prerequisites_for_ubuntu_debian' into 'master' 
docs: update installation prerequisites for Ubuntu and Debian system

See merge request espressif/esp-idf!23618
 2023-05-10 14:07:08 +08:00
Kevin (Lao Kaiyao)
9ee4c48f54 Merge branch 'bugfix/fix_several_bugs_in_i2s' into 'master' 
i2s: fix several bugs in std and tdm mode

Closes IDF-7288

See merge request espressif/esp-idf!23465
 2023-05-10 11:39:51 +08:00
morris
c176e05ae2 Merge branch 'docs/update_cn_trans_ulp-risc-v_bootloader' into 'master' 
Docs: update CN translation for ulp-risc-v.rst and bootloader.rst

Closes DOC-5159

See merge request espressif/esp-idf!23644
 2023-05-10 11:33:27 +08:00
Mo Fei Fei
83d6754f8b Docs: update CN translation for ulp-risc-v.rst and bootloader.rst 2023-05-10 11:33:26 +08:00
morris
6ef187d4fb Merge branch 'doc/update_mcpwm_deadtime' into 'master' 
MCPWM: don't allow to apply the same delay module to multiple generators

Closes IDFGH-10050

See merge request espressif/esp-idf!23601
 2023-05-10 09:55:36 +08:00
Kondal Kolipaka
24525c32d9 Merge branch 'ide/debugger_doc_update' into 'master' 
doc: Add ESP-IDF GDB OpenOCD debugging plugin support

See merge request espressif/esp-idf!19597
 2023-05-09 19:31:56 +08:00
Kondal Kolipaka
62ef1a5b86 doc: Add ESP-IDF GDB OpenOCD debugging plugin support 2023-05-09 19:31:56 +08:00
zhiweijian
3a4d2c5b21 fix blufi doc error 2023-05-09 19:05:28 +08:00
laokaiyao
82159fa135 i2s_doc: fixed the data of stereo left/right state 2023-05-09 17:53:46 +08:00
Zim Kalinowski
3947688d54 Merge branch 'bugfix/make_clean_files' into 'master' 
build-system: replace ADDITIONAL_MAKE_CLEAN_FILES with ADDITIONAL_CLEAN_FILES

Closes IDF-2444

See merge request espressif/esp-idf!23628
 2023-05-09 16:53:18 +08:00
morris
72d0f5b35b mcpwm: can't apply the same delay module to multiple generators 
This is a hardware limitation, one delay module can only be used by one generator at one time.

Closes https://github.com/espressif/esp-idf/issues/11327
 2023-05-09 16:41:47 +08:00
Cai Xin Ying
af872cc079 docs:provide translation for api-reference/system/esp_timer.rst 2023-05-09 12:02:12 +08:00
Kevin (Lao Kaiyao)
b9da400545 Merge branch 'docs/fix_description_i2s.rst' into 'master' 
Docs: fix descriptions in i2s.rst

Closes DOC-4788

See merge request espressif/esp-idf!23631
 2023-05-08 19:11:13 +08:00
Mo Fei Fei
87d5573094 Docs: fix descriptions in i2s.rst 2023-05-08 19:11:13 +08:00
Linda
97ba0d2426 docs: update installation prerequisites for Ubuntu and Debian system 2023-05-08 18:59:41 +08:00
Wang Zi Yan
421bf2f798 Merge branch 'docs/update_cn_trans_for_build-system' into 'master' 
docs: Update CN for api-guides/build-system.rst

Closes DOC-5078

See merge request espressif/esp-idf!23580
 2023-05-08 17:47:51 +08:00
Shang Zhou
343e8de21b Merge branch 'docs/provide_CN_trans_for_22939' into 'master' 
docs: update CN translation for mdns.rst

Closes DOC-5076

See merge request espressif/esp-idf!23593
 2023-05-08 17:02:32 +08:00
Shang Zhou
a2b3176b58 docs: update CN translation for mdns.rst 2023-05-08 17:02:32 +08:00
Marius Vikhammer
d17248ecdf build-system: replace ADDITIONAL_MAKE_CLEAN_FILES with ADDITIONAL_CLEAN_FILES 
ADDITIONAL_MAKE_CLEAN_FILES is deprecated and only worked with make.
Replaced with the new ADDITIONAL_CLEAN_FILES (CMake 3.15) which also works with ninja.
 2023-05-08 15:51:48 +08:00
Wang Zi Yan
254415a21d docs: Update CN for api-guides/build-system.rst 2023-05-08 07:22:30 +00:00
Mo Fei Fei
850ef76981 docs: add cn trans i2s.rst 2023-05-08 14:25:19 +08:00
Cai Xin Ying
cf3e19019e Docs/add Chinese translation for api-reference/network/esp_netif.rst 2023-05-06 19:45:35 +08:00
Wang Fang
0bfffa0160 Merge branch 'docs/add_more_information_about_c3_gpio0_gpio5' into 'master' 
Add more information about which GPIOs of ESP32-C3/ESP32-C2/ESP32-H2 can wake up the chip from Deep-sleep mode

Closes DOC-4899

See merge request espressif/esp-idf!23279
 2023-05-05 12:56:21 +08:00
Cai Xin Ying
b8e02d01a6 Merge branch 'docs/add_Chinese_translation_for_api-reference/api-conventions' into 'master' 
Provide CN translation for api-reference/api-conventions.rst

Closes DOC-5056

See merge request espressif/esp-idf!23335
 2023-05-05 11:58:40 +08:00
Cai Xin Ying
eb29fe1d7e Provide CN translation for api-reference/api-conventions.rst 2023-05-05 11:58:40 +08:00
Marius Vikhammer
ffdea977dc Merge branch 'contrib/github_pr_11326' into 'master' 
correct typo in reference to ESP-IDF repo (GitHub PR)

Closes IDFGH-10049

See merge request espressif/esp-idf!23550
 2023-05-05 11:04:30 +08:00
Wang Fang
719b75da9b docs: provide more information about ESP32-C3 GPIO0~GPIO5 which can be used to wake up the chip from Deep-sleep mode 2023-05-05 11:04:02 +08:00
Cai Xin Ying
c636946310 docs:Updated CN Translation for api-reference/protocols/modbus.rst and docs/zh_CN/libraries-and-frameworks/libs-frameworks.rst 2023-05-05 10:54:26 +08:00
Cai Xin Ying
f2fa91eec8 Merge branch 'docs/add_Chinese_translation_for_several_short_docs1' into 'master' 
Docs/add Chinese translation for api-reference/bluetooth/esp_gap_ble.rst, api-reference/protocols/modbus.rst, and libraries-and-frameworks/libs-frameworks.rst from scratch

Closes DOC-5046

See merge request espressif/esp-idf!23322
 2023-05-04 17:25:42 +08:00
Cai Xin Ying
9c4dc67870 Docs/add Chinese translation for api-reference/bluetooth/esp_gap_ble.rst, api-reference/protocols/modbus.rst, and libraries-and-frameworks/libs-frameworks.rst from scratch 2023-05-04 17:25:41 +08:00
Shang Zhou
f53dbc7f7a docs: translate api-reference/peripherals.mcpwm.rst and library-and-framework index from scratch 2023-05-04 15:45:15 +08:00
Marius Vikhammer
88a5f8b23e docs: fix wrong link to esp-adf github issues in migration guide 2023-05-04 12:56:34 +08:00
caixinying-git
05fe748c1e docs: provide Chinese translation for api-reference/peripherals/spi_master 2023-04-27 12:10:54 +08:00
Zhang Xiao Yan
a154a93430 Merge branch 'docs/update_connection_description_in_ESP32-S2-DevKitC-1_user_guide' into 'master' 
docs/update connection description in ESP32-S2-DevKitC-1 user guide

See merge request espressif/esp-idf!23161
 2023-04-26 14:33:35 +08:00
Linda
0ef75bbb64 docs/update connection description in ESP32-S2-DevKitC-1 user guide 2023-04-26 10:29:16 +08:00
Zim Kalinowski
4a647d08de Merge branch 'feature/c6_ulp_sleep' into 'master' 
ulp: added sleep support for lp core

Closes IDF-7012

See merge request espressif/esp-idf!23103
 2023-04-25 22:40:52 +08:00
Marius Vikhammer
359b237cc5 ulp: added sleep support for lp core 
Added support for running LP core while hp core sleeps, as well
as waking up the hp core.
 2023-04-25 11:51:35 +08:00
laokaiyao
49f16eefbb esp32h4: checked all the corner stuffs of the removal 2023-04-23 12:03:07 +00:00
laokaiyao
bf2a7b2df6 esp32h4: removed esp32h4 related codes 2023-04-23 12:03:07 +00:00
Song Ruo Jing
6700630ccb Merge branch 'refactor/ledc_driver_refactor' into 'master' 
ledc: Improvement made on the LEDC driver

See merge request espressif/esp-idf!22971
 2023-04-23 16:43:52 +08:00
Cai Xin Ying
d3eafe505b Merge branch 'docs/add_Chinese_translation_for_api-reference/error-codes' into 'master' 
docs: provide translation for docs/zh_CN/api-reference/error-codes.rst

Closes DOC-4940

See merge request espressif/esp-idf!23111
 2023-04-23 15:45:39 +08:00
Song Ruo Jing
64aec54308 ledc: Add timer selection check to the driver, and leave space for future clk tree management 2023-04-21 16:40:54 +08:00
Kevin (Lao Kaiyao)
4fd62bce13 Merge branch 'refacor/remove_esp32h4_target_stage1' into 'master' 
esp32h4: remove esp32h4 target (stage 1)

See merge request espressif/esp-idf!23237
 2023-04-20 20:29:58 +08:00
Suren Gabrielyan
33a97d27a6 Merge branch 'docs/esp_protocols_docs_migration' into 'master' 
docs: migrated documentation from github.io to docs.espressif.com

Closes IDF-5486

See merge request espressif/esp-idf!22939
 2023-04-20 17:49:08 +08:00
laokaiyao
1f84f6c6ed esp32h4: remove esp32h4 target from ci 2023-04-20 15:19:47 +08:00
laokaiyao
b7053b46ef esp32h4: remove esp32h4 target from peripherals 2023-04-20 15:19:45 +08:00
Zhang Xiao Yan
c151e1509f fix typos in ESP32 DevKitC V4 Getting Started Guide 2023-04-20 10:04:27 +08:00
Suren Gabrielyan
36a5f898ba docs: migrated documentetation from github.io to docs.espressif.com 2023-04-19 12:33:40 +04:00
Mo Fei Fei
b18f390ed9 Merge branch 'docs/update_cn_trans_api_guides' into 'master' 
Docs: update CN translation for esp_http_client.rst, external-ram.rst, bootloader.rst

Closes DOC-4934

See merge request espressif/esp-idf!23136
 2023-04-19 10:37:49 +08:00
Mo Fei Fei
0d2549a4f1 Docs: update CN translation for esp_http_client.rst, external-ram.rst, bootloader.rst 2023-04-19 10:37:49 +08:00
Wang Zi Yan
d7cdcfb76b docs: update out-of-sync api reference docs 2023-04-18 08:00:39 +00:00
Linda
528bc7b35a fix a typo in api-reference/system/ota 2023-04-14 17:21:36 +08:00
Sonika Rathi
248dadc8c8 Merge branch 'docs/descrive-approach-fatfstools' into 'master' 
docs: Describe the approach of fatfsgen.py and fatfsparse.py

Closes IDF-4755

See merge request espressif/esp-idf!19978
 2023-04-13 18:48:51 +08:00
caixinying-git
3aec2dc02d docs: provide translation for docs/zh_CN/api-reference/error-codes.rst 2023-04-13 16:06:20 +08:00
Ondrej Kosta
6ed31a98bd Merge branch 'bugfix/eth_driver_cleanup' into 'master' 
Ethernet driver and documentation clean-up

Closes IDF-6339

See merge request espressif/esp-idf!23051
 2023-04-13 15:07:43 +08:00
Shang Zhou
41d9f29f9f docs: update translation for esp_eth 2023-04-12 10:47:58 +08:00
Martin Gaňo
024b58604a docs: Describe the approach of fatfsgen.py and fatfsparse.py 2023-04-11 09:41:06 +05:30
zhangyanjiao
71bb7d681a Update the ESP-NOW frame length in docs 2023-04-07 06:58:22 +00:00
Zhang Xiao Yan
86b8ef4587 Merge branch 'docs/update_mdns_link' into 'master' 
Update link in mDNS.rst

See merge request espressif/esp-idf!22039
 2023-04-06 10:09:15 +08:00
Jiang Jiang Jian
5898953156 Merge branch 'doc/update_doc_for_pd_periph_config' into 'master' 
esp_pm: update help doc  for PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP

See merge request espressif/esp-idf!22888
 2023-03-31 18:11:41 +08:00
wuzhenghui
fcf0498da8 esp_pm: update doc for PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP 2023-03-30 10:33:47 +08:00
Marius Vikhammer
a964b85d45 docs: use soc_caps directly in text where possible 2023-03-28 17:23:43 +08:00
Armando
abb03b8dc4 doc: added memory management programming guides 2023-03-22 16:33:52 +08:00
Wang Zi Yan
e9ab97e467 Merge branch 'docs/translate_kconfig' into 'master' 
docs: translate kconfig.rst

Closes DOC-4574

See merge request espressif/esp-idf!22624
 2023-03-22 10:37:35 +08:00
Zim Kalinowski
0d3f25ecf4 Merge branch 'doc/remove_legacy_event_loop_docs' into 'master' 
doc: remove left-over legacy event loop docs

Closes IDF-6189

See merge request espressif/esp-idf!22733
 2023-03-21 21:20:22 +08:00
Wang Zi Yan
477a9ac72b docs: translate kconfig.rst 2023-03-21 19:24:24 +08:00
Kevin (Lao Kaiyao)
2d14ba2b91 Merge branch 'feature/analog_comparator_h2' into 'master' 
Introduce the Analog Comparator driver

Closes IDF-6817

See merge request espressif/esp-idf!22355
 2023-03-18 00:42:20 +08:00
Jakob Hasse
a44671c11a doc: remove left-over legacy event loop docs 2023-03-17 15:37:26 +08:00
laokaiyao
53584bb5a7 ana_cmpr: add programming guide 2023-03-17 14:35:55 +08:00
Roland Dobai
b08d08d766 Merge branch 'docs/simplify_udev_rules_instructions' into 'master' 
docs: Simplify OpenOCD udev rules instructions for manual Linux installation

See merge request espressif/esp-idf!22628
 2023-03-17 14:30:23 +08:00
Marius Vikhammer
34ad5d8d29 Merge branch 'docs/extra_component_dirs' into 'master' 
docs: fixed EXTRA_COMPONENT_DIRS being mispelled as EXTRA_COMPONENTS_DIRS in build-system guide

See merge request espressif/esp-idf!22792
 2023-03-17 11:28:45 +08:00
Marius Vikhammer
a0764049fa docs: fixed EXTRA_COMPONENT_DIRS being mispelled as EXTRA_COMPONENTS_DIRS in build-system guide 2023-03-16 16:52:03 +08:00
Wang Zi Yan
6c8d4ed6ec docs: update translation for configure-ft2232h-jtag.rst and configure-other-jtag.rst 2023-03-16 10:29:28 +08:00
Marius Vikhammer
02f88d81ce docs: fix broken links 2023-03-14 11:40:35 +08:00
Song Ruo Jing
3ec287eaa5 Merge branch 'feature/ledc_gamma_curve_support' into 'master' 
ledc: Support gamma curve fade feature

Closes IDF-5811 and IDF-6236

See merge request espressif/esp-idf!22486
 2023-03-12 07:54:08 +08:00
morris
f8d68efcbf Merge branch 'bugfix/atomic_gptimer_fsm' into 'master' 
gptimer: fix race condition between start and stop

See merge request espressif/esp-idf!22620
 2023-03-11 09:40:17 +08:00
morris
2d52334e5d gptimer: fix race condition between start and stop 
Added state transition in gptimer_start/stop functions.
So that it's not possible to make a stopped timer continue to run
because of race condition.
 2023-03-10 23:27:29 +08:00
Nachiket Kukade
4c76af3f68 esp_wifi: Add support for NAN Discovery and Datapath 
Update wifi lib with below -
1. Create NAN Discovery SM for beaconing & cluster formation
2. Create NAN interface for Tx/Rx of beacons & action frames
3. Add commands & events for NAN Services Publish/Subscribe/Followup
4. Add NAN Datapath definitions, Events, Peer structures
5. Support for forming and parsing of Datapath related attributes
6. Modules for NDP Req, Resp, Confirm, Term, Peer management
7. NAN Interface related additions in Datapath, Data Tx Q's

In addition include below changes -
1. Add netif and driver support for NAN Interface
2. Add simple examples for Publisher-Subscriber usecases
3. Add an advanced console example that supports commands
   for NAN Discovery, Services & Datapath
4. Add wifi_apps for providing better NAN API's and Peer management

Co-authored-by: Shyamal Khachane <shyamal.khachane@espressif.com>
 2023-03-10 11:18:23 +05:30
Song Ruo Jing
79f34fe524 ledc: Support gamma curve fade feature on esp32c6 and esp32h2 2023-03-10 12:42:46 +08:00
Armando
75629ee6a8 spi_flash: added programming guide for ESP-IDF vs ESP-ROM flash driver 2023-03-09 14:55:13 +08:00
Zim Kalinowski
05037957c7 Merge branch 'docs/broken_links_2' into 'master' 
docs: fix broken links

See merge request espressif/esp-idf!22611
 2023-03-08 18:12:24 +08:00
daiziyan
9ba9dc04b0 docs: updated flash-encryption, startup, memory-types and misc_system_api 2023-03-07 18:06:52 +08:00
Marius Vikhammer
24e0d91cd0 docs: fix broken links 2023-03-06 17:29:10 +08:00
Wu Zheng Hui
2066977b48 Merge branch 'feature/bringup_esp32c6_deepsleep_support_master' into 'master' 
esp32c6: bringup deepsleep examples

Closes IDF-6051, IDF-6052, IDF-5349, IDF-5924, and WIFI-5352

See merge request espressif/esp-idf!22300
 2023-03-03 23:53:10 +08:00
wuzhenghui
709adaaa37 soc_caps: since esp32c6 only support one ext wakeup src, split SOC_PM_SUPPORT_EXT_WAKEUP 
Close IDF-5924
 2023-03-02 15:06:05 +08:00
Wang Zi Yan
2e4455a7e4 docs: finalize CN for index/spi_slave/system_time 2023-03-02 07:04:49 +00:00
Wang Zi Yan
c490c3a183 docs: update CN for index/spi_slave/system_time 2023-03-02 07:04:49 +00:00
Song Ruo Jing
0558d40c81 Merge branch 'contrib/github_pr_10856' into 'master' 
Correct typo in referenced function name (GitHub PR)

Closes IDFGH-9496

See merge request espressif/esp-idf!22537
 2023-03-01 18:39:11 +08:00
morris
14555a19db Merge branch 'feature/parlio_driver' into 'master' 
Parallel IO TX driver && LED Matrix example

Closes IDF-6607

See merge request espressif/esp-idf!22163
 2023-03-01 17:08:16 +08:00
Bradley McFadden
6a21403cba uart: Correct typo in referenced function name 
The functions `uart_enable_pattern_det_intr` have been renamed to `uart_enable_pattern_det_baud_intr`, but a reference to these functions in the programming guide was not updated.

Merges https://github.com/espressif/esp-idf/pull/10856
 2023-03-01 12:19:07 +08:00
morris
a7f5ff32ff doc: initial parallel IO programming guide 
Also correct the GPIO information on esp32h2.
 2023-03-01 00:43:14 +00:00
Linda
414a5c0410 docs: add link to configuration of VSCode debug 2023-02-27 16:31:48 +08:00
liuning
7817c23623 esp_coex: correct Kconfig name 2023-02-26 06:58:18 +00:00
Sudeep Mohanty
6c1a544782 Merge branch 'docs/ulp_docs_incorrect_notes' into 'master' 
docs: Ulpdated ULP docs to have the correct notes directive

Closes IDF-2522

See merge request espressif/esp-idf!22415
 2023-02-24 18:17:31 +08:00
Jing Li
a529771d88 Merge branch 'refactor/pm_use_unified_esp_pm_config_t' into 'master' 
pm: refactor pm codes to use unified esp_pm_config_t

See merge request espressif/esp-idf!22472
 2023-02-24 14:06:19 +08:00
jingli
eede7295d1 docs: upate migration guides for deprecated type and header file in power management component 2023-02-23 11:36:13 +08:00
jingli
8f415a7f44 refactor: power management component use unified esp_pm_config_t 2023-02-23 11:36:07 +08:00
Wang Ning
aa892a18a3 Merge branch 'docs/fix_errors_in_esp32-c3-devkitm-1_pin_list' into 'master' 
Docs/Fix Errors in ESP32-C3-DevKitM-1 Pin List

Closes DOC-4657

See merge request espressif/esp-idf!22460
 2023-02-23 11:07:12 +08:00
Wang Ning
712e15e45c Docs/Fix Errors in ESP32-C3-DevKitM-1 Pin List 2023-02-23 11:07:11 +08:00
Wang Zi Yan
262699683d docs: add CN GCC-12.2.0 migration guide 2023-02-22 05:33:03 +00:00
Alexey Lapshin
e4eca000f7 docs: add EN GCC-12.2.0 migration guide 2023-02-22 05:33:03 +00:00
Zhang Xiao Yan
778aeae99e Merge branch 'docs/remove_incorrect_note_from_esp32s3_get_started' into 'master' 
docs: remove incorrect note from get started of esp32s3

See merge request espressif/esp-idf!22389
 2023-02-22 09:58:57 +08:00
Wan Lei
66cda021d0 Merge branch 'feature/h2_gpio_hysteresis_support' into 'master' 
gpio: h2 support input hysteresis filter

Closes IDF-6653

See merge request espressif/esp-idf!22263
 2023-02-21 17:27:56 +08:00
Mo Fei Fei
ba79daade6 Docs: Add CN translation for dac.rst 2023-02-21 14:36:30 +08:00
wanlei
c9bcec9212 gpio: h2 support input hysteresis filter 2023-02-20 19:34:48 +08:00
Linda
7a9676db16 Update link in mDNS.rst 2023-02-20 18:51:44 +08:00
Zhang Xiao Yan
6642009074 Merge branch 'docs/fix_typo_spi_flash' into 'master' 
docs: fix typo in api-reference/peripherals/spi_flash

See merge request espressif/esp-idf!22402
 2023-02-20 17:49:37 +08:00
Jakob Hasse
603fc32e24 Merge branch 'docs/fix_broken_link_format' into 'master' 
docs: fix rst external links with wrong format

See merge request espressif/esp-idf!22335
 2023-02-20 14:28:07 +08:00
Linda
b08017f599 docs: fix typo in api-reference/peripherals/spi_flash 2023-02-20 14:26:47 +08:00
Mo Fei Fei
c88efb7fa8 Merge branch 'docs/sync_cn_trans_peripherals' into 'master' 
Docs: update CN translation for migration-guides, api-reference, api-guides

Closes DOC-4614

See merge request espressif/esp-idf!22386
 2023-02-20 11:49:55 +08:00
Mo Fei Fei
600ed6ac10 Docs: update CN translation for migration-guides, api-reference, api-guides 2023-02-20 11:49:54 +08:00
Krzysztof Budzynski
0048c977ee Merge branch 'docs/fix_typo_esp32s3_gpio' into 'master' 
docs: fix typo in api-reference/peripherals/gpio/esp32s3

See merge request espressif/esp-idf!22403
 2023-02-17 22:21:37 +08:00
Sudeep Mohanty
449ea7cab7 docs: Ulpdated ULP docs to have the correct notes directive 
This commit updates the ULP .rst files to have the correct notes
directive format. The notes directives were missing a colon.
 2023-02-17 12:55:25 +01:00
Shang Zhou
74980e1ceb Merge branch 'docs/update_spi_features' into 'master' 
docs: Review and update spi_features

Closes DOC-4575

See merge request espressif/esp-idf!22249
 2023-02-16 21:57:08 +08:00
Martin Vychodil
c58a84f893 Merge branch 'feature/fatfs_format_api' into 'master' 
fatfs: added APIs to format a FAT filesystem

Closes IDF-6046

See merge request espressif/esp-idf!21845
 2023-02-16 19:59:31 +08:00
Shang Zhou
913c1722c2 docs: Review and update spi_features 2023-02-16 16:27:42 +08:00
Armando
d59fd3e529 fatfs: deprecate esp_vfs_fat_sdmmc_unmount 
This API was deprecated before, but without deprecation warning and
migration doc. This commit added deprecation warning and migration doc
to it.
 2023-02-16 14:17:51 +08:00
Linda
75df11ccbc docs: fix typo in api-reference/peripherals/gpio/esp32s3 2023-02-16 12:14:30 +08:00
Marius Vikhammer
29d347acdf Merge branch 'docs/system_feature_general_notes_c6_h2' into 'master' 
docs: update misc docs for C6 and H2

Closes IDF-5938 and IDF-6675

See merge request espressif/esp-idf!22390
 2023-02-16 10:19:14 +08:00
Erhan Kurubas
a3df4d5386 Merge branch 'apptrace_pytest' into 'master' 
Generic apptrace example with pytest support

Closes IDF-5620

See merge request espressif/esp-idf!22195
 2023-02-16 03:41:19 +08:00
Wang Zi Yan
d4e79801a9 docs: update CN for api-guides/app_trace.rst 2023-02-15 10:30:41 +01:00
Erhan Kurubas
db10697b74 example/system: remove app_trace_to_host example. Instead use app_trace_basic 2023-02-15 10:30:32 +01:00
Marius Vikhammer
b67c822d10 docs: update misc docs for C6 and H2 2023-02-15 17:27:31 +08:00
Linda
c36b2eac6f docs: remove incorrect note from get started of esp32s3 2023-02-15 15:44:39 +08:00
Darian Leung
69433a9660 freertos: Rename SMP changes document to ESP-IDF FreeRTOS 
This commit renames "freertos-smp" docuemnt to "freertos_idf". This fits better
with the current dual FreeRTOS implementation (i.e., IDF FreeRTOS and Amazon
SMP FreeRTOS), both of which are SMP capable.
 2023-02-15 12:42:04 +08:00
Erhan Kurubas
69b1d1786c docs: JTAG debugging update for ESP32-H2 2023-02-13 22:49:00 +01:00
Armando (Dou Yiwen)
d3fec8394f Merge branch 'feature/adc_filter' into 'master' 
adc: supported adc digital filter

Closes IDF-2529, IDFGH-9113, and IDFGH-9279

See merge request espressif/esp-idf!22035
 2023-02-13 16:43:58 +08:00
Marius Vikhammer
98c55f29d1 docs: fix rst external links with wrong format 2023-02-13 11:51:31 +08:00
Kapil Gupta
30a2558450 esp_wifi: Merge wpa_supplicant and esp_wifi Kconfig 2023-02-11 07:38:45 +08:00
Armando
7e6bf9f987 esp_adc: added adc filter doc, and filter migration guides 2023-02-10 16:46:20 +00:00
Jakob Hasse
4be50db159 Merge branch 'docs/elm_chan_broken_link' into 'master' 
docs: fix broken link in fatfs doc

See merge request espressif/esp-idf!22268
 2023-02-09 11:54:49 +08:00
morris
044a114e66 gptimer: unify clock setting with clk_tree API 2023-02-08 16:30:47 +08:00
Marius Vikhammer
4a0c5991ab docs: fix broken link in fatfs doc 2023-02-08 12:02:17 +08:00
Roland Dobai
4bd5ebb4a1 Merge branch 'tools/monitor_move' into 'master' 
Tools(idf_monitor): Move idf_monitor to separate repo

Closes IDF-4109

See merge request espressif/esp-idf!22050
 2023-02-07 19:47:46 +08:00
Kevin (Lao Kaiyao)
421e5e6416 Merge branch 'refactor/pack_driver_source_files' into 'master' 
components/driver: pack peripherals

See merge request espressif/esp-idf!22173
 2023-02-07 10:20:57 +08:00
Mo Fei Fei
6d4313f414 Docs: update CN trans for idf_monitor.rst 2023-02-03 11:20:18 +01:00
David Čermák
b37980d26e Merge branch 'bugfix/mqtt_docs_migration_5.x' into 'master' 
mqtt/docs: Mention removal of user_context in 5.x migration guide

Closes IDFGH-9261

See merge request espressif/esp-idf!22177
 2023-02-02 18:55:29 +08:00
laokaiyao
f27cd67c00 driver: pack peripherals 2023-02-02 18:19:58 +08:00
Dai Zi Yan
b97a98a703 Merge branch 'docs/sync_up_translation_Jan' into 'master' 
docs: sync up translation for api-reference

Closes DOC-4445 and DOC-3673

See merge request espressif/esp-idf!22150
 2023-02-02 18:07:21 +08:00
David Cermak
2f8b12deb4 mqtt/docs: Mention removal of user_context in 5.x migration guide 
update CN for migration-guides/release-5.x/5.0/protocols.rst
Co-Authored-By: Wang Zi Yan <wangziyan@espressif.com>

Closes https://github.com/espressif/esp-idf/issues/10644
 2023-02-02 10:41:21 +01:00
Erhan Kurubas
dbdffd7329 Merge branch 'fix_jtag_debugging_update_doc_esp32c6' into 'master' 
doc: fix usb-jtag configure efuse section

See merge request espressif/esp-idf!22166
 2023-02-02 17:06:46 +08:00
daiziyan
4667f1b3ef docs: sync up translation for api-reference 2023-02-02 14:44:13 +08:00
laokaiyao
330149f3a6 i2c: support i2c on esp32h2 2023-02-01 11:23:11 +08:00
David Čermák
dba0718f47 Merge branch 'feature/lwip_linux' into 'master' 
lwip: Add support for linux target

Closes IDF-5707, IDF-5647, and IDF-6003

See merge request espressif/esp-idf!19302
 2023-01-31 22:01:50 +08:00
Wang Zi Yan
2940d41047 docs: update translation for configure-other-jtag.rst and index.rst 2023-01-31 10:02:48 +01:00
David Cermak
fa97004faf lwip: Support for linux target 
Implement linux port layer and reuse the original FreeRTOS layer
that's compiled and used on linux target as well, by means of FreeRTOS
simulator.
 2023-01-31 08:43:45 +01:00
Jiang Jiang Jian
1195b6cb2b Merge branch 'docs/add_some_details_for_wifi_scan_description' into 'master' 
Docs/add some details for wifi scan description

Closes DOC-4179 and IDFGH-8980

See merge request espressif/esp-idf!21589
 2023-01-31 13:56:09 +08:00
Song Ruo Jing
0d07f85916 Merge branch 'feature/esp32h2_ledc_support' into 'master' 
ledc: Add support for ESP32H2

Closes IDF-6235 and IDF-6698

See merge request espressif/esp-idf!22120
 2023-01-31 12:26:30 +08:00
Marius Vikhammer
4c4a0a9427 Merge branch 'docs/fatal_errors_c6_h2' into 'master' 
docs: update misc system docs for C6/H2

Closes IDF-5920, IDF-6692, IDF-5928, IDF-6684, IDF-5927, and IDF-6685

See merge request espressif/esp-idf!22105
 2023-01-31 09:57:50 +08:00
Song Ruo Jing
ad55230b0a ledc: Add support for esp32h2; Refactor ledc driver clock source selection related code 
LEDC examples and test cases are supported on ESP32H2.
   Switch to use general clock IDs for ledc_clk_cfg_t enum values.
   Deprecate LEDC_USE_RTC8M_CLK.
 2023-01-30 19:19:34 +08:00
Armando
d59f77b8f0 Doc: added a warning to not use pin 35, 36, 37 on modules with octal external memory 
Closes https://github.com/espressif/esp-idf/issues/10605
 2023-01-30 14:22:55 +08:00
Marius Vikhammer
2973600c45 docs: update fatal error doc for C6/H2 2023-01-29 14:03:09 +08:00
Darian Leung
a57496acfe usb_host: Add maintainer's notes (Design, Architecture) 
This commit adds some parts of the USB Host Stack's maintainers notes
(specifically "Design" and "Architecture").
 2023-01-24 02:49:35 +08:00
Erhan Kurubas
9d6383340f Merge branch 'doc_update_esp32c6_jtag' into 'master' 
docs: JTAG debugging update for ESP32C6

Closes IDF-6033

See merge request espressif/esp-idf!22028
 2023-01-19 03:44:43 +08:00
Shang Zhou
fa33755de4 Merge branch 'docs/sync_up_translation_january' into 'master' 
docs: Sync up CN and EN versions for files in api-guides and hw-reference (Jan)

Closes DOC-4458

See merge request espressif/esp-idf!22047
 2023-01-19 02:22:58 +08:00
Erhan Kurubas
7cb79db71e docs: JTAG debugging update for ESP32C6 2023-01-18 15:17:23 +01:00
David Čermák
2f1d30d155 Merge branch 'bugfix/lwip_core_locking' into 'master' 
esp_netif/lwip: Fix core-locking config

Closes IDFGH-8445, IDFGH-9098, and IDFGH-9063

See merge request espressif/esp-idf!20840
 2023-01-18 20:31:25 +08:00
Shang Zhou
f114008fc7 docs: Sync up CN and EN versions for files in api-guides and hw-reference (Jan) 2023-01-18 18:57:59 +08:00
Song Ruo Jing
4c8fdc31f9 gpio: Add support for esp32h2 2023-01-18 11:41:12 +08:00
Wang Zi Yan
9d80d981b5 docs: CN translation for system_time.rst and migration-guides: 5.1/networking.rst 2023-01-17 16:16:03 +01:00
David Cermak
a71fa82177 esp_netif/lwip: Fix core-locking config 
* Fix thread safety issues in non-core locking
* Add option to verify thread safety issues in lwip (core-lock assertion)
* Make esp_sntp.h thread safe API
* Fix sntp examples
* Fix openthread libs

Closes https://github.com/espressif/esp-idf/issues/9908
Closes https://github.com/espressif/esp-idf/issues/10502
Closes https://github.com/espressif/esp-idf/issues/10466
 2023-01-17 16:15:58 +01:00
Marius Vikhammer
70d1dbccd8 Merge branch 'docs/enable_h2_build' into 'master' 
docs: add support for building H2 docs

Closes IDF-6259

See merge request espressif/esp-idf!21933
 2023-01-17 12:11:29 +08:00
Marius Vikhammer
7100b7d1ff docs: add support for building H2 docs 2023-01-17 10:04:26 +08:00
Erhan Kurubas
3df87a91a3 Merge branch 'doc_update_esp32c2_jtag' into 'master' 
docs: JTAG debugging update for ESP32C2

See merge request espressif/esp-idf!22030
 2023-01-16 19:17:59 +08:00
Ivan Grokhotkov
8084552722 Merge branch 'bugfix/sntp_docs_time_t_64bit' into 'master' 
docs: remove outdated section on custom toolchain for 64-bit time_t

See merge request espressif/esp-idf!21994
 2023-01-16 17:56:29 +08:00
Wang Zi Yan
1568f9b7ef
docs: remove outdated section on custom toolchain for 64-bit time_t 
Co-authored-by: Ivan Grokhotkov <ivan@espressif.com>
 2023-01-16 14:19:56 +08:00
Darian Leung
a52aff81a8 usb_host: Add maintainer's notes (Introduction and DWC_OTG Controller) 
This commit adds some parts of the USB Host Stack's maintainers notes
(specifically "Introduction" and "DWC_OTG Controller" chapters).
 2023-01-13 20:00:18 +08:00
Erhan Kurubas
c453326a8a docs: JTAG debugging update for ESP32C2 2023-01-12 09:09:02 +01:00
muhaidong
f855d0790d docs: update ftm docs 2023-01-10 21:14:51 +08:00
muhaidong
fe576d316e docs: add some details for wifi scan description 2023-01-10 21:14:42 +08:00
muhaidong
b2e302fc97 docs: update wifi amsdu receiving docs 2023-01-10 21:14:34 +08:00
Krzysztof Budzynski
4b1ea708a3 Merge branch 'docs/update_esp_mqtt' into 'master' 
update ESP-MQTT by including the mqtt5 example

See merge request espressif/esp-idf!21737
 2023-01-10 15:52:10 +08:00
daiziyan
f6419eb3fe docs: update CN trans for memory-types,tips-and-quirks, partition-tables and start-project 2023-01-10 02:40:03 +00:00
morris
d052ce9240 Merge branch 'contrib/github_pr_10469' into 'master' 
Reference code fixed. (GitHub PR)

Closes IDFGH-9066

See merge request espressif/esp-idf!21961
 2023-01-10 10:12:02 +08:00
archen
ed1b2ba60e
Reference code fixed. 
Merges https://github.com/espressif/esp-idf/pull/10469
 2023-01-09 16:17:35 +05:30
Linda
ff57f243f2 update ESP-MQTT by including the mqtt5 example 2023-01-07 13:39:32 +08:00
laokaiyao
6b631b68d1 sdm: correct concept duty to density 2023-01-06 17:01:48 +08:00
Ivan Grokhotkov
61c5fc21e1
docs: fix nvs-related docs build issue 2023-01-05 09:28:57 +01:00
Roland Dobai
ec0466e0e5 Merge branch 'fix/idf_monitor_pc_addr_intervals' into 'master' 
Tools: IDF Monitor: Determine possible instruction addresses based on ELF segments

Closes IDF-6174

See merge request espressif/esp-idf!21393
 2023-01-05 14:44:19 +08:00
Mahavir Jain
18f3b71e92 Merge branch 'docs/update_cn_trans_flash_encryption' into 'master' 
docs: update cn trans for flash-encryptions

Closes DOC-4343

See merge request espressif/esp-idf!21826
 2023-01-04 22:00:39 +08:00
Shang Zhou
1089065b02 docs: Update CN translation for idf-monitor.rst 2023-01-03 13:22:26 +01:00
Song Ruo Jing
105fe9f950 Merge branch 'bugfix/ledc_channel_update_usage' into 'master' 
ledc: Fix bug in channel-duty configuration

Closes IDF-6439

See merge request espressif/esp-idf!21635
 2023-01-03 20:11:08 +08:00
mofeifei
3bdad0032e docs: update cn trans for flash-encryptions 2023-01-03 19:32:41 +08:00
Song Ruo Jing
662df0da3b ledc: Channel configuration requires the ledc core clock on to be effective. Therefore, a clock source is selected for the core clock since the peripheral initialization. Additionally, correct the usage of channel para_up and duty_start bits. 2023-01-03 15:16:00 +08:00
Wang Zi Yan
996e564f54 docs: update mqtt wifi coexist 2023-01-03 14:27:58 +08:00
Michael (XIAO Xufeng)
57a9c67c01 index 2022-12-29 01:00:31 +08:00
Michael (XIAO Xufeng)
daa4af1b1f docs: split spi_flash api-reference documents to peripherals folder 2022-12-29 00:59:03 +08:00
Zhang Xiao Yan
93d99eb062 Merge branch 'docs/update_ota_translation' into 'master' 
update CN translation of api-reference/system/ota

See merge request espressif/esp-idf!21741
 2022-12-27 17:03:20 +08:00
Zhang Xiao Yan
ae639f68a6 Merge branch 'docs/update_USB-OTG_ESP32S2_ESP32S3' into 'master' 
updated USB_OTG in dfu.rst, usb_device.rst and secure-boot-v2.rst

Closes DOC-3565

See merge request espressif/esp-idf!20144
 2022-12-27 14:38:51 +08:00
Jiang Jiang Jian
2c9a180e73 Merge branch 'doc/add_esp_now_change_to_migration_guides' into 'master' 
docs: add esp now breaking change to migration guides

See merge request espressif/esp-idf!21736
 2022-12-23 19:09:01 +08:00
Shang Zhou
5cf0d92503 Merge branch 'docs/update_esp32_c3_devkitc_2_pin_layout' into 'master' 
docs: Update pin layout diagram for ESP32-C3-DevKitC-02

Closes DOC-2927 and DOC-3164

See merge request espressif/esp-idf!21430
 2022-12-22 16:55:52 +08:00
Shang Zhou
b5d27aa436 docs: Update pin layout diagram for ESP32-C3-DevKitC-02 2022-12-22 16:55:51 +08:00
Song Ruo Jing
36cdf88a5b Merge branch 'contrib/github_pr_10402' into 'master' 
ledc: move callback to IRAM as it's called from an ISR (GitHub PR)

Closes IDFGH-8990

See merge request espressif/esp-idf!21711
 2022-12-22 16:55:29 +08:00
Jakob Hasse
58f58c25a6 Merge branch 'docs/test_linux' into 'master' 
docs: refactored and updated Linux target docs

See merge request espressif/esp-idf!21236
 2022-12-22 16:36:51 +08:00
Song Ruo Jing
1a6e1aba3d ledc: Add check for whether the registered callback is in iram in ledc_cb_register 2022-12-22 14:38:58 +08:00
Jack
f4953c453a doc: add esp now changes to migration guides 2022-12-22 11:20:01 +08:00
Jakob Hasse
b718c7182c docs(linux): refactored and updated Linux target docs 2022-12-21 17:12:42 +08:00