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
24,849 Commits 20 Branches 148 Tags 384 MiB
453ecbe9f2
Commit Graph

16505 Commits

Author SHA1 Message Date
Ivan Grokhotkov
0d4a533b74 Merge branch 'bugfix/usb_console_reset' into 'master' 
esp_system: usb_console: fix restart when Wi-Fi is working

Closes IDFGH-5683

See merge request espressif/esp-idf!19289
 2022-08-01 13:36:44 +08:00
wangyuanze
4a617e459a touch_sensor: make touch_element compile on esp32s3 
Closes: https://github.com/espressif/esp-idf/issues/9292
 2022-08-01 13:16:03 +08:00
Guillaume Souchere
8357fc728f Merge branch 'bugfix/update-doc-freertos-task-header' into 'master' 
freertos: Update the documentation of the ulBitsToClearOnEntry parameter

Closes IDFGH-5468

See merge request espressif/esp-idf!19277
 2022-08-01 13:07:45 +08:00
Kevin (Lao Kaiyao)
6658b7eb0a Merge branch 'feature/setup_target_test_for_c2_26m' into 'master' 
ci: setup 26mhz esp32c2 runner

Closes IDF-5526

See merge request espressif/esp-idf!19032
 2022-08-01 11:54:09 +08:00
weitianhua
e51df179ad components_bt/bluedroid: Fix Memory&String Copy Build Err 
1. When setting compilier into -O2 optimization, build for classic bt demo will get wrong
   2. Fix a memcpy bug that maybe get memory truncated

Closes https://github.com/espressif/esp-idf/issues/9398
 2022-08-01 11:37:46 +08:00
Marius Vikhammer
da91fb7a81 system: moved placement of disable rom log efuse in startup flow 
Functions used for burning this efuse would log, but at this point
esp_log is not initialized. Moved to a later point in the startup process.

Closes https://github.com/espressif/esp-idf/issues/9457
 2022-08-01 11:16:17 +08:00
zhouli
13770a2660 rgb_lcd: support mirror and swap axis 2022-08-01 03:05:19 +00:00
Marius Vikhammer
af329784b1 ulp: fix missing cpp header guard 
https://github.com/espressif/esp-idf/issues/9464
 2022-08-01 10:19:32 +08:00
Wan Lei
1265a2db9d Merge branch 'refactor/add_missing_include_path_for_soc_struct_files' into 'master' 
Fix check_public_headers violations for soc component

Closes IDF-5397

See merge request espressif/esp-idf!19158
 2022-08-01 10:14:04 +08:00
Wu Zheng Hui
7c17a04733 Merge branch 'feature/optimize_chips_memory_allocation' into 'master' 
system: Optimize chips bootloader and heap memory allocation

Closes IDF-4585 and IDF-4299

See merge request espressif/esp-idf!18807
 2022-08-01 10:11:01 +08:00
Kapil Gupta
e9c18ad02f esp_wifi: set default authmode as wpa2 2022-07-30 10:43:39 +05:30
Shen Weilong
028d071e84 support BLE with 26M xtal for esp32c2 2022-07-29 21:36:33 +08:00
Darian
b66be87f88 Merge branch 'bugfix/increase_ipc_stack_size_for_esp32s3' into 'master' 
esp_system: Increase IPC stack size for ESP32-S3

Closes IDFCI-1403

See merge request espressif/esp-idf!19250
 2022-07-29 21:23:43 +08:00
laokaiyao
4ab8f00b47 ci: setup 26mhz esp32c2 runner 2022-07-29 17:10:34 +08:00
wuzhenghui
5e8ba9cea8 use enum and designated initializers in soc_memory_type define 2022-07-29 17:07:41 +08:00
wuzhenghui
70eabb5492 ci: fix ci 2022-07-29 17:07:41 +08:00
wuzhenghui
7cb9304b65 Clean IRAM and DRAM address space conversion macros 2022-07-29 17:07:39 +08:00
jincheng
ca0d8be5b8 fix the dependency error of macro for memory debug 2022-07-29 17:03:59 +08:00
Omar Chebib
fde4afc67a Merge branch 'bugfix/queue_use_vtasksettimeoutstate' into 'master' 
FreeRTOS: Modifying a timeout is now protected on multi-core configuration

Closes IDF-3808

See merge request espressif/esp-idf!19259
 2022-07-29 15:33:01 +08:00
Darian Leung
e073fc4254 esp_system: Increase IPC stack size for ESP32-S3 
ESP32-S3 stacks have currently have less useable space compared to other targets (due to
AI coprocessor context registers). This has caused a stack overflow in the IPC tasks under
some configurations. This commit increases the default IPC stack size for the ESP32-S3.
 2022-07-29 15:00:57 +08:00
Kapil Gupta
ebd6a467b4 Merge branch 'bugfix/rsnxe_invalid_pointer_dereference' into 'master' 
wpa_supplicant: fix invalid pointer free

Closes WIFI-4672, WIFI-4673, and WIFI-4674

See merge request espressif/esp-idf!19287
 2022-07-29 14:25:58 +08:00
David Čermák
8d62485a12 Merge branch 'feat/lwip_dhcps_append_opts' into 'master' 
lw-ip/dhcpserver: Support for adding extra opts

Closes IDFGH-973

See merge request espressif/esp-idf!19115
 2022-07-29 14:02:20 +08:00
Marius Vikhammer
32efa1e92d Add ULP-RISCV print and bitbanged UART tx API 
Add example to demonstrate the use of this API.
 2022-07-29 12:18:01 +08:00
Darian
c22968182a Merge branch 'bugfix/spinlocks_misused_as_critical_sections' into 'master' 
esp_hw_support: Fix misuse of spinlocks as critical sections

See merge request espressif/esp-idf!19282
 2022-07-29 11:57:28 +08:00
Omar Chebib
692891e773 FreeRTOS: Modifying a timeout is now protected on multi-core configuration 2022-07-29 11:56:06 +08:00
wanlei
bb5a95f1aa soc: fix register header files not self-contain 2022-07-29 11:18:06 +08:00
Wang Yuan Ze
0acae63317 Merge branch 'spi_flash/fix_hpm_dummy_in_80m_flash_and_psram' into 'master' 
spi_flash: fix hpm dummy error when using 80m flash and psram

Closes IDF-5696

See merge request espressif/esp-idf!19244
 2022-07-29 11:05:47 +08:00
wuzhenghui
65aea5d177 stack/dram is also IRAM0 accessible 2022-07-29 10:51:48 +08:00
wuzhenghui
2ad49a9be5 update bootloader.ld rom_boot ram usage info 2022-07-29 10:51:47 +08:00
wuzhenghui
31183270fb bugfix: fix SOC_ROM_STACK_START defines 2022-07-29 10:51:47 +08:00
wuzhenghui
21a4eda4d4 Use the entire sharedbuffer space as the heap of the D/IRAM attribute 2022-07-29 10:51:47 +08:00
wuzhenghui
d6461d91e2 update bootloader memory allocation 2022-07-29 10:51:47 +08:00
Ivan Grokhotkov
bf10146a15
esp_system, vfs: fix incomplete blocking reads in vfs_cdcacm 
Blocking read from cdcacm VFS could return less bytes than requested.
This didn’t match the behaviour of other VFS drivers, and higher level
code could misbehave.
 2022-07-28 17:28:08 +02:00
Ivan Grokhotkov
3254f8deae
esp_system: usb_console: fix restart when Wi-Fi is working 
Previously, reset over USB CDC was done by calling esp_restart from
an interrupt handler. This works only until some restart hook function
is registered using esp_register_shutdown_handler, and the hook
function tries to do something that isn’t allowed in an interrupt
handler. One such case is with Wi-Fi. When Wi-Fi driver is installed,
it registers esp_wifi_stop as a shutdown handler function. However
esp_wifi_stop cannot be called from an ISR, and hence we shouldn’t
call esp_restart from an ISR either.

This commit modifies USB CDC driver to call esp_restart by posting it
to esp_timer task.

Closes https://github.com/espressif/esp-idf/issues/7404
 2022-07-28 17:15:03 +02:00
David Čermák
ac0487e8b7 Merge branch 'feature/support_mqtt5_protocol' into 'master' 
Make MQTT client to comply with mqtt v5.0 spec

See merge request espressif/esp-idf!17345
 2022-07-28 21:24:56 +08:00
Kapil Gupta
465996fba5 wpa_supplicant: fix invalid pointer free 2022-07-28 12:47:31 +00:00
Erhan Kurubas
22d771bf51 esp32c2: fix gcov example build 2022-07-28 13:59:29 +02:00
Martin Gano
50626e776e Merge branch 'bugfix/speedup-fatfsgen-cluster-allocation' into 'master' 
fatfsgen.py: Speedup FAT cluster allocation in fatfs partition generator

Closes IDF-5243

See merge request espressif/esp-idf!19216
 2022-07-28 18:02:11 +08:00
Darian Leung
05ff1039dc esp_hw_support: Fix misuse of spinlocks as critical sections 
Spinlocks themselves do not constitute critical sections as after a spinlock is acquired, interrupts
can remain enabled. However, there are some places where spinlocks are used direclty instead of using
the portMUX_TYPE and portENTER_CRITICAL_...() APIs. This commit fixes those calls.
 2022-07-28 17:25:00 +08:00
Guillaume Souchere
421a408b42 freertos: Update the docuementation of the ulBitsToClearOnEntry parameter in xTaskGenericNotifyWait() function. 
Closes https://github.com/espressif/esp-idf/issues/7207

The description of how the xTaskGenericNotifyWait parameter is handled in the
xTaskGenericNotifyWait() function was inaccurate.

In this commit, the description was updated to match the implementation of xTaskGenericNotifyWait().
 2022-07-28 10:30:41 +02:00
David Čermák
e7e350d439 Merge branch 'bugfix/lwip_store_esp_netif_ptr' into 'master' 
esp_netif/lw-ip: Use netif-client-data to store esp_netif ptr

Closes IDFGH-7813 and IDF-5542

See merge request espressif/esp-idf!19075
 2022-07-28 14:54:08 +08:00
Jing Li
2c41aae1e7 Merge branch 'bugfix/temp_fix_clk8m_and_cpu_cannot_pd_at_the_same_time' into 'master' 
esp_hw_support/sleep: fix cannot pd cpu and rc fast at the same time during light sleep

Closes WIFI-4492 and IDF-5473

See merge request espressif/esp-idf!19196
 2022-07-28 14:45:28 +08:00
Rahul Tank
7ed3157351 Merge branch 'bugfix/add_max_procs_config' into 'master' 
Nimble: Configurable option to modify max gatt procedures allowed for GATT client

See merge request espressif/esp-idf!19197
 2022-07-28 14:38:41 +08:00
wangyuanze
8781a50abe spi_flash: fix hpm dummy error when using 80m flash and psram 2022-07-28 14:32:30 +08:00
yuanjm
66e0171c42 test: Add mqtt5 unit-test 2022-07-28 06:24:43 +00:00
yuanjm
5a7b17ff7d mqtt: Add mqtt5 Kconfig 2022-07-28 06:24:43 +00:00
xiongweichao
7eedd710c2 fix legacy pair controller does not send the link key to the host 
Closes https://github.com/espressif/esp-idf/issues/5850
 2022-07-28 14:21:48 +08:00
Jiang Jiang Jian
49348299f0 Merge branch 'bugfix/qatest_spp_crash' into 'master' 
bugfix/qatest spp crash

Closes BT-1875, BT-2410, BT-2015, and BT-2536

See merge request espressif/esp-idf!19232
 2022-07-28 13:44:56 +08:00
Mahavir Jain
c0e096d5b2 Merge branch 'contrib/github_pr_9446' into 'master' 
Add missing comma (GitHub PR)

Closes IDFGH-7928

See merge request espressif/esp-idf!19271
 2022-07-28 12:36:30 +08:00
morris
ef02fb63dd Merge branch 'bugfix/fix_wrong_mmu_end_addr_check' into 'master' 
mmu: fix wrong mmu end check in mmu_ll.h

See merge request espressif/esp-idf!19257
 2022-07-28 12:00:35 +08:00
Armando
4f80c0f27e esp_adc: remove esp_adc from g1 component dependencies 2022-07-28 03:49:48 +00:00
Armando
5e6a16380a esp_adc: move adc common hw related code into esp_hw_support 2022-07-28 03:49:48 +00:00
jingli
7211b0a89a esp_hw_support/sleep: fix cannot pd cpu and rc fast at the same time during light sleep 
Since cpu retention dma use rc fast as clk source, so rc_fast_digi
will be enabled when we config to pd cpu. And cpu retention does not
need rc fast keep on during light sleep. So, if we use rc_fast_digi
to determine whether rc fast can be powered down, then cpu and and
rc fast cannot pd at the same time.
 2022-07-28 11:10:58 +08:00
Kevin (Lao Kaiyao)
9a7a1fe61f Merge branch 'contrib/github_pr_9430' into 'master' 
Fix offset for cosine wave function generator (GitHub PR)

Closes IDFGH-7911

See merge request espressif/esp-idf!19254
 2022-07-28 10:56:43 +08:00
Martin Gaňo
d56e692f2f fatfsgen.py: Speedup FAT cluster allocation in fatfsgen.py 
Closes IDF-5243
 2022-07-28 01:37:39 +02:00
Roland Dobai
9b87390daf Merge branch 'bugfix/fix_the_monitor_consol_problem' into 'master' 
tools: Fix the monitor console problem

Closes IDF-5514 and IDFGH-7913

See merge request espressif/esp-idf!19129
 2022-07-28 01:05:48 +08:00
Tomas Rezucha
5bd6696557 Merge branch 'feature/usb_device/hid' into 'master' 
usb: Add HID device example

Closes IDFGH-7637, IDFGH-5054, IDF-581, and IDFGH-6013

See merge request espressif/esp-idf!19177
 2022-07-27 21:18:50 +08:00
David Cermak
64f4f0ac1e esp_netif/lwip: Use netif-client-data to store esp_netif ptr 
lwip/netif struct has two places to store user's data
* netif->state (1 void*) but that might be occupied in special cases
* netif->client_dtat (n void*s) but that must be enabled in opts.h
This commit stores esp_netif_t* primarily in state, but if any special
netif is enabled in menuconfig (bridgeif, pppos), it uses netif->client_data.
This commit also fixes incorrect esp_netif that is attached to
IP_EVENT_GOT_IP6 event posted by pppos interfaces in:
c585618b97/components/esp_netif/lwip/esp_netif_lwip_ppp.c (L114)

Closes https://github.com/espressif/esp-idf/issues/9345
 2022-07-27 11:55:18 +00:00
morris
96c29841bb Merge branch 'feature/mcpwm_new_driver' into 'master' 
⛵ MCPWM Driver-NG

Closes IDF-2471, IDF-2895, IDF-20, and IDF-3945

See merge request espressif/esp-idf!11480
 2022-07-27 19:25:06 +08:00
Armando
42dfb5cadd esp_psram: improve mapping log when physical range is larger 
After this commit, when physical address is larger than vaddr range,
driver will still map as much as it can, but also give a verbose level
log to show the actual mapped size
 2022-07-27 10:22:09 +00:00
Armando
f325ad2211 mmu: fix wrong mmu end check 
In mmu code, we follow the rule that the `end` address shouldn't be
touched. This commit fix wrong end address check in mmu_ll.h
 2022-07-27 10:22:09 +00:00
jincheng
44607e10ea add protect for bt_util_buf_env buffers when access by task and interrupt 
ignore the assert_err in rm_bt_clkoff1_setf
 2022-07-27 17:56:08 +08:00
FanhuaCloud
a1c04ad6fd
Add missing comma 
Add missing comma when CONFIG_ESP32S3_DATA_CACHE_16KB is enabled
 2022-07-27 17:12:17 +08:00
Rahul Tank
2be66a6151 Nimble: Configurable option to modify max gatt procedures allowed for GATT 
client
 2022-07-27 08:59:37 +00:00
simon.chupin
5468d79382 tools: fix idf.py monitor consol problem 
Closes https://github.com/espressif/esp-idf/issues/9432
 2022-07-27 08:35:30 +00:00
Armando (Dou Yiwen)
1ed5e5130e Merge branch 'bugfix/increase_overhead_when_test_adc_continuous_iram' into 'master' 
esp_adc: increase test consumption threshold

Closes IDFCI-1397

See merge request espressif/esp-idf!19206
 2022-07-27 16:16:23 +08:00
Ivan Grokhotkov
0330e952d1 Merge branch 'feature/add-wl-support-fatfsparse' into 'master' 
fatfsparse.py: Add support for WL

Closes IDF-4994 and IDF-5522

See merge request espressif/esp-idf!18760
 2022-07-27 16:01:02 +08:00
morris
1571417679 mcpwm: new driver implementation 2022-07-27 15:22:24 +08:00
morris
fd3a1ffc21 mcpwm: deprecate legacy driver 2022-07-27 15:08:58 +08:00
laokaiyao
77a5c209d9 dac_ll: sync PR changes to esp32s2 2022-07-27 14:45:48 +08:00
Florian Loitsch
2f307b8b65 Feedback. 2022-07-27 14:45:48 +08:00
Florian Loitsch
3793e90790 Fix offset for cosine wave function generator 2022-07-27 14:45:48 +08:00
Isha Pardikar
7b1da8ab0a Merge branch 'feature/rainmaker_BT_configurable' into 'master' 
Wifi_prov_mgr: Made BT configurable after provisioning is completed

See merge request espressif/esp-idf!18014
 2022-07-27 13:59:56 +08:00
Tomas Rezucha
45e8115dc6 usb: Add HID device example 
Closes https://github.com/espressif/esp-idf/issues/6839
Closes https://github.com/espressif/esp-idf/issues/7700
 2022-07-27 05:31:09 +00:00
paul356
1144f752f4 use kconfig to add config options 2022-07-27 05:31:09 +00:00
Martin Gaňo
2ddcda29b3 fatfsparse.py: Add support for WL 2022-07-26 14:50:07 +02:00
Ivan Grokhotkov
c38c153f6a Merge branch 'bugfix/cpu_utils_watchpoint_num' into 'master' 
xtensa: fix swapped breakpoint and watchpoint numbers

Closes IDFCI-1315

See merge request espressif/esp-idf!19213
 2022-07-26 20:31:10 +08:00
Armando
0e6c8aef19 esp_adc: increase adc continuous iram test time overhead a bit 
Prior to this commit, overhead is 0us on esp32s2, s3, c3, c2. However
when the conv_done event happens, software takes some time to do
necessary operations.
 2022-07-26 18:19:14 +08:00
Isha Pardikar
2cfcae8d41 Merge branch 'feature/rainmaker_BT_configurable' into 'master' 
Doc: Made bluetooth configurable after wifi provisioning is completed

See merge request espressif/esp-idf!18014
 2022-07-26 15:21:27 +05:30
Mahavir Jain
c917219c04 Merge branch 'contrib/github_pr_9408' into 'master' 
nvs_partition_gen: Allow up to 4000 byte strings with NVS V2 (GitHub PR)

Closes IDFGH-7884

See merge request espressif/esp-idf!19195
 2022-07-26 15:48:43 +08:00
David Cermak
b5d13b9837 lwip/dhcpserver: Support for adding extra opts 
This enables users appending an extra, user defined options in dhcp
server messages. Example of adding captive_portal option (160) to dhcp
offer message is provided:
* Add idf-lwip hook file (project makefile):
  idf_component_get_property(lwip lwip COMPONENT_LIB)
  target_compile_options(${lwip} PRIVATE "-I${PROJECT_DIR}/main")
  target_compile_definitions(${lwip} PRIVATE "-DESP_IDF_LWIP_HOOK_FILENAME=\"add_captive_portal.h\"")
* Implement appending (add_captive_portal.h):
  #pragma once
  #define LWIP_HOOK_DHCPS_POST_APPEND_OPTS(netif, dhcp, state, pp_opts) \
  if ((state)==DHCPOFFER) { *(pp_opts) = append_captive_portal_uri(*(pp_opts)); }
  static inline uint8_t *append_captive_portal_uri(uint8_t *optptr)
  {
    const static uint8_t DHCP_OPTION_CAPTIVE_PORTAL=160;
    const static char CAPTIVE_PORTAL_URI[]="my_uri";
    int size = sizeof(CAPTIVE_PORTAL_URI) - 1;
    *optptr++ = DHCP_OPTION_CAPTIVE_PORTAL;
    *optptr++ = size;
    for(int i = 0; i < size; ++i) {
        *optptr++ = CAPTIVE_PORTAL_URI[i];
    }
    return optptr;
  }

Merges https://github.com/espressif/esp-idf/pull/3308
 2022-07-26 07:09:22 +00:00
Marius Vikhammer
4f1046a292 ulp-riscv: made ulp_riscv_delay_cycles more accurate 2022-07-26 14:32:39 +08:00
morris
5e50ec1d66 systimer: add helper functions to convert between tick and us 2022-07-25 16:08:52 +08:00
morris
783e1781bd esp_rom: patch systimer driver for esp32c2 2022-07-25 16:08:52 +08:00
morris
d94432fea8 systimer: refactor hal to accomodate more xtal choices 2022-07-25 16:08:52 +08:00
Ivan Grokhotkov
a97686f607
xtensa: fix swapped breakpoint and watchpoint numbers 2022-07-25 09:43:10 +02:00
Martin Vychodil
8def7b3e55 Merge branch 'contrib/github_pr_9361' into 'master' 
Change placeholder in ESP_LOGD conditionally depending on FF_FS_EXFAT (GitHub PR)

Closes IDFGH-7832 and IDFGH-7735

See merge request espressif/esp-idf!19111
 2022-07-24 16:49:22 +08:00
Martin Vychodil
a16431c7a9 Merge branch 'feature/vfs_serial_fcntl_get_rd_wr_state' into 'master' 
vfs: uart/cdcacm/usb_serial_jtag fcntl return read/write state

See merge request espressif/esp-idf!19168
 2022-07-24 16:15:28 +08:00
Chen Jian Xing
feefe820a4 Merge branch 'bugfix/esp32c2_coex_timer_clk_src' into 'master' 
esp_wifi: select slowclk as coex hardware timer source on esp32c2

See merge request espressif/esp-idf!19170
 2022-07-23 11:37:35 +08:00
Jakob Hasse
45b3662c3a Merge branch 'bugfix/esp_timer_mux_static' into 'master' 
bugfix (esp_timer): made os spinlock static

See merge request espressif/esp-idf!19112
 2022-07-23 05:58:06 +08:00
Fu Hanxi
585e0431c7 Merge branch 'test/spi_param_redund_desc' into 'master' 
test_spi: fixed redundant quotes in test descriptions

See merge request espressif/esp-idf!19140
 2022-07-23 02:22:58 +08:00
Darian
c8ee369a7c Merge branch 'feature/deprecate-old-cpu-api' into 'master' 
HAL: Deprecate old CPU/SoC/Interrupt Controller HAL API

Closes IDF-4919 and IDF-5032

See merge request espressif/esp-idf!18987
 2022-07-23 00:37:33 +08:00
John
aaf35889b6 Change placeholder in ESP_LOGD conditionally depending on FF_FS_EXFAT 
In case of using EXFAT by setting in ffconf.h:
the type FSIZE_t is changing from 4 to 8 bytes.

As a result,  ESP_LOGD() in vfs_fat_lseek() does not compile:
error: format '%d' expects argument of type 'int', but argument 8 has type 'FSIZE_t' {aka 'long long unsigned int'} [-Werror=format=]
     ESP_LOGD(TAG, "%s: offset=%ld, filesize:=%d", __func__, new_pos, f_size(file));

To solve the problem we need to change %d with %lld conditionally, depending on FF_FS_EXFAT.

Closes https://github.com/espressif/esp-idf/pull/9361
 2022-07-22 16:52:14 +01:00
liuning
bc2f2a3100 esp_wifi: select slowclk as coex hardware timer source on esp32c2 2022-07-22 21:44:11 +08:00
Jiang Jiang Jian
88f2f5fdd7 Merge branch 'bugfix/default_config_sae_pwe_value' into 'master' 
esp_wifi: WPA3 SAE keep default value as h2e and hunting and pecking for sae pwe

See merge request espressif/esp-idf!19015
 2022-07-22 20:30:58 +08:00
Jakob Hasse
bff6826ee1 bugfix (esp_system): made xt_wdt spinlock static 2022-07-22 08:17:59 +00:00
Shreyas Sheth
341a92aaa5 esp_wifi: WPA3 SAE keep default value as h2e and hunting and pecking for sae pwe 2022-07-22 12:23:13 +05:30
Jiang Jiang Jian
0e874812a0 Merge branch 'bugfix/sync_reg_base' into 'master' 
esp_wifi: fix crash in esp_wifi_set_ant_gpio()

Closes IDFGH-7720

See merge request espressif/esp-idf!19096
 2022-07-22 14:07:33 +08:00
Jiang Jiang Jian
9a6ccb7f57 Merge branch 'bugfix/make_sure_sempher_and_queue_used_in_isr_is_in_DRAM' into 'master' 
Bugfix/make sure sempher and queue used in isr is in dram

Closes WIFI-3571, IDFGH-7458, IDFGH-7342, and IDFGH-7569

See merge request espressif/esp-idf!19160
 2022-07-22 14:04:27 +08:00
Jiang Jiang Jian
371a935e76 Merge branch 'bugfix/wpa2_enterprise_issues' into 'master' 
esp_wifi: WPA2 enterprise related changes

Closes WIFI-4579

See merge request espressif/esp-idf!19162
 2022-07-22 13:56:41 +08:00
Angus Gratton
bb141956df nvs_partition_gen: Allow up to 4000 byte strings with NVS V2 
As documented, the limit for NVS format v2 is 4000 bytes for a string.
 2022-07-22 15:43:19 +10:00
Jiang Jiang Jian
22b17a3471 Merge branch 'bugfix/schm_process_in_active_crash' into 'master' 
Coex: fixed crash when calculating end transfer time

See merge request espressif/esp-idf!18330
 2022-07-22 11:02:08 +08:00
Cao Sen Miao
ec6a56ed0c spi_flash: re-enable the HPM mode on several XMC chips 2022-07-22 09:54:56 +08:00
morris
c4e84751a5 driver: fix public header exceptions for driver 2022-07-22 00:12:36 +00:00
morris
9a921ada7f rmt: const callback event data 2022-07-22 00:12:36 +00:00
morris
741b031e83 soc: added SOC_TOUCH_SENSE_SUPPORTED macro 2022-07-22 00:12:36 +00:00
morris
5dbae0c2cd esp_adc: fix dead code reported by coverity 2022-07-22 00:12:36 +00:00
Guillaume Souchere
50a58b4a83 esp_hw_support: Fix formatting of intr_alloc.h and test_panic.c 2022-07-22 00:06:06 +08:00
Guillaume Souchere
0bac33ed41 esp_system: Remove deprecate section from esp_cpu.h 
- Remove esp_cpu_in_ocd_mode() from esp_cpu.h. Users should call esp_cpu_dbgr_is_attached() instead.
- Remove esp_cpu_get_ccount() from esp_cpu.h. Users should call esp_cpu_get_cycle_count() instead.
- Remove esp_cpu_set_ccount() from esp_cpu.h. Users should call esp_cpu_set_cycle_count() instead.
- Other IDF components updated to call esp_cpu_dbgr_is_attached(), esp_cpu_get_cycle_count() and esp_cpu_set_cycle_count() as well.
 2022-07-22 00:06:06 +08:00
Guillaume Souchere
dcae121d80 hal: Deprecate soc_hal.h and soc_ll.h interface 
This commit marks all functions in soc_hal.h and soc_ll.h as deprecated.
Users should use functions from esp_cpu.h instead.

Also added missing wrap funcions for esp_cpu_stall() in test_panic.c files.
 2022-07-22 00:06:06 +08:00
Guillaume Souchere
6005cc9163 hal: Deprecate interrupt_controller_hal.h, cpu_hal.h and cpu_ll.h interfaces 
This commit marks all functions in interrupt_controller_hal.h, cpu_ll.h and cpu_hal.h as deprecated.
Users should use functions from esp_cpu.h instead.
 2022-07-22 00:06:06 +08:00
Darian Leung
781d06af73 esp_hw_support: Remove compare_set.h API 
This function removes the following legacy atomic CAS functions:

From compare_set.h (file removed):
- compare_and_set_native()
- compare_and_set_extram()

From portmacro.h
- uxPortCompareSet()
- uxPortCompareSetExtram()

Users should call esp_cpu_compare_and_set() instead as this function hides the details
of atomic CAS on internal and external RAM addresses.

Due to the removal of compare_set.h, some missing header includes are also fixed in this commit.
 2022-07-22 00:06:06 +08:00
Darian Leung
d37fa7e244 esp_hw_support: Update spinlocks to use esp_cpu_compare_and_set() 
esp_cpu_compare_and_set() abstracts the atomic compare-and-set instruction by
hiding the details of whether the target variable is in internal or external
RAM. This commit updates "spinlocks.h" as follows:

- esp_cpu_compare_and_set() is now called instead of "compare_set.h"
- Refactored spinlock logic to be more optimized and have more stringent sanity checks
 2022-07-22 00:06:06 +08:00
Darian Leung
64117a0c59 esp_system: Fix esp_cpu_compare_and_set() 
This commit fixes esp_cpu_compare_and_set() in the following ways

- Removed call to esp_ptr_external_ram() as it incurred > 80 CPU cycles (due to multiple nested
  function calls, and those functions not being in IRAM). We now check manually if the pointer
  is in external RAM for increased speed.
- Fixed infinite wait when attempting to get the external_ram_cas_lock. The function should
  return immediatley if any part of the compare and set call fails.
- The preprocessor conditions of esp_cpu_compare_and_set() to depend on CONFIG_SPIRAM instead
  of SOC_SPIRAM_SUPPORTED. Even if the target supports SPIRAM, we only need the external RAM
  compare and set feature if SPIRAM is enabled.

Also fixed incorrect inclusion of esp_intr_alloc.h in esp_cpu.h
 2022-07-22 00:06:06 +08:00
shenjun
4cfed490ad esp_wifi: fix crash in esp_wifi_set_ant_gpio() 2022-07-21 22:18:08 +08:00
morris
454d658309 rgb_lcd: workaround pclk polarity bug by setting mo>=2 2022-07-21 13:06:09 +00:00
morris
a149afb0c0 rgb_lcd: support PLL240MHz clock source 2022-07-21 13:06:09 +00:00
David Čermák
36f49f361c Merge branch 'bugfix/esp_netif_clean_deps_lwip' into 'master' 
esp-netif/lw-ip: Make dependencies one-directional

Closes IDF-4459, IDF-4460, IDF-1099, and IDFGH-6287

See merge request espressif/esp-idf!18084
 2022-07-21 20:18:05 +08:00
Jiang Jiang Jian
7a5f5760fd Merge branch 'bugfix/optimize_beacon_timeout_issue' into 'master' 
esp_wifi:bugfix optimize beacon timeout issue

Closes WIFI-4647

See merge request espressif/esp-idf!19153
 2022-07-21 19:48:00 +08:00
Jiang Jiang Jian
cf5b097c88 Merge branch 'bugfix/further_fix_for_mspi_current_leakage' into 'master' 
system/sleep: further fix spi flash/ram current leakage

Closes IDF-4720

See merge request espressif/esp-idf!18566
 2022-07-21 19:14:26 +08:00
Jing Li
66395a5c00 system/sleep: further fix spi flash/ram current leakage 2022-07-21 19:14:26 +08:00
Armando (Dou Yiwen)
097e64f8c7 Merge branch 'bugfix/adc2_legacy_oneshot_clk_gating_issue' into 'master' 
adc: fix legacy oneshot driver clock gating issue on c3 and c2

See merge request espressif/esp-idf!19144
 2022-07-21 19:13:20 +08:00
Simon
62bc3348d5 Merge branch 'ci/flash_encryption_test' into 'master' 
flash_encryption: Add several test environments for flash encryption test

Closes IDF-5530

See merge request espressif/esp-idf!19043
 2022-07-21 18:38:18 +08:00
xueyunfei
07d2eaaead esp_wifi:bugfix optimize beacon timeout issue 2022-07-21 08:23:59 +00:00
Dong Heng
37c18d9ee4 vfs: uart/cdcacm/usb_serial_jtag fcntl return read/write state 2022-07-21 16:16:44 +08:00
Kapil Gupta
951928960b esp_wifi: WPA2 enterprise related changes 
1. Removed DHE ciphers when mbedTLS is disabled since they take
too much processing power.
2. Removed support of SHA384 and SHA512 when mbedTLS is disabled
due to too much processing needed.
3. Fixed bugs in crypto_hash_init API which was causing
EAP connections to fail when mbedTLS was enabled.
4. Cleaned some code of crypto_hash_***
 2022-07-21 13:33:18 +05:30
David Cermak
b8fa24d100 esp_netif/openthread: Update ot_br and ot_port libs 
Add libraries with ot_port, that includes netif/lwip port layers
in esp-openthread
 2022-07-21 10:01:19 +02:00
laokaiyao
edee3ee3cd i2s: add slot sequence table 
Closes: https://github.com/espressif/esp-idf/issues/9208

When I2S is configured into different modes, the slot sequence varies.
This commit updates slot sequence tables and corresponding descriptions
in (both code and programming guide).
 2022-07-21 15:52:39 +08:00
laokaiyao
92ea22fe81 i2s: support esp32h2 2022-07-21 15:52:39 +08:00
laokaiyao
90866e99fb i2s: add basic examples for STD/TDM/PDM mode 2022-07-21 15:52:39 +08:00
Jiang Jiang Jian
92b4e134bb Merge branch 'bugfix/remove_inappropriate_bluetooth_init_api' into 'master' 
Remove unused bluetooth init api

See merge request espressif/esp-idf!18923
 2022-07-21 14:53:44 +08:00
Jiang Jiang Jian
080ba9a80e Merge branch 'bugfix/phy_init_failed_when_wifi_deinit' into 'master' 
bugfix for phy init failed when wifi deinit

Closes WIFI-4631

See merge request espressif/esp-idf!19127
 2022-07-21 13:58:20 +08:00
baohongde
db308d2939 components/coex: Make sure sempher and queue used in isr is in DRAM 
Closes https://github.com/espressif/esp-idf/issues/9032
Closes https://github.com/espressif/esp-idf/issues/8928
Closes https://github.com/espressif/esp-idf/issues/9129
 2022-07-21 13:56:02 +08:00
baohongde
6d631d14de components/bt: Make sure sempher and queue used in isr is in DRAM 2022-07-21 13:50:29 +08:00
Darian
0570c5db1a Merge branch 'bugfix/freertos_xTaskIncrementTick' into 'master' 
freertos: Fix xTaskIncrementTick() and xTaskResumeAll()

Closes IDF-4698 and IDF-4705

See merge request espressif/esp-idf!17204
 2022-07-21 08:14:30 +08:00
Mahavir Jain
15039f367d Merge branch 'update/update_certs_bundle' into 'master' 
Update esp_crt_bundle certificates

See merge request espressif/esp-idf!19132
 2022-07-21 06:14:41 +08:00
wangyuanze
ab0c4abd6e rmt: add open-drain flag on tx channel 2022-07-20 14:12:43 +00:00
morris
8944479bcd Merge branch 'feature/gpio_sigma_delta_ng' into 'master' 
⛵ SDM Driver-NG (Sigma-Delta channel allocator)

Closes IDF-5261 and IDF-2877

See merge request espressif/esp-idf!18626
 2022-07-20 21:30:12 +08:00
Sudeep Mohanty
dadafb753f Merge branch 'bugfix/freertos_oneshot_timer_active_after_expiry' into 'master' 
freertos: Fixed a bug where xTimerIsTimerActive incorrectly returns pdTRUE from callback

Closes IDFGH-6353

See merge request espressif/esp-idf!19076
 2022-07-20 21:06:05 +08:00
David Cermak
e7afdff6ca esp_netif: Make set_link_speed() conditional on MIB2_STATS 2022-07-20 14:59:34 +02:00
David Cermak
89bb1fdec1 esp_netif: Add error checks to dhcp server state transitions 2022-07-20 14:59:34 +02:00
David Cermak
5c383d7b73 esp_netif/lwip: Fix deps cycles to "lwip -> esp_netif -> phy-drivers" 
Fix dependency tree so that lwip doesn't depend on any specific network
interface component.
Network interface drivers shall depend on esp_netif.
esp_netif shall depend on lwip (but not on any specific interface
driver) -- it optionally depends on vfs and esp_eth (need ethernet
header for L2/bridge mode)
 2022-07-20 14:59:07 +02:00
Jiang Jiang Jian
84ae84e3fe Merge branch 'bugfix/fix_lora_ie_bcn' into 'master' 
Fix missing LoRa IE length in SoftAP beacon

Closes WIFI-4495

See merge request espressif/esp-idf!18997
 2022-07-20 20:23:02 +08:00
David Čermák
e7ccaaf9ca Merge branch 'feature/update_mqtt_client' into 'master' 
[MQTT] - Updates esp_mqtt configuration struct

See merge request espressif/esp-idf!18101
 2022-07-20 19:52:04 +08:00
Kapil Gupta
b8267a59eb Merge branch 'bugfix/wps_disable_disconnect' into 'master' 
WiFi: Do not disconnect in WPS disable API incase WPS is done/scanning

Closes IDFGH-7807

See merge request espressif/esp-idf!19092
 2022-07-20 18:47:32 +08:00
Nachiket Kukade
792472c419 esp_wifi: Update wifi libs 
Add missing LoRa IE length while allocating for Beacon in SoftAP LoRa mode
 2022-07-20 09:24:46 +00:00
morris
3277b11c39 Merge branch 'feature/esp_lcd_spi_rx_1' into 'master' 
Add support SPI rx into LCD component

Closes IDFGH-7661

See merge request espressif/esp-idf!19020
 2022-07-20 16:59:44 +08:00
Ivan Grokhotkov
e56b1fd59d Merge branch 'feature/unity_runner_get_test_list' into 'master' 
unity: expose some internal functions to allow iterating over tests

See merge request espressif/esp-idf!19056
 2022-07-20 16:57:49 +08:00
Armando
638f39ff40 adc: fix legacy oneshot driver clock gating issue on c3 and c2 2022-07-20 16:35:59 +08:00
Michael (XIAO Xufeng)
5d24a207b6 test_spi: fixed redundant quotes in test descriptions 2022-07-20 15:36:10 +08:00
Vilem Zavodny
7b3fe6d832 esp_lcd: Add RX into SPI lcd panel. 2022-07-20 07:07:33 +00:00
Vilem Zavodny
a7bd917c42 esp_lcd: Fix code style. 2022-07-20 07:07:33 +00:00
Slamy
256945997d fixed misaligned data transfer for ssd1306 
(cherry picked from commit 46a2bf8ac9)
 2022-07-20 07:07:33 +00:00
morris
edb5600348 sdm: refactor example with new driver 2022-07-20 14:59:50 +08:00
morris
f33428f2e5 sdm: added channel allocator for sigma delta module 2022-07-20 14:59:50 +08:00
morris
e080248141 sdm: deprecate legacy driver 2022-07-20 14:59:50 +08:00
morris
4154eaec93 sdm: clean up soc/hal/ll code 2022-07-20 14:59:50 +08:00
morris
9e532696f4 pcnt: add const qualifier to event data 2022-07-20 14:59:50 +08:00
xueyunfei
b4d11d00ca bugfix for phy init failed when wifi deinit 2022-07-20 14:16:08 +08:00
GengYuchao
964304b751 Change the selection based on target to function selection 2022-07-20 13:06:56 +08:00
Cao Sen Miao
e69f658ac6 flash_encryption: Add several test environments for flash encryption test 2022-07-20 12:49:42 +08:00
morris
bec44ca2e9 gptimer: test on c2 with xtal 26mhz 2022-07-20 04:40:28 +00:00
Mahavir Jain
075e0729de Merge branch 'bugfix/mbedtls_dep_on_driver' into 'master' 
mbedtls: remove dependency on driver component

Closes IDF-1265

See merge request espressif/esp-idf!19081
 2022-07-20 12:04:34 +08:00
GengYuchao
298583b116 Fix nimble port api adapt remove esp_nimble_hci_and_controller_init 2022-07-20 11:44:00 +08:00
GengYuchao
fd055d3ba6 Fix example after removing API esp_nimble_hci_and_controller_init 2022-07-20 11:44:00 +08:00
GengYuchao
5430ad0519 Remove esp_nimble_hci_and_controller_init function 2022-07-20 11:44:00 +08:00
Darian Leung
38d974aca0 freertos: Update scheduler suspension unit tests 
This commit updates unit tests for vTaskSuspendAll()/xTaskResumeAll().
 2022-07-20 11:32:10 +08:00
Darian Leung
ac38f9aaf1 freertos: Rename scheduler suspension test file 2022-07-20 11:32:10 +08:00
Darian Leung
db26ff2503 freertos: Fix vTaskSuspendAll() and xTaskResumeAll() 
This commit fixes vTaskSuspendAll() and xTaskResumeAll() in the following ways.

- For vTaskSuspendAll()
    - Sync function source code with upstream single core version
    - Clearly mark IDF additions
- For xTaskResumeAll()
    - Sync function source code with upstream single core version
    - Clearly mark IDF additions
    - Fix bug where cores other than core 0 were allowed to unwind pended ticks
 2022-07-20 11:32:10 +08:00
Darian Leung
5971253971 freertos: Fix vTaskStepTick() and xTaskCatchUpTicks() 
This commit fixes the following issues:

- Clearly mark IDF additions in vTaskStepTick() and xTaskCatchUpTicks()
- Add back vTaskSuspendAll()/xTaskResumeAll() to xTaskCatchUpTicks(). Scheduler
  suspension and resumption is required to unwind the pended ticks.
 2022-07-20 11:32:10 +08:00
Darian Leung
7a4e1fee99 freertos: Fix xTaskIncrementTick() 
Previously, xTaskIncrementTick() would always trigger a yield (i.e., return pdTRUE)
when called on core 1. This would mean core 1 would call vTaskSwitchContext() on
every tick, leading to uneccesary CPU overhead.

This commit fixes xTaskIncrementTick() in the following ways:

- Clearly mark IDF additions in xTaskIncrementTick()
- Moved esp_vApplicationTickHook() to be called direclty in xPortSysTickHandler() in order to
  simplify xTaskIncrementTick().
- Only core 0 calls xTaskIncrementTick() in order to simplify the function's logic. Core 0 is
  solely responsible for managing xTickCount and xPendedTicks
- All other cores call xTaskIncrementTickOtherCores() instead which is a simplified version of
  xTaskIncrementTick() and handles the following:
    - Check if core 0 has unblocked a higher priority task to run
    - Check if the current core requires time slicing
    - Call vApplicationTickHook()
 2022-07-20 11:31:50 +08:00
Espressif BOT
72fe927e85 Update esp_crt_bundle certificates 2022-07-20 10:00:11 +08:00
Marius Vikhammer
1315f85e01 docs: fixed misc broken links 2022-07-20 09:43:52 +08:00
Song Ruo Jing
4734b1433b Merge branch 'bugfix/gpio_hal_coverity_fix' into 'master' 
gpio: Fix ESP32S3 GPIO48 does not support hold function bug and Fix coverity report

Closes IDF-4901

See merge request espressif/esp-idf!18805
 2022-07-19 21:37:15 +08:00
Armando (Dou Yiwen)
9f6f61345b Merge branch 'feature/adc_driver_ng' into 'master' 
ADC Driver NG

Closes IDF-4560, IDF-3908, IDF-4225, IDF-2482, IDF-4111, IDF-3610, IDF-4058, IDF-3801, IDF-3636, IDF-2537, IDF-4310, IDF-5150, IDF-5151, and IDF-4979

See merge request espressif/esp-idf!17960
 2022-07-19 21:28:31 +08:00
Sudeep Mohanty
5e1437deb8 freertos: Fixed a bug where xTimerIsTimerActive incorrectly returns pdTRUE from callback 
This commit fixes the following:
- Fixes a bug wherein the timer status is active for oneshot timers that
expire before they are started.
- Callback calls for periodic timers where made before the timers were
auto-reloaded.
- Timer expiry trace was being set after the timer callback is called.

Closes https://github.com/espressif/esp-idf/issues/8014
 2022-07-19 10:42:09 +02:00
Jakob Hasse
1f75fc0aa1 bugfix (esp_timer): made os spinlock static 2022-07-19 15:35:32 +08:00
Marius Vikhammer
12dcb95644 Merge branch 'ci/remove_temp_deepsleep_tag' into 'master' 
ci: remove temp deepsleep tag runner

Closes IDF-5213

See merge request espressif/esp-idf!18654
 2022-07-19 14:58:33 +08:00
Mo Fei Fei
f3a16d5122 Merge branch 'docs/update_nvs_encryption_cn_trans' into 'master' 
Docs: Update CN translation for nvs encryption docs

Closes DOC-3202

See merge request espressif/esp-idf!18938
 2022-07-19 14:47:16 +08:00
Simon
7c14328daa Merge branch 'fix/i2c_clk_26M' into 'master' 
I2C: Add the I2C clock tree, and support 26M XTAL on ESP32-C2

Closes IDF-5005, IDF-5415, and IDF-4535

See merge request espressif/esp-idf!19057
 2022-07-19 13:34:22 +08:00
Chen Jian Xing
c449abc8cd Merge branch 'feat/esp32c2_26M_phy_support' into 'master' 
esp_phy: Support 26M and 40M crystal for esp32c2 phy

See merge request espressif/esp-idf!19010
 2022-07-19 13:00:55 +08:00
Marius Vikhammer
e4cbaa6f2b ci: remove temp deepsleep tag runner 2022-07-19 12:12:46 +08:00
Cao Sen Miao
53580a62b5 I2C: Fullfill the I2C clock tree, and support 26M XTAL on ESP32-C2 2022-07-19 11:41:42 +08:00
Mahavir Jain
508661b03e Merge branch 'bugfix/ipc_O0_stack' into 'master' 
ipc: Increase stacksize when compiling with -O0

Closes IDFCI-1372 and IDFCI-1360

See merge request espressif/esp-idf!19083
 2022-07-19 00:37:08 +08:00
Mahavir Jain
a94c74c26b
mbedtls: remove dependency on driver component 
- keep `esp_pm` dependency conditional in mbedtls
- refactor `bt` cmakelist to keep dependencies as private

Related: IDF-1265
 2022-07-18 21:10:51 +05:30
David Čermák
5548f5acd6 Merge branch 'bugfix/lwip_ondemand_timers_num_system_timeout' into 'master' 
lw ip: Fix on-demand timers to update internal system touts

Closes IDFGH-7595

See merge request espressif/esp-idf!18724
 2022-07-18 21:56:57 +08:00
morris
9df1b0e3a1 Merge branch 'bugfix/not_test_bounce_buffer_mode_iram_safe' into 'master' 
rgb_lcd: don't test bounce buffer mode with iram-safe

See merge request espressif/esp-idf!19089
 2022-07-18 18:22:53 +08:00
Jiang Jiang Jian
5b771082bd Merge branch 'bugfix/wifi_owe_memory_leak' into 'master' 
esp_wifi:bugfix for wifi owe memory leak

Closes WIFI-4589

See merge request espressif/esp-idf!19011
 2022-07-18 17:53:51 +08:00
Kapil Gupta
9d98cd8f8d WiFi: Do not disconnect in WPS disable incase WPS is done/scanning 
Closes https://github.com/espressif/esp-idf/issues/9341
 2022-07-18 14:57:01 +05:30
Jiang Jiang Jian
633a9f744a Merge branch 'bugfix/OWE_memory_leak' into 'master' 
esp_wifi : fixed OWE memory leak

See merge request espressif/esp-idf!19061
 2022-07-18 17:20:36 +08:00
morris
05c51093c8 rgb_lcd: don't test bounce buffer mode with iram-safe 
(cherry picked from commit 3ece942704)
 2022-07-18 14:57:50 +08:00
morris
3ece942704 rgb_lcd: don't test bounce buffer mode with iram-safe 2022-07-18 14:55:11 +08:00
intern
4866e91398 docs: update nvs encryption cn trans 2022-07-18 14:40:56 +08:00
Kapil Gupta
882ad4e5e7 Merge branch 'feature/eloop_debug_framework' into 'master' 
wpa_supplicant: Add debug info for eloop functions

See merge request espressif/esp-idf!18451
 2022-07-18 14:17:25 +08:00
Marius Vikhammer
ccc184de51 ipc: Increase stacksize when compiling with -O0 2022-07-18 13:55:03 +08:00
David Čermák
1334011d4f Merge branch 'bugfix/transport_foundation_intialization' into 'master' 
tcp_transport: Fix initialition of transport

See merge request espressif/esp-idf!17869
 2022-07-16 16:28:49 +08:00
Euripedes Rocha
ff1c405ed1 [MQTT] - Updates esp_mqtt configuration struct 
- Layered config struct
- Fix examples.
 2022-07-15 12:32:50 -03:00
Armando
5b523a3313 esp_adc: new esp_adc component and adc drivers 2022-07-15 18:31:00 +08:00
Shyamal Khachane
88db86672d fix for OWE memory leak 2022-07-15 14:29:32 +05:30
songruojing
145454356b gpio: Fix ESP32S3 GPIO48 does not support hold function bug 
GPIO_HOLD_MASK array was missing the last item

Add __Static_assert to check array sizes for all gpio_periph.c files to prevent same mistake in the future.
 2022-07-15 16:51:25 +08:00