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

4326 Commits

Author SHA1 Message Date
Fu Hanxi
9f01d9aa2c build_system: stop looking for sdkconfig file specified by env var SDKCONFIG_DEFAULTS in bootloader subproject 2023-01-10 09:48:59 +08:00
Tomas Rezucha
b4f281f523 tinyusb: Add TinyUSB example tests 2023-01-09 17:55:02 +08:00
KonstantinKondrashov
d2ddb4b5e1 test_apps(gdb): Updates the chip version format (vX.Y) 2023-01-06 02:00:52 +08:00
KonstantinKondrashov
0c0049b5e4 tools: Update check_copyright_ignore.txt 2023-01-06 02:00:52 +08:00
KonstantinKondrashov
9538f9c5ff ci: Fix environment variable IDF_CI_BUILD is not set 2023-01-06 02:00:52 +08:00
KonstantinKondrashov
823024c10c all: Apply new version logic (major * 100 + minor) 2023-01-06 02:00:52 +08:00
Guillaume Souchere
249fde21e5 esp_hw_support: allow writing in IRAM when CONFIG_ESP_SYSTEM_PMP_IDRAM_SPLIT is not set for esp32C2 
when CONFIG_ESP_SYSTEM_PMP_IDRAM_SPLIT is not set, the PMP rule for esp32c2 shoud allow write access.
Fix esp_cpu_configure_region_protection() in cpu.c accordingly.
 2023-01-04 07:51:46 +01:00
Roland Dobai
0883101f7f Tools: Improve idf.py error message when the argument value collides with the environment variable 
Closes https://github.com/espressif/esp-idf/issues/10475
 2023-01-03 19:00:48 +01:00
Guillaume Souchere
327bf0d608 heap: RE-enable ESP32C2 test in test_apps 2023-01-03 09:52:33 +01:00
Guillaume Souchere
4175dd7a56 newlib: Update the esp32c2 config default to avoid RTC related test to not run on esp32c2 
Set CONFIG_NEWLIB_TIME_SYSCALL_USE_HRT to enable to force CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER to disable
and hence prevent the following tests from being executed:

- Timestamp after abort is correct in case RTC & High-res timer have + big error
- Timestamp after restart is correct in case RTC & High-res timer have + big error
- Timestamp after restart is correct in case RTC & High-res timer have - big error
 2023-01-03 08:37:28 +01:00
sanket.wadekar
9067214f33 Changed wifi provisioning scan method 
Signed-off-by: sanket.wadekar <sanket.wadekar@espressif.com>
 2022-12-31 18:09:45 +05:30
Ivan Grokhotkov
506f7d0d8e
tools: fix RISC-V GDB not being installed for C2, H2 2022-12-22 11:42:29 +01:00
Ivan Grokhotkov
acb2397341
gdb stub: re-enable for ESP32-C2 2022-12-22 11:39:02 +01:00
muhaidong
94d2040ba7 esp_phy: add country code 01 to country code map type table 2022-12-21 20:00:36 +08:00
Jiang Jiang Jian
3bd8a8e890 Merge branch 'bugfix/remove_-Wno-formate_in_ble_mesh_examples_v5.0' into 'release/v5.0' 
ble_mesh: example: Remove -Wno-format compile option for BLE Mesh examples(v5.0)

See merge request espressif/esp-idf!21675
 2022-12-21 18:32:13 +08:00
Zim Kalinowski
6972b61ea5 Merge branch 'staging/esp_static_assert_v5.0' into 'release/v5.0' 
C/Cxx: unify static assertions with the macro ESP_STATIC_ASSERT (backport v5.0)

See merge request espressif/esp-idf!21695
 2022-12-20 20:53:02 +08:00
wangjialiang
fca1b1dd58 ble_mesh: example: Remove -Wno-format compile option for BLE Mesh examples 2022-12-20 10:57:39 +00:00
Jiang Jiang Jian
c173845ff3 Merge branch 'feature/tlsf-dynamic-control-size_v5.0' into 'release/v5.0' 
heap: Update to the new tlsf implementation of dynamic metadata size (backport v5.0)

See merge request espressif/esp-idf!20774
 2022-12-20 13:51:07 +08:00
Chen Yudong
afc433114e CI: fix ipv6 test failed on some runners 2022-12-20 11:26:32 +08:00
Roland Dobai
66703dc788 Merge branch 'feature/spiflash_override_cmake_function_v5.0' into 'release/v5.0' 
build system: Add spi_flash_add_link_dependency function for spi_flash custom driver (v5.0)

See merge request espressif/esp-idf!21705
 2022-12-20 06:19:07 +08:00
Angus Gratton
8468ea3dcc
build system: Add idf_component_add_link_dependency function, use for spi_flash overriding 2022-12-19 15:25:30 +01:00
Omar Chebib
ac2ac0c705 CI: check_public_headers script will detect the use of static asserts in headers 
When a public header contains _Static_assert or static_assert, check_public_headers.py script will detect it and report it as an issue.
Indeed, public headers shall now use ESP_STATIC_ASSERT.
 2022-12-19 15:06:20 +01:00
Omar Chebib
0714847552 C/Cxx: unify static assertions with the macro ESP_STATIC_ASSERT 
Closes https://github.com/espressif/esp-idf/issues/9938
 2022-12-19 15:06:15 +01:00
Djordje Nedic
1c35538b96 idf_size.py: Fix issue where diram size was halved in cases where iram was not fully filled with cache 
This fixes an attempted fix for diram size calculation where it was counted twice, however the fix did not account for cases where iram was not fully filled with cache and therefore was of non 0 size.
Now the calculation should be correct regardless of the cache size.

Closes https://github.com/espressif/esp-idf/issues/9960

Fix expected output
 2022-12-19 14:33:10 +01:00
jiangguangming
5f7d8bfd6b esp_rom: update rom gpio.h 2022-12-15 16:27:57 +08:00
Guillaume Souchere
c47ea5d2bb tools: update list of references to not include symbold used by __assert_func calls 
On xtensa architecture, the call to __assert_func uses a reference to __func__ that can
sometimes be placed in flash. Since the __asert_func can be called from functions in IRAM
the check_callgraph script can report an error when checking for invalid calls from IRAM
to flash sections. However, the __asert_func prevents this scenario at runtime so the
check_callgraph script reports a 'flas positive' situation. For this reasson, all references
to __func__$x found prior to a call to __assert_func are droped in the parsing of the rtl files.
 2022-12-14 12:37:23 +01:00
Guillaume Souchere
e92250e6a2 heap: add check for usage of flash content from iram 
this commits:
- adds build-time test to check that no call to flash regions are done from IRAM functions

- resolves problems related to IRAM function using content in flash memory

- update heap_caps_alloc_failed to use a default function name in DRAM
  when necessary instead of creating a function name variable in DRAM for
  each call of heap_caps_alloc_failed. This allows to save some extra bytes
  in RAM.
 2022-12-14 12:37:16 +01:00
Roland Dobai
34a1a1b098 Tools: gdbgui is not supported on Python 3.11 
This is a follow-up of a816dfbfc3 with
additional check.

Related to https://github.com/espressif/esp-idf/issues/10116
 2022-12-14 09:50:11 +01:00
morris
a3b040e991 Merge branch 'feature/_spi_slave_reset_trans_queue_api_v5.0' into 'release/v5.0' 
spi: limit esp32 dma workaround only on esp32(v5.0)

See merge request espressif/esp-idf!21381
 2022-12-13 16:29:41 +08:00
Island
12a069d593 Merge branch 'feature/seperate_ble_wifi_test_environment_v5.0' into 'release/v5.0' 
seperate ble wifi environment and support ci esp32c2 (backport v5.0)

See merge request espressif/esp-idf!20084
 2022-12-12 16:36:20 +08:00
Chen Sheng
96ff16199a seperate ble wifi environment and support ci esp32c2 (backport v5.0) 2022-12-12 16:36:20 +08:00
Roland Dobai
22b82efbe5 Merge branch 'bugfix/tool_removal_offer_macOS_v5.0' into 'release/v5.0' 
Tools: bugfix Export script offers cmake & ninja for removal on macOS (v5.0)

See merge request espressif/esp-idf!21451
 2022-12-07 17:06:19 +08:00
Zim Kalinowski
ffdec34c11 Merge branch 'bugfix/hints_require_v5.0' into 'release/v5.0' 
hints: add a more complete description for component not found errors (v5.0)

See merge request espressif/esp-idf!21457
 2022-12-06 17:33:18 +08:00
zhangyanjiao
175f0dec6c Modify maximum softap conn num and espnow encryption peer num 2022-12-06 05:06:18 +00:00
Marius Vikhammer
c3f578d17c hints: add a more complete description for component not found errors 2022-12-06 12:16:24 +08:00
Marek Fiala
39ee8117c3 Tools: bugfix Export script offers cmake & ninja for removal on macOS 2022-12-05 15:56:08 +01:00
David Čermák
a4782767d9 Merge branch 'feature/mqtt_cmakefile_cleanup_v5.0' into 'release/v5.0' 
Mqtt:  Cmakelists.txt file simplification. (v5.0)

See merge request espressif/esp-idf!20493
 2022-12-05 20:43:10 +08:00
Fu Hanxi
6688ba7b8e Merge branch 'ci/upload_elf_map_to_minio_v5.0' into 'release/v5.0' 
ci: upload elf map file to s3 server to reduce artifacts size (v5.0)

See merge request espressif/esp-idf!19902
 2022-12-05 18:17:59 +08:00
Zim Kalinowski
759f7ec13d Merge branch 'feature/add_int_task_wdt_esp32c2_v5.0' into 'release/v5.0' 
WDT: implement interrupt wdt and task wdt for ESP32-C2 (backport v5.0)

See merge request espressif/esp-idf!20980
 2022-12-05 16:38:35 +08:00
wanlei
ec7265dca4 spi: limit esp32 dma workaround only on esp32 2022-12-05 12:10:45 +08:00
Marius Vikhammer
2643e4b320 idf.py hints: add hint IRAM overflow 2022-12-05 10:34:41 +08:00
morris
aff2157f10 Merge branch 'feature/esp_rom_alias_mz_crc32_to_crc32_le_v5.0' into 'release/v5.0' 
move {target}/rom/miniz.h to a common miniz.h (backport to v5.0)

See merge request espressif/esp-idf!21104
 2022-12-05 10:10:38 +08:00
Fu Hanxi
3eb66d2ef0 ci: move LDGEN_CHECK_MAPPING to configure_ci_environment.sh 2022-12-02 15:42:40 +00:00
morris
302ecb0764 Merge branch 'doc/pcnt_overflow_compensate_v5.0' into 'release/v5.0' 
pcnt: support accumulate the count value in the high/low limit event (v5.0)

See merge request espressif/esp-idf!21170
 2022-12-02 22:42:50 +08:00
Jiang Jiang Jian
b48971317f Merge branch 'bugfix/fix_part_of_modem_not_reset_when_power_on_backport_v5.0' into 'release/v5.0' 
Coexistence: fix part of modem module not reset when power up(backport v5.0)

See merge request espressif/esp-idf!20807
 2022-12-02 20:25:21 +08:00
Jiang Jiang Jian
df80bc864d Merge branch 'bugfix/fix_xtal_related_rtc_params_for_esp32_backport_v5.0' into 'release/v5.0' 
esp32/rtc: fix xtal unstable in some cases when sleep(backport v5.0)

See merge request espressif/esp-idf!20799
 2022-12-02 20:24:25 +08:00
jiangguangming
af425e5a8e move {target}/rom/miniz.h to a common miniz.h 
- Move {target}/rom/miniz.h to common miniz.h
- Add ESP_ROM_HAS_MZ_CRC32 for ESP32/S2/S3/C3/H2
- Alias mz_crc32 to crc32_le if chips not support ESP_ROM_HAS_MZ_CRC32
 2022-12-02 19:39:44 +08:00
Ivan Grokhotkov
228ecfdce0 Merge branch 'bugfix/serial_reader_linux_writes_correctly_5.0' into 'release/v5.0' 
bugfix(tools): idf.py monitor now reads correctly on Linux (backport 5.0)

See merge request espressif/esp-idf!21270
 2022-12-02 19:35:24 +08:00
Ivan Grokhotkov
75edeabec9 Merge branch 'fix/gdbgui_v5.0' into 'release/v5.0' 
Tools: gdbgui is not supported on Python 3.11 (v5.0)

See merge request espressif/esp-idf!21327
 2022-12-02 19:14:50 +08:00
Roland Dobai
f7a32dbb1d Merge branch 'tools/idf_tools_use_mirror_url_v5.0' into 'release/v5.0' 
tools: espidf constraints also supports mirror url (v5.0)

See merge request espressif/esp-idf!21086
 2022-12-02 19:12:17 +08:00
Roland Dobai
8faf09234c Merge branch 'feature/use_tools_json_to_check_toolchain_ver_v5.0' into 'release/v5.0' 
Tools: use tools.json to double-check toolchain version when building (v5.0)

See merge request espressif/esp-idf!20662
 2022-12-02 19:11:54 +08:00
Roland Dobai
5ae4abe717 Merge branch 'fix/idf_tools_venv_check_v5.0' into 'release/v5.0' 
Tools: Check venv the same way how it will be used later (v5.0)

See merge request espressif/esp-idf!20544
 2022-12-02 19:10:33 +08:00
Roland Dobai
e08150e534 Merge branch 'fix/tools-gdbinit-with-elf-symbols_v5.0' into 'release/v5.0' 
tools: fixed elf symbols load if gdbinit specified (v5.0)

See merge request espressif/esp-idf!20467
 2022-12-02 19:09:48 +08:00
Roland Dobai
d1a32474b3 Merge branch 'fix/idf_tools_download_issues_v5.0' into 'release/v5.0' 
Tools: Improve download error messages coming from idf_tools.py (v5.0)

See merge request espressif/esp-idf!20352
 2022-12-02 19:08:33 +08:00
Roland Dobai
f1f7ac2f28 Merge branch 'bugfix/writable_idf_tools_path_v5.0' into 'release/v5.0' 
Tools: Support ESP-IDF installed in system-wide shared directory for all users (v5.0)

See merge request espressif/esp-idf!20328
 2022-12-02 19:07:50 +08:00
jingli
18fef64089 wifi/bt: fix part of modem module not reset when power up 2022-12-01 21:08:57 +08:00
Omar Chebib
b675bb2a4d WDT: implement interrupt wdt and task wdt for ESP32-C2 
ESP32-C2 has a single group timer, thus it will use it for the interrupt watchdog,
which is more critical than the task watchdog. The latter is implement in
software thanks to the `esp_timer`component.
 2022-12-01 10:45:35 +00:00
Roland Dobai
2c1b0b3643 Tools: gdbgui is not supported on Python 3.11 
Closes https://github.com/espressif/esp-idf/issues/10116
 2022-11-29 14:32:41 +01:00
Jakob Hasse
46c92405f2 bugfix(tools): idf.py monitor now reads correctly on Linux 
A missing flush in the serial reader implementation for
Linux target was causing input to idf.py monitor to not
be forwarded to the application. This is fixed now.
 2022-11-25 11:32:49 +01:00
Euripedes Rocha
c0f99f5a28 [MQTT] Simplifies MQTT CMakeLists file 
- Uses mocks from tools instead of creating them.
- Move host based definition to test code.
 2022-11-24 08:48:00 +01:00
Roland Dobai
1f614bdcff Merge branch 'feature/oocd_ver_upgrade_v5.0' into 'release/v5.0' 
tools: Updates OpenOCD version to 'v0.11.0-esp32-20221026' (v5.0)

See merge request espressif/esp-idf!21004
 2022-11-22 22:12:26 +08:00
morris
0dbbf7bac5 pcnt: support accumulate count value 
Closes https://github.com/espressif/esp-idf/issues/10167
 2022-11-21 15:17:55 +08:00
Chen Yudong
6f583ccb29 tools: idf extra wheels url can be set by environment variables 2022-11-14 19:53:34 +08:00
Chen Yudong
0dbf7f5d4c tools: support download espidf constraints files from mirror url 2022-11-14 19:53:34 +08:00
Michael (XIAO Xufeng)
f8d4bc8911 soc: upgrade version printing to vX.Y 2022-11-10 06:21:11 +00:00
Alexey Gerenkov
e10d97a5d2 tools: Updates OpenOCD version to 'v0.11.0-esp32-20221026' 2022-11-08 21:15:28 +03:00
Martin Vychodil
af81bd1b0a Storage: Partition APIs moved to the new component 'esp_partition' 
All the partition handling API functions and data-types were moved from the 'spi_flash' component to the new one named 'esp_partition'. See Storage 5.x migration guide for more details
 2022-11-02 21:49:08 +01:00
Michael (XIAO Xufeng)
725eacbf16 Merge branch 'feature/usb/voltage_monitoring_backport_v5.0' into 'release/v5.0' 
tinyusb: TinyUSB in IDF v5.0.0 (backport v5.0)

See merge request espressif/esp-idf!20673
 2022-11-02 17:26:22 +08:00
morris
a6d2c65fdc Merge branch 'bugfix/2nd_bootloader_uart1_baudrate_issues_v5.0' into 'release/v5.0' 
esp_rom: fix 2nd bootloader custom uart1 baudrate issue (backport to v5.0)

See merge request espressif/esp-idf!20653
 2022-11-01 10:11:28 +08:00
morris
b1c856022c Merge branch 'bugfix/spi2_add_device_cs_more_than_3_v5.0' into 'release/v5.0' 
spi_master:fix error when use `spi_bus_add_device` more than 3 device(v5.0)

See merge request espressif/esp-idf!20073
 2022-10-31 11:46:16 +08:00
Jiang Jiang Jian
2635a18df2 Merge branch 'bufix/Backport_some_wifi_lwip_bugs_for_5.0_0821' into 'release/v5.0' 
Bufix/backport some wifi lwip bugs for 5.0 0821

See merge request espressif/esp-idf!20732
 2022-10-28 16:33:50 +08:00
jingli
e04c8505e1 esp32/rtc: fix xtal unstable in some cases when sleep 
1. add xtal buf wait to fix high temperature restart issue
2. add min sleep value to fix xtal stop due to too short sleep time issue
 2022-10-26 16:11:27 +08:00
Laukik Hase
9a97071501
esp_prov: Update deprecated APIs 
- Updated deprecated APIs for bleak module
- Updated README and troubleshooting reference for
  BLE transport
 2022-10-26 10:49:30 +05:30
Tomas Rezucha
61191a5ce5 tinyusb: Use TinyUSB from component registry 2022-10-25 06:44:56 +02:00
morris
acb3b06ed6 twai: remove deprecated code and add hint 
name "CAN" has been deprecated for a long time, this commit just remove
it from the code base.

Please use "TWAI" driver instead.
 2022-10-24 18:39:45 +08:00
xueyunfei
9948de101d lwip:bugfix for increase ping task stack size 2022-10-21 16:21:06 +08:00
Alexey Lapshin
97353355ab tools: cmake: check tool supported version with idf_tools.py 2022-10-18 12:27:55 +04:00
jiangguangming
9adf4dc240 esp_rom: fix 2nd bootloader custom uart1 baudrate issue 2022-10-18 11:02:25 +08:00
Aleksei Apaseev
79c0514f2b tools: fixed the coredump package's suppressed print 2022-10-17 17:54:39 +08:00
Michael (XIAO Xufeng)
2209831dd2 Merge branch 'feat/sdio_slave_disable_hs_v5.0' into 'release/v5.0' 
sdio_slave: allow disabling highspeed mode (v5.0)

See merge request espressif/esp-idf!20456
 2022-10-14 12:11:14 +08:00
Roland Dobai
bbc5009e9f Tools: Check venv the same way how it will be used later 
It is possible that import of venv passes but it still cannot be
started. This can happen with the embedded Python deployed by the
ESP-IDF installer.
 2022-10-11 16:26:21 +02:00
Ivan Grokhotkov
58f725a7fd Merge branch 'fix/export_without_constraint_download_v5.0' into 'release/v5.0' 
Tools: The Python dependency checker should not update the constraint file (v5.0)

See merge request espressif/esp-idf!20516
 2022-10-11 19:35:00 +08:00
Roland Dobai
737cdcbaa6 Tools: The Python dependency checker should not update the constraint file 
The Python dependency checker called from the export scripts and before
build remains offline, i.e. it will use the previously downloaded
constraint file but won't download a newer version.

Related to https://github.com/espressif/esp-idf/pull/9328
 2022-10-10 09:46:39 +02:00
yuanjianmin
bb41b340b9 ci: Fix mqtt broker is not available 2022-10-10 02:38:28 +00:00
Euripedes Rocha
9d29738473 Makes COMPONENT_LIB available for mock components 
- COMPONENT_LIB wasn't available for parent scope
 2022-10-07 14:26:14 +02:00
Alexey Lapshin
2d61c9ca79 tools: move cmake executable check into function uses it 
Before this change idf.py could exit with reason cmake does not exist in PATH
even cmake will not be executed by idf.py (e.g., 'idf.py gdb').
 2022-10-03 18:48:16 +04:00
Alexey Lapshin
7561367808 tools: add test for ROM symbols in GDB 2022-10-03 18:48:16 +04:00
Alexey Lapshin
2e9f175ae5 tools: fixed elf symbols load if gdbinit specified 
ROM and bootloader symbols add to use in GDB (via 'idf.py gdb')
 2022-10-03 18:48:16 +04:00
Alexey Lapshin
3eec946f60 tools: add esp-rom-elfs version '20220823' 2022-10-03 18:48:16 +04:00
Michael (XIAO Xufeng)
1d09c78c17 sdio_slave: allow disabling highspeed mode 2022-10-01 01:53:28 +08:00
Roland Dobai
dc9a41b562 Tools: Improve download error messages coming from idf_tools.py 
Closes https://github.com/espressif/esp-idf/issues/9618
 2022-09-26 14:46:23 +02:00
Marek Fiala
1e6e0cf062 Tools: Support ESP-IDF installed in system-wide shared directory for all users 
Closes: https://github.com/espressif/esp-idf/issues/9329
Closes: https://github.com/espressif/esp-idf/pull/9328
 2022-09-23 15:54:57 +02:00
Jiang Jiang Jian
c321739074 Merge branch 'ci/optimize_ats_ci_flow_v5.0' into 'release/v5.0' 
CI: optimize ATS ci flow (v5.0)

See merge request espressif/esp-idf!20173
 2022-09-21 23:12:40 +08:00
Darian Leung
0c8ac295c5 riscv: Remove redundant riscv_interrupts.h header 
This commit removes the riscv_interrupts.h header is it has become redundant. The previously
exposed API has been handled as follows:

- "riscv_interrupt_enable()" and "riscv_interrupt_disable()" have been removed. These functions
  were declarations only and never had any implementation.
- "riscv_global_interrupts_enable()" and "riscv_global_interrupts_disable()" renamed to
  "rv_utils_intr_global_enable()" and "rv_utils_intr_global_disable()" respectively and now
  placed in rv_utils.h
 2022-09-19 14:19:11 +08:00
Jiang Jiang Jian
2772806cb6 Merge branch 'feature/ulp_binutils_multi_target_v5.0' into 'release/v5.0' 
ulp: support the new multi-target ULP-FSM binutils (v5.0)

See merge request espressif/esp-idf!20132
 2022-09-19 11:03:49 +08:00
Chen Yudong
5e175a4d01 CI: optimize ATS ci flow 2022-09-15 18:44:50 +08:00
Jiang Jiang Jian
581b228d04 Merge branch 'fix/python_dbus_linux_v5.0' into 'release/v5.0' 
Tools: Install dbus-python on Linux only (v5.0)

See merge request espressif/esp-idf!20128
 2022-09-14 13:58:08 +08:00
Jiang Jiang Jian
1313574c89 Merge branch 'bugfix/idf_tools_update_bundled_cert_v5.0' into 'release/v5.0' 
tools: update bundled root certificate in idf_tools.py (v5.0)

See merge request espressif/esp-idf!20113
 2022-09-14 13:57:51 +08:00
Jiang Jiang Jian
1944b4bdb3 Merge branch 'bugfix/build_color_output_windows_v5.0' into 'release/v5.0' 
tools: idf.py: use actual sys.stdout instead of the memoized one (v5.0)

See merge request espressif/esp-idf!20112
 2022-09-14 13:53:41 +08:00
Jiang Jiang Jian
21a15ad172 Merge branch 'feature/usb_v5_qol_backport_v5.0' into 'release/v5.0' 
usb: USB IDF v5 update (backport v5.0)

See merge request espressif/esp-idf!20045
 2022-09-14 13:52:36 +08:00