Commit Graph

13889 Commits

Author SHA1 Message Date
Kapil Gupta
fa8f057ba8 wpa_supplicant: Fix compilation error when debug enabled
Closes https://github.com/espressif/esp-idf/issues/7789
2021-11-20 18:24:56 +05:30
Kapil Gupta
27e3422a23 wpa_supplicant: Optimize BTM request scan 2021-11-20 18:24:56 +05:30
wangmengyang
8cfffa260b [nimble]: clear timer handler during de-initialization 2021-11-19 15:08:55 +08:00
Isha Pardikar
28db922cfd Merge branch 'bugfix/protocomm_nimble_allocation' into 'master'
Fix for potential allocation bug in protocomm_nimble.c

Closes IDFGH-6005

See merge request espressif/esp-idf!15669
2021-11-19 04:47:44 +00:00
Wang Meng Yang
2ee3c7b542 Merge branch 'bugfix/wifi_prov_mgr_crash' into 'master'
NimBLE: Fixed wifi_prov_mgr crash after provisioning

See merge request espressif/esp-idf!15793
2021-11-19 02:59:12 +00:00
Wang Meng Yang
83a5823564 Merge branch 'bugfix/fix_device_name_len_limited_mr' into 'master'
Fix the issue of device name len limited

Closes BT-2066

See merge request espressif/esp-idf!15880
2021-11-19 02:36:25 +00:00
Wang Meng Yang
412808909c Merge branch 'bugfix/fix_modem_sleep_hw_error_mr_master' into 'master'
fix modem sleep hw error

See merge request espressif/esp-idf!15824
2021-11-19 02:34:39 +00:00
Wei Tian Hua
4d3323d4cc Merge branch 'bugfix/leedarson_master' into 'master'
component_bt: Fix some code logic errors

Closes BT-2079

See merge request espressif/esp-idf!15943
2021-11-19 02:03:15 +00:00
KonstantinKondrashov
209702d055 esp_ipc: Update documentation and API descriptions
This commit updates the documentation and API descriptions of
the esp_ipc and esp_ipc_isr features.
2021-11-18 21:34:50 +08:00
xiongweichao
ce2d72ddfb Missing break in switch 2021-11-18 19:47:09 +08:00
xiongweichao
5152b33385 Dereference null return value 2021-11-18 19:47:09 +08:00
xiongweichao
1bada6c0f6 already defined in bt_target.h 2021-11-18 19:47:09 +08:00
xiongweichao
752b1976c0 Dereference after null check 2021-11-18 19:47:07 +08:00
xiongweichao
101ad32110 Dereference before null check 2021-11-18 19:38:48 +08:00
xiongweichao
564f9e8f68 Logically dead code 2021-11-18 19:38:48 +08:00
isha pardikar
7377f8a5a6 Merge branch 'bugfix/protocomm_nimble_allocation' into 'master'
NimBLE: Fixed potential allocation bug in protocomm_nimble.c

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

See merge request espressif/esp-idf!15669
2021-11-18 14:15:08 +05:30
Yang Zhao
3b84612582 Update esp32 bt-lib
It is abnormal when getting the deep sleep state bit. So we need to check
the state again and run the "ble_master_soft_rst()" if neesed.
2021-11-18 15:23:36 +08:00
Jiang Jiang Jian
aa2047a83f Merge branch 'mesh/bugfix_fix_layer2_node_connection_issue' into 'master'
mesh: fix the issue that layer2 node connect to lower-layer node when FIXED-ROOT root disappeared

See merge request espressif/esp-idf!15181
2021-11-18 03:55:00 +00:00
Zim Kalinowski
d7d280b9df Merge branch 'staging/improve_riscv_vector_s_file' into 'master'
RISC-V: Fix vectors.S assembly file indentation and macro usage

See merge request espressif/esp-idf!15927
2021-11-18 00:50:35 +00:00
isha pardikar
e2a37b2712 Merge branch 'bugfix/wifi_prov_mgr_crash' into 'master'
NimBLE: Fixed wifi_prov_mgr crash after provisioning

See merge request espressif/esp-idf!15793
2021-11-17 18:35:40 +05:30
chenjianxing
65f3bf4a8a esp_phy: fix esp32s3 phy work with USB-OTG issue 2021-11-17 11:08:01 +08:00
Matus Fabo
a390efe798 fix: pin definitions for other boards
fix: re-enabled fatfs r/w test on sdspi
fix: copyright notice
add: pin definitions for esp32c3
fix: Changed fixed spi dma channel to a macro definition
2021-11-16 14:13:25 +01:00
Ondrej Kosta
6d4ff2c05e Merge branch 'feature/eth_ioctl_speed_duplex' into 'master'
esp_eth:  esp_eth_ioctl update

Closes IDF-1240 and IDF-4060

See merge request espressif/esp-idf!15607
2021-11-16 11:56:18 +00:00
Ondrej Kosta
d1f2a3dfcc esp_eth: added ioctl options to set Ethernet speed and duplex mode
esp_eth_ioctl third argument always acts as untyped pointer to memory now
2021-11-16 08:34:07 +01:00
morris
2e008825a9 Merge branch 'feat/rm_makefiles' into 'master'
Build & config: Remove leftover files from the unsupported make build system

Closes IDF-4273 and IDF-2827

See merge request espressif/esp-idf!15829
2021-11-16 03:44:41 +00:00
morris
207891ef6c clk: fix esp32h2 print wrong CPU frequency 2021-11-15 17:40:51 +08:00
Mahavir Jain
c5b904745f Merge branch 'bugfix/efuse_utility_header' into 'master'
efuse: Add missing esp_rom_sys.h include file

See merge request espressif/esp-idf!15939
2021-11-15 09:24:13 +00:00
Omar Chebib
220e52fca1 RISC-V: Fix vectors.S assembly file indentation and macro usage
The file is now more consistent as the macros have been fixed, more comments
have been added and the indentation is now using spaces only.
2021-11-15 17:17:24 +08:00
Wang Meng Yang
6322632a37 Merge branch 'bugfix/add_warning_print_timer' into 'master'
NimBLE: Modified timer not started / running warning print

See merge request espressif/esp-idf!15177
2021-11-15 08:32:47 +00:00
Li Shuai
5b766e63c0 Merge branch 'bugfix/wifi_bt_mac_bb_pd_light_sleep' into 'master'
fixes some sleep related issues

Closes AUD-3278

See merge request espressif/esp-idf!15844
2021-11-15 05:05:47 +00:00
Simon
197d6c05b6 Merge branch 'feature/support_new_psram' into 'master'
PSRAM: Add ESP32-D0WDR2-V3 support

Closes IDF-4308

See merge request espressif/esp-idf!15875
2021-11-15 03:43:59 +00:00
Li Shuai
37e1e9c540 Merge branch 'bugfix/memory_region_define_rtc_fast' into 'master'
substract rtc_iram_seg memory region size from ESP_BOOTLOADER_RESERVE_RTC

Closes WIFI-4115

See merge request espressif/esp-idf!15743
2021-11-15 02:34:35 +00:00
Gustavo Henrique Nihei
626d78c2e0 efuse: Add missing esp_rom_sys.h include file
This prevents the compiler error for the implicit declaration of
function "esp_rom_printf".

Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
2021-11-12 17:35:59 -03:00
Gustavo Henrique Nihei
4a011f3183 Merge branch 'bugfix/efuse_stdbool' into 'master'
efuse: Add missing stdbool.h include file

See merge request espressif/esp-idf!15917
2021-11-12 16:18:07 +00:00
Gustavo Henrique Nihei
5f0e213d9d efuse: Enable C++ linkage for the include headers on esp_efuse.h
Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
2021-11-12 09:17:02 -03:00
Li Shuai
c99cb930c3 sleep: deep sleep does not need cpu and wifi/bt mac retention 2021-11-12 17:46:56 +08:00
Li Shuai
d9e3204115 light sleep: replace new kconfig option of mac bb power down & phy reduce tx power 2021-11-12 17:46:18 +08:00
Shang Zhou
6da09b3542 Merge branch 'docs/update_syntax_error_for_customer_feedback' into 'master'
docs: Update punctuation and syntax error for esp_err_tesp_sleep_enable_ext1_wakeup

Closes DOC-2263

See merge request espressif/esp-idf!15909
2021-11-12 06:41:49 +00:00
Cao Sen Miao
ce1ee3d8ae psram: add ESP32-D0WD-R2-V3 support 2021-11-12 13:52:24 +08:00
Sudeep Mohanty
0497f18688 Merge branch 'feature/esp-timer-add-api-for-expiry-time' into 'master'
esp_timer: Added esp_timer_get_period/expiry_time APIs

Closes IDF-4285

See merge request espressif/esp-idf!15835
2021-11-12 05:13:34 +00:00
Mahavir Jain
f104bf1b76 Merge branch 'bugfix/httpd_stop' into 'master'
Check for failure in stopping http server [GitHub PR]

Closes IDFGH-7843

See merge request espressif/esp-idf!15904
2021-11-12 04:21:33 +00:00
Jakob Hasse
c14c81733d Merge branch 'bugfix/nvs_partition_encrypted_flag_compatibility' into 'master'
nvs: add config to ignore "encrypted" flag of nvs partitions

Closes IDFGH-6162

See merge request espressif/esp-idf!15912
2021-11-12 03:24:19 +00:00
Omar Chebib
76fbd73b20 Merge branch 'bugfix/ledc_auto_clk_refactor' into 'master'
ledc: improved support for ESP32-C3 and refactored divisor calculation

Closes IDF-2441

See merge request espressif/esp-idf!13837
2021-11-12 03:21:46 +00:00
Gustavo Henrique Nihei
77a6347849 efuse: Add missing stdbool.h include file
Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
2021-11-11 18:04:26 -03:00
Simon
4f7e51231f Merge branch 'refactor/flash_qio_overidable' into 'master'
spi_flash: refactor flash qio to make it overridable

Closes IDF-3089

See merge request espressif/esp-idf!15371
2021-11-11 17:54:47 +00:00
Roland Dobai
766aa57084 Build & config: Remove leftover files from the unsupported "make" build system 2021-11-11 15:32:36 +01:00
Song Ruo Jing
2c606c29b1 Merge branch 'bugfix/gpio_interrupt_on_app_cpu' into 'master'
gpio: Fix the bug that esp32 gpio interrupt cannot be triggered on core 1

Closes IDFGH-5900

See merge request espressif/esp-idf!15901
2021-11-11 12:28:53 +00:00
Mahavir Jain
ad9230fb34 spi_flash: minor cleanup, use type/subtype from esp_partition.h 2021-11-11 16:35:55 +05:30
likunqiao
5ae287b240 Bug fix: cmakelist update for build ieee802154 driver from src 2021-11-11 19:03:13 +08:00
Mahavir Jain
e67128dd0a nvs: add config to ignore "encrypted" flag of nvs partitions
This is to allow having pre IDF v4.3 behavior where "encrypted"
flag was not being checked for NVS partitions.

It is recommended to enable this new config only if you have
production devices where NVS partition was being set with "encrypted"
flag by mistake.

Please see commit aca9ec28b3 which
introduced check to not allow NVS partitions with "encrypted" flag set.

More discussion on this at:
https://github.com/espressif/esp-idf/issues/5747#issuecomment-956223024
https://github.com/espressif/esp-idf/issues/7839#issuecomment-961477667

Closes https://github.com/espressif/esp-idf/issues/7839
Closes IDFGH-6162
2021-11-11 15:20:57 +05:30
Sudeep Mohanty
5806e57773 esp_timer: Added esp_timer_get_period/expiry_time APIs
Added the following new APIs to the esp_timer module:
- esp_timer_get_period(): Returns the period of a timer in microseconds.
- esp_timer_get_expiry_time(): Returns the timeout value of a one-shot timer in microseconds.

Signed-off-by: Sudeep Mohanty <sudeep.mohanty@espressif.com>
2021-11-11 15:13:05 +05:30
Shang Zhou
1669504614 docs: Update punctuation and syntax error for esp_err_tesp_sleep_enable_ext1_wakeup 2021-11-11 17:25:45 +08:00
David Čermák
f788c337b1 Merge branch 'bugfix/esp_eth_test_deinit' into 'master'
esp_eth: Update test_emac.c (GitHub PR)

Closes IDFGH-6178 and IDFGH-6177

See merge request espressif/esp-idf!15873
2021-11-11 07:45:42 +00:00
Omar Chebib
44df880c12 Merge branch 'feature/move_ipc_to_esp_system' into 'master'
IPC: Move ipc sources to esp_system

Closes IDF-2160

See merge request espressif/esp-idf!15234
2021-11-11 06:57:44 +00:00
Dániel Buga
994038e0e9 esp_http_server: Check for failure in stopping http server
In some cases, sending the shutdown signal may fail, which causes `httpd_stop` to wait indefinitely.
This PR adds a check to prevent this infinite loop.

Signed-off-by: Shubham Kulkarni <shubham.kulkarni@espressif.com>

Closes https://github.com/espressif/esp-idf/pull/7843
2021-11-11 11:43:57 +05:30
Cao Sen Miao
981abed2b2 spi_flash: refact that flash qio can be overidable 2021-11-11 12:28:21 +08:00
Omar Chebib
1e8a0909f6 LEDC: divisor calculation will now be rounded up when necessary
Closes https://github.com/espressif/esp-idf/issues/7722
2021-11-11 12:21:22 +08:00
Omar Chebib
aa2ca7dd94 LEDC: improved support for ESP32-C3 and refactored divisor calculation
As ESP32C3 does not have support for REF_TICK source clock, it is now not
possible to select it anymore.
Auto cfg clock has been improved for all boards.
2021-11-11 12:21:15 +08:00
songruojing
7ec38fcc42 gpio: Fix the bug that esp32 gpio interrupt cannot be triggered on core 1
Introduced in 874a720286

Closes https://github.com/espressif/esp-idf/issues/7594
2021-11-11 12:14:32 +08:00
Wang Meng Yang
534cd5bb31 Merge branch 'bugfix/fix_custmoer_issues' into 'master'
bugfix/fix_3_controller_issues

Closes ESPCS-721, IDFGH-5407, IDFGH-5712, and IDFGH-6082

See merge request espressif/esp-idf!15821
2021-11-11 03:39:37 +00:00
Jiang Jiang Jian
3a443d523f Merge branch 'bugfix/fix_memory_leak_controller_deinit' into 'master'
ESP32: Fix memory leak in controller deinit function

See merge request espressif/esp-idf!15449
2021-11-11 03:36:18 +00:00
Yang Zhao
66fa67cde6 Fix the issue of device name len limited 2021-11-11 11:35:36 +08:00
Zim Kalinowski
9502656640 Merge branch 'bugfix/github-7830' into 'master'
docs: fix a small typo in logging library docs

Closes IDFGH-6153

See merge request espressif/esp-idf!15831
2021-11-11 03:30:02 +00:00
Jiang Jiang Jian
c6ad0e4658 Merge branch 'bugfix/power_down_bluetooth_module_when_deinit' into 'master'
component/bt: Power down bluetooth module when deinit

Closes WIFI-4180

See merge request espressif/esp-idf!15716
2021-11-11 03:23:46 +00:00
Omar Chebib
9d5923a13e IPC: Move ipc sources to esp_system
IPC shall be put back into esp_system as it is an 'OS additions'.
2021-11-11 10:30:01 +08:00
Jiang Jiang Jian
6ef6c2a2c7 Merge branch 'bugfix/esp32_light_sleep_crash' into 'master'
Fix crash caused by bluetooth high level interrupt

Closes BT-2047 and BT-2048

See merge request espressif/esp-idf!15867
2021-11-10 14:41:30 +00:00
Roland Dobai
016198f68f Merge branch 'feat/remove_make' into 'master'
Build & config: Remove the "make" build system

Closes IDF-4272

See merge request espressif/esp-idf!15818
2021-11-10 14:13:25 +00:00
David Čermák
f4bb97c56a Merge branch 'bugfix/DM9051_network_communication_abnormal' into 'master'
esp_eth: DM9051 tx throughput rate optimization

See merge request espressif/esp-idf!15099
2021-11-10 11:31:55 +00:00
Jiacheng Guo
5d3f8157e0 mdns: fix wrong PTR record count 2021-11-10 17:29:09 +08:00
Roland Dobai
9c1d4f5b54 Build & config: Remove the "make" build system
The "make" build system was deprecated in v4.0 in favor of idf.py
(cmake). The remaining support is removed in v5.0.
2021-11-10 09:53:53 +01:00
xiongweichao
422cf3cf37 Fix crash caused by bluetooth high level interrupt 2021-11-10 16:11:10 +08:00
Rahul Tank
897926d21c NimBLE: Modified timer not started / running warning print
Current check for valid timer throws a print which can mislead to be a crash. Modified the same

 Closes: https://github.com/espressif/esp-idf/issues/7550
2021-11-10 12:44:39 +05:30
Zim Kalinowski
04d80db499 freertos: Move Espressif's specific esp_reent_init into collective ifdef 2021-11-10 10:55:05 +08:00
Omar Chebib
86fbe68d94 Merge branch 'bugfix/xStreamBufferReset_crashing' into 'master'
FreeRTOS: Fix xStreamBufferReset function always crashing

Closes IDFGH-6040

See merge request espressif/esp-idf!15626
2021-11-10 02:12:30 +00:00
Jing Li
caa9e323cc Merge branch 'bugfix/fix_ota_crash' into 'master'
fix: app crash when OTA because the OTA task's stack is in rtc fast memory

See merge request espressif/esp-idf!15720
2021-11-09 08:45:01 +00:00
jincheng
74e121af88 fix HCI_Read_Clock error
fix HCI_Create_Connection_Cancel error
fix ASSERT_WARN during epr
2021-11-09 14:37:13 +08:00
Tian Sen Wen
c6ba84e5cd esp_eth: optimize dm9051 Tx throughput 2021-11-09 14:04:11 +08:00
Omar Chebib
8376276b14 FreeRTOS: Fix xStreamBufferReset function always crashing
This function resets the spinlock given as a parameter after taking it
(when entering the critical section). This then results in a panic once
it tries to exit the same critical section.

* Closes https://github.com/espressif/esp-idf/issues/7725
2021-11-09 14:04:02 +08:00
baohongde
11656377af components/bt: Fix the issue caused by the power off the bt power domain 2021-11-09 12:03:49 +08:00
lisekt84
474073c0a9
Update test_emac.c
Test of uninstall driver always return ESP_OK (IDFGH-6177) #7854
2021-11-08 19:45:11 +01:00
Alex Lisitsyn
58283e385a Merge branch 'feature/modbus_update_for_other_targets' into 'master'
modbus: update to support other targets

See merge request espressif/esp-idf!12345
2021-11-08 16:28:56 +00:00
Alex Lisitsyn
0586be45d2 modbus: update to support other targets 2021-11-08 16:28:55 +00:00
Li Shuai
bf650edc55 fix the wifi scan fail issue caused by the power off the wifi power domain 2021-11-08 20:59:10 +08:00
morris
83d16aa00c gdma: support IRAM interrupt 2021-11-08 16:14:51 +08:00
morris
490d3fee71 Merge branch 'refactor/make_peripheral_ctrl_as_private_api' into 'master'
global: make periph enable/disable APIs private

Closes IDF-3647

See merge request espressif/esp-idf!15632
2021-11-08 07:31:01 +00:00
Wang Fang
b86619fc61 Merge branch 'docs/add_a_note_to_mck_io_num' into 'master'
docs: add a note to mck_io_num: for esp32, only gpio0/gpio1/gpio3 can be set

Closes DOC-2218

See merge request espressif/esp-idf!15812
2021-11-08 05:14:41 +00:00
morris
16677b0d3c global: make periph enable/disable APIs private
peripheral enable/disable usually should be managed by driver itself,
so make it as espressif private APIs, not recommended for user to use it
in application code.
However, if user want to re-write the driver or ports to other platform,
this is still possible by including the header in this way:
"esp_private/peripheral_ctrl.h"
2021-11-08 10:37:47 +08:00
morris
7bc3506350 tinyusb: sync to master 9245b8f89f5 2021-11-08 09:57:42 +08:00
Cao Sen Miao
599227a1b6 ESP8684: Add esp8684 target to other repo for passing build 2021-11-06 17:33:45 +08:00
Cao Sen Miao
9ab043574d ESP8684: update esptool 2021-11-06 17:33:45 +08:00
Cao Sen Miao
5add6593f4 ESP8684: Add esp_gdbstub, mbedtls, esp_timer 2021-11-06 17:33:45 +08:00
Cao Sen Miao
742f99f7d0 ESP8684: add esp8684, esp_adc_cal, esp_common 2021-11-06 17:33:44 +08:00
Cao Sen Miao
a9f0a3531e ESP8684: add driver esp_pm heap support 2021-11-06 17:33:44 +08:00
Cao Sen Miao
36f6d16b8d ESP8684: add soc, riscv, newlib support 2021-11-06 17:33:44 +08:00
Cao Sen Miao
09487761cf ESP8684: add freertos, hal, esp_system support 2021-11-06 17:33:44 +08:00
Cao Sen Miao
3934e24d22 ESP8684: add spi_flash, efuse, hw_support support 2021-11-06 17:33:44 +08:00
Cao Sen Miao
bf6fa70812 ESP8684: update bootloader, bootloader_support, esp_rom 2021-11-06 17:33:44 +08:00
Cao Sen Miao
7f5c415401 ESP8684: introduce a new target esp8684 2021-11-06 17:33:44 +08:00
Ivan Grokhotkov
53015490e3 Merge branch 'bugfix/freemodbus_tcp_master_fix_long_frame_buffer_issue' into 'master'
freemodbus: fix tcp master long frame buffer issue

See merge request espressif/esp-idf!11687
2021-11-05 16:23:35 +00:00
Alex Lisitsyn
0d393558d3 freemodbus: fix tcp master long frame buffer issue 2021-11-05 16:23:35 +00:00
aleks
ee104f8de2 freemodbus: fix timer port to use esp_timer instead of group timer 2021-11-05 13:19:09 +00:00
Jiacheng Guo
674a3ff878 openthread: support updating RCP with OTA over spinel 2021-11-05 16:47:30 +08:00
Xie Wen Xiang
579aa4bd90 Merge branch 'bugfix/fix_crash_when_shutdown_bt' into 'master'
component/bt: fix crash when shutdown bt

See merge request espressif/esp-idf!15705
2021-11-05 03:00:09 +00:00
Ivan Grokhotkov
0b376251df Merge branch 'feature/kconfig_for_reproducible_build' into 'master'
Feature: kconfig for reproducible build

See merge request espressif/esp-idf!15100
2021-11-04 22:07:29 +00:00
Ondrej Kosta
cb8432e0f2 esp_eth: KSZ8851SNL, enable Rx multicast in MAC filter
Closes https://github.com/espressif/esp-idf/issues/7750
2021-11-04 16:17:45 +00:00
Roland Dobai
71dd63c5f1 Merge branch 'feature/gcov_esp32c3' into 'master'
debug_stubs and gcov: Refactor and add support for RISCV

See merge request espressif/esp-idf!15212
2021-11-04 13:56:18 +00:00
Wang Meng Yang
328450b8c2 Merge branch 'bugfix/fix_ble_prefered_ext_conn_parameter_detection' into 'master'
component/bt: check the ble ext conn parameter

See merge request espressif/esp-idf!15767
2021-11-04 12:23:42 +00:00
Wang Fang
21378f007f docs: add a note to mck_io_num: for esp32, only gpio0/gpio1/gpio3 can be set 2021-11-04 19:38:51 +08:00
Jakob Hasse
465d6a37cc Merge branch 'feature/wear_levelling_test_app' into 'master'
wear_levelling: move tests from unit-test-app to a component test app

See merge request espressif/esp-idf!15582
2021-11-04 06:58:04 +00:00
Wu Zheng Hui
f64efe6076 Merge branch 'feature/update_c3_h2_soc_caps' into 'master'
heap: update memory heap caps

See merge request espressif/esp-idf!15792
2021-11-04 06:34:25 +00:00
wuzhenghui
ca1c4114bc heap: update esp32&s2&c3&h2 soc caps 2021-11-04 10:40:57 +08:00
Marius Vikhammer
f578a67ec7 Merge branch 'bugfix/aes_gcm_unaligned_psram' into 'master'
aes: fix potential unaligned access in aes-gcm

Closes IDFGH-5506

See merge request espressif/esp-idf!15668
2021-11-04 02:23:57 +00:00
Uri Shaked
18b398cfb4
fix a small typo in logging library docs 2021-11-04 04:08:35 +02:00
Alexey Gerenkov
e7dd7d3110 gcov: Fixes interference of gcov dump with normal IPC calls 2021-11-04 01:33:24 +03:00
Alexey Gerenkov
e4e4bbae5e gcov: Do not use shrunk ROM's fake stdout and stderr FILE struct 2021-11-04 01:33:24 +03:00
Alexey Gerenkov
bb9cd84cdc debug_stubs: Refactor and add support for RISCV 2021-11-04 01:33:24 +03:00
David Čermák
9466fd1e16 Merge branch 'bugfix/LAN8720_reset_assertion' into 'master'
Increased LAN8720 ETH-PHY reset assertion time

Closes IDFGH-6132 and IDFGH-6018

See merge request espressif/esp-idf!15636
2021-11-03 16:29:09 +00:00
jingli
efbc980d4f fix: app crash when OTA because the OTA task's stack is in rtc fast memory 2021-11-03 20:56:42 +08:00
Martin Gano
3c4034d36e support for generating FATFS on a host 2021-11-03 13:06:11 +01:00
Ivan Grokhotkov
5962a7e931 wear_levelling: move tests from unit-test-app to a component test app
* Migrate test cases from IDF test runner to Unity fixture.
* Tighten heap checks in the test case a bit.
* Run formatting script on test_wl.c
* NEW: Define 4 test configurations, including configs with 512 byte
  sector size. Previously these configs weren't tested in CI.
* NEW: The test app only runs for ESP32 and ESP32-C3 (one chip for
  each architecture). The component is pretty high level so we don't
  need to test it for each chip. This reduces the load on CI.
2021-11-03 09:56:20 +01:00
Jakob Hasse
32e3444701 feat (pthread): reader-writer locks implementation
* Added implementation based on cond. variables
* Added unit tests

Closes https://github.com/espressif/esp-idf/issues/7411
2021-11-03 16:38:14 +08:00
Marius Vikhammer
1cb07a1288 aes: fix potential unaligned access in aes-gcm 2021-11-03 14:10:11 +08:00
Jakob Hasse
7df16fdf8f Merge branch 'feature/i2c_mock' into 'master'
feat (driver): Added mocking for i2c.h

See merge request espressif/esp-idf!15641
2021-11-03 05:49:04 +00:00
Mahavir Jain
268143b732 Merge branch 'bugfix/mbedtls_disable_dhe_by_default' into 'master'
mbedtls: disable Diffie-Hellman key exchange modes by default

Closes IDF-1230

See merge request espressif/esp-idf!15642
2021-11-03 04:30:30 +00:00
Shu Chen
117bb79ec2 Merge branch 'feature/add_ieee802154_timer' into 'master'
ieee802154: Add ieee802154 timer APIs

See merge request espressif/esp-idf!15752
2021-11-03 02:31:03 +00:00
Island
417ef24b06 Merge branch 'bugfix/ble_mesh_host_init' into 'master'
ble_mesh: nimble: return error if init host twice

See merge request espressif/esp-idf!13065
2021-11-03 02:25:03 +00:00
Island
e595fb43cd Merge branch 'bugfix/sig_ble_mesh_errata_e16350' into 'master'
ble_mesh: stack: Apply the errata E16350 from Bluetooth SIG

See merge request espressif/esp-idf!15645
2021-11-03 02:24:59 +00:00
Darian
ea6a0dde5a Merge branch 'bugfix/usb_hcd_robustness' into 'master'
USB Host: Fix how disconnections an EP halts are handled

Closes IDFGH-5797 and IDFGH-6108

See merge request espressif/esp-idf!15640
2021-11-02 13:50:09 +00:00
lly
a1535faad5 ble_mesh: nimble: return error if init host twice 2021-11-02 20:40:49 +08:00
lly
277a5947ee ble_mesh: stack: Apply the errata E16350 from Bluetooth SIG 2021-11-02 20:39:56 +08:00
Darian
44b2b7c22c Merge branch 'bugfix/freertos_round_robin_scheduling_retain_skip' into 'master'
freertos: Implement best effort round robin scheduling

Closes IDFGH-5528

See merge request espressif/esp-idf!15507
2021-11-02 11:58:48 +00:00
Mahavir Jain
bd2c528241 Merge branch 'bugfix/manual_secure_boot_v2_multiple_digest_issue' into 'master'
secure_boot_v2: fix issue in pre-flashed digest (manual) workflow

Closes IDF-4248

See merge request espressif/esp-idf!15688
2021-11-02 10:57:47 +00:00
David Čermák
7bd93e3362 Merge branch 'bugfix/eth_emac_reset_dma_desc' into 'master'
esp-eth: emac: Reset Tx DMA channel owner on init

Closes IDFGH-6071

See merge request espressif/esp-idf!15685
2021-11-02 10:29:02 +00:00
Ondrej Kosta
380864861f Copyright message fix for 'Increased LAN8720 ETH-PHY reset assertion time' 2021-11-02 09:57:03 +01:00
Mahavir Jain
f7ed95349f mbedtls: fix dynamic buffer feature build 2021-11-02 15:52:09 +08:00
Mahavir Jain
8c9a3da695 mbedtls: disable Diffie-Hellman key exchange modes by default
Using these ciphers can constitute a security risk if the server
uses a weak prime for the key exchange.

Footprint impact:
Roughly 3K saved in text+rodata in default https_request example
2021-11-02 15:52:09 +08:00
Mahavir Jain
2a885ae694 secure_boot_v2: fix issue in pre-flashed digest (manual) workflow
This commit fixes issue where empty (unprogrammed) digest slot out of
multiple supported (e.g. 3 for ESP32-C3) could cause issue in
workflow enablement process.

Notes:

1. This issue was applicable for chips supporting "secure-boot-v2"
scheme with multiple digests slots
2. This issue was affecting only manual workflow, where digest of
public was pre-flashed in efuse
3. Change in "flash_encrypt.c" is only for additional safety purpose
2021-11-02 15:26:24 +08:00
xiewenxiang
f0ef891901 component/bt: check the ble ext conn parameter 2021-11-02 14:33:24 +08:00
Darian Leung
189899180f usb: Change API and refactor tests
This commit updates the USB Host Library API in the following wasy:
- usb_host_client_handle_t and usb_device_handle_t made into struct pointers
  to generate compiler warnings about conflicting handle types
- usb_host_client_config_t changed to future proof API for Synchronous Clients
- Added usb_host_lib_unblock()
- Added usb_host_device_addr_list_fill()
- Return of usb_host_device_free_all() updated to indicate whether there
  are still devices yet to be freed.
- Blockg APIs are now marked explicitly
- Fixed a bug in usb_host_transfer_submit_control() when checking the bEndpointAddress
  of a control transfer.

Tests are also refactored to move some common macros into shared headers

Closes https://github.com/espressif/esp-idf/issues/7786
2021-11-02 14:30:58 +08:00
Darian Leung
54b6c902d3 usb: Add USB Host Library sudden disconnect tests 2021-11-02 14:30:58 +08:00
Darian Leung
6a12e28333 usb: Fix USBH handling of disconnections
This commit fixes how the USBH handling of a sudden device disconnection,
more specifically handling of device gone.
- Previously the USBH would only halt, flush, and dequeue the device's
default EP, then send a device gone event to the Host Library layer.
- Now the USBH will also halt and flush all non-default EPs, allowing
all of the URBs to be dequeud.
- Some internal object members are now protected by a mutex instead of
a spinlock.

Closes https://github.com/espressif/esp-idf/issues/7505
2021-11-02 14:30:58 +08:00
Darian Leung
0c758c8557 usb: Fix how the HCD handles sudden disconnection
This commit fixes how the USB Host HCD handles sudden disconnections.

Bugs:
- HW channels remain active when the port suddenly disconnects, and
previously the channel would be disabled by setting the disabled bit,
then waiting for a disabled interrupt. However, ISOC channels do not
generate the disabled interrupt when the port is invalid, thus leading
to tasks getting indefinitely blocked in hcd_pipe_command().

Fix:
On a sudden disconnection, forcibly treat all channels as halted even
if their HCCHAR.ChEna bit is still set. We do a soft reset after a port
error anyways, so the channels will eventually be reset.

Closes https://github.com/espressif/esp-idf/issues/7505
2021-11-02 14:30:58 +08:00
Darian Leung
0159c37cf2 usb: Fix LL 8/16 bit register field access
This commit addes the 8/16 bit register field access workarounds to
the DWC_OTG peripheral. This workaround was applied to all other
peripherals in commit 874a720286.
2021-11-02 14:30:58 +08:00
Jakob Hasse
1eb96cfc79 feat (driver)!: Added mocking for i2c.h
BREAKING CHANGE: removed ringbuf.h from public i2c.h
2021-11-02 14:16:31 +08:00
xiaqilin
3fc4a0c9c1 ieee802154: add timer APIs 2021-11-02 14:08:34 +08:00
Darian Leung
8babb3bca6 freertos: Fix SMP round robin scheduling
The previous SMP freertos round robin would skip over tasks when
time slicing. This commit implements a Best Effort Round Robin
where selected tasks are put to the back of the list, thus
makes the time slicing more fair.

- Documentation has been updated accordingly.
- Tidy up vTaskSwitchContext() to match v10.4.3 more
- Increased esp_ipc task stack size to avoid overflow

Closes https://github.com/espressif/esp-idf/issues/7256
2021-11-02 14:00:14 +08:00
Zim Kalinowski
13ab2cd9f9 Merge branch 'bugfix/spiram_abort_allocation_failure' into 'master'
SPIRAM: 'Abort on allocation failure' should not trigger when there is available SPI ram

Closes IDFGH-5870

See merge request espressif/esp-idf!15454
2021-11-02 05:36:18 +00:00
Omar Chebib
96391ef62b SPIRAM: 'Abort on allocation failure' should not trigger when there is available SPI ram 2021-11-02 05:36:18 +00:00
Zim Kalinowski
6b3201605e Merge branch 'bugfix/riscv_fix_vector_mcause' into 'master'
RISC-V: fix usage of special register when interrupts are enabled

Closes IDF-3955

See merge request espressif/esp-idf!15370
2021-11-02 05:31:06 +00:00
morris
b2c2e2302b Merge branch 'feature/KSZ8091_support' into 'master'
Add support for Eth PHY KSZ8091

Closes IDFGH-5845

See merge request espressif/esp-idf!15702
2021-11-02 02:37:53 +00:00
xiewenxiang
9b16f5d831 component/bt: fix crash when shutdown bt 2021-11-02 10:29:10 +08:00
Ivan Grokhotkov
f47e8f90ce Merge branch 'bugfix/multi_heap_get_info_impl' into 'master'
heap: fix multi_heap_get_info_impl

See merge request espressif/esp-idf!15470
2021-11-01 21:21:22 +00:00
Frank Sautter
5e7df077d6 Increased LAN8720 ETH-PHY reset assertion time (IDFGH-6018)
Increase reset assertion time from 100µs (as specified minimum in the datasheet) to 150µs.
Some specimen of the LAN8720 need the reset signal asserted longer than 100µs to initialise properly. Otherwise they are in a zombie state where they are establishing and loosing an Ethernet link once in a seconds interval.
2021-11-01 22:03:30 +01:00
gaoxiaojie
0028e2c23c heap: fix multi_heap_get_info_impl 2021-11-01 16:08:07 +00:00
ma-lalonde
0f754551dd Add support for Eth PHY KSZ8091 2021-11-01 11:11:18 -04:00
KonstantinKondrashov
884a6b17cc spi_flash: No CPU release time for an erase operation when OS is not running
During the early start, the virtual eFuse mode can call erase operations when OS is not yet running.

Possible workaround: CONFIG_SPI_FLASH_YIELD_DURING_ERASE=n

Fixed for the legacy flash driver as well.
2021-11-01 21:49:24 +08:00
Cao Sen Miao
049349a087 Merge branch 'feature/usb_serial_default_option' into 'master'
usb_serial_jtag: Add secondary menu to support using usb_serial port to print when primary is uart

Closes IDF-3525 and IDF-3555

See merge request espressif/esp-idf!14554
2021-11-01 11:22:35 +00:00
Martin Vychodil
8a86434ece Merge branch 'feature/fatfs_disk_status_implementation' into 'master'
fatfs: Implementation of disk_status for SD/MMC card

Closes IDF-4125

See merge request espressif/esp-idf!15488
2021-11-01 09:48:59 +00:00
Armando (Dou Yiwen)
742517bcea Merge branch 'bugfix/fix_120m_sdr_flash_config_on_non_s3_bug' into 'master'
spi_flash: make 120m config only visible on s3 sdr mode

See merge request espressif/esp-idf!15704
2021-11-01 09:06:13 +00:00
Cao Sen Miao
adfb7bed96 vfs_usb_serial: set secondary selection for making usb port can output under default menu 2021-11-01 15:48:36 +08:00
Jan Procházka
fb22c1f182 fatfs: Implementation of disk_status nad disk_initialize for SD/MMC card
FATFS provides a disk status and disk initialize callback which were not
implemented. Implementation has very low impact on SD/MMC speed and
fixes issues, when trying to open file when SD card was removed from
slot and not deinited.

If disk_status returns STA_NOINIT, it will always continue with
disk_initialize. If that returns 0, it will continue like everything is
working normally. So there has to be the same check as in disk_status.
Return of disk_initialize is always checked like this for STA_NOINIT or
STA_PROTECT so if command fails, we return the STA_NOINIT.

stat = disk_initialize(pdrv);
if (stat & STA_NOINIT) return FR_NOT_READY;
if (stat & STA_PROTECT) return FR_WRITE_PROTECTED;

Closes IDF-4125
2021-11-01 15:11:40 +08:00
Omar Chebib
5206afe755 Merge branch 'bugfix/fix_select_timeout' into 'master'
VFS: `select` function's timeout is now POSIX compliant

Closes IDFGH-5807

See merge request espressif/esp-idf!15374
2021-11-01 07:01:20 +00:00
Steinbart Andreas (HAU-EDS)
f9d6fa2b84 esp-eth: emac: Reset Tx DMA channel owner on init
Reset ethernet TX DMA descriptors sets owner to CPU, so re-installing the ethernet driver will now not result in packet loss

Merges https://github.com/espressif/esp-idf/pull/7752
2021-11-01 06:16:59 +00:00
Shubham Kulkarni
33e6549597 Merge branch 'bugfix/http_client_breaking_changes' into 'master'
esp_http_client: v5.0 specific breaking changes

Closes IDFGH-4777 and IDF-2985

See merge request espressif/esp-idf!15639
2021-10-31 04:53:26 +00:00
Li Shuai
9ac58e32a2 substract rtc_iram_seg memory region size from ESP_BOOTLOADER_RESERVE_RTC 2021-10-29 21:24:09 +08:00
Mahavir Jain
a89d56082f Merge branch 'bugfix/memprot_bad_esp_restart_check' into 'master'
System/Security: wrong check of the Memprot feature in esp_restart()/panic_restart()

See merge request espressif/esp-idf!15414
2021-10-29 12:17:32 +00:00
Chinmay Chhajed
da0234ca01 Merge branch 'bugfix/ble_conn_latency_max_value' into 'master'
BLE: Set connection max latency value to 499.

Closes BT-2025

See merge request espressif/esp-idf!15706
2021-10-29 12:16:55 +00:00
Shubham Kulkarni
5bf49e1cd6 esp_http_client: Support handling larger content lengths
Closes https://github.com/espressif/esp-idf/issues/6580
2021-10-29 18:14:22 +08:00
Shubham Kulkarni
436249de4f esp_http_client: Disable HTTP digest auth by default 2021-10-29 18:14:22 +08:00
Island
c33db5d4f5 Merge branch 'bugfix/ble_mesh_update_license' into 'master'
ble_mesh: stack: update license of esp specific files

See merge request espressif/esp-idf!15603
2021-10-29 09:56:33 +00:00
Chinmay Chhajed
7caa6ca45f BLE: Set connection max latency value to 499. 2021-10-29 14:24:45 +05:30
Martin Vychodil
dffb92e45f System/Security: wrong check of the Memprot feature in esp_restart()/panic_restart()
esp_restart()/panic_restart() never resets the Digital system (so far required only by the Memprot feature) as there's a typo in the corresponding #define:
it checks CONFIG_ESP_SYSTEM_CONFIG_MEMPROT_FEATURE instead of CONFIG_ESP_SYSTEM_MEMPROT_FEATURE.
Issue fixed.

IDF-4094
2021-10-29 16:28:28 +08:00
Shu Chen
546a66c65e Merge branch 'bugfix/fix_esp32h2_efuse_get_ext_mac' into 'master'
efuse: fix esp32h2 get ext_mac

See merge request espressif/esp-idf!15682
2021-10-29 08:20:28 +00:00
Sudeep Mohanty
4846222102 freertos: update freertos folder structure to match upstream
The following changes have been made:
1. All FreeRTOS kernel source files are now placed in the
   freertos/FreeRTOS-Kernel folder to match with the upstream folder structure.
2. All kernel include files are now placed in freertos/FreeRTOS-Kernel/include.
3. All port files are now placed in freertos/FreeRTOS-Kernel/portable.
4. All additions/customizations are placed in freertos/esp_additions.
5. All other miscellaneous files (README, License files etc.) are moved to
   freertos/FreeRTOS-Kernel folder to match with the upstream.
6. Updated esp-cryptoauthlib to latest commit to resolve FreeRTOS
   include dependencies.

Signed-off-by: Sudeep Mohanty <sudeep.mohanty@espressif.com>
2021-10-29 12:05:13 +08:00
Sudeep Mohanty
a3db2dd4a8 Merge branch 'bugfix/ringbuf_read_pointer_wrap' into 'master'
ringbuf: Fix bug where comparision between a signed and unsigned operand resulted in incorrect free size for no-split/allow-split buffers

Closes IDFGH-5624 and IDFGH-5649

See merge request espressif/esp-idf!15373
2021-10-29 03:59:21 +00:00
baohongde
e6ceedf3a0 component/bt: Power down bluetooth module when deinit 2021-10-29 10:42:23 +08:00
Wei Tian Hua
347e04cf73 Merge branch 'doc/make_classic_bt_API_ref_only_for_esp32' into 'master'
Doc/Make Classic BT related document links only visible for ESP32

Closes IDFGH-5008, IDFGH-6022, and AUD-3378

See merge request espressif/esp-idf!15635
2021-10-29 02:27:24 +00:00
KonstantinKondrashov
f45d25d380 efuse_table_gen: Fixes wrong joining fields with omitted names
The issue is related to the non-sequential way of description when
such fields going together sequential.

Related to esp32h2 chip for eFuses: MAC_FACTORY and MAC_EXT.
The issue is in wrong indexes of MAC_EXT.
MAC_EXT got indexes like it is joined to MAC_FACTORY.

const esp_efuse_desc_t* ESP_EFUSE_MAC_FACTORY[] = {
    &MAC_FACTORY[0],
    &MAC_FACTORY[1],
    &MAC_FACTORY[2],
    &MAC_FACTORY[3],
    &MAC_FACTORY[4],
    &MAC_FACTORY[5],
    NULL
};

const esp_efuse_desc_t* ESP_EFUSE_MAC_EXT[] = {
    &MAC_EXT[6],
    &MAC_EXT[7],
    NULL
};

This commit fixed it to:

const esp_efuse_desc_t* ESP_EFUSE_MAC_EXT[] = {
    &MAC_EXT[0],
    &MAC_EXT[1],
    NULL
};
2021-10-28 23:53:38 +08:00
zhangwenxu
55fd8cb685 efuse: fix esp32h2 get ext_mac 2021-10-28 23:53:38 +08:00
lly
eeb9a9bd2c ble_mesh: stack: Update license of esp specific files 2021-10-28 21:20:27 +08:00
shenjun
5532c33be9 esp_wifi_mesh: fix the issue that layer2 node connect to lower-layer node when FIXED-ROOT root disappeared 2021-10-28 20:16:31 +08:00
yuanjm
9f875b8db5 esp_http_client: Fix HEAD request will affect the all next HTTP requests unless we close the HTTP request
Closes https://github.com/espressif/esp-idf/issues/7777
2021-10-28 19:53:12 +08:00
Armando
f9fa38463a spi_flash: make 120m config only visible on s3 sdr mode 2021-10-28 19:36:34 +08:00
weitianhua
0ea06fa336 Remove dummy defines of Classic BT 2021-10-28 19:26:46 +08:00
Sudeep Mohanty
ac0cbebb89 ringbuf: Fix bug where comparision between a signed and unsigned operand resulted in incorrect free size for no-split/allow-split buffers
This commit fixes a bug in no-split and allow-split ring buffers free buffer size calculation.
When the free size available in the buffers less than the size of one item header,
the function prvGetCurMaxSizeNoSplit/AllowSplit() incorrectly returned the maxItemSize instead of 0.
This is due to the comparision between a negative and a positive value
where both operands are treated as unsigned during the comparision operation,
thereby treating the negative operand as a large integer.

Also added new unit tests to test buffer-full and almost-full conditions
where this scenario is likely to be hit.

Closes https://github.com/espressif/esp-idf/issues/7344
Closes https://github.com/espressif/esp-idf/pull/7371
2021-10-28 14:02:18 +05:30
Sudeep Mohanty
0d81eb9855 Merge branch 'bugfix/ringbuf_send_semaphore_release_order' into 'master'
esp_ringbuf: Fix order of semaphore release in xRingbufferSend

Closes IDFGH-6030 and IDFGH-6036

See merge request espressif/esp-idf!15657
2021-10-28 05:30:31 +00:00
Jiang Jiang Jian
05a618ce10 Merge branch 'feature/decouple_softap_and_8684_support' into 'master'
Feature/decouple softap and 8684 support

See merge request espressif/esp-idf!15564
2021-10-28 04:13:18 +00:00
Omar Chebib
73303e5de0 VFS: select function's timeout is now POSIX compliant
`select` function will now round up the timeout passed as a parameter (if any).
It  makes it POSIX compliant.

* Closes https://github.com/espressif/esp-idf/issues/7514
2021-10-28 02:52:59 +00:00
Chen Jian Xing
4f5ab6be05 Merge branch 'bugfix/fix_phy_usb_issue' into 'master'
esp_phy: fix esp32c3/s3 PHY disable USB & RSSI issue

Closes ESPCS-710 and WIFI-3946

See merge request espressif/esp-idf!15596
2021-10-27 13:16:35 +00:00
weitianhua
64aa94d823 Make Classic BT related document links only visible for ESP32 2021-10-27 15:28:47 +08:00
Cao Sen Miao
bd2a524a12 Merge branch 'bugfix/esp_timer_before_init' into 'master'
esp_timer: allow querying the timer before esp_timer_init is called

Closes IDF-3570

See merge request espressif/esp-idf!14428
2021-10-27 05:49:06 +00:00
RichFalk
1222f6dd3a esp_ringbuf: Fix assertion xQueueGenericSend queue.c:818
The release of the semaphore indicating the item was successfully sent must be the last semaphore released.  The receiver may be in another task and may delete the Ringbuffer (such as with a return code across tasks design pattern) if they are through with the Ringbuffer.

The function xRingbufferSendAcquire followed by xRingbufferSendComplete had the semaphores released in the proper order and that same pattern should have been used in xRingbufferSend and xRingbufferSendFromISR.  This commit fixes this order.

Issue (IDFGH-6030) #7716 describes the problem in more detail.

Closes IDFGH-6030, https://github.com/espressif/esp-idf/issues/7716
Closes IDFGH-6036, https://github.com/espressif/esp-idf/pull/7721
2021-10-27 09:54:36 +05:30
Zhang Jun Hao
a568b4fddf esp_wifi: support station only mode for code size down 2021-10-27 11:48:22 +08:00
Island
8037e2462f Merge branch 'bugfix/heartbeat_filter_with_acceptlist' into 'master'
ble_mesh: stack: Fix heartbeat filter with accept list error

See merge request espressif/esp-idf!14529
2021-10-27 02:50:00 +00:00
David Čermák
bcbef9a8db Merge branch 'bugfix/ping_sock_0_valid' into 'master'
lw-ip: Fix ping socket create to allow for fd=0

See merge request espressif/esp-idf!15644
2021-10-26 14:27:45 +00:00
Cao Sen Miao
b0123199da esp_timer: init rtc timer and system timer in early init 2021-10-26 19:07:34 +08:00
Ivan Grokhotkov
249abb3fe8 esp_timer: allow querying the timer before esp_timer_init is called 2021-10-26 19:07:34 +08:00
Anton Maklakov
e525964f67 Merge branch 'bugfix/gdbstub_4_c3' into 'master'
Add missing function for C3

See merge request espressif/esp-idf!15538
2021-10-26 10:16:38 +00:00
Alexey Gerenkov
e777653222 Merge branch 'feature/esp32s3_apptrace' into 'master'
apptrace/trax: Adds ESP32-S3 support

Closes IDF-1785

See merge request espressif/esp-idf!14857
2021-10-26 09:50:40 +00:00
lly
fc97277e2f ble_mesh: stack: Update the license of provisioner_main.c 2021-10-26 17:44:36 +08:00