Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3726 commits 10 branches 75 tags 114 MiB
Commit graph

2816 commits

Author SHA1 Message Date
Angus Gratton
728b46c578 Merge branch 'bugfix/minor_fixes_github' into 'master' 
Minor fixes from github

See merge request !1292
 2017-09-21 07:21:32 +08:00
me-no-dev
14b12a27cf Fix typo in spiffs config and update submodule 
Fixes github issues #1012 and #1013

https://github.com/espressif/esp-idf/issues/1012
https://github.com/espressif/esp-idf/issues/1013
 2017-09-20 17:29:57 +08:00
Yulong
f325ba3942 component/bt: Change the cmpl_evt command in the bta_gattc_read_cmpl function. 2017-09-20 04:28:52 -04:00
Angus Gratton
7e428433e1 Merge branch 'bugfix/lwip_tcp_oversize_assert' into 'master' 
fix lwip tcp_oversize_dbgcheck assert

See merge request !1260
 2017-09-20 10:16:47 +08:00
Simon Werner
45ad0cdda2 Improved uart_flush() documentation. 
Improved `uart_flush()` documentation based on this discussion: https://esp32.com/viewtopic.php?f=13&t=2804&p=13377&hilit=uart_flush#p13373

Merges https://github.com/espressif/esp-idf/pull/970
 2017-09-20 12:09:44 +10:00
Tian Hao
b54719d00f component/bt : fix bluetooth controller enable limit && release memory when de-initialize bluetooth controller 
1. fix bluetooth controller enable limit
2. release memory when de-initialize bluetooth controller
3. fix heap_caps_add_region limit
 2017-09-19 21:14:28 +08:00
michael
1b91cb7be0 fix(sdspi): fix issues causing the sdspi driver to work low efficiently with DMA. 2017-09-19 19:00:47 +08:00
Yulong
e815660824 component/bt: Fixed the bug of mutiple read can not callback. 2017-09-19 04:50:26 -04:00
michael
074f36afff fix(spi_master): fix the heap corruption bug that RX DMA writes over the temporary buffer boundary. 
TW#15434

Closes #994.
 2017-09-19 16:47:14 +08:00
Yulong
7827bc486d component/bt: Fiexd the bug of the gattc cannot get the db properties. 2017-09-18 23:15:32 -04:00
Ivan Grokhotkov
9325f2a7a4 nvs_flash: emulator: fix issues in load function, add save function 2017-09-19 10:39:44 +08:00
Ivan Grokhotkov
fe30789149 nvs_flash: delete Storage if init fails 
Previously, nvs_flash_init_custom would not be called if Storage for a
particular partition was already created. This caused issues if the
first call to nvs_flash_init failed due to Storage init error. This issue
exhibited itself as random failures of NVS CI test.

With this change, storage object is deleted (and not added to storage
list) if initialization fails.
 2017-09-19 10:39:44 +08:00
Ivan Grokhotkov
f32b25ebe2 nvs_flash: add functions to deinitialize storage 2017-09-19 10:39:44 +08:00
Amey Inamdar
c8945bb82a nvs: minor - removed unused header inclusion 
Signed-off-by: Amey Inamdar <amey.inamdar@gmail.com>
 2017-09-18 17:02:32 +05:30
Jiang Jiang Jian
e9655c5d90 Merge branch 'feature/btdm_cherry_pick_ble_new_api' into 'master' 
Feature/btdm cherry pick ble new api

See merge request !1113
 2017-09-18 18:17:11 +08:00
Yulong
388bf8d579 componnent/bt: remove the <<<<<<< HEAD in the code. 2017-09-18 05:44:50 -04:00
Yulong
8925a90d40 squash again 
squash the commit.
component/bt:Added the update_white_list & set_prefer_conn_params API to the bt project.

component/bt: Added the get white list size API & delete the read adv tx power API.

component/bt: Change the esp_gap_ble_api.h esp_ble_gap_set_prefer_conn_params API docs.

changed btm_find_dev to btm_find_or_alloc_dev

component/bt: Change the rssi API deep copy method.

component/bt: Change the code as comment in the gitlab.

squash the commit.
component/bt:Added the update_white_list & set_prefer_conn_params API to the bt project.

component/bt: Added the get white list size API & delete the read adv tx power API.

component/bt: Change the esp_gap_ble_api.h esp_ble_gap_set_prefer_conn_params API docs.

changed btm_find_dev to btm_find_or_alloc_dev

component/bt: Change the rssi API deep copy method.

component/bt: Change the code as comment in the gitlab.

component/bt: change the ESP_BLE_CONN_PARAM_UNDEF redefinition error.

component/bt: Change the ESP_BLE_IS_VALID_PARAM function with the compile error.
 2017-09-18 05:39:26 -04:00
Angus Gratton
959462ffb6 multi_heap_poisoning: Use MULTI_HEAP_STDERR_PRINTF (ets_printf) to print heap errors 
Needed because normal printf() can trigger a malloc() (for standard stream locks) which
then re-triggers this check.
 2017-09-18 16:54:28 +10:00
Angus Gratton
76d8190444 multi_heap: Print the problem address when aborting due to heap corruption 
New multi_heap code has proven effective at aborting when buffer overruns occur,
but it's currently hard to debug the stack traces from these failures.
 2017-09-18 16:54:23 +10:00
michael
8244fa95fe feat(log): add new function to log buffer with level and hex dump. 2017-09-18 11:44:54 +08:00
Angus Gratton
9a1ba5985b Merge branch 'feature/partition_table_expand_line' into 'master' 
partition_table: Expand vars before splitting fields (github #841)

See merge request !1174
 2017-09-18 09:18:25 +08:00
Alexey Gerenkov
fe3b557fa8 esp32: Fixes double initialization of apptrace down ring buffer in dual core mode 
Additional minor fixes:
 - Host file I/O code warnings
 - Initialization of down buffer for GCOV
 2017-09-15 22:45:21 +03:00
Jiang Jiang Jian
3d7ec475d1 Merge branch 'feature/btdm_cherry_pick_change_gattc_api' into 'master' 
component/bt: Change all the gattc API && bta gattc layer.

See merge request !1147
 2017-09-15 19:39:29 +08:00
Jiang Jiang Jian
18f2a29a99 Merge branch 'bugfix/btdm_smp_close_compile_error' into 'master' 
component/bt: fix the bug when close the SMP module in the menuconfig will lead to compile error.

See merge request !1265
 2017-09-15 19:36:30 +08:00
Ivan Grokhotkov
4d62f8e5d0 Merge branch 'bugfix/apptrace_init_sequence' into 'master' 
Changed initialization sequence of application tracing component on APP CPU so i…

See merge request !1256
 2017-09-15 15:02:42 +08:00
Tian Hao
dff95aed65 component/bt : fix a malloc bzero of blufi 2017-09-15 11:08:42 +08:00
Yulong
875ba996d5 component/bt: fix the bug when close the SMP module in the menuconfig will lead to compile error. 2017-09-15 10:32:28 +08:00
zhangyanjiao
336c4b4a55 fix lwip tcp_oversize_dbgcheck assert 2017-09-15 10:28:51 +08:00
Alexey Gerenkov
b09f4acb27 Added proper handling of apptrace and pthread initialization errors 2017-09-14 20:47:43 +02:00
krzychb
a1ebeed303 Changed initialization sequence of application tracing component on APP CPU so it follows completion of initialization of the same component on PRO CPU. Previously, because of missing locking mechanism, both components were printing logs to UART at the same time. As results logs contained only corrupted characters / were not legible at all. Internal tracking: esp-idf/openocd-esp32, Issue 15 2017-09-14 20:47:43 +02:00
yulong
09a3e4fd58 squesh the commit. 
component/bt: Change the idf test KnownIssues file.

component/bt: Fixed the bug of gattc mutilple read.
 2017-09-14 09:35:36 -04:00
Jiang Jiang Jian
4c97fc04ca Merge branch 'bugfix/optimize_lwip_loopback_route' into 'master' 
optimize lwip route when loopback open and in "APSTA" mode

See merge request !1252
 2017-09-14 21:07:58 +08:00
Jiang Jiang Jian
5aa52709c2 Merge branch 'bugfix/fix_some_wifi_lib_bugs' into 'master' 
Fix some wifi lib bugs

See merge request !1255
 2017-09-14 20:39:02 +08:00
Jiang Jiang Jian
c74d944edf Merge branch 'feature/refractor_smartconfig' into 'master' 
Refractor smartconfig

See merge request !1253
 2017-09-14 20:38:30 +08:00
Jeroen Domburg
0460069582 Merge branch 'bugfix/panic_dport_no_mutex' into 'master' 
Panic: stop dport access handler without trying to use a lock

See merge request !1244
 2017-09-14 18:07:06 +08:00
Jiang Jiang Jian
fff90da8d6 Merge branch 'bugfix/btdm_gatt_read_by_type_bug' into 'master' 
component/bt: Fix gatt read by type response bug

See merge request !1102
 2017-09-14 17:24:02 +08:00
zhangyanjiao
164006509f optimize lwip route when loopback open and in "APSTA" mode 2017-09-14 16:19:05 +08:00
XiaXiaotian
6bfbe6e4ed Fix some wifi lib bugs 
1. add adc2 coexistence

2. change NOW() to WDEV_NOW()

3. call ets_timer_done() before calling ets_timer_setfn()

4. fix the bug that api lock is not unlocked when call esp_wifi_stop()
   twice

5. more hmac tx buffer limit from 32 to 64.
 2017-09-14 15:19:46 +08:00
Jeroen Domburg
6d95934a3c Make 80MHz PSRAM work as well, add testcase for weirdness reported on esp32 forums, clean up unused define in psram code 2017-09-14 10:47:44 +08:00
Jeroen Domburg
875ae6a134 Add option to allocate external RAM using heap_alloc_caps 2017-09-14 10:47:44 +08:00
Jiang Jiang Jian
574daad1c4 Merge branch 'feature/btdm_update_to_bluedroid7.1_l2cap' into 'master' 
component/bt: Added the new feature of the l2cap layer from the bluedroid new version 7.1.1

See merge request !1087
 2017-09-13 20:39:38 +08:00
Jiang Jiang Jian
33a4a6a510 Merge branch 'feature/add_espnow' into 'master' 
add ESPNOW feature

See merge request !1061
 2017-09-13 20:32:53 +08:00
Jiang Jiang Jian
b70329040d Merge branch 'bugfix/btdm_gatts_notify_stress_test_crash' into 'master' 
component/bt: fix bug for gatts notify stress test crash

See merge request !1245
 2017-09-13 20:27:17 +08:00
Ivan Grokhotkov
a91b330b49 Merge branch 'bugfix/spiffs_submodule' into 'master' 
spiffs: Track spiffs submodule in component

See merge request !1251
 2017-09-13 18:02:32 +08:00
XiaXiaotian
6753f6cb59 Refractor smartconfig 
Move code of receiving smartconfig packets and getting password to
    wifi lib. Open source code of sending smartconfig ACK to cellphone
    in IDF.
 2017-09-13 16:55:30 +08:00
Angus Gratton
b687e1a41f spiffs: Track spiffs submodule in component 
Will now automatically initialise as part of "make".
 2017-09-13 14:54:33 +10:00
Jiang Jiang Jian
f1e3b0df02 Merge branch 'feature/adv_scan_simultaneously' into 'master' 
component/bt : support adv & scan simultaneously

See merge request !1209
 2017-09-13 11:50:57 +08:00
Jiang Jiang Jian
ea7a09c3e4 Merge branch 'bugfix/btdm_sec_config' into 'master' 
component/bt : fix btc security storage bug

See merge request !1161
 2017-09-13 11:46:34 +08:00
zhiweijian
8921a36828 Component/bt: fix bug for gatts notify stress test crash 2017-09-13 11:19:58 +08:00
Jeroen Domburg
9c56d9e75e Make sure functions that are in ROM in the non-external-ram-workaround version, are in RAM (and not in flash) in the ext-ram workaround version. 2017-09-13 10:36:56 +08:00
Angus Gratton
df888a4f54 Merge branch 'bugfix/openocd_top_used_priority' into 'master' 
freertos: place uxTopUsedPriority into DRAM

See merge request !1246
 2017-09-13 09:02:27 +08:00
Yulong
1759a47060 This is a combination of 4 commits. 
squash again all the commit.

component/bt: Change all the gattc API && bta gattc layer.

component/bt: Debug the code and change the btc_ble_gattc_get_db method.

component/bt: Change the gatt read API interface.

component/bt: Reconstruction the BTA_gattc_cache code.

component/bt: Change back the bluedroid_get_status to marco.

component/bt: Added the serch service res start_handle & end_handle to the result.

component/bt: Change the gattc docs format.

component/bt: Change the docs format.

component/bt: fix the read char value bug.

component/bt: change the gattc_get_attr_count method.

component/bt: Change back the bta_gattc write ccc code.

component/bt: Change the gattc api docs format

component/bt: Change the gattc API docs.

component/bt: Change the prepare write descriptor method to avoid the exection.

Component/bt: modify gatt clinet demo with new API

component/bt: Change the p_src_data->read.p_value to avoid exection.

compoent/bt: Change the bugfix of gattc unreg for the notify.

Modify gattc security demo

component/bt: Change the log error.

Component/bt: modify gattc_multi_connect demo

componnet/bt: Change the bta_gattc_cache sdp include.

component/bt: Change the start_handle & end_handle not from the service.

component/bt: Change the gattc API docs.

component/bt: Change the return issues.

component/bt: Fixed the include service bug.

component/bt: Modify gattc_multi_connect demo , add scan log

component/bt: Fixed the BTA_GATTC_GetIncludeService start handle & end handle error bug.

component/bt: Fix the invalid handle of the get all char issues.

component/bt: Fix the bug with get_db_size_with_type of the start handle & end_handle not correted issue.

component/bt: Fixed the get secondly service num not correct issue.

component/bt: Fixed the last service handle not correted issue.
 2017-09-12 07:36:02 -04:00
Ivan Grokhotkov
b6d82eeceb Merge branch 'feature/gcov_over_apptrace' into 'master' 
esp32: Adds gcov over JTAG feature

See merge request !1117
 2017-09-12 18:54:26 +08:00
Tian Hao
00a7cdbb0b component/bt : support adv & scan simultaneously 
1. Occupy conn[9] for adv. The max connection number of bluetooth controller decrease to 9. (Previously, it is 10)
2. modify the enum of setting BLE TX power corresponding to connection's.
3. fix libbtdm_app.a cwitch jump table
 2017-09-12 16:10:30 +08:00
Ivan Grokhotkov
820df6aa27 Merge branch 'bugfix/btdm_nvs_get_str_or_blob' into 'master' 
fix: Fix bug of function nvs_get_str_or_blob

See merge request !1182
 2017-09-12 12:20:42 +08:00
XiaXiaotian
e4ba31a8b9 add ESPNOW feature 
ESPNOW is a kind of WiFi communication bettween WiFi devices, no
    matter they are connected to each other or not. Once two WiFi
    devices are paired, they can send data to or receive data from
    each other. The data is transmitted in action frame which can
    be encrypted with CCMP method. ESPNOW also support mutilcast frame
    transmitting.
 2017-09-12 12:12:13 +08:00
Ivan Grokhotkov
23f10e1a57 Merge branch 'feature/uart_software_flow_control' into 'master' 
uart: Add api call to switch on hardware support for 'software' flow control. (github #890)

See merge request !1215
 2017-09-12 12:11:11 +08:00
Ivan Grokhotkov
868b0ce228 Merge branch 'bugfix/list_node_naming' into 'master' 
Fix "list_node" name conflict in bluedroid & dhcp_server

See merge request !1216
 2017-09-12 12:10:54 +08:00
Ivan Grokhotkov
635bd9ac9e Merge branch 'bugfix/btdm_disable_gatts' into 'master' 
component/bt: fix build error when GATTS is disabled in menuconfig

See merge request !1232
 2017-09-12 12:06:41 +08:00
Ivan Grokhotkov
f4ddaa7a11 Merge branch 'bugfix/crashed_core_dump' into 'master' 
esp32: Fixes crash during core dump.

See merge request !1239
 2017-09-12 11:32:48 +08:00
me-no-dev
dd87deb278 Add SPIFFS Component to IDF 2017-09-11 19:56:40 +03:00
Alexey Gerenkov
4e0c3a0415 esp32: Fixes crash during core dump. 
Removes piece of debugging code introduced by 8d43859b.
 2017-09-11 17:20:42 +03:00
Ivan Grokhotkov
64bce3ce59 freertos: place uxTopUsedPriority into DRAM 
When debugging crashes caused by flash cache access errors, OpenOCD may
request the value of uxTopUsedPriority when cache is disabled. Placing
it into IRAM to avoid an error in such case.
 2017-09-11 20:15:27 +08:00
Ivan Grokhotkov
1e7c3854d3 Merge branch 'bugfix/warn_on_invalid_xtal_freq' into 'master' 
soc/rtc: warn if detected XTAL frequency does not match configured one

See merge request !1242
 2017-09-11 18:15:11 +08:00
Jeroen Domburg
b3fd494e71 Panic: stop dport access handler without trying to use a lock 2017-09-11 17:24:22 +08:00
Ivan Grokhotkov
de038f502c Merge branch 'feature/gpio_channel_macro' into 'master' 
feat(global): add macros for GPIO->channel lookup

See merge request !1170
 2017-09-11 12:15:08 +08:00
Ivan Grokhotkov
5a88f90a33 soc/rtc: warn if detected XTAL frequency does not match configured one 
Since 9a8c0392, XTAL frequency is set to 40MHz by default, and users
of 26MHz boards need to select 26MHz manually. Most users are not aware
of this change, and existing getting started guides do not mention that
XTAL frequency needs to be set for some boards. So users are left with
garbage output from UART without any clue what to check.

This change adds a warning in case specific XTAL frequency was set, and
it does not match automatically detected one. This should help users
fix the issue.
 2017-09-11 11:42:26 +08:00
baohongde
87031f9457 component/bt: fix nvs_get_str_or_blob length output error 2017-09-08 12:02:35 +08:00
baohongde
e1bd51af80 component/bt: fix nvs_get_str_or_blob length output error 2017-09-08 12:02:35 +08:00
baohongde
f3be0395d2 component/bt: fix nvs_get_str_or_blob length output error 2017-09-08 12:02:35 +08:00
Ivan Grokhotkov
e12967297d Merge branch 'feature/docs_touch_pad_api' into 'master' 
Touch Pad driver overview

See merge request !1195
 2017-09-08 11:55:27 +08:00
wangmengyang
21586063de component/bt: fix build error when GATTS is disabled in menuconfig 2017-09-08 11:34:59 +08:00
Ivan Grokhotkov
33cb16fd2a esp32: fix cache error interrupt handler 
Cache error interrupt would read DPORT registers, which caused DPORT
access protection to kick in. Disable DPORT protection before doing the
reads.
 2017-09-08 09:59:09 +08:00
Alexey Gerenkov
891f0db31d esp32: Adds gcov over JTAG feature 
Implements function to dump GCOV data to host via JTAG.
The following functionality was added:
 - Host file I/O
 - GCOV runtime I/O stubs
 - GCOV example
 2017-09-07 18:13:16 +03:00
Tian Hao
38102f4148 component/bt : fix btc security storage bug 
1. Remove the bond_device global variable.
2. Fix bond_device add cause memory exception
3. Modify the code location.
4. modify thread security
5. remove esp_ble_clear_bond_device_list() API
6. modify esp_ble_get_gond_device_list() to return list immediately, rather than wait event.
7. modify the gatt_security_server demo to show how to remove all the bonded devices.
8. fix some code bugs may cause something error.
 2017-09-07 19:37:49 +08:00
Ivan Grokhotkov
3c470e7c43 Merge branch 'bugfix/rmt' into 'master' 
RMT 2 fixes: Rename one API and specify wait_time in another API

See merge request !896
 2017-09-07 18:03:08 +08:00
Ivan Grokhotkov
5425d8569c Merge branch 'feature/pthread_api' into 'master' 
esp32: pthread API

See merge request !1146
 2017-09-07 17:49:42 +08:00
Ivan Grokhotkov
40df6546c0 Merge branch 'feature/multi_heap_poisoning' into 'master' 
Heap tracing & poisoning features

See merge request !749
 2017-09-07 17:47:51 +08:00
Ivan Grokhotkov
310269bcdc Merge branch 'bugfix/tcpip_adapter_ethernet' into 'master' 
tcpip_adapter: Fix bug which prevents setting a static IP address for Ethernet interface (github #657)

See merge request !1178
 2017-09-07 17:47:20 +08:00
Ivan Grokhotkov
de06a0b8a7 Merge branch 'feature/mbedtls2_6_0' into 'master' 
Update mbedTLS to version 2.6.0

See merge request !1224
 2017-09-07 17:45:45 +08:00
Ivan Grokhotkov
b9dfb437ab Merge branch 'bugfix/intr_free' into 'master' 
fix(intr): fix the logic for allocating and freeing interrupts.

See merge request !1124
 2017-09-07 17:45:18 +08:00
Angus Gratton
c503a01388 mbedtls: Rename net to net_sockets (in line with 2.4.0 API change) 2017-09-07 18:02:39 +10:00
Angus Gratton
3a08ec7b3d mbedtls: Re-apply: MBEDTLS_SHA512_ALT also replaces mbedtls_sha512_process() 
IDF-specific patch.
 2017-09-07 18:02:26 +10:00
Angus Gratton
3142997830 mbedtls: Re-apply ECP memory leak fix 
Fix not yet submitted upstream.

(Previously applied in ffefeef5ea)
 2017-09-07 18:02:26 +10:00
Angus Gratton
736db688a8 mbedtls: Re-apply MBEDTLS_BIGNUM_ALT & related macros for custom bignum functions 
(IDF-specific patch.)
 2017-09-07 18:02:26 +10:00
Angus Gratton
ae382b3bfa mbedtls: Update to 2.6.0 release (without IDF-specific patches) 2017-09-07 18:02:26 +10:00
Angus Gratton
f8339fc1bd newlib: Avoid deprecation warning calling system_get_time() from system_relative_time() 2017-09-07 16:32:05 +10:00
Angus Gratton
73b3ae8a2d lwip: Use hardware RNG for LWIP_RAND(), use LWIP_RAND() for random port assignment 2017-09-07 16:32:05 +10:00
Angus Gratton
72995bfcec doc: Add docs for heap trace & poisoning 2017-09-07 16:32:05 +10:00
Angus Gratton
ec498ad86d libgcc: Place assembly functions (including __xtensa_libgcc_window_spill) in IRAM 2017-09-07 16:32:05 +10:00
Angus Gratton
1c7b8aa3a5 Heap tracing support 2017-09-07 16:32:05 +10:00
Angus Gratton
5c417963eb multi_heap: Add heap poisoning features 2017-09-07 16:32:05 +10:00
Angus Gratton
5222428dde unit tests: Check heap integrity after each test, check for obvious leaks 2017-09-07 16:32:05 +10:00
Angus Gratton
1cb0f30933 heap_caps: Add heap_caps_check_integrity() function 2017-09-07 16:32:05 +10:00
Ivan Grokhotkov
63e1e4e502 Merge branch 'test/modify_mtu_cases' into 'master' 
test: update BLE GATT MTU cases

See merge request !1223
 2017-09-07 14:27:41 +08:00
chensheng
ac5e1f65b2 test:update BLE GATT MTU cases 2017-09-07 13:46:13 +08:00
Jiang Jiang Jian
5146289eea Merge branch 'feature/update_wifi_lib_for_some_feature_and_bugfix' into 'master' 
esp32: update wifi lib for a bunch of small feature and bugfix

See merge request !1222
 2017-09-07 13:24:24 +08:00
Ivan Grokhotkov
8f5e4bacf3 Merge branch 'bugfix/spi_cache_disable_adjustments_iram' into 'master' 
Make sure cache is disabled/enabled when *both* CPUs are running inside the iram guard code

See merge request !1208
 2017-09-07 11:02:21 +08:00
Liu Zhi Fu
a568ad2c9d esp32: update wifi lib for a bunch of small feature and bugfix 
1. Update RTC V229: add BT AGC saturation protection
2. Update PHY V359: (1). esp_init_data_v2.bin -- modify WIFI and BT RX gain table Setting
                    (2). modify phy_close_rf()
                    (3). noisefloor add limit and no print
3. WiFi supports modem sleep dynamic frequency switch
4. Fix disabling AMPDU cause esp_wifi_init fail issue
5. Fix sniffer mode cause WiFi can't connect issue
6. Optimize an internal rx buffer full issue
7. Rollback the internal wifi init flag when wifi init fail
 2017-09-07 11:01:12 +08:00
michael
08b9fbc242 feat(global): add macros for GPIO->channel lookup 
including: macros for dac, adc, touch, rtc_gpio, uart and clk_out.

TW#13970
 2017-09-07 10:40:25 +08:00