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
9,863 Commits 20 Branches 148 Tags 384 MiB
43135dc348
Commit Graph

1797 Commits

Author SHA1 Message Date
suda-morris
61ce868396 make bootloader_support support esp32s2beta 2019-06-11 13:07:02 +08:00
suda-morris
b146104885 add esp32s2beta component 2019-06-11 13:06:32 +08:00
suda-morris
cc98b9ef60 add rom for esp32s2beta 2019-06-11 13:06:32 +08:00
suda-morris
2f4c5c51f4 update esp32 component 2019-06-11 13:06:32 +08:00
Angus Gratton
a0382de0ea Merge branch 'bugfix/psram_io_struct_uninitialized' into 'master' 
Make sure the psram_io struct is initialized

See merge request idf/esp-idf!5147
 2019-06-07 07:36:16 +08:00
Jeroen Domburg
2b7da2a245 Make unknown psram package version more obvious 2019-06-06 16:57:01 +08:00
Gautier Seidel
542e544faa esp32: Allow fixed static RAM size and DRAM heap size 
Merges https://github.com/espressif/esp-idf/pull/3222
 2019-06-06 18:23:04 +10:00
Jeroen Domburg
ed17cbbb8a Make sure the psram_io struct is initialized 
Closes https://github.com/espressif/esp-idf/issues/3591
 2019-06-06 09:05:49 +08:00
Angus Gratton
045aaf6fb0 Merge branch 'feature/add_xxx_periph_h' into 'master' 
soc: Add xxx_periph.h for all modules

Closes IDF-192

See merge request idf/esp-idf!4952
 2019-06-04 13:24:14 +08:00
Angus Gratton
db6a30b446 Merge branch 'bugfix/libgcc_fpu_functions' into 'master' 
esp32: Use FPU for floating point divide, power, complex multiplications

See merge request idf/esp-idf!5005
 2019-06-04 08:41:58 +08:00
Wu Jian Gang
4d3762a8df clk: Fix the overflow when setting ccount 
The multiplication will be overflow when using 160 or 240 MHz, this can lead the inaccuracy of log time stamp in startup.
 2019-06-03 11:04:47 +00:00
Konstantin Kondrashov
399d2d2605 all: Using xxx_periph.h 
Using xxx_periph.h in whole IDF instead of xxx_reg.h, xxx_struct.h, xxx_channel.h ... .

Cleaned up header files from unnecessary headers (releated to soc/... headers).
 2019-06-03 14:15:08 +08:00
Angus Gratton
30d9ee56fb Merge branch 'feature/config_spi_pins_based_on_efuse_value' into 'master' 
feat(psram): config SPI psram pins based on efuse value

See merge request idf/esp-idf!4950
 2019-05-31 16:15:56 +08:00
Angus Gratton
0b70dfc27f Add floating point performance test 2019-05-30 10:09:24 +10:00
Angus Gratton
31b854e17d Merge branch 'feature/do_not_use_link_groups' into 'master' 
Do not use link groups

See merge request idf/esp-idf!4897
 2019-05-29 15:18:31 +08:00
Angus Gratton
73b90387cb Merge branch 'bugfix/reset_log_uart_port' into 'master' 
esp32: Add reset CONSOLE_UART port

See merge request idf/esp-idf!5011
 2019-05-29 14:28:37 +08:00
Angus Gratton
c7a0d5e063 Fix bug in the floating point unit test code 2019-05-29 10:14:31 +10:00
Angus Gratton
d9a5c8f387 esp32: Use FPU for floating point divide, power, complex multiplications 
* Linker was choosing ROM symbols for these, which use integer soft-float
  operations and are much slower.
* _divsf3() moved to IRAM to avoid regressions with any code that does
  integer float division in IRAM interrupt handlers (+88 bytes IRAM)
* Thanks to michal for reporting:
  https://esp32.com/viewtopic.php?f=14&t=10540&p=43367
 2019-05-29 10:14:31 +10:00
Angus Gratton
154fc74f76 Merge branch 'bugfix/nvs_typedef_naming_pr3239' into 'master' 
nvs: Append _t to nvs_handle & nvs_open_mode types

Closes IDFGH-891

See merge request idf/esp-idf!4783
 2019-05-29 08:14:00 +08:00
chenjianqiang
db138ae19b feat(psram): config SPI psram pins based on efuse value 2019-05-28 21:25:16 +08:00
chenjianqiang
d68f1907ef bugfix(flash): improve flash dio read timing 
When flash work in DIO Mode, in order to ensure the fast read mode of flash
is a fixed value, we merged the mode bits into address part, and the fast
read mode value is 0 (the default value).
 2019-05-28 14:51:04 +08:00
Angus Gratton
22514c1dd9 cmake: For gcc8 use linker to find paths to libc, libm, libstdc++, etc 
Removes the need to know/guess the paths to these libraries. Once we are gcc 8 only, we
can remove -nostdlib and no additional arguments are needed for system libraries.

The catch is: any time IDF overrides a symbol in the toolchain sysroot, we need
an undefined linker marker to make sure this symbol is seen by linker.
 2019-05-28 12:54:37 +08:00
Angus Gratton
b2e54a9cc6 ci: Add IDF_DEPRECATED macro for things we only deprecate in our CI passes 2019-05-27 17:43:38 +10:00
liu zhifu
197e0ae147 esp_wifi: fix some WiFi bugs 
Fix following WiFi bugs:
1. Make smartconfig thread-safe
2. Fix WiFi stop/deinit memory leak
3. Refactor for WiFi init/deinit/ioctl etc
4. Add declaration for esp_wifi_internal_ioctl()
5. Fix the bug that WiFi stop leads to task watchdog
 2019-05-22 22:18:05 +08:00
Roland Dobai
1ad2283641 Rename Kconfig options (components/bootloader) 2019-05-21 09:32:55 +02:00
Roland Dobai
6c0a7a66f3 Rename Kconfig options (components/app_trace) 2019-05-21 09:32:55 +02:00
Roland Dobai
0ae53691ba Rename Kconfig options (components/esp32) 2019-05-21 09:09:01 +02:00
Roland Dobai
b8111ab1d5 Rename Kconfig options (components/esp_wifi) 2019-05-21 09:09:01 +02:00
Roland Dobai
64c2aa15aa Rename Kconfig options (components/freertos) 2019-05-21 09:09:01 +02:00
Roland Dobai
c5000c83d2 Rename Kconfig options (root) 2019-05-21 09:09:01 +02:00
Konstantin Kondrashov
be6f5563b4 esp32: Add reset uart 
Fixed the case when the first part of log was missed
this was happened when:
 * CONFIG_CONSOLE_UART_CUSTOM option is selected (UART1)
 * The selected CONSOLE_UART port is used also for the console component
 * in code esp_restart() or abort() functions were called.
 2019-05-21 06:18:28 +00:00
Ivan Grokhotkov
6b08e8b449 esp_timer: handle esp_timer_delete in timer task 
Closes https://github.com/espressif/esp-idf/issues/3458
 2019-05-21 10:48:28 +08:00
Angus Gratton
907471ce41 Merge branch 'feature/cmake_changes_for_4.0' into 'master' 
CMake for 4.0

See merge request idf/esp-idf!4452
 2019-05-17 14:21:48 +08:00
Renz Christian Bagaporo
477fa49fc0 examples: update idf_as_lib example to use new api 2019-05-14 18:01:14 +08:00
Renz Christian Bagaporo
ffec9d4947 components: update with build system changes 2019-05-13 19:59:17 +08:00
Sachin Parekh
a190b527ac power_management: port*_CRITICAL vanilla FreeRTOS compliance 
Signed-off-by: Sachin Parekh <sachin.parekh@espressif.com>
 2019-05-13 16:39:19 +05:30
Sachin Parekh
db8041a67f intr_alloc: port*_CRITICAL vanilla FreeRTOS compliance 
Signed-off-by: Sachin Parekh <sachin.parekh@espressif.com>
 2019-05-13 16:39:19 +05:30
Sachin Parekh
f3db0b5a4a crosscore_init: port*_CRITICAL vanilla FreeRTOS compliance 
Signed-off-by: Sachin Parekh <sachin.parekh@espressif.com>
 2019-05-13 16:39:19 +05:30
Ivan Grokhotkov
912c8e31fc Merge branch 'bugfix/pm_isr_exit_lock' into 'master' 
pm: prevent interrupt nesting during esp_pm_impl_isr_hook

See merge request idf/esp-idf!4775
 2019-04-18 11:16:26 +08:00
Ivan Grokhotkov
d31ee806be pm: prevent interrupt nesting during esp_pm_impl_isr_hook 
Follows the approach proposed in https://github.com/espressif/esp-idf/pull/3110,
but masks the interrupts during the entire ISR hook, not only during
leave_idle. Interrupt nesting during update_ccompare may also cause
issues.

Closes https://github.com/espressif/esp-idf/issues/3057
 2019-04-17 07:13:52 +00:00
Michael (XIAO Xufeng)
562af8f65e global: move the soc component out of the common list 
This MR removes the common dependency from every IDF components to the SOC component.

Currently, in the ``idf_functions.cmake`` script, we include the header path of SOC component by default for all components.
But for better code organization (or maybe also benifits to the compiling speed), we may remove the dependency to SOC components for most components except the driver and kernel related components.

In CMAKE, we have two kinds of header visibilities (set by include path visibility):

(Assume component A --(depends on)--> B, B is the current component)

1. public (``COMPONENT_ADD_INCLUDEDIRS``): means this path is visible to other depending components (A) (visible to A and B)
2. private (``COMPONENT_PRIV_INCLUDEDIRS``): means this path is only visible to source files inside the component (visible to B only)

and we have two kinds of depending ways:

(Assume component A --(depends on)--> B --(depends on)--> C, B is the current component)

1. public (```COMPONENT_REQUIRES```): means B can access to public include path of C. All other components rely on you (A) will also be available for the public headers. (visible to A, B)
2. private (``COMPONENT_PRIV_REQUIRES``): means B can access to public include path of C, but don't propagate this relation to other components (A). (visible to B)

1. remove the common requirement in ``idf_functions.cmake``, this makes the SOC components invisible to all other components by default.
2. if a component (for example, DRIVER) really needs the dependency to SOC, add a private dependency to SOC for it.
3. some other components that don't really depends on the SOC may still meet some errors saying "can't find header soc/...", this is because it's depended component (DRIVER) incorrectly include the header of SOC in its public headers. Moving all this kind of #include into source files, or private headers
4. Fix the include requirements for some file which miss sufficient #include directives. (Previously they include some headers by the long long long header include link)

This is a breaking change. Previous code may depends on the long include chain.
You may need to include the following headers for some files after this commit:

- soc/soc.h
- soc/soc_memory_layout.h
- driver/gpio.h
- esp_sleep.h

The major broken include chain includes:

1. esp_system.h no longer includes esp_sleep.h. The latter includes driver/gpio.h and driver/touch_pad.h.
2. ets_sys.h no longer includes soc/soc.h
3. freertos/portmacro.h no longer includes soc/soc_memory_layout.h

some peripheral headers no longer includes their hw related headers, e.g. rom/gpio.h no longer includes soc/gpio_pins.h and soc/gpio_reg.h

BREAKING CHANGE
 2019-04-16 13:21:15 +08:00
Ivan Grokhotkov
d359d4c77c Merge branch 'bugfix/fix_deprecated_warning_with_dfs_init_auto_config' into 'master' 
cpu_start: fix warnings with CONFIG_PM_DFS_INIT_AUTO option

See merge request idf/esp-idf!4761
 2019-04-15 15:57:49 +08:00
Ivan Grokhotkov
f935294c48 Merge branch 'doc/move_WiFi_Kconfig' into 'master' 
move WiFi-specific Kconfig to esp-wifi component

See merge request idf/esp-idf!4736
 2019-04-15 12:00:59 +08:00
Mahavir Jain
f4328e5346 cpu_start: fix warnings with CONFIG_PM_DFS_INIT_AUTO option 
Closes https://github.com/espressif/esp-idf/issues/3297
 2019-04-15 03:08:26 +00:00
Jiang Jiang Jian
91eb59f543 Merge branch 'bugfix/improve_spi_timing_for_psram_and_flash' into 'master' 
bugfix(psram): improve spi cs timing settings for psram

See merge request idf/esp-idf!4641
 2019-04-12 22:57:04 +08:00
suda-morris
958c2792e3 move WiFi-specific Kconfig to esp-wifi component 
1. separate Kconfig from esp32 component
2. modify component.mk for esp_wifi a little bit to make it depend on IDF_TARGET
 2019-04-11 12:33:15 +08:00
Ivan Grokhotkov
b1a722b2ca system_api: return error on repeated registration of shutdown handler 2019-04-11 12:04:58 +08:00
Ivan Grokhotkov
bd309a133f system_api: add esp_unregister_shutdown_handler 2019-04-11 12:04:58 +08:00
Ivan Grokhotkov
a2d59525e5 mdns: use esp_event library to handle events 2019-04-11 12:04:58 +08:00
Ivan Grokhotkov
b1d1e37f87 event loop: re-implement based on esp_event library 
Includes ds2ds unit test fix, iperf example test fix
 2019-04-11 12:04:58 +08:00
Wangjialin
448d32bc53 bugfix(psram): improve spi cs timing settings for psram 
1. remove redundant SPI clock settings, use rom functions to set clock.
2. remove redundant SPI cs setup and hold settings.
3. for old 32Mbit psram, cs hold time must only be 0.5T due to the special driving mode.(cs_setup = 0; cs_hold = 0)
4. for new 64Mbit psram, cs hold time is recommended to be 2.5T. (cs_setup = 1, cs_setup_time = 0;cs_hold = 1, cs_hold_time = 1)
 2019-04-09 11:24:10 +08:00
Renz Christian Bagaporo
90ee405afd ldgen: update component linker fragment files 2019-04-04 15:57:34 +08:00
morris
f5b03c9ea3 misc adjustment of esp32 component 2019-04-03 19:57:46 +08:00
Ivan Grokhotkov
43d3e75125 Merge branch 'feature/derive_esp_wifi_from_esp32' into 'master' 
derive esp_wifi from esp32 component

See merge request idf/esp-idf!4602
 2019-04-02 10:13:15 +08:00
Angus Gratton
ae585b6615 Merge branch 'bugfix/external_rtc_start_fail' into 'master' 
Bugfix/external rtc start fail

See merge request idf/esp-idf!4374
 2019-04-02 09:42:27 +08:00
morris
79bb5de426 derive esp_wifi from esp32 component 2019-04-01 20:04:52 +08:00
zhangyanjiao
b13ceaf468 wifi: increase the block scan time because of changing channel will take at 30nm when BT/WiFi coexist 2019-04-01 03:12:20 +00:00
morris
dbdb299bb1 create xtensa component 
1. move xtensa specific files out of esp32 component
2. merge xtensa-debug-module component into xtensa
 2019-03-27 20:24:28 +08:00
Ivan Grokhotkov
18946a5421 Merge branch 'feature/common_parts_into_esp_common' into 'master' 
move common include files from esp32 into esp_common

See merge request idf/esp-idf!4515
 2019-03-27 17:00:58 +08:00
Jiang Jiang Jian
21f6b4d6c3 Merge branch 'bugfix/modify_wifi_reason_code' into 'master' 
wifi: modify wifi reason code

Closes WIFI-268 and WIFI-388

See merge request idf/esp-idf!4604
 2019-03-27 16:50:35 +08:00
morris
709a320f33 move hwcrypto from esp32 to mbedtls 2019-03-26 16:24:22 +08:00
morris
a2f07b0806 move common include files from esp32 into esp_common 2019-03-26 11:57:03 +08:00
zhangyanjiao
ebe7190f01 wifi: modify wifi reason code 2019-03-26 11:16:47 +08:00
Jiang Jiang Jian
c2d1f83bce Merge branch 'mesh/decouple_addition' into 'master' 
wifi: decouple mesh functions from net80211

See merge request idf/esp-idf!4393
 2019-03-22 12:57:03 +08:00
Angus Gratton
1be147c457 Merge branch 'feature/allow_components_to_declare_images_to_flash' into 'master' 
Allow components to present their own images to flash

See merge request idf/esp-idf!4148
 2019-03-22 11:14:37 +08:00
morris
fcedf442ce move common source files from esp32 to esp_common 2019-03-22 10:35:03 +08:00
morris
c159984264 separate rom from esp32 component to esp_rom 
1. separate rom include files and linkscript to esp_rom
2. modefiy "include rom/xxx.h" to "include esp32/rom/xxx.h"
3. Forward compatible
4. update mqtt
 2019-03-21 18:51:45 +08:00
Ivan Grokhotkov
106dc05903 Merge branch 'feature/specify_includes_belonging_esp32' into 'master' 
move esp32 chip specific includes to esp32/xxx.h

See merge request idf/esp-idf!4534
 2019-03-21 18:34:08 +08:00
Ivan Grokhotkov
ce07a1057c Merge branch 'feature/make-debug-verbose-usable' into 'master' 
logs: Make verbose and debug logging cleaner

Closes IDFGH-782

See merge request idf/esp-idf!4578
 2019-03-21 18:29:50 +08:00
Hanh Tran
e5e41e0a5e Fix comment typos in WiFi types header 
Merges https://github.com/espressif/esp-idf/pull/3145
 2019-03-21 15:06:24 +08:00
Anuj Deshpande
13cf867023 logs: Make verbose and debug logging cleaner 
* Closes #3193
* Closes IDFGH-782

The logs that are deleted in this commit make debug and verbose mode
unusable.
 2019-03-21 11:54:04 +05:30
Angus Gratton
25043c4d56 Merge branch 'feature/merge_flash_data_type-flash_partitions' into 'master' 
merge esp_flash_data_types into esp_flash_partitions

See merge request idf/esp-idf!4504
 2019-03-21 13:40:40 +08:00
maojianxin
95301c16bd Fix external start fail 2019-03-20 18:34:01 +08:00
chenyudong
b2b0f75fbb Decouple Wifi and ESP-Mesh to reduce bin size 
Do not link mesh code when mesh is not used
 2019-03-20 15:17:03 +08:00
Jiang Jiang Jian
d31a137f9c Merge branch 'bugfix/mesh_memory_leak' into 'master' 
mesh: fix memory leak and group send

See merge request idf/esp-idf!4438
 2019-03-20 14:57:05 +08:00
Anton Maklakov
886d8a6f28 Merge branch 'bugfix/newlib_misc_cleanups' into 'master' 
newlib: minor cleanup

See merge request idf/esp-idf!4550
 2019-03-20 11:08:20 +08:00
Ivan Grokhotkov
068b700786 newlib: remove usage of pre-ANSI defines 2019-03-19 22:15:26 +08:00
morris
fd9bc30aca separate legacy esp_event from esp32 component to esp_event 2019-03-18 19:58:04 +08:00
morris
956c25dedd move esp32 chip specific includes to esp32/xxx.h 2019-03-18 17:14:05 +08:00
morris
fae39dc326 merge esp_flash_data_types into esp_flash_partitions 2019-03-18 08:51:55 +00:00
chenyudong
7d96b3442a mesh: fix memory leak and group send 
fix a bug in group send
fix esp_mesh_set_router when router_t not initialized
fix mesh memory leak with invalid option
 2019-03-18 14:43:21 +08:00
Renz Christian Bagaporo
234de8de55 cmake: Allow components to present their own images to flash 2019-03-18 03:45:22 +08:00
zhangyanjiao
6408ef9e7c wifi: fix the bug that when call set_config before connecting to an encrypted AP, PMK will be recalculated 
Closes https://github.com/espressif/esp-idf/issues/2880
 2019-03-15 16:28:58 +08:00
Jiang Jiang Jian
b1a81e8167 Merge branch 'bugfix/bb_watchdog_reset' into 'master' 
esp32: add WiFi baseband watchdog reset

See merge request idf/esp-idf!4409
 2019-03-15 16:12:30 +08:00
Angus Gratton
cc9b06d4da Merge branch 'bugfix/esp_sha_signing_sha256' into 'master' 
secure boot: Fix esp_sha INT WDT, switch to using mbedTLS API

Closes IDFGH-681

See merge request idf/esp-idf!4440
 2019-03-15 14:35:38 +08:00
Ivan Grokhotkov
416b756ea4 Merge branch 'bugfix/name_conflict_esp32_project_ld' into 'master' 
esp32: Rename esp32.common.ld to esp32.project.ld to avoid build errors when downgrading

See merge request idf/esp-idf!4484
 2019-03-15 11:42:20 +08:00
Angus Gratton
12bdf8e45b esp32: Chunk input blocks for esp_sha() function performance, add perf test 2019-03-14 05:56:06 +00:00
Angus Gratton
6a6fbde83d esp32 hwcrypto: Prevent esp_sha() from disabling interrupts for extended period 
* Closes https://github.com/espressif/esp-idf/issues/3127
* Closes IDFGH-681

Also reported at https://esp32.com/viewtopic.php?f=13&t=9506
 2019-03-14 05:56:06 +00:00
Angus Gratton
a79c5b8271 esp32: Rename esp32.common.ld to esp32.project.ld to avoid build errors when downgrading 
Linker script generator produces build/esp32/esp32.common.ld from
components/esp32/ld/esp32.common.ld.in

This works fine until IDF is downgraded to V3.1 which uses components/esp32/ld/esp32.common.ld and
doesn't track build/esp32/esp32.common.ld at all.

At this point, the linker runs in the build/esp32 directory and "-T esp32.common.ld" picks up the
linker script generated .ld file, which causes mis-builds.

As reported on forums: https://esp32.com/viewtopic.php?f=13&t=9684&p=40105
 2019-03-14 09:59:31 +11:00
Angus Gratton
fa5bc5d58b Merge branch 'bugfix/ssid_passwords_null_terminated' into 'master' 
wifi: Specify that SSID & Password fields should be NULL terminated strings

See merge request idf/esp-idf!4468
 2019-03-13 13:29:09 +08:00
Angus Gratton
710bcbd447 Merge branch 'feature/freertos_check_mutex_owner' into 'master' 
freertos: check that mutex is released by owner task

See merge request idf/esp-idf!4012
 2019-03-13 13:15:34 +08:00
Angus Gratton
f44dcf4878 Merge branch 'bugfix/macros_trailing_semicolon' into 'master' 
Remove trialing semicolon from function-like macros

See merge request idf/esp-idf!4397
 2019-03-13 13:15:12 +08:00
Angus Gratton
8120efc6ed Merge branch 'bugfix/modify_dhcpserver_and_tcpip_adapter' into 'master' 
modify the behavior for dhcpserver and tcpip_adapter

Closes IDFGH-557 and IDFGH-563

See merge request idf/esp-idf!4453
 2019-03-13 12:54:55 +08:00
Liu Zhi Fu
674d234283 esp32: add WiFi baseband watchdog reset 
When WiFi enter into a special status (11b weak mode), then reset
Wifi baseband to recover to normal mode.
 2019-03-13 11:09:30 +08:00
Angus Gratton
79d37b75f3 wifi: Specify that SSID & Password fields should be NULL terminated strings 
Closes https://github.com/espressif/esp-idf/issues/1176
 2019-03-13 11:44:41 +11:00
Ivan Grokhotkov
d539183b40 esp32: use binary semaphore instead of mutex in dport tests 2019-03-11 14:40:54 +00:00
zhangyanjiao
27cc0d1f91 modify the behavior for dhcpserver and tcpip_adapter: 
1. dhcp_server: suppress send_offer debug output
2. tcpip_adapter: zero-initialize system_event_t structures
3. tcpip_adapter: pass client IP address along with SYSTEM_EVENT_AP_STAIPASSIGNED

Closes https://github.com/espressif/esp-idf/issues/2924
Closes https://github.com/espressif/esp-idf/issues/2949
 2019-03-11 12:11:05 +08:00
aleks
13e1c0b32f esp32: coredump header (fix linker.lf) 
remove duplicated include from components/esp32/incliude/esp_core_dump.h
espcoredump/incliude/esp_core_dump.h:
fix signature of the functions esp_core_dump_to_uart() and esp_core_dump_to_uart();
add espcoredump into COMPONENT_PRIV_REQUIRES list
fix linker.lf file
 2019-03-08 09:49:37 +00:00
Ivan Grokhotkov
42c906140e Merge branch 'bugfix/level5_intr_alloc' into 'master' 
esp32: esp_intr_alloc: Fixed issue with level 5 not being called

Closes IDFGH-616

See merge request idf/esp-idf!4405
 2019-03-06 11:18:36 +08:00
Ivan Grokhotkov
d474018725 Merge branch 'feature/gdbstub_task_list' into 'master' 
Add support for listing tasks to gdb in gdbstub

Closes IDFGH-498

See merge request idf/esp-idf!4357
 2019-03-06 11:12:46 +08:00