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
29,921 Commits 20 Branches 148 Tags 384 MiB
8c5a395483
Commit Graph

20003 Commits

Author SHA1 Message Date
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
Zhi Wei Jian
c0ab96b65d Merge branch 'bugfix/fix_some_bluedroid_bugs' into 'master' 
Fixed some bluedroid bugs

See merge request espressif/esp-idf!23616
 2023-05-10 20:44:15 +08:00
zhiweijian
d565a7825d Fix the bug that the iPhone disconnects immediately after connecting when BLE and wifi coexist 2023-05-10 20:15:10 +08:00
Alexey Lapshin
e634137a03 Merge branch 'feature/libstd++-use-posix-pthread' into 'master' 
tools: enable libstd++ to use idf posix-semaphores

Closes GCC-305 and IDFGH-9209

See merge request espressif/esp-idf!23588
 2023-05-10 20:06:16 +08:00
morris
5680d28b0e mcpwm: fix bldc example force output level inverted 
set_force_level can only set the generator level before the deadtime module.
if the deadtime module enables the inverter, then the real output level is inverted accordingly
 2023-05-10 19:17:21 +08:00
morris
6a7f730c77 Merge branch 'feature/efuse_settings' into 'master' 
hal: Explicit setting of efuse time settings

See merge request espressif/esp-idf!23533
 2023-05-10 19:11:01 +08:00
Roshan Bangar
f0fa24c176 NimBLE : Update macro name changes in nimble-1.5 2023-05-10 16:02:07 +05:30
Darian Leung
d044e63b39 freertos(IDF): Update kernel version tag of V10.5.1 source files 
This commit updates the kernel version tags of all V10.5.1 source files to
indicate that the source files are modified.
 2023-05-10 16:58:57 +08:00
Darian Leung
f76194add9 freertos(IDF): Add hidden build option for V10.5.1 kernel 
This commit adds a "CONFIG_FREERTOS_USE_KERNEL_10_5_1" hidden option to enable
building of the v10.5.1 kernel for development/testing purposes. Currently
enabling this option will just cause CMake to error out.

Also added a markdown file to record the code changes made to the V10.5.1 source
when porting over SMP behavior.
 2023-05-10 16:53:00 +08:00
Darian Leung
74f37f50ec freertos(IDF): Add upstream V10.5.1 files 
This commit adds the source files for the FreeRTOS Kernel V10.5.1 in
preparation for upgrading ESP-IDF FreeRTOS Kernel version (files copied from
https://github.com/FreeRTOS/FreeRTOS-Kernel/tree/V10.5.1)

The following modifications were made to the files when copying

- Added "SPDX-FileCopyrightText" and "SPDX-FileContributor" tags to all files
  to pass ESP-IDF pre-commit checks.
- Left out some files unnecessary to ESP-IDF (e.g., URLs, "History.txt", and
"portable" folder).
 2023-05-10 16:52:22 +08:00
Li Shuai
87dd7bb51a Merge branch 'bugfix/support_esp32c6_sleep_retention_extra_link' into 'master' 
support extra linked list retention for BLE and 15.4

Closes IDF-6528

See merge request espressif/esp-idf!22985
 2023-05-10 15:07:03 +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
Marius Vikhammer
1590fbd31c ci: misc fixes for newlib test app 
Enabled additional tests for C2, added config for testing with newlib nano
as well as cleaned up old configs
 2023-05-10 11:14:15 +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
Zim Kalinowski
099ffe6243 Merge branch 'feature/c6_ulp_timer' into 'master' 
ulp: lp timer support for lp core

Closes IDF-6956, IDF-6830, and IDF-6835

See merge request espressif/esp-idf!23453
 2023-05-10 03:06:35 +08:00
Zim Kalinowski
54576b7528 Merge branch 'bugfix/freertos_fix_unordered_event_list' into 'master' 
freertos: Updated vTaskRemoveFromUnorderedEventList() to consider scheduler state before adding task to ready list

Closes IDF-5785

See merge request espressif/esp-idf!23482
 2023-05-10 01:48:47 +08:00
Zim Kalinowski
a495f4729b Merge branch 'ci/fix_system_invalid_kconfigs' into 'master' 
ci: fix invalid kconfig options in system test apps

See merge request espressif/esp-idf!23582
 2023-05-10 01:38:46 +08:00
KonstantinKondrashov
e48130246a hal: Explicit setting of efuse time settings 
EFUSE_PWR_ON_NUM in C3 has default value = 0x2880, now = 0x3000
 2023-05-10 00:41:35 +08:00
Sudeep Mohanty
02d473615d Merge branch 'bugfix/ulp_i2c_timeout_config' into 'master' 
ulp-riscv-i2c: Add ULP RISC-V I2C read/write timeout config option

Closes IDFGH-9822

See merge request espressif/esp-idf!23470
 2023-05-09 21:06:51 +08:00
Wang Meng Yang
e156fcec8a Merge branch 'bugfix/hfp_ag_idx_invalid_master' into 'master' 
bt: Fixed out of bounds access due to variable length array

Closes IDFGH-9979

See merge request espressif/esp-idf!23481
 2023-05-09 19:51:42 +08:00
zlq
ff88f42819 H2:fix tsensor issue @low temp 2023-05-09 19:40:53 +08:00
Wu Zheng Hui
35bb946653 Merge branch 'bugfix/update_esp32c6eco1_sleep_fosc_cal_cycles' into 'master' 
bugfix: update esp32c6eco1 / esp32h2eco2 fosc calibration cycles during sleep and support calibrate OSC clock every N times lightsleep

Closes IDF-7287

See merge request espressif/esp-idf!23489
 2023-05-09 18:44:20 +08:00
Zim Kalinowski
ead5f19f7c Merge branch 'bugfix/freertos_nested_sched_suspension' into 'master' 
freertos-idf: Fixed incorrect scheduler suspension check in xTaskRemoveFromEventList()

Closes IDF-7299

See merge request espressif/esp-idf!23537
 2023-05-09 18:07:47 +08:00
laokaiyao
563b223ab7 i2s_std: enable left alignment as default 2023-05-09 17:53:53 +08:00
laokaiyao
bebcaad35f i2s_tdm: add check for slot mask 2023-05-09 17:53:53 +08:00
laokaiyao
fd8042cf5b i2s_tdm: fixed half sample bit calculation 2023-05-09 17:51:33 +08:00
laokaiyao
382059699e i2s_std: fixed mclk check for 24-bit data 2023-05-09 17:51:33 +08:00
Sudeep Mohanty
662e0812f4 ulp-riscv-i2c: Add ULP RISC-V I2C read/write timeout config option 
The commit 88e4c06028 introduced a loop timeout for all ULP RISC-V I2C
transactions to avoid getting stuck in a forever loop. The loop timeout
was set to 500 msec by default. This commit improves on the concept by
making the loop timeout configurable via a Kconfig option in terms of
CPU ticks. If the timeout is set to -1 value then the transaction loops
will never timeout, therefore restoring the driver behavior before the
timeout was introduced.

The commit also updates the I2C Fast mode timings for esp32s2 which need
to be adjusted due to bus timing constraints.

Closes https://github.com/espressif/esp-idf/issues/11154
 2023-05-09 11:17:01 +02: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
Sudeep Mohanty
abe5311a22 freertos: Updated vTaskRemoveFromUnorderedEventList() to consider scheduler state before adding task to ready list 
vTaskRemoveFromUnorderedEventList() runs under the assumption that the
scheduler is suspended during the call. However, for IDF FreeRTOS, this
is not true. When dual-core system is active, this API call is made in
a critical section but without suspending the scheduler. This commit
updates the vTaskRemoveFromUnorderedEventList() function to now consider
the scheduler state on either cores before adding a task to the ready list.
 2023-05-09 10:47:24 +02:00
morris
06b1e10273 Merge branch 'feature/reset_mcpwm_in_restart' into 'master' 
mcpwm: reset peripheral in restart, panic and halt

Closes IDFGH-10047

See merge request espressif/esp-idf!23591
 2023-05-09 16:44:55 +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
Sudeep Mohanty
1acd2b5ce7 freertos-idf: Fixed incorrect scheduler suspension check in xTaskRemoveFromEventList() 
This commit fixes a bug in xTaskRemoveFromEvenetList() where in the
check for scheduler suspension did not account for nested suspensions.
Additionally, this commit updates all checks for scheduler
suspension to follow a uniform way.
 2023-05-09 10:28:02 +02:00
morris
2b707decfc Merge branch 'feature/rgb_lcd_pclk_gpio_optional' into 'master' 
rgb_lcd: make pclk gpio setting optional

Closes IDFGH-10021

See merge request espressif/esp-idf!23626
 2023-05-09 14:47:37 +08:00
Rahul Tank
732c921c65 Nimble: Fix compilation issues seen while enabling -O2 optimization 2023-05-09 04:57:28 +00:00
Marius Vikhammer
a300b3eb81 ci: fix invalid kconfig options in system test apps 2023-05-09 11:27:55 +08:00
Zim Kalinowski
75d00928f5 Merge branch 'feature/migrate-newlib-to-pytest' into 'master' 
newlib: move test to pytest

Closes IDF-5595 and IDF-6961

See merge request espressif/esp-idf!20984
 2023-05-08 23:40:50 +08:00
Darian
e1dba0fa9e Merge branch 'refactor/freertos_component_structure' into 'master' 
FreeRTOS: Refactor copmonent structure

See merge request espressif/esp-idf!23367
 2023-05-08 21:18:37 +08:00
Darian Leung
66499f17a5 freertos: Refactor component structure 
This commit refactors the "freertos" component's structure as follows:

- "FreeRTOSConfig.h" related files moved to "./config" directory
- Refactored CMakeLists.txt file in preparation for v10.5.1 upgrade
    - Grouped list appends based on component organization
    - Removed some unecessarily public "include_dirs"
- Removed FreeRTOS-openocd.c
    - uxTopUsedPriority has been added back to tasks.c since v10.4.2
    - Thus the workaround in FreeRTOS-openocd.c is no longer needed and can
      be removed.
 2023-05-08 18:40:03 +08:00
Zim Kalinowski
a825dde9c0 newlib: move test to pytest 2023-05-08 12:31:48 +02:00
Mahavir Jain
17451f1fb3 Merge branch 'fix/sha512_block_mode' into 'master' 
mbedtls: fix sha-512 block mode build error

See merge request espressif/esp-idf!23569
 2023-05-08 16:09:50 +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
Armando
8e4974d66f mspi: modified mspi 80mhz octal psram timing tuning point fallback id on s3 2023-05-08 14:57:12 +08:00
morris
5ba53c9294 rgb_lcd: make pclk gpio setting optional 
PCLK may not be necessary in VGA use case.
Closes https://github.com/espressif/esp-idf/issues/11298
 2023-05-08 14:55:26 +08:00
Wang Meng Yang
9652d8ed6f Merge branch 'bugfix/fix_idfgh_9931' into 'master' 
Fixed remote mic error during encryption procedure

See merge request espressif/esp-idf!23609
 2023-05-08 14:44:40 +08:00
harshal.patil
9a87b26294 mbedtls: fix sha-512 block mode build error 2023-05-08 10:27:34 +05:30
Kevin (Lao Kaiyao)
e9e5f1b90f Merge branch 'feature/add_default_config_for_i2s_pdm_dac_mode' into 'master' 
i2s: public bclk_div and add a default config for PDM TX DAC

Closes IDF-7289

See merge request espressif/esp-idf!23466
 2023-05-08 12:36:05 +08:00
Armando (Dou Yiwen)
38e84bdd4f Merge branch 'refactor/mspi_timing_tuning_compatible_on_all_chips' into 'master' 
mspi: timing tuning driver framework

Closes IDF-7004

See merge request espressif/esp-idf!22786
 2023-05-08 10:27:29 +08:00
Armando (Dou Yiwen)
4fd45f2483 Merge branch 'bugfix/fix_adc_filter_acquire_logic' into 'master' 
adc: fix adc filter acquire logic

Closes IDF-7311

See merge request espressif/esp-idf!23566
 2023-05-08 10:10:35 +08:00
Michael (XIAO Xufeng)
4e24516ee2 Merge branch 'feat/i2s_ng_stailq' into 'master' 
driver: use STAILQ_NEXT instead empty to improve readability

See merge request espressif/esp-idf!23528
 2023-05-06 22:30:23 +08:00
WanqQixiang
a61b937577 openthread: Add menuconfig to set the default dns server address 2023-05-06 17:44:27 +08:00
morris
083d9e7c0f mcpwm: reset peripheral in restart, panic and halt 
mcpwm is commonly used in power eletronic area, when restart happens,
make sure the mcpwm generator is not working.

closes https://github.com/espressif/esp-idf/issues/11324
 2023-05-06 15:58:58 +08:00
chenjianhua
b87f96e115 bluedroid: fix ble ext adv rand addr setting for NRPA 2023-05-06 15:26:45 +08:00
chenjianhua
7593466dc6 bluedroid: fix ble adv data construct for device name 2023-05-06 15:26:45 +08:00
chenjianhua
f7ff6b127e bluedroid: fix ble smp key distribution setting 2023-05-06 15:26:45 +08:00
cjin
7a708c35cb pau: fix logic error in extra link retention 2023-05-06 14:58:02 +08:00
Li Shuai
2e22491b02 sleep retention: implement the extra linked list retention for modules with retention clock bugs 2023-05-06 14:58:00 +08:00
laokaiyao
bf8419fd6e i2s: public bclk_div and add a default config for PDM TX DAC 2023-05-06 14:19:48 +08:00
Marius Vikhammer
3ced7b12e8 ulp: add support for using lp timer with lp core on C6 2023-05-06 14:13:14 +08:00
Marius Vikhammer
97aab3bedc Merge branch 'bugfix/gdma_log_nano' into 'master' 
gdma: fixed crash from logging when using newlib nano

Closes IDFGH-8134

See merge request espressif/esp-idf!23579
 2023-05-06 13:46:50 +08:00
Marius Vikhammer
e806d9c9cb gdma: fixed crash from logging when using newlib nano 
Newlib nano printf formatting do not support %z, and will crash if such an identifier
is followed by a %s indentifier.

Closes https://github.com/espressif/esp-idf/issues/9631
 2023-05-06 10:51:03 +08:00
Armando
d7cbd04d43 adc: added adc filter exhausted allocation test 2023-05-06 10:31:19 +08:00
Armando
108ce25750 adc: fix adc filter acquire logic 2023-05-06 10:31:19 +08:00
chenjianhua
6c10a7f60d Update bt lib for ESP32-C3 and ESP32-S3 
- Fixed remote mic error during encryption procedure
 2023-05-05 21:54:01 +08:00
David Čermák
292d16b440 Merge branch 'bugfix/linux_target_with_out_lwip' into 'master' 
linux: Add lwip support to networking components under linux

See merge request espressif/esp-idf!23053
 2023-05-05 17:26:45 +08:00
morris
eaa4ad502a Merge branch 'bugfix/check_filter_range' into 'master' 
rmt: check filter and idle threashold

Closes IDFGH-9977

See merge request espressif/esp-idf!23518
 2023-05-05 17:19:45 +08:00
Jiang Jiang Jian
05d1104d28 Merge branch 'bugfix/reduce_logging_for_SAE_master' into 'master' 
Modify log level for SAE

See merge request espressif/esp-idf!23548
 2023-05-05 17:00:50 +08:00
Armando (Dou Yiwen)
313f8cdbb7 Merge branch 'bugfix/add_len_check_per_spi_master_transaction' into 'master' 
spi master: added transaction length check to refuse longer than hardware supported length

Closes IDF-7236

See merge request espressif/esp-idf!23199
 2023-05-05 16:25:05 +08:00
Jiang Jiang Jian
5c4ffe47d6 Merge branch 'bugfix/c6_tx_callback_issue' into 'master' 
esp_wifi: Fix tx_callback issue for ESP32C6

See merge request espressif/esp-idf!23531
 2023-05-05 15:57:40 +08:00
Michael (XIAO Xufeng)
120d848ef8 Merge branch 'bugfix/fix_wrong_hp_ldo_h2' into 'master' 
ESP32H2: Fix wrong hp ldo

See merge request espressif/esp-idf!23501
 2023-05-05 14:39:54 +08:00
Alexey Lapshin
dfcab42a01 pthread: fix restrict keyword usage in function declarations 
See https://gcc.gnu.org/onlinedocs/gcc/Restricted-Pointers.html
 2023-05-05 13:35:19 +08:00
David Cermak
b2af4d9689 lwip/linux: Add lwip support for networking component under linux 
linux/lwip: Wrap some IO posix functions
* to workaourd the FreeRTOS EINTR issue (when building without lwip)
* to correctly choose the sub-system based on fd (when building with
lwip) -- passing control to either linux/system or to lwip
This commit also addapts tapio-if to provide DHCP client by default and
configurable settings for static IP
 2023-05-05 05:03:39 +00:00
Rahul Tank
ef232423dd Merge branch 'bugfix/add_event_cb_for_pcl' into 'master' 
Nimble: Add support to send power control event in registered callback

See merge request espressif/esp-idf!23522
 2023-05-05 11:59:36 +08:00
Xiao Xufeng
b24ce390c0 dac: use STQILA instead empty to improve readability 2023-05-05 01:18:49 +08:00
Zim Kalinowski
4ba38c2105 Merge branch 'fix/console-build-error' into 'master' 
console: Fix building issue when serial JTAG is set

Closes IDFGH-9327

See merge request espressif/esp-idf!23311
 2023-05-04 20:15:42 +08:00
morris
d0258a57d0 Merge branch 'refactor/use_ccomp_timer_for_dma_performance_test' into 'master' 
dma: use ccomp_timer in the test_app by component manager

See merge request espressif/esp-idf!23526
 2023-05-04 18:42:06 +08:00
morris
6f749ae038 Merge branch 'test/enlarge_gptimer_test_threshold' into 'master' 
gptimer: enlarge test threshold

Closes IDFCI-1702

See merge request espressif/esp-idf!23511
 2023-05-04 18:40:22 +08:00
Armando
dbf3612d6d spi_flash: replace flash clock src change API with mspi timing API 2023-05-04 17:05:35 +08:00
Armando
8eec6558d1 mspi: refactor timing tuning driver to make it compatible with p4 2023-05-04 17:05:35 +08:00
Sarvesh Bodakhe
bb88774286 esp_wifi: Fix tx_callback issue for ESP32C6 2023-05-04 14:13:39 +05:30
Jiang Jiang Jian
39e93a95a3 Merge branch 'bugfix/sae_pk_improvements' into 'master' 
wpa_supplicant: fixes in mbedtls porting to parse compressed EC public key and remove unnecessary code

See merge request espressif/esp-idf!23440
 2023-05-04 16:06:51 +08:00
xiongweichao
a7519e17c8 bt: Deleted some redundant variables in HFP_AG 2023-05-04 15:36:23 +08:00
morris
da3b3cf4a4 dma: use ccomp_timer component for testing performance metric 
ccomp_timer now becomes a standalone component, located in the component registry.
we can use that in the test app by component manager.
 2023-05-04 14:09:36 +08:00
Shyamal Khachane
032305a74f wpa_supplicant: Reduce logging for SAE 2023-05-04 11:21:57 +05:30
wuzhenghui
dcab6368ce feature: support configuration of sleep clock calibration frequency 2023-05-04 12:09:26 +08:00
wuzhenghui
dd4d1bbe90 bugfix: fix esp32c6eco1 fosc calibration cycles during sleep 2023-05-04 11:46:21 +08:00
Armando
0e72940001 spi: added an API to get max transaction length and use in spi lcd driver 2023-05-04 11:37:23 +08:00
Armando
ea10aac4f0 spi: added transaction length check to refuse longer than hardware supported length 2023-05-04 11:37:23 +08:00
morris
1438d9a02c Merge branch 'bugfix/bootloader_support/flash' into 'master' 
bootloader_support: fix register backup

See merge request espressif/esp-idf!23507
 2023-05-04 10:52:28 +08:00
Jakob Hasse
0a3cfce671 Merge branch 'contrib/github_pr_10895' into 'master' 
Fix possible conversion errors by using __builtin_ffsll (GitHub PR)

Closes IDFGH-9541

See merge request espressif/esp-idf!23429
 2023-05-04 10:41:46 +08:00
Chen Jian Hua
3aa1ac99c7 Merge branch 'bugfix/fix_ble_hop_sel' into 'master' 
Fixed BLE connection failed to be established when disabled 5.0 feature

See merge request espressif/esp-idf!23516
 2023-05-04 10:16:07 +08:00
Marek Matej
d1a447f6c0 bootloader_support: fix register backup 
By storing the 'user2' register during the early init
we fix the flash access issue, which occurs in the
Zephyr/MCUboot ports for ESP32.

Signed-off-by: Marek Matej <marek.matej@espressif.com>
 2023-05-03 15:11:10 +02:00
Ivan Grokhotkov
3775ce8bd8 Merge branch 'feature/sdmmc_test_app' into 'master' 
sdmmc: new component test app

Closes IDF-7108

See merge request espressif/esp-idf!19699
 2023-05-03 03:07:06 +08:00
Ivan Grokhotkov
500b5b2103 Merge branch 'contrib/github_pr_11215' into 'master' 
improve thread safety in esp_timer (GitHub PR)

Closes IDFGH-9920

See merge request espressif/esp-idf!23295
 2023-05-03 02:21:07 +08:00
Ivan Grokhotkov
1f7c4b5690 Merge branch 'bugfix/xtensa_cmake_stderr_message' into 'master' 
xtensa: don't print debug messages to stderr

See merge request espressif/esp-idf!23439
 2023-05-02 18:51:22 +08:00
Ivan Grokhotkov
a0f4664625 Merge branch 'contrib/github_pr_11245' into 'master' 
app_trace: fix out of bounds array write (GitHub PR)

Closes IDFGH-9952

See merge request espressif/esp-idf!23345
 2023-05-02 18:10:00 +08:00
Rahul Tank
1f92c349a2 Nimble: Add support to send power control event in registered callback 2023-05-02 12:14:23 +05:30
Rahul Tank
329eec289b Merge branch 'feature/services_health_therm' into 'master' 
NimBLE: Added health thermometer profile

See merge request espressif/esp-idf!23065
 2023-05-02 13:28:08 +08:00
morris
9ae742eb85 rmt: check filter and idle threashold 
Closes https://github.com/espressif/esp-idf/issues/11262
 2023-04-29 06:51:35 +00:00
Darian Leung
76d4c9f592 freertos: Refactor port_systick 
This commit refactors port_systick.c so that all ports (RISC-V vs Xtensa) of
all FreeRTOS implementations (IDF vs Amazon SMP FreeRTOS) use the same set of
tick interrupt functions. Thus, these funcitons are now common:

- vPortSetupTimer() to setup the tick interrupt's timer
- xPortSysTickHandler() that is called on each tick interrupt
 2023-04-28 23:03:00 +08:00