Jiang Jiang Jian
ed1c0bf445
Merge branch 'bugfix/rm_tx_buffer_limits' into 'master'
...
esp_wifi: remove wifi tx buffer limits
See merge request espressif/esp-idf!8933
2020-05-27 20:12:17 +08:00
lly
6768c2b7a1
ble_mesh: Check the result of creating timer
2020-05-27 09:30:34 +00:00
Island
3b85d4ef24
Merge branch 'bugfix/ble_mesh_sync_zephyr_fixes' into 'master'
...
Bugfix/ble mesh sync zephyr fixes
Closes BLEMESH-215
See merge request espressif/esp-idf!8912
2020-05-27 17:26:00 +08:00
Island
d82f3372a0
Merge branch 'bugfix/ble_mesh_not_use_same_private_key' into 'master'
...
ble_mesh: Not using pre-initialized private key
Closes BLEMESH-214
See merge request espressif/esp-idf!8905
2020-05-27 17:25:39 +08:00
Island
02376b97d4
Merge branch 'bugfix/ble_mesh_uses_deprecated_config' into 'master'
...
ble_mesh: Fix using old config for duplicate scan
Closes BLEMESH-213
See merge request espressif/esp-idf!8898
2020-05-27 17:23:55 +08:00
Island
7b12d96169
Merge branch 'bugfix/ble_mesh_comp_data_store_restore' into 'master'
...
ble_mesh: Same func for storing/restoring comp data
See merge request espressif/esp-idf!8882
2020-05-27 17:23:21 +08:00
ChenJianxing
9e45c3c7d8
esp_wifi: remove wifi tx buffer limits
2020-05-27 15:06:53 +08:00
Jakob Hasse
0e5abaf303
Enabled enum types for nvs C++ handle
...
Closes https://github.com/espressif/esp-idf/issues/5232
2020-05-27 12:36:48 +08:00
Jakob Hasse
0de732fd0e
nvs: unit tests for new partition API
2020-05-27 11:22:32 +08:00
Dmitriy Shilin
de89598779
nvs: allow to specify custom partition
...
Closes https://github.com/espressif/esp-idf/pull/5172
2020-05-27 11:22:32 +08:00
Jiang Jiang Jian
ff9322e007
Merge branch 'mesh/add_ps_ie_option' into 'master'
...
mesh: add mesh PS option following add announce
Closes WIFI-2348 and WIFI-2330
See merge request espressif/esp-idf!8826
2020-05-27 11:15:50 +08:00
jiangguangming
92eae20bca
add new config items for spiflash ci unit-test
2020-05-26 15:23:38 +08:00
jiangguangming
b25ccde45f
flash mmap: fix bug for cache2phys and phys2cache on esp32s2
2020-05-26 15:14:23 +08:00
lly
0cfb6c138b
ble_mesh: Transport tx fields overflow [Zephyr]
...
The transport segmented TX nack and seg_pending fields must be at least
6 bits to avoid overflow for 32 segment messages. This change rearranges
the seg_tx fields to gather all state flag fields in one byte, while
making the counter fields whole bytes.
2020-05-26 11:42:31 +08:00
Angus Gratton
94f5129bf8
mbedtls: Don't compile hardware MPI & SHA files if disabled in config
...
Fixes bug where hardware accelerated mbedtls_mpi API was always used, even when
disabled in config.
2020-05-26 03:37:46 +00:00
lly
f863a1b328
ble_mesh: Friend with unknown appkey [Zephyr]
...
Ensures that friend messages are enqueued, even if the packet is
received with an appkey is unknown to the friend. Previously, sdu_recv
would return EINVAL if the appkey was unknown, which would prevent the
lower transport layer from adding the packet to the friend queue. This
is irrelevant for the logic in lower transport, and should not be
returned as an error.
2020-05-26 11:16:01 +08:00
lly
05c287e05c
ble_mesh: Not using pre-initialized private key
2020-05-26 10:46:22 +08:00
lly
3c1487be0e
ble_mesh: Fix using old config for duplicate scan
2020-05-25 16:48:15 +08:00
Michael (XIAO Xufeng)
0d90861984
Merge branch 'bugfix/fix_rmt_driver_breaking_change_issue' into 'master'
...
Bugfix(RMT): Fix the breaking change issue of RMT driver.
Closes IDFGH-2837, IDFGH-2579, and IDFGH-2915
See merge request espressif/esp-idf!8006
2020-05-25 15:27:24 +08:00
Angus Gratton
084e170a8f
Merge branch 'refactor/esp_ipc' into 'master'
...
Split esp_ipc to a seaparate component
Closes IDF-1295
See merge request espressif/esp-idf!8520
2020-05-25 15:03:04 +08:00
Michael (XIAO Xufeng)
b3587ff88c
Merge branch 'bugfix/fix_i2s_comm_format_unclear_description_bug' into 'master'
...
Bugfix(I2S): Fix i2s_comm_format_t configuration parameter does not match the TRM bug
Closes IDFGH-3040, IDFGH-2913, IDFGH-578, IDFGH-2408, and IDFGH-3117
See merge request espressif/esp-idf!8339
2020-05-25 15:00:10 +08:00
lly
bbbdbb8699
ble_mesh: Same func for storing/restoring comp data
2020-05-25 13:27:08 +08:00
Jiang Jiang Jian
5bb656bd5e
Merge branch 'bugfix/bt_universal_calculation' into 'master'
...
bugfix/correct_bt_mac_calculation
Closes IDFGH-3343
See merge request espressif/esp-idf!8825
2020-05-25 11:57:37 +08:00
Wei Tian Hua
6572959fd3
Add user invisible kconfig for bt mac offset
...
Closes https://github.com/espressif/esp-idf/issues/5320
2020-05-25 11:57:37 +08:00
xueyunfei
df43a1affc
add LINGER to menuconfig
2020-05-25 11:23:03 +08:00
Krzysztof Budzynski
56635f22b8
Merge branch 'doc/add_types_api_ref' into 'master'
...
doc: add peripheral_types.h as API reference for peripheral docs
Closes DOC-136 and IDF-1673
See merge request espressif/esp-idf!8528
2020-05-25 03:22:22 +08:00
Ivan Grokhotkov
1f734b7057
Merge branch 'feature/native_smp_suport' into 'master'
...
APP CPU syscall table for gcov handler
See merge request espressif/esp-idf!8350
2020-05-23 20:31:22 +08:00
Island
248db690e1
Merge branch 'bugfix/ble_mesh_provisioner_fail_to_pub' into 'master'
...
ble_mesh: Fix Provisioner failed to publish
Closes BLEMESH-211
See merge request espressif/esp-idf!8872
2020-05-22 19:14:00 +08:00
Darian Leung
baf06d4971
Increase C++ unit test leak threshold
...
Heap fragmentation causes 4-8 bytes of memory to be leaked
(due to rounding up of memory sizes). Increase the leak
thresholds to prevent test cases from failing.
2020-05-22 16:39:44 +08:00
KonstantinKondrashov
4275056423
esp32: Switch SPIRAM stack in esp_restart_noos() to internal stack
...
If esp_restart_noos() is run and the stack address points to external memory (SPIRAM)
then Cache_Read_Disable() raises up the error "Cache disabled but cached memory region accessed"
to fix this we switch stack to internal RAM before disable cache.
Added unit tests.
Closes: https://github.com/espressif/esp-idf/issues/5107
2020-05-22 16:23:53 +08:00
lly
af37aee5bf
ble_mesh: Fix Provisioner failed to publish
2020-05-22 15:32:12 +08:00
Anton Maklakov
a9c61dca4e
Merge branch 'bugfix/static_analysis_mem_issues' into 'master'
...
fix minor static analysis memory issues
See merge request espressif/esp-idf!8697
2020-05-22 15:08:20 +08:00
Ivan Grokhotkov
a2d7e8cbba
Merge branch 'bugfix/crt_bundle_no_config_file' into 'master'
...
esp_crt_bundle: fixes the "No CA Chain is set" error
See merge request espressif/esp-idf!8851
2020-05-22 09:34:32 +08:00
Mahavir Jain
6272cb842f
Merge branch 'feature/esp_wroom32_se_example' into 'master'
...
Feature/esp wroom32 se example
See merge request espressif/esp-idf!8552
2020-05-21 19:51:19 +08:00
Aditya Patwardhan
423e600d46
secure_element: atecc608_ecdsa example
...
* Replaced crypotoauthlib with esp-cryptoauthlib
* Added menuconfig option for esp-tls about using HSM
* Added error codes for HSM in esp-tls,
* Added support to select different type of ATECC608A chips
* Added README, updated docs
* tcp_transport: Added option to enable secure_element for ssl
Closes https://github.com/espressif/esp-idf/issues/4432
2020-05-21 13:08:30 +05:30
Marius Vikhammer
f72d259622
esp_crt_bundle: fixes the "No CA Chain is set" error
...
When compiling esp_crt_bundle.c, it would end up with a different struct layout due
to configuration options from "mbedtls/esp_config.h" not being considered.
This lead to ca_chain potentially not being set correctly.
2020-05-21 15:19:49 +08:00
Island
9f801fd2f5
Merge branch 'bugfix/ble_mesh_friend_init_flag' into 'master'
...
ble_mesh: Add init flag for friend init/deinit
Closes BLEMESH-205
See merge request espressif/esp-idf!8783
2020-05-21 11:46:17 +08:00
chenyudong
8fb982c512
mesh: add mesh PS option following add announce
2020-05-21 03:40:47 +00:00
Angus Gratton
0ad6e1b977
Merge branch 'feature/80m_flashspeed_esp32s2' into 'master'
...
esptool: Set 80MHz SPI flash speed for ESP32-S2 & future chips
See merge request espressif/esp-idf!8739
2020-05-21 10:22:59 +08:00
Mahavir Jain
7a2ea9b7f7
esp-tls: add support for using hardware security module
2020-05-20 22:52:37 +05:30
Bryan Hunt
4553f6c95d
Add cryptoauthlib as a component with mbedtls integration
...
* Add options to mbedtls for hardware acceleration
* Disable mbedtls EC curves if hardware acceleration is selected
since the hardware will have to define the curves supported
* Add a hardware ecdsa example
2020-05-20 22:52:37 +05:30
Jiang Jiang Jian
5f08bed88b
Merge branch 'feature/optimize_wifi_API_max_tx_power_description' into 'master'
...
feature: optimize wifi API max tx power description
Closes WIFI-1097
See merge request espressif/esp-idf!8173
2020-05-20 22:43:54 +08:00
lly
b1f3843ed6
ble_mesh: Clear two more vars during proxy server deinit
2020-05-20 11:35:26 +00:00
lly
d5b126667a
ble_mesh: Add missing sdkconfig.h
2020-05-20 11:35:26 +00:00
lly
4e60919a66
ble_mesh: Init device name during proxy server init
...
Device name will be reset when deinit mesh stack. If not
initializing device name during the next mesh stack init,
it will fail to set the device name when using bluedroid.
2020-05-20 11:35:26 +00:00
lly
a0ce8c64b0
ble_mesh: Add init flag for friend init/deinit
...
Since bt_mesh_friend_init() will only be invoked when
a device is provisioned or Provisioner is enabled, so
we add a flag to indicate if the friend functionality
is initialized in case deinit before initialization.
2020-05-20 11:35:26 +00:00
Angus Gratton
5bd75b134d
esptool: Set 80MHz SPI flash speed for ESP32-S2 & future chips
...
Most ESP32 devices will also work at 80MHz, but third party boards/modules
may not have been tested at this speed so the default is kept at 40MHz for safety.
2020-05-20 06:19:34 +00:00
Mahavir Jain
e497bf37c4
Merge branch 'bugfix/httpd_lru_purge' into 'master'
...
esp_http_server: Fixed a bug which could cause issues with LRU purge
Closes IDFGH-2680
See merge request espressif/esp-idf!8818
2020-05-20 14:08:02 +08:00
Alexander Borsuk
fb0fa34ac8
sdmmc: Correctly check function parameters before using them
...
Closes https://github.com/espressif/esp-idf/pull/5000
2020-05-20 13:09:05 +08:00
David Čermák
7d7f3f8d8f
Merge branch 'bugfix/esp_netif_minor_fixes' into 'master'
...
esp-netif: Minor fixes
Closes IDFGH-3311
See merge request espressif/esp-idf!8799
2020-05-20 12:47:01 +08:00
ronghulin
cdaeef70c3
feature: optimize wifi API max tx power description
2020-05-20 11:52:42 +08:00
Jiang Jiang Jian
af97a5abc3
Merge branch 'workaround/wps_iot_fixes' into 'master'
...
wpa_supplicant: WPS Inter operatability Fixes
See merge request espressif/esp-idf!8654
2020-05-20 11:32:34 +08:00
Jiang Jiang Jian
b0cbc4f7bb
Merge branch 'bugfix/optimize_4way_handshake' into 'master'
...
ESP-WIFI; Optimize 4way handshake failure time
See merge request espressif/esp-idf!8020
2020-05-20 11:29:56 +08:00
Jiang Jiang Jian
05f4668ad0
Merge branch 'nimble/update_nimble_submodule' into 'master'
...
NimBLE: Include upstream fixes and use macros for log level filtering
See merge request espressif/esp-idf!8448
2020-05-20 11:23:46 +08:00
Angus Gratton
0927ec029e
wpa_supplicant: Allow building with mbedTLS integration but no hardware MPI
...
Also disable the relevant function in bignum.h based on config, so fails at
compile not link time.
Closes https://github.com/espressif/esp-idf/issues/5321
2020-05-20 12:06:07 +10:00
Piyush Shah
c2ab112590
esp_http_server: Fixed a bug which could cause issues with LRU purge
...
LRU counter should be started from 1, and not 0, so that all checks
work fine.
Closes https://github.com/espressif/esp-idf/issues/4753
2020-05-19 22:11:02 +05:30
Mahavir Jain
7dbf01afad
coap: move mbedTLS config options from component to examples
...
CoAP component relies on some mbedTLS crypto configuration
options, e.g. DTLS and PSK. These configuration options if
selected, have footprint impact on generic TLS examples like
https_request or https_ota as well.
Footprint of https_request example with/without change is per below:
$ ./tools/idf_size.py new_https_request.map --diff old_https_request.map
<CURRENT> MAP file: new_https_request.map
<REFERENCE> MAP file: old_https_request.map
Difference is counted as <CURRENT> - <REFERENCE>, i.e. a positive number means that <CURRENT> is larger.
Total sizes of <CURRENT>: <REFERENCE> Difference
DRAM .data size: 14796 bytes 14796
DRAM .bss size: 23560 bytes 23680 -120
Used static DRAM: 38356 bytes ( 142380 available, 21.2% used) 38476 -120 ( +120 available, +0 total)
Used static IRAM: 89045 bytes ( 42027 available, 67.9% used) 89045 ( +0 available, +0 total)
Flash code: 554231 bytes 563823 -9592
Flash rodata: 179000 bytes 181224 -2224
Total image size:~ 860632 bytes (.bin may be padded larger) 872568 -11936
This commit moves relevant config options to CoAP specific examples
and also adds some run time warnings if they are kept disabled.
Closes https://github.com/espressif/esp-idf/issues/5262
2020-05-19 17:23:29 +05:30
kapil.gupta
fb53a454b9
ESP-WIFI: Optimize 4way handshake failure time
...
In case of wrong passpharse, AP will keep on sending 1/4 multiple
times which may take around 10 secs to disconnect and detect
wrong password event.
Add changes to reject EAPOL1 after 3 consecutive reception
2020-05-19 16:55:42 +05:30
Jiang Jiang Jian
56c307b356
Merge branch 'mesh/set_type_new' into 'master'
...
mesh: support set new type (node and sta)
Closes WIFI-1824, WIFI-1725, WIFI-1823, and WIFI-1908
See merge request espressif/esp-idf!7934
2020-05-19 16:53:49 +08:00
Ivan Grokhotkov
948580d1a2
Merge branch 'gdb/bt_on_invalid_pc' into 'master'
...
gdb: Modify PC in case of invalid PC
See merge request espressif/esp-idf!8391
2020-05-19 16:44:07 +08:00
David Cermak
95b5ef3687
esp-netif: wifi-deinit to clear handlers only in tcpip-adapter mode
2020-05-19 08:34:36 +00:00
David Cermak
1183b95cc4
esp-netif: Fix compilation if ESP_GRATUITOUS_ARP not enabled
...
Closes https://github.com/espressif/esp-idf/issues/5294
2020-05-19 08:34:36 +00:00
kapil.gupta
76335b2558
wpa_supplicant: WPS Inter operatability Fixes
...
Add WPS IOT fixes under config option
Current fixes under this flag.
1. Allow NULL-padded WPS attributes.
2. Bypass WPS-Config method validation
2020-05-19 08:05:52 +00:00
Nachiket Kukade
c643d0a611
wpa_supplicant: Allow NULL-padded WPS attributes
...
Some AP's keep NULL-padding at the end of some variable length WPS
Attributes. This is not as par the WPS2.0 specs, but to avoid interop
issues, ignore the padding by reducing the attribute length by 1.
2020-05-19 08:05:52 +00:00
Angus Gratton
183dddd50e
Merge branch 'bugfix/wdt_reset_info_unicore' into 'master'
...
bootloader: Don't print an error message after WDT reset in unicore mode
See merge request espressif/esp-idf!8570
2020-05-19 15:54:06 +08:00
Michael (XIAO Xufeng)
fd3e28ef0d
Merge branch 'bugfix/esp_flash_write_performance_regression' into 'master'
...
esp_flash: fix the write performance regression
See merge request espressif/esp-idf!8658
2020-05-19 12:06:42 +08:00
houwenxiang
0bf2906bc9
driver(RMT): Fix the breaking change issue of RMT driver introduced by refactoring.
...
After RMT driver refactor, two breaking change are introduced:
1. Users needs to call `rmt_driver_install` before `rmt_config`.
2. Do not support memory block count > 1,
fix this two issues
closes https://github.com/espressif/esp-idf/issues/4664
closes https://github.com/espressif/esp-idf/issues/4959
2020-05-19 11:39:38 +08:00
Angus Gratton
3e7ba2f389
bootloader: Don't print an error message after WDT reset in unicore mode
...
Caused some confusion here: https://github.com/espressif/esp-idf/issues/4388
2020-05-19 03:35:53 +00:00
Angus Gratton
4fa8f7d01b
Merge branch 'bugfix/parttool_get_info_wo_info_option' into 'master'
...
partition_table: Fix parttool.py crashes when retrieving partition info
Closes IDFGH-3279
See merge request espressif/esp-idf!8715
2020-05-19 11:30:20 +08:00
chenyudong
040f4be2a7
mesh: support set new type
...
If the root is specified (FIXED-ROOT) by set type or set parent, change ie.mesh_type to MESH_ROOT before connect to router
Release emesh_recv_toDS when the root becomes non-root
esp_mesh_set_type now supports MESH_IDLE and MESH_STA
2020-05-19 11:17:56 +08:00
Jiang Jiang Jian
37f4e3855f
Merge branch 'bugfix/fix_sta_connect_compatibility' into 'master'
...
esp_wifi: Fix the timeout issue of EAPOL four-way handshake
Closes WIFI-2110 and WIFI-1809
See merge request espressif/esp-idf!8382
2020-05-18 22:26:52 +08:00
houwenxiang
b35d9002f3
driver(I2S): Fix i2s_comm_format_t configuration parameter does not match the TRM bug.
...
When I2S `i2s_comm_format_t` is set to `I2S_COMM_FORMAT_I2S_MSB`, the data should launch at first BCK. But not in fact, this MR fixed this issue.
For compatibility, several nwe parameters have been added, and the old parameters will be removed in the future.
closes https://github.com/espressif/esp-idf/issues/5065
closes https://github.com/espressif/esp-idf/issues/4957
closes https://github.com/espressif/esp-idf/issues/2978
closes https://github.com/espressif/esp-idf/issues/5136
Merges https://github.com/espressif/esp-idf/pull/4522
2020-05-18 19:55:30 +08:00
Darian Leung
11d96b39d0
esp_ipc: Move to new component
...
This commit moves esp_ipc into a separate component.
2020-05-18 16:51:45 +08:00
David Cermak
8a45f074fc
esp-netif: Added API to get the underlying interface name
...
The interface name can be used in socket API, i.e. setsockopt(). The API esp_netif_get_netif_impl_name() shoudl be used to populate standard
interface structure struct ifreq.
2020-05-18 09:26:24 +02:00
David Cermak
06711c7c36
examples: common connect component to use both interfaces at once
2020-05-18 09:26:24 +02:00
xiehang
158602c942
esp_wifi: Fix the timeout issue of EAPOL four-way handshake
2020-05-18 14:53:31 +08:00
weitianhua
8fc05d0665
Fix ASSERT for RXDESC and save the log for debug
2020-05-18 06:51:51 +00:00
weitianhua
8d1032ccac
Fix ASSERT in ld_acl at line 302 forclkoff1 and localval
2020-05-18 06:51:51 +00:00
weitianhua
77cc105c72
Fix ld_acl schedule bug to parity shift
2020-05-18 06:51:51 +00:00
weitianhua
55877684a0
Fix ASSERT(64,0) in rwble.c
2020-05-18 06:51:51 +00:00
weitianhua
0811851378
Fix ASSERT in ld_pscan.c at line 1032
2020-05-18 06:51:51 +00:00
weitianhua
b20f254483
Free lmp tx buf in EM in the procedure of handling LMP_detach_Req when not received the last acknowledge from peer device and seperate them by ACL State
2020-05-18 06:51:51 +00:00
weitianhua
190ff3ae37
Fix that when slave initiate unsniff procedure and meet transaction collision, no mode change event is repoerted
2020-05-18 06:51:51 +00:00
weitianhua
70fa5b4ac5
Fix int_wdt due to disable interrupt too long time
2020-05-18 06:51:51 +00:00
weitianhua
c18ed5cbee
Fix Connection fail in loop
2020-05-18 06:51:51 +00:00
weitianhua
7aeb3d329a
Set AFH in BTDM Task when WiFi changes channel
2020-05-18 06:51:51 +00:00
weitianhua
e0e1154b62
Fix ASSERT(25,0) in lc_task.c
2020-05-18 06:51:51 +00:00
weitianhua
899e49b90e
Disable frequent warning log in ld_acl
2020-05-18 06:51:51 +00:00
weitianhua
b45f2d3913
Move default log level to WARNING instead ERROR in BT Controller
2020-05-18 06:51:51 +00:00
Mahavir Jain
be3b6b7cb8
Merge branch 'feature/mbedtls_dynamic_memory' into 'master'
...
feat(mbedtls): add dynamic buffer and local resource managment to decrease SSL heap cost
See merge request espressif/esp-idf!8313
2020-05-18 13:55:05 +08:00
Michael (XIAO Xufeng)
3f778a92da
spi_flash: add unit test for read/write performance
2020-05-17 22:06:03 +08:00
Michael (XIAO Xufeng)
651eb1a694
esp_flash: fix the write performance regression
...
Also changed internal delay unit into microsecond.
2020-05-17 22:06:02 +08:00
Michael (XIAO Xufeng)
f67044c822
spi: simplify the caps header
...
The mapping logic from register address to instance number is moved into the LL
2020-05-17 22:06:01 +08:00
Michael (XIAO Xufeng)
dae3196157
esp_flash: fix issue that cannot add flash on SPI1 CS1 when SPI_FLASH_SHARE_SPI1_BUS is disabled
2020-05-17 22:06:00 +08:00
Jiang Jiang Jian
bb2379b7ab
Merge branch 'bugfix/wpa3_mixed_mode_authype' into 'master'
...
esp_wifi: Add and utilize WPA3/WPA2 Mixed mode Authtype
See merge request espressif/esp-idf!8778
2020-05-17 17:04:18 +08:00
Jiang Jiang Jian
bef57a8ddc
Merge branch 'bugfix/V3.1.7_ble_bug_mr' into 'master'
...
component/bt: fix notify malloc failed , fix no BLE_AUTH_CMPL_EVT and fix bluedroid btc deinit crash
See merge request espressif/esp-idf!8729
2020-05-16 19:52:34 +08:00
Island
52e9bcb696
Merge branch 'bugfix/ble_mesh_remove_patch' into 'master'
...
ble_mesh: Remove patch for the bug of an App
Closes BLEMESH-202
See merge request espressif/esp-idf!8737
2020-05-15 20:17:22 +08:00
Nachiket Kukade
d7edd28338
esp_wifi: Update WiFi lib
...
Add and utilize WPA3/WPA2 Mixed mode Authtype.
2020-05-15 17:24:51 +05:30
Mahavir Jain
5b5a8c276d
Merge branch 'feature/mbedtls_add_config_options' into 'master'
...
Add config options in mbedtls
See merge request espressif/esp-idf!8760
2020-05-15 15:53:21 +08:00
zhiweijian
ec6c7558ef
add congest direct callback and fix malloc failed when multi_connection notify performance test
2020-05-15 15:35:39 +08:00