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
15,861 Commits 20 Branches 148 Tags 384 MiB
49322be893
Commit Graph

10696 Commits

Author SHA1 Message Date
Michael (XIAO Xufeng)
ad6ed3fd2e mmap: fixed the issue mmap cannot be called with pointers to psram 2020-12-22 13:42:42 +08:00
Michael (XIAO Xufeng)
7f3e61cf63 esp_flash: add support for external flash on C3 2020-12-22 13:31:04 +08:00
ronghulin
b4e4fd7a67 bugfix: fix some wifi bugs 
1. fix max tx power to 20dBm
2. fix the issue that the esp_wifi_sta_get_ap_info can't get country

Closes https://github.com/espressif/esp-idf/issues/6267
 2020-12-22 11:51:13 +08:00
Island
7ed95d13b1 Merge branch 'feat/ble_mesh_support_ble_scan' into 'master' 
ble_mesh: stack: Add BLE scan callback when mesh is enabled

Closes BLEMESH-252

See merge request espressif/esp-idf!10918
 2020-12-22 10:46:59 +08:00
Sachin Parekh
6e1f53bce3 i2c: Acquire PM lock after acquiring mutex 2020-12-22 00:50:19 +05:30
Jiang Jiang Jian
f13ace5253 Merge branch 'bugfix/wifi_bugs_fixes' into 'master' 
esp_wifi: Fix some wifi bugs.

Closes WIFI-3105, WIFI-3166, and WIFI-3174

See merge request espressif/esp-idf!11651
 2020-12-21 23:41:51 +08:00
baohongde
3b0fc48ab4 components/bt: Shutdown Bluetooth before esp_restart. 2020-12-21 20:08:10 +08:00
Mahavir Jain
953418dbb4 Merge branch 'bugfix/missing_coreinfo_in_vtasklist' into 'master' 
freertos: Fix missing affinity info in vTaskList

Closes IDFGH-4239 and IDFGH-4241

See merge request espressif/esp-idf!11606
 2020-12-21 19:43:40 +08:00
lly
ac93a38990 ble_mesh: stack: Support reporting normal ble adv packets 2020-12-21 09:08:25 +00:00
lly
a6ebe48e6e ble_mesh: stack: Add a btc file for ble coex functions 
Previously if starting/stopping BLE advertising when BLE Mesh
is enabled, the corresponding events will be notified through
the callback registered by esp_ble_mesh_register_prov_callback().

With this commit, the func esp_ble_mesh_register_ble_callback()
needs to be invoked for resgitering the callback used for BLE
coexistence related functionalities (i.e. ADV/SCAN).
 2020-12-21 09:08:25 +00:00
lly
1bb3f693d5 ble_mesh: stack: Move ble scan funcitons to a single file 2020-12-21 09:08:25 +00:00
lly
9be0120d94 ble_mesh: stack: Optimize handling received mesh adv packets 2020-12-21 09:08:25 +00:00
kapil.gupta
903198ad7f esp_wifi: Fix some wifi bugs. 
1. Send encrypted mgmt frames in pmf connection
2. Remove dependecy of SHA256 AKM on PMF
3. Fix null pointer dereference
4. Set TTLS default phase2 method as MSCHAPV2.
 2020-12-21 14:27:10 +05:30
boarchuz
06d6146445 fix rtc_gpio_desc_t compilation error 
Closes https://github.com/espressif/esp-idf/pull/6029
Closes https://github.com/espressif/esp-idf/issues/6301
Closes IDFGH-4470
Closes IDFGH-4167
 2020-12-21 13:54:52 +05:30
Angus Gratton
778b54bbcb Merge branch 'bugfix/correct_logging_timestamp_format' into 'master' 
log: correct timestamp formatting to unsigned integer type

Closes IDFGH-4393

See merge request espressif/esp-idf!11605
 2020-12-21 15:08:30 +08:00
Supreet Deshpande
c4cf6d6d26 Secure boot v2: Fixes the issue of passing the flash calculated digest for ota verification. 2020-12-21 11:32:37 +05:30
Supreet Deshpande
e517b4953f Secure Boot v2: Fix the double padding of the image length during flash encryption 
Fixes https://github.com/espressif/esp-idf/issues/6236
 2020-12-21 11:32:37 +05:30
Mahavir Jain
ec4de5bd38 Merge branch 'feature/upgrade_mbedtls_to_v2.16.9' into 'master' 
mbedtls: upgrade to v2.16.9 release

See merge request espressif/esp-idf!11596
 2020-12-21 13:09:38 +08:00
Jiang Jiang Jian
21e6706e07 Merge branch 'feature/support_esp32c3_wifi' into 'master' 
esp_wifi: add esp32c3 wifi lib

See merge request espressif/esp-idf!11610
 2020-12-21 12:27:33 +08:00
Jiang Jiang Jian
bba4325ce5 Merge branch 'bugfix/btdm_clear_llcp_rsp_timeout_after_reject' into 'master' 
btdm bugfix: clear the timer after remote reject when respond the parameters update

Closes BCI-101

See merge request espressif/esp-idf!11667
 2020-12-21 12:13:32 +08:00
Krzysztof Budzynski
8e4c73b1d1 Merge branch 'bugfix/minor_docs_fixes' into 'master' 
minor docs fixes

See merge request espressif/esp-idf!11430
 2020-12-21 11:31:00 +08:00
Angus Gratton
06bdaba0e8 Merge branch 'tuning/heap_tlsf_sl_tune' into 'master' 
heap: increase the second level list length to reduce the fragmentation to acceptable level.

See merge request espressif/esp-idf!11668
 2020-12-21 08:54:32 +08:00
David Čermák
1b1c42440b Merge branch 'feature/enable_lwip_checksums' into 'master' 
lw-IP: Add Kconfig options to enable/disable checksum validation for IP/UDP/ICMP

Closes IDFGH-4349

See merge request espressif/esp-idf!11429
 2020-12-19 02:44:47 +08:00
ryan kurte
85083ddc3d lwip: Added debug config options for DHCP and TCP 2020-12-18 16:38:59 +00:00
ryan kurte
5d91a27a1e lwip: Added KConfig option to control checksum validation on IP/UDP/ICMP 
This maintains the current default, but could be swapped if desired

Merges https://github.com/espressif/esp-idf/pull/6187
 2020-12-18 16:38:59 +00:00
suren.gabrielyan
f33772c960 mDNS: Fix of collision detection during txt length calculation 
Closes https://github.com/espressif/esp-idf/issues/6114
 2020-12-18 15:38:30 +00:00
Angus Gratton
c3cc5b17e0 Merge branch 'feature/esp32c3_spi_flash' into 'master' 
spi_flash: Add esp32c3 support

Closes IDF-2362

See merge request espressif/esp-idf!11639
 2020-12-18 14:02:04 +08:00
Krzysztof Budzynski
3474daecb1 Merge branch 'bugfix/doxygen_warnings' into 'master' 
Docs: fix doxygen warnings

See merge request espressif/esp-idf!11643
 2020-12-18 13:44:07 +08:00
Angus Gratton
3b37c87535 Merge branch 'bugfix/delete_gdbstub_h' into 'master' 
esp_system: remove remaining use of old gdbstub header

Closes IDFGH-4444

See merge request espressif/esp-idf!10717
 2020-12-18 13:03:24 +08:00
Renz Bagaporo
32dc37fbe8 esp_system: remove remaining use of old gdbstub header 
Closes https://github.com/espressif/esp-idf/issues/6274
 2020-12-18 09:32:24 +08:00
Felipe Neves
89d461df2a heap: increase the sl to reduce the fragmentation to acceptable level. 2020-12-17 12:52:56 -03:00
gengyuchao
247484c454 bugfix: clear the timer after remote reject when respond the parameters update 2020-12-17 22:19:44 +08:00
Mahavir Jain
b85c534130 mbedtls: upgrade to v2.16.9 release 
For details release notes please refer to:
https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.9
 2020-12-17 14:15:41 +05:30
Angus Gratton
06ec032c0c spi_flash: Simplify init-time size check 2020-12-17 15:34:13 +11:00
Cao Sen Miao
0736c91d68 soc: Remove cache constants from soc.h 2020-12-17 15:34:13 +11:00
Angus Gratton
d4c9a45675 spi_flash: Add ESP32-C3 support 
Based on internal commit 3ef01301fff
 2020-12-17 15:34:13 +11:00
wangcheng
386a8e37f1 components/bt:fix exl200, add btdm_disable_adv_delay, fix RPA addr update error. 2020-12-17 10:57:54 +08:00
wangcheng
cc7dbc6177 components/bt: Fixed the problem of early release of pointer(p_ccb) in funcion 2020-12-17 10:54:56 +08:00
Jiang Jiang Jian
c2364e133d Merge branch 'bugfix/free_acl_rx_buf_in_em' into 'master' 
Free ACL RX Buf in EM when disconnection

Closes BT-1083 and BT-1152

See merge request espressif/esp-idf!11590
 2020-12-16 18:02:44 +08:00
Wei Tian Hua
6b7c878581 Free ACL RX Buf in EM when disconnection 2020-12-16 18:02:39 +08:00
Ivan Grokhotkov
792dc6ebb8 Merge branch 'feature/linux_target' into 'master' 
build system: Add Linux target

Closes IDF-2145

See merge request espressif/esp-idf!10076
 2020-12-16 16:25:38 +08:00
Marius Vikhammer
dc0e80a4c8 Docs: fix doxygen warnings 2020-12-16 14:37:14 +08:00
Jakob Hasse
7b223c3337 NVS: fix string comparison 
Closes IDF-2476
 2020-12-16 13:53:17 +08:00
Axel Lin
93c79c4516 freertos_hooks: Fix unbalance lock in deregistration for cpu functions 
Current code exits the deregistration for cpu functions with spinlock held when
cpuid >= portNUM_PROCESSORS. Fix it.

Fixes: 9d63e1da4a ("New Task Watchdog API (Revert of Revert)")
Signed-off-by: Axel Lin <axel.lin@gmail.com>
 2020-12-16 09:10:38 +08:00
Ivan Grokhotkov
25a4a61665 Merge branch 'bugfix/nvs_coverage_script' into 'master' 
NVS: fixed coverage-report target in Makefile

See merge request espressif/esp-idf!11218
 2020-12-16 00:30:07 +08:00
Ivan Grokhotkov
632a33cef8 Merge branch 'fix/nvs_flash_api_docs' into 'master' 
nvs_flash: fix nvs initialization API documentation

See merge request espressif/esp-idf!11621
 2020-12-15 19:56:55 +08:00
Ivan Grokhotkov
829d94ad01 Merge branch 'fix/rtc_fast_memory_force_on_in_use_for_heap' into 'master' 
fix: RTC_FAST_MEM always power on if used for heap

See merge request espressif/esp-idf!11555
 2020-12-15 18:45:20 +08:00
ChenJianxing
1ffb12e6fd esp_wifi: add esp32c3 wifi lib 2020-12-15 17:13:10 +08:00
Anton Maklakov
df544dee30 tools: Redirect some warnings to stderr 2020-12-15 12:41:20 +07:00
Aditya Patwardhan
163d5f314a nvs_flash: fix nvs initialization API documentation 2020-12-15 08:11:49 +05:30
Axel Lin
29b6b0ce0d freertos: Fix missing affinity info in vTaskList 
Show affinity info if CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID is set.

Closes https://github.com/espressif/esp-idf/pull/6099
Closes https://github.com/espressif/esp-idf/issues/6097

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mahavir Jain <mahavir@espressif.com>
 2020-12-14 16:50:07 +05:30
Jakob Hasse
00819a3022 NVS flash: host-based unit test of nvs::Page 
* General tests like page loading from flash
* Rough test of fixed-size data types
* Rough test of blob read
* Added coverage target in cmake, also accessible
  via `idf.py coverage`
* Fixed unsigned comparison in comp. enum table
* introducing temporary LINUX_TARGET define
 2020-12-14 18:53:14 +08:00
Jakob Hasse
c233ce0449 spi_flash: mocking should be possible now 
The following three headers will be mockes:
* esp_flash.h
* esp_spi_flash.h
* esp_partition.h
* counter functions live in own header
* add spi_flash sim dir for esp_err.h to Unity
* modified gen_esp_err_to_name.py to ignore
  sim/ dir in spi_flash component

Add cmock .yaml config file
Add spi hal header until soc can mock the hal
  layer as well.
 2020-12-14 18:53:14 +08:00
Jakob Hasse
52093fa4ef linux: added linux target 
* add toolchain file
* add linux to preview targets
* add stub for dfu number in cmake
* excluded unity runner per default
* Added esp_attr.h and esp_partition.h linux stubs
* component.cmake check list for emptyness
* added switch for linux in unity cmake file
* Added Linux host example app
 2020-12-14 18:53:14 +08:00
Mahavir Jain
a46dfd316e log: correct timestamp formatting to unsigned integer type 
Closes https://github.com/espressif/esp-idf/issues/6226

Closes IDFGH-4393
 2020-12-14 15:03:55 +05:30
Jiang Jiang Jian
a16d1e8f1a Merge branch 'fixbug/baidu_tcp_recv_assert' into 'master' 
lw-ip:fixbug/baidu tcp recv assert

Closes WIFI-2802

See merge request espressif/esp-idf!11287
 2020-12-14 16:48:24 +08:00
Angus Gratton
7eed079473 Merge branch 'Bugfix/esp_event' into 'master' 
Bugfix/esp_event fix misuse of recursive semaphore take/give calls for profiling_mutex

Closes IDFGH-4246

See merge request espressif/esp-idf!11454
 2020-12-14 16:32:58 +08:00
Ivan Grokhotkov
e0e6194c95 Merge branch 'bugfix/coredump_plain_partition_on_encrypted_flash' into 'master' 
coredump: Core dump is encrypted if the partition itself is encrypted

Closes IDF-458

See merge request espressif/esp-idf!11424
 2020-12-14 15:40:05 +08:00
Michael (XIAO Xufeng)
40b08e33c9 Merge branch 'bugfix/touch_sensor_reading_error_in_light_sleep_process' into 'master' 
driver(touch): fix touch sensor false trigger in sleep mode

See merge request espressif/esp-idf!10983
 2020-12-14 14:51:51 +08:00
Krzysztof Budzynski
dc73031f7f Merge branch 'doc/esp_partition_documentation' into 'master' 
SPI Flash: fix doc error in esp_partition.h

See merge request espressif/esp-idf!10506
 2020-12-11 16:36:44 +08:00
Angus Gratton
8929a9cdb1 Merge branch 'feature/aes_hal' into 'master' 
AES: refactor and add HAL layer

See merge request espressif/esp-idf!10979
 2020-12-11 15:39:49 +08:00
Angus Gratton
f50dd23872 Merge branch 'feature/merge_esp32c3_bootloader_support' into 'master' 
esp32c3: add initial bootloader and target component support

Closes IDF-2435 and IDF-2436

See merge request espressif/esp-idf!11433
 2020-12-11 15:36:28 +08:00
Angus Gratton
3e6313ffc1 Merge branch 'bugfix/enable_verify_app_test_s2' into 'master' 
bootloader_support: re-enable S2 unit test

See merge request espressif/esp-idf!11521
 2020-12-11 14:36:55 +08:00
morris
c39476d699 esp_rom: added esp_rom_install_uart_printf 2020-12-11 11:45:10 +08:00
morris
3f287800eb bootloader_support: added esp32-c3 support 2020-12-11 11:45:10 +08:00
morris
8330b2541a esp32c3: added target component 2020-12-11 11:44:01 +08:00
morris
65aebef596 esp32c3: added 2nd bootloader project linker file 2020-12-11 11:44:01 +08:00
Angus Gratton
7472d76db0 Merge branch 'bugfix/after_ligth_sleep_esp_timer_forms_one_event' into 'master' 
esp_timer: Add an option skip_unhandled_events

See merge request espressif/esp-idf!10969
 2020-12-11 06:04:58 +08:00
fuzhibo
985e94139d driver(touch): fix touch sensor false trigger in sleep mode 2020-12-10 17:43:14 +08:00
Marius Vikhammer
457ce080ae AES: refactor and add HAL layer 
Refactor the AES driver and add HAL, LL and caps.

Add better support for running AES-GCM fully in hardware.
 2020-12-10 09:04:47 +00:00
Jakob Hasse
60dfd87e65 SPI Flash: fix doc error in esp_partition.h 2020-12-10 17:03:56 +08:00
Marius Vikhammer
0c3714de1c bootloader_support: re-enable S2 unit test 
Re-enable "Verify unit test app image"
 2020-12-10 08:04:09 +00:00
fuzhibo
f4aedfd017 fix: RTC_FAST_MEM always power on if used for heap 2020-12-10 14:45:41 +08:00
Michael (XIAO Xufeng)
49022d4d92 Merge branch 'fix/adc_hal_reading_efuse_in_critical' into 'master' 
adc: fixed efuse called in critical section issue

See merge request espressif/esp-idf!11519
 2020-12-10 14:09:09 +08:00
Jakob Hasse
ff03bbce78 NVS: fixed coverage-report target in Makefile 2020-12-10 03:51:16 +00:00
Angus Gratton
e4407468bc Merge branch 'feature/flash_binary_partition_with_name' into 'master' 
buildsystem: flash binary to a named partition

Closes IDF-2387

See merge request espressif/esp-idf!11342
 2020-12-10 06:24:15 +08:00
Mahavir Jain
1584ccf834 Merge branch 'feature/http_error_code' into 'master' 
Feature/support 401, 403 response error code for HTTP server

Closes IDFGH-3511

See merge request espressif/esp-idf!11473
 2020-12-09 23:45:38 +08:00
liqigan
478cef9b75 fix spp vfs demo crash when use dynamic memory 2020-12-09 19:46:43 +08:00
KonstantinKondrashov
aa96c9a4d8 esp_timer: Add an option to skip unhandled events for periodic timers 
- Added an option to skip unhandled events for periodic timers. Useful for light sleep.
- Added doc about this case
- Added Test a latency between a call of callback and real event (14-16us). and UT to check skip_unhandled_events.
- Fixed for esp_timer_dump() if name of timer is NULL
- Refactored timer_process_alarm()
- Added the delete function after using in UTs
 2020-12-09 17:19:19 +08:00
David Čermák
bf294fd1ae Merge branch 'bugfix/crt_bundle_bad_md' into 'master' 
esp_crt_bundle: allow weak hash algorithm for trusted certificate

Closes IDFGH-4266

See merge request espressif/esp-idf!11376
 2020-12-09 16:16:35 +08:00
Liu Han
669d9820fc esp_http_server: Add some response error code, such as 401, 403 etc. 
Closes https://github.com/espressif/esp-idf/issues/5466
 2020-12-09 06:22:01 +00:00
Island
4605a8ac80 Merge branch 'optimize/ble_mesh_miscellaneous' into 'master' 
Optimize/ble mesh miscellaneous

See merge request espressif/esp-idf!11500
 2020-12-08 19:35:46 +08:00
Michael (XIAO Xufeng)
04d6b115ae adc: fixed efuse called in critical section issue 2020-12-08 17:41:49 +08:00
Angus Gratton
c0e0be6ac3 Merge branch 'bugfix/bootloader_dont_trigger_address_decoding' into 'master' 
bootloader: avoid printing load addresses with '0x'

See merge request espressif/esp-idf!11445
 2020-12-08 15:19:58 +08:00
lly
fb531815b0 ble_mesh: stack: Move bt_mesh_rand to mesh_common.c 2020-12-08 15:13:04 +08:00
lly
19c3f38b36 ble_mesh: stack: Remove useless BT_DBG_ENABLED in a few files 2020-12-08 15:13:04 +08:00
lly
b77563abb0 ble_mesh: Replace zephyr integer types with C99 types [Zephyr] 2020-12-08 15:13:04 +08:00
lly
162e11cff3 ble_mesh: stack: Update ARRAY_SIZE definition 2020-12-08 15:13:04 +08:00
Omar Chebib
02ddecb69f buildsystem: flash binary to a named partition 
Changed optional value parameter 'encrypted' to a named parameter
called 'ALWAYS_PLAINTEXT'. This flag can be passed to:
- esptool_py_flash_target
- esptool_py_flash_target_image
Fix wrong identation.
 2020-12-08 12:16:02 +08:00
Michael (XIAO Xufeng)
f174cc35a8 Merge branch 'test/disable_sdio_single_core_tests' into 'master' 
ci: disable some sdio_slave tests on single core config

Closes IDFCI-233 and IDFCI-240

See merge request espressif/esp-idf!11492
 2020-12-08 11:48:13 +08:00
Marius Vikhammer
7e0f362149 esp_crt_bundle: add additional unit tests 
Add unit test for:
 * Trusted certificate with weak hash algorithm signature
 * Certificate with wrong signature

Merges https://github.com/espressif/esp-idf/pull/6117
 2020-12-08 10:11:31 +08:00
Michael (XIAO Xufeng)
85ac572e4a Merge branch 'bugfix/phy_set_xpd_sar' into 'master' 
wifi: add set_xpd_sar override

Closes IDFGH-235, IDFGH-1442, IDFGH-1917, IDFGH-2473, and IDFGH-2168

See merge request espressif/esp-idf!7185
 2020-12-07 16:09:02 +08:00
Ivan Grokhotkov
4bfa2c937f Merge branch 'bugfix/nvs_close_nukes_all_handles' into 'master' 
NVS: fixed deinit other partition's handles

Closes FCS-533

See merge request espressif/esp-idf!10940
 2020-12-07 15:57:14 +08:00
Island
4f082154e0 Merge branch 'feat/ble_mesh_multiple_nvs_namespace' into 'master' 
ble_mesh: stack: Provisioner supports multiple nvs namespaces

Closes BLEMESH-260

See merge request espressif/esp-idf!11355
 2020-12-07 14:43:04 +08:00
Angus Gratton
3d1d22f1f4 Merge branch 'esp32/include_extram_bss_in_linker_fragment' into 'master' 
esp32: Provision to redirect .bss to external ram through linker fragments

See merge request espressif/esp-idf!9894
 2020-12-07 14:01:21 +08:00
Cao Sen Miao
d6f0b4af6f adc_i2s: solve the i2s_adc issue when using wifi 2020-12-07 10:45:04 +08:00
Ivan Grokhotkov
d890a516a1 driver: add notes about GPIO36/39 issue (ECO 3.11) workaround 
Closes IDFGH-1917
Closes https://github.com/espressif/esp-idf/issues/4117
 2020-12-07 10:45:04 +08:00
Ivan Grokhotkov
80e7252c13 wifi: add set_xpd_sar override 
Wi-Fi enables and disables ADC when exiting and entering sleep mode.
Coordinate ADC power state with other modules, using adc_power_acquire
and adc_power_release.
 2020-12-07 10:45:04 +08:00
Ivan Grokhotkov
a4f81d0bd3 adc: add adc_power_acquire/release, deprecate adc_power_on/off 2020-12-07 10:45:04 +08:00
Michael (XIAO Xufeng)
a579011584 ci: disable some sdio_slave tests on single core config 2020-12-07 10:15:35 +08:00
lly
a90e3cdf95 ble_mesh: stack: Provisioner supports multiple nvs namespaces 
Now Provisioner can use different NVS namespaces to store
different instances of mesh information, for example, for
different user accounts.
 2020-12-04 20:31:25 +08:00
Sachin Parekh
be5563207d esp32: Provision to redirect .bss to external ram through linker fragments 
Include external ram section in the linker template to process it
through linker script generation mechanism. This enables redirection of .bss section to external memory using linker fragments

libnet80211, libpp, libbt, liblwip: Redirect .bss through fragments
 2020-12-04 06:32:38 +00:00
Liu Han
620b0df2b1 esp_event: fix misuse of recursive semaphore take/give calls for profiling_mutex 
Closes/Merges https://github.com/espressif/esp-idf/pull/6102
 2020-12-04 11:12:27 +08:00
Cao Sen Miao
eeddd44d0a esp_flash: update document to reflect the restrictions of mmap/cache 2020-12-04 11:10:43 +08:00
Konstantin Kondrashov
4a487af43a efuse: Add new APIs for keys, purposes, wr/rd protection 
- the batch mode can be called recursively
 2020-12-04 10:42:57 +08:00
Michael (XIAO Xufeng)
a92d90435f Merge branch 'feature/esp32s2_adc_calib' into 'master' 
adc: add driver for esp32s2 adc calibration scheme

Closes IDFGH-3500, IDF-1458, and IDF-2013

See merge request espressif/esp-idf!9557
 2020-12-03 20:09:07 +08:00
Wu Bo Wen
5cc329b9d0 driver/adc: support for esp32s2 adc calibration scheme V2 
notice that the o_code is now pulled from efuse instead of automatically calibrated. This may influence other parts of the system.

Closes https://github.com/espressif/esp-idf/issues/5455
 2020-12-03 20:08:59 +08:00
Shubham Kulkarni
bc78b8f2da esp_https_ota: Add definition for esp_https_ota_abort 
Update esp_https_ota API to use esp_https_ota_abort in case of error
 2020-12-03 14:49:55 +05:30
lucastcox
d5d722c66f app_update: Add definition for esp_ota_abort 
Closes: https://github.com/espressif/esp-idf/issues/5329
Merges: https://github.com/espressif/esp-idf/pull/5331

Signed-off-by: Shubham Kulkarni <shubham.kulkarni@espressif.com>
 2020-12-03 14:49:52 +05:30
Jeff Epler
a79cb9f8cd esp_crt_bundle: Allow verify_callback to correct BADCERT_BAD_MD 2020-12-03 14:53:53 +08:00
Island
e2e05fd91c Merge branch 'feature/btdm_support_some_ble_new_features' into 'master' 
Feature/btdm support some ble new features

See merge request espressif/esp-idf!11432
 2020-12-03 11:50:55 +08:00
Ivan Grokhotkov
89d39308a0 bootloader: avoid printing load addresses with '0x' 
Since idf_monitor decodes anything that looks like a code address and
starts with 0x, bootloader logs often get annotated with function
names such as WindowOverflow and other random and scary looking things
unrelated to the issue the user is facing. Print the addresses without
0x to avoid confusion by decoded function names. Print hexadecimal
size with 'h' suffix to distinguish it from the decimal value that
follows.
 2020-12-02 16:33:43 +01:00
Mahavir Jain
a5fd7878db Merge branch 'fix/update_tls_sockfd_after_freeing_internally' into 'master' 
esp-tls : (Fix) update tls->sockfd value after socket is freed internally

Closes IDFGH-4321

See merge request espressif/esp-idf!11417
 2020-12-02 21:23:39 +08:00
xiewenxiang
945606b658 component/bt: support BLE Read Attribute value by UUID 2020-12-02 20:04:36 +08:00
Ivan Grokhotkov
8bf1c2565f freertos: clarify statement on task function not returning 
Mentioned in https://www.esp32.com/viewtopic.php?f=2&t=18220.
 2020-12-02 11:58:56 +01:00
martin.gano
f4ea2dcb74 Tools: add Python 2 deprecation warning 2020-12-02 11:08:48 +01:00
Aditya Patwardhan
95d9533294 esp-tls : (Fix) update tls->sockfd value after socket is freed internally 
Closes https://github.com/espressif/esp-idf/issues/6163
 2020-12-02 03:47:15 +00:00
xiewenxiang
7e5e0ba7de component/bt: refactor ble random address setting 2020-12-02 09:08:31 +08:00
XieWenxiang
e840191a0c component/bt: support BLE Application Layer Encryption key size check 2020-12-02 09:08:03 +08:00
XieWenxiang
366b036ba5 component/bt: support BLE Authorization 2020-12-02 09:07:24 +08:00
xiewenxiang
3d8eb26fe1 component/bt: fix incorrect encryption flag setting 2020-12-02 09:06:44 +08:00
Omar Chebib
f4ac8433c1 coredump: Core dump is encrypted if the partition itself is encrypted 
Core dump can now be written in plain text if the partition itself is encrypted.
So it is important to modify the partition table if the user wants an encrypted
core dump partition as by default, it is not.
Added some functions in core_dump_port.c to abstract the checksum implementation
from core_dump_flash.c file.

Closes IDF-458
 2020-12-01 16:58:45 +08:00
Angus Gratton
38116853f4 Merge branch 'feature/esp32c3_small_changes' into 'master' 
esp32c3: Merge small target support changes

Closes IDF-2361

See merge request espressif/esp-idf!11381
 2020-12-01 13:46:57 +08:00
Angus Gratton
493ffe0f46 Merge branch 'feature/esp32c3_soc' into 'master' 
esp32c3: Add initial soc, hal, esp_rom, esp_hw_support

Closes IDF-2360

See merge request espressif/esp-idf!11253
 2020-12-01 13:27:39 +08:00
Angus Gratton
337985de04 driver: Simplify spi dma peripheral enable/disable logic 2020-12-01 10:58:50 +11:00
Angus Gratton
beb75b13f2 driver test: Use regular target guards for single-target test files 2020-12-01 10:58:50 +11:00
Angus Gratton
5228d9f9ce esp32c3: Apply one-liner/small changes for ESP32-C3 2020-12-01 10:58:50 +11:00
Ivan Grokhotkov
499f3e1540 Merge branch 'bugfix/parttool_miss_arg' into 'master' 
partition_table: Fix missing argument not present for all parsers

See merge request espressif/esp-idf!11373
 2020-12-01 07:30:42 +08:00
Ivan Grokhotkov
e241884cfd Merge branch 'bugfix/plain_coredump_encrypted_flash' into 'master' 
coredump: fix plain coredump written on an encrypted flash

Closes IDF-458

See merge request espressif/esp-idf!11166
 2020-12-01 07:29:36 +08:00
Armando
f80bcb733a uart: modify s3 ll functions of reading/writing fifo 2020-11-30 15:23:15 +11:00
Armando
d393699ab6 uart: bringup on esp32c3 2020-11-30 15:23:15 +11:00
Angus Gratton
076be2b480 esp_rom: Refactor ROM CMakeLists.txt file 
Reduce duplication and use a utility function for the "add ROM linker script"
pattern, move to a simple file structure of "one if block per target"
 2020-11-30 15:23:15 +11:00
Angus Gratton
b696d2917e esp_hw_support: Add initial ESP32-C3 support 
From internal commit 7761d6e8
 2020-11-30 15:23:15 +11:00
Angus Gratton
7c08be5771 hal: Add initial ESP32-C3 support 
From internal commit 7761d6e8
 2020-11-30 15:23:15 +11:00
Angus Gratton
b68094199f esp_rom: Add initial ESP32-C3 support 
From internal commit 7761d6e8
 2020-11-30 11:12:56 +11:00
Angus Gratton
c29d93986d soc: Add initial ESP32-C3 support 
From internal commit 7761d6e8
 2020-11-30 11:12:56 +11:00
Mahavir Jain
c62a9e5f2c freertos: add xQueueGenericReceive for backward compatibility 
Add `xQueueGenericReceive` as that has been removed in FreeRTOS10.
This in turn breaks pre-builts libraries with earlier IDF releases
relying on this API.

Closes https://github.com/espressif/esp-wolfssl/issues/6
 2020-11-27 19:08:42 +05:30
Artem Godlevskyi
3caa9699ae Added missing MYNEWT_VAL_BLE_L2CAP_COC_MPS definition 
Signed-off-by: Prasad Alatkar <prasad.alatkar@espressif.com>

Merges https://github.com/espressif/esp-idf/pull/5825
 2020-11-27 11:50:03 +00:00
Prasad Alatkar
922a994896 NimBLE: Fix misc coverity issues in NimBLE host 
- NimBLE NVS : Additional check to account for NVS operation failure
- NimBLE host: Fix minor bug in ble_eddystone_set_adv_data_gen
- NimBLE host: remove recursive call, upstream PR: https://github.com/apache/mynewt-nimble/pull/857
 2020-11-27 11:50:03 +00:00
Jakob Hasse
09d2c5daa6 nvs_flash: fixed deinit other partition's handles 
* When deinitializing or erasing a partition,
  nvs used to close all handles instead of only
  the current partition's handles.
  This is fixed now
* Added a unit test for that case

Closes FCS-533
 2020-11-27 18:51:05 +08:00
Jiang Jiang Jian
079247b42a Merge branch 'bugfix/blufi_config_potential_double_free' into 'master' 
Bugfix/blufi config potential double free

Closes BCI-249, BCI-241, BCI-244, and BT-1174

See merge request espressif/esp-idf!9980
 2020-11-27 13:44:37 +08:00
Jiang Jiang Jian
4985310b29 Merge branch 'bugfix/fix_crash_of_divide_zero' into 'master' 
Fix crash caused by dividing zero

Closes AUD-2450

See merge request espressif/esp-idf!11100
 2020-11-27 12:01:13 +08:00
Jiang Jiang Jian
5196976dbd Merge branch 'docs/fix_some_typos_in_wifi.h' into 'master' 
fixed some typos

See merge request espressif/esp-idf!11076
 2020-11-27 11:28:28 +08:00
dongyou
070eaea67e Add description for esp_wifi_set_inactive_time() 
Add documentation to avoid using WiFi modem sleep for WiFi/BT coexistence
Remove description of unusable API esp_wifi_restart()
Update esp_now_fetch_peer discription
Update table format prblm for esp_wifi_set_max_tx_power()
Update description for ssid and password

Closes https://github.com/espressif/esp-idf/issues/6049
Closes https://github.com/espressif/esp-idf/issues/5759
Closes https://github.com/espressif/esp-idf/issues/5719
Closes https://github.com/espressif/esp-idf/issues/3762
 2020-11-26 20:52:36 +08:00
Paweł pidpawel Kozubal
cf60ec0ffc lwip: Added support for configurable LwIP hooks 
Added lwIP hooks which could be optionally overwritten in the
application code. These three options are provided in Kconfig:
* NONE: No hook support
* DEFAULT: Default implementation is provided. If IDF doesn't
have a specific hook implementation, an empty stub is provided, which
could be overwritten by strong implementation in application code.
* CUSTOM: Hooks are declared only to be implemented in application code.

Merges https://github.com/espressif/esp-idf/pull/6034
 2020-11-26 12:02:00 +00:00
Jiang Jiang Jian
fc08ff8162 Merge branch 'bugfix/pmf_tx_rx_routine' into 'master' 
esp_wifi: Always register pmf tx/rx routines

Closes WIFI-2958

See merge request espressif/esp-idf!11045
 2020-11-26 19:23:39 +08:00
Michael (XIAO Xufeng)
a3b59aeeb5 Merge branch 'bugfix/clk_allocator' into 'master' 
I2C: Fix logic issue on i2c clk allocator

See merge request espressif/esp-idf!11343
 2020-11-26 18:18:52 +08:00
Omar Chebib
a56a0921aa espcoredump: fix plain coredump written on an encrypted flash 
The coredump is now encrypted when saved on an encrypted flash.
The cache used for saving the file onto the flash is bigger,
making the proccess more efficient.

Relates to IDF-458
Closes https://github.com/espressif/esp-idf/issues/2932
 2020-11-26 16:28:32 +08:00
Anton Maklakov
01d8782393 Merge branch 'bugfix/pppos_app_test_python3' into 'master' 
CI: Fix python3 issue on PPPoS app test

Closes IDFCI-251

See merge request espressif/esp-idf!11344
 2020-11-26 11:12:11 +08:00
Michael (XIAO Xufeng)
665c7f05d2 Merge branch 'feature/uart_bringup_on_esp32s3' into 'master' 
uart: bringup on esp32s3

Closes IDF-1768

See merge request espressif/esp-idf!11298
 2020-11-26 10:45:17 +08:00
Island
bebdd08e08 Merge branch 'optimize/ble_mesh_provision_dev_uuid_check' into 'master' 
ble_mesh: stack: Need uuid when adding device for provisioning

See merge request espressif/esp-idf!11299
 2020-11-26 10:36:10 +08:00
Omar Chebib
ccaee8ce88 buildsystem: flash binary to a named partition 
Add support for CMake version less than 3.8. These versions don't
provide a way to have ternary expressions in expressions generator.
 2020-11-26 10:04:34 +08:00
Omar Chebib
956538e364 buildsystem: flash binary to a named partition 
- Add the function esptool_py_flash_to_partition to flash a binary
image to a named partition. If encryption is enabled, this function
will also determine if the partition needs to be encrypted or not
according the its type, subtype and flag in the CSV file (if any).
- Use idf.py encrypted-flash will now flash both encrypted and
non-encrypted file if any (spiffs for example) using esptool.py's
--encrypt-files option.

Closes IDF-2387
Relates to IDF-723
Relates to IDF-2231
 2020-11-26 10:04:34 +08:00
Roland Dobai
075d3a57ac partition_table: Fix missing argument not present for all parsers 2020-11-25 23:33:57 +01:00
David Cermak
8bd758b72a ci: Removed remaining binary size checks in app-tests 
Also removes unused references to http-request app size in idf_performance.h
 2020-11-25 21:22:18 +01:00
Mahavir Jain
0a933f66e3 Merge branch 'fix/https_server_mem_leak_for_error_ret' into 'master' 
Fix/https server mem leak for error ret

Closes IDFGH-4300

See merge request espressif/esp-idf!11369
 2020-11-26 00:11:58 +08:00
lly
992ceca71b ble_mesh: stack: Need uuid when adding device for provisioning 2020-11-25 20:51:23 +08:00
Anton Maklakov
bf10c537e4 Merge branch 'bugfix/ci_espcoredump' into 'master' 
tools: Fix non-existing key in espcoredump's GDMI payload and increase internal GDB delay for CI tests

Closes IDFCI-74 and IDFCI-226

See merge request espressif/esp-idf!11221
 2020-11-25 19:16:24 +08:00
Michael (XIAO Xufeng)
5b97f4ab5b Merge branch 'feature/esp_flash_32b_addr_doc' into 'master' 
spi_flash: add a block of flash chip supports in the document

See merge request espressif/esp-idf!9895
 2020-11-25 17:01:12 +08:00
Aditya Patwardhan
c707d0d323 Fixed ssl_ctx not being freed at the time of error. 
Closes https://github.com/espressif/esp-idf/issues/6143
 2020-11-25 13:47:38 +05:30
Cao Sen Miao
31afe8109f i2c: Fix bug on i2c clk allocator 2020-11-25 14:26:37 +08:00
Armando
05a4a8d864 uart: seperate sclk and baudrate setting 2020-11-24 19:12:52 +08:00
Armando
fb8b905539 uart: add uart support on esp32s3 2020-11-24 19:12:51 +08:00
kapil.gupta
447eb894c0 esp_wifi: Always register pmf tx/rx routines 
Fixes the issue when PMF packets are not sent after mode change.
 2020-11-24 15:56:42 +05:30
Michael (XIAO Xufeng)
af992c26bc Merge branch 'bugfix/fix_x32k_startup_slow_bug' into 'master' 
bugfix: Fix xtal 32k not oscillate or oscillate too slowly issue for esp32

See merge request espressif/esp-idf!10519
 2020-11-24 17:37:29 +08:00
Cao Sen Miao
a610b3ac42 spi_flash: add a block of flash chip supports in the document 2020-11-24 15:46:53 +08:00
Angus Gratton
7446988959 Merge branch 'bugfix/secure_boot_v2_manual_enablement' into 'master' 
Secure Boot V2: Fix an issue leading to manual enablement of Secure Boot v2.

See merge request espressif/esp-idf!11161
 2020-11-24 15:39:00 +08:00
Michael (XIAO Xufeng)
10fd0c26d4 Merge branch 'bugfix/spi_fix_spi_ll_func_name' into 'master' 
spi: fix rx_eof and out_eof related function names in spi_ll.h

See merge request espressif/esp-idf!11007
 2020-11-24 12:25:04 +08:00
wangcheng
d1bf93e055 component/bt: Add a macro to control the compilation of blufi. 2020-11-24 10:43:18 +08:00
wangcheng
714d88e426 component/bt: Fix a potential double free error. 2020-11-24 10:22:40 +08:00
wangcheng
709ad66d44 blufi: fix an error caused by incorrect conn_id parameters. 2020-11-24 10:22:32 +08:00
Island
58f11c0c33 Merge branch 'feat/ble_mesh_provisioner_recv_hb_support' into 'master' 
ble_mesh: stack: Provisioner supports receiving heartbeat

Closes BLEMESH-259

See merge request espressif/esp-idf!11244
 2020-11-23 20:02:33 +08:00
Jiang Jiang Jian
e130d27fb7 Merge branch 'bugfix/control_wpa3_code_with_flag' into 'master' 
Use WPA3 flag to reduce code size

Closes WIFI-2910 and IDFGH-4103

See merge request espressif/esp-idf!10963
 2020-11-23 19:52:38 +08:00
chaijie
a48b5246cc ESP32: Fix xtal 32k not oscillate or oscillate too slowly issue 
ESP32 in revision0 and revision1 uses touchpad to provide
current to oscillate xtal 32k. But revision2 and revision3
do not need to do that.
Note: touchpad can not work and toupad/ULP wakeup sources
are not available when toupad provides current to xtal 32k
 2020-11-23 19:38:11 +08:00
Angus Gratton
d6bdd1cb32 Merge branch 'bugfix/small_cleanups' into 'master' 
Small cleanups

See merge request espressif/esp-idf!11141
 2020-11-23 17:23:53 +08:00
Supreet Deshpande
73d1be4281 Secure Boot V2: Fix an issue leading to manual enablement of Secure Boot v2. 
Fixes https://github.com/espressif/esp-idf/issues/6050
 2020-11-23 06:52:44 +00:00
Michael (XIAO Xufeng)
698ccb7604 Merge branch 'bugfix/remove_log_from_adc_set_init_code' into 'master' 
Driver(ADC): remove ESP_LOGD from adc_set_init_code

Closes IDFGH-4233

See merge request espressif/esp-idf!11306
 2020-11-23 14:46:16 +08:00
zhangyanjiao
c0f4fdfd4d wpa_supplicant: Use WPA3 flag to reduce code size 
Flag ESP32_WIFI_ENABLE_WPA3_SAE from Menuconfig is used to
control the stack size required by WPA3. Use the same flag
to compile out the WPA3 code and control the code size.
With this flag disabled code footprint reduces by about 7.7kB
in libwpa_supplicant.a
Update WiFi libs with added checks to cleanly handle disabling
of WPA3 callbacks.

Closes https://github.com/espressif/esp-idf/issues/5971
 2020-11-23 14:28:12 +08:00
lly
db4b87a771 ble_mesh: stack: Provisioner supports receiving heartbeat 2020-11-23 01:28:28 +00:00
David Cermak
916d2f6f4c esp_netif: Added test for failing to set hostname 2020-11-20 10:06:53 +00:00
David Cermak
7c4d3fbf8b esp_netif: Fixed possible use of hostname pointer after its freed 
When setting hostname using esp_netif_set_hostname_api() failed for some reason, the netif pointer might be freed while lwip pointer stil point to that location and could be used. Fixed by moving the freeing and string duplication to the block where lwip hostname is set.

Closes https://github.com/espressif/esp-idf/issues/6048
 2020-11-20 10:06:53 +00:00
Chen Yi Qun
579b842fd6 Driver(ADC): remove ESP_LOGD from adc_set_init_code 
ESP_LOGD is called from adc_set_init_code, which is invoked from a critical section.

Closes: https://github.com/espressif/esp-idf/issues/6091
 2020-11-20 07:10:09 +00:00
David Cermak
467e4d997b MQTT: Update submodule reference: config, error handle, minor fixes 
Updates esp-mqtt reference to include fixes below related mainly to:
* configuration update (disable keepalive, network timeout)
* minor fixes (size_t for all sizes, unbalanced lock, api for
  outbox-size)
* extended error handle to include socket's errno

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

Config: Added config value to disable keepalive mechanism
esp-mqtt commit: 8562437c8a
Related https://github.com/espressif/esp-mqtt/issues/179

Added esp_mqtt_client_get_outbox_size API
esp-mqtt commit: 0a1d9d0300
Related https://github.com/espressif/esp-mqtt/pull/178

mqtt_outbox: Removed unused retry_count field from outbox_item_t
esp-mqtt commit: 673086e13a

config: Fixed typo for configuring OUTBOX_EXPIRED_TIMEOUT_MS
esp-mqtt commit: 259baaec96

Fixed missing MQTT_API_UNLOCK in esp_mqtt_client_stop error path
esp-mqtt commit: 845c2a3a1e
Related https://github.com/espressif/esp-mqtt/issues/173
Related https://github.com/espressif/esp-mqtt/pull/174

Extended mqtt error handle to capture transport's socket errno (IDF
v4.3+)
esp-mqtt commit: 23c8e1ecf5

Config: Added configuration value to set network timeout
esp-mqtt commit: a03228ac46
Related https://github.com/espressif/esp-mqtt/pull/166

Used size_t for all lengths to allow for other architectures
esp-mqtt commit: b9db8d9020
 2020-11-19 17:17:40 +01:00
Mahavir Jain
a1c2141f82 Merge branch 'bugfix/fix_mbedtls_dynamic_resource_memory_leak' into 'master' 
fix(mbedtls): fix mbedtls dynamic resource memory leaks

Closes IDFGH-4251

See merge request espressif/esp-idf!9874
 2020-11-19 22:18:54 +08:00
Armando
9c507982aa spi: fix spi_ll.h func name 
On esp32 and esp32s2:
``spi_ll_dma_set_out_eof_generation`` is modified to
``spi_ll_dma_set_rx_eof_generation``.

``spi_dma_ll_set_rx_eof_generation`` is modified to
``spi_dma_ll_set_out_eof_generation``.

Because on ESP32S3, this bit ``out_eof_mode`` is moved to DMA related
registers.
 2020-11-19 19:33:02 +08:00
Mahavir Jain
30bc5dec1a Merge branch 'bugfix/redirection' into 'master' 
esp_http_client: Skip check for redirection counter if status code is success, fix issue with digest auth, configurable user agent string.

Closes IDFGH-4009 and IDFGH-4184

See merge request espressif/esp-idf!10707
 2020-11-19 19:09:48 +08:00
Scott Shell
8c09fbf6f1 Make the UserAgent string in esp-http-client configurable 
Signed-off-by: Shubham Kulkarni <shubham.kulkarni@espressif.com>

Merges https://github.com/espressif/esp-idf/pull/6044
 2020-11-19 14:43:14 +05:30
Shubham Kulkarni
aceb38c326 http_auth.c: Fix crash when opaque field is not present in challenge string 
Closes: https://github.com/espressif/esp-idf/issues/5888
 2020-11-19 14:43:14 +05:30
Shubham Kulkarni
83f4ebf852 esp_http_client: Skip check for redirection counter if status code is success. 
Set disable_auto_redirect in esp_http_client example to validate this condition in CI
 2020-11-19 14:43:14 +05:30
David Čermák
4f0428a811 Merge branch 'feature/ws_server_subprotocols' into 'master' 
http_server: adds support for setting websocket subprotocol

See merge request espressif/esp-idf!10783
 2020-11-19 16:29:19 +08:00
Dong Heng
1c9592efc4 fix(mbedtls): fix mbedtls dynamic resource memory leaks and RSA cert drop earlier 
RX process caches the session information in "ssl->in_ctr" not in "ssl->in_buf".
So when freeing the SSL, can't free the "ssl->in_ctr", because the "ssl->in_buf"
is empty.

Make the RX process like TX process, and cache the session information in
"ssl->in_buf", so that the cache buffer can be freed when freeing the SSL.

Closes https://github.com/espressif/esp-idf/issues/6104
 2020-11-19 07:31:50 +00:00
xueyunfei
3b6014f5a0 fix bug for tcp recv assert 2020-11-19 12:16:49 +08:00
weitianhua
56f0978caa Add protection for interval_min when it comes to zero 2020-11-19 11:05:40 +08:00
Angus Gratton
2558830339 Merge branch 'bugfix/sha_lldesc_scop' into 'master' 
SHA: fix dma lldesc going out of scope issue

See merge request espressif/esp-idf!11272
 2020-11-19 10:07:31 +08:00
Roland Dobai
2ecf66eba3 tools: Wait and dump the initial messages during gdbmi initialization 2020-11-18 19:08:16 +01:00
Roland Dobai
82ee1d4683 tools: Increase the internal GDB response delay for espcoredump CI tests 2020-11-18 18:56:30 +01:00
Roland Dobai
646f3fb801 tools: Fix non-existing key in espcoredump's GDMI payload 2020-11-18 18:56:30 +01:00
Jiang Jiang Jian
a139bceb0a Merge branch 'feature/11kv_roaming' into 'master' 
esp_wifi: 11kv support for network assisted roaming

Closes WIFI-2471

See merge request espressif/esp-idf!9474
 2020-11-18 20:40:36 +08:00
Michael (XIAO Xufeng)
9277306aef Merge branch 'bugfix/fix_rtc_wdt_in_light_sleep_process' into 'master' 
RTC(bugfix): compile the regi2c_ctrl.c code to iram

See merge request espressif/esp-idf!10931
 2020-11-18 20:30:25 +08:00
Michael (XIAO Xufeng)
6dbf72acf9 Merge branch 'bugfix/fix_driver_dac_ci_fail' into 'master' 
Driver(DAC): fix testcase fail for DAC of esp32s2

See merge request espressif/esp-idf!10905
 2020-11-18 20:30:03 +08:00