Angus Gratton
ff8d05466e
Merge branch 'bugfix/deep_sleep_stub_heap_rtc_fast_mem' into 'master'
...
deep sleep: Calculate RTC CRC without using any stack or other RTC heap memory
Closes IDF-2242
See merge request espressif/esp-idf!10741
2020-10-13 06:17:50 +08:00
Mahavir Jain
0b71a0a46d
Merge branch 'bugfix/esp_https_ota_error_codes' into 'master'
...
esp_https_ota: fix error code formatting
See merge request espressif/esp-idf!10809
2020-10-12 22:39:31 +08:00
Michael (XIAO Xufeng)
fc7433d610
Merge branch 'feature/twai_isr_runs_with_cache_disabled' into 'master'
...
TWAI: ISR runs when cache is disabled
See merge request espressif/esp-idf!9920
2020-10-12 20:18:36 +08:00
Ivan Grokhotkov
85f919a428
esp_https_ota: fix error code formatting
2020-10-12 13:46:15 +02:00
Michael (XIAO Xufeng)
f5e4638c54
Merge branch 'feature/tusb_cdc_without_timer' into 'master'
...
Update `tinyusb_cdcacm_write_flush` to using ticks counting instead of the FreeRTOS timer
See merge request espressif/esp-idf!10738
2020-10-12 19:45:57 +08:00
Andrei Gramakov
ab33f55e1b
tinyusb: Fix a strncpy-related warning caused by a wrong argument
...
The issue was in using with `strncpy` a size of source array instead of using a size of destination array.
2020-10-12 12:30:42 +02:00
Jiang Jiang Jian
b8d26ca389
Merge branch 'bugfix/assert_no_IRAM_ATTR' into 'master'
...
components/bt: btdm fix cache disable crash
See merge request espressif/esp-idf!10778
2020-10-12 16:58:26 +08:00
Michael (XIAO Xufeng)
b821025312
Merge branch 'bugfix/uart_test_debug' into 'master'
...
driver: add diagnostic information into UART test, enable flow control
See merge request espressif/esp-idf!10627
2020-10-12 15:50:33 +08:00
fuzhibo
9cd5e6f8c9
bugfix(adc): missing ranges of ADC codes in ESP32
2020-10-12 07:41:03 +00:00
Angus Gratton
ff4d82c7d2
Merge branch 'feature/sha_hal' into 'master'
...
SHA: add HAL layer and refactor
See merge request espressif/esp-idf!10065
2020-10-12 15:15:28 +08:00
Supreet Deshpande
2356be7c7a
Secure Boot V2: Fixes the OTA regression with secure boot in ESP32-V3
...
Closes https://github.com/espressif/esp-idf/issues/5905
2020-10-12 07:15:16 +00:00
Island
64fa998c0f
Merge branch 'optimize/ble_mesh_make_buf_config_invisible' into 'master'
...
ble_mesh: stack: Make mesh buf debug option invisible
See merge request espressif/esp-idf!10777
2020-10-12 14:14:50 +08:00
Michael (XIAO Xufeng)
3c167497ad
Merge branch 'bugfix/esp_flash_erase_timeout' into 'master'
...
esp_flash: change timeout threshold and can close timeout
Closes IDF-2023
See merge request espressif/esp-idf!10138
2020-10-12 12:49:36 +08:00
Cao Sen Miao
b9f6efd99a
esp_flash: change timeout threshold and can close timeout
2020-10-12 10:43:25 +08:00
xueyunfei
91fd587fb7
lwip/ipv6:ipv6 address get fail after wifi disconnect
2020-10-12 10:40:22 +08:00
lly
0d3c724281
ble_mesh: stack: Make mesh buf debug option invisible
2020-10-12 02:26:47 +00:00
Island
2b374ab7b8
Merge branch 'feat/ble_mesh_device_properties_v2' into 'master'
...
ble_mesh: Update mesh device property to v2
See merge request espressif/esp-idf!10754
2020-10-12 10:13:27 +08:00
Michael (XIAO Xufeng)
47e5dfb120
Merge branch 'feature/test_for_ext_flash_HSPI_on_esp32s2' into 'master'
...
spi_flash: add unit tests for HSPI on esp32s2
See merge request espressif/esp-idf!10040
2020-10-12 10:06:49 +08:00
lly
d3aa32c2ec
ble_mesh: stack: Add mesh device properties v2 definitions
...
Also fixes wrong characteristic value length of some device
properties.
2020-10-12 00:39:58 +00:00
lly
0b57cdf85b
ble_mesh: stack: Move device property to model common part
2020-10-12 00:39:58 +00:00
Angus Gratton
562ab01046
deep sleep: Calculate RTC CRC immediately before deep sleep, without using RAM
...
Fix for issues where RTC FAST memory is updated as part of going into deep
sleep. Very high risk if heaps are in RTC memory - in particular task stacks
may be in RTC memory, but also other variables.
Also fixes potential concurrency problems as RTC FAST memory is not accessible
by CPU during the CRC calculation itself.
Method:
- Disable interrupts (currently for single core only, will need update for S3)
- Load all registers before calculating CRC or going to sleep
2020-10-12 11:19:56 +11:00
Angus Gratton
bb480b72d0
Merge branch 'bugfix/parttool_init' into 'master'
...
parttool: make part_list an optional argument
See merge request espressif/esp-idf!10776
2020-10-12 06:36:48 +08:00
Anton Maklakov
c8d45f11b3
Merge branch 'ci/fast_template_app_s3' into 'master'
...
ci: add esp32s3 into template app build
See merge request espressif/esp-idf!10598
2020-10-11 19:00:48 +08:00
wangcheng
49a52cda6e
components/bt: btdm fix cache disable crash
2020-10-11 15:14:34 +08:00
Island
cbb9aca23a
Merge branch 'bugfix/ble_mesh_proxy_cfg_replay' into 'master'
...
Bugfix/ble mesh proxy cfg replay
See merge request espressif/esp-idf!10699
2020-10-10 21:07:42 +08:00
Nachiket Kukade
6ae4b3ef48
esp_wifi: Update wifi lib
...
1. Add STA checks during STA PMF operations
2. Fix WPA2-Ent issue with Open AP
3. Skip WPA-TKIP profile if PMF is required
4. Skip & clear Supplicant PMK Cache with mismatching AP config
2020-10-10 09:03:55 +00:00
Darian Leung
4c57f50fe4
TWAI: ISR runs when cache is disabled
...
This commit adds the feature where the TWAI ISR will continue to
run even if the cache is disabled. Whilst cache is disabled, any
received messages will go into the RX queue, and any pending TX
messages in the TX queue will be transmitted. This feature should
be enabled using the CONFIG_TWAI_ISR_IN_IRAM option.
2020-10-10 14:19:32 +08:00
Marius Vikhammer
b3e7b58d04
parttool: make part_list an optional argument
...
Previous versions of PartitionType only required type and subtype as
arguments for the constructor. Make the new part_list argument optional to
keep backwards compatibilty
2020-10-10 09:46:51 +08:00
Cao Sen Miao
98cb2e5af3
spi_flash: add a unit test for HSPI on esp32s2
2020-10-09 20:57:00 +08:00
Ivan Grokhotkov
eb83878323
Merge branch 'bugfix/coredump_thread_info_failure' into 'master'
...
espcoredump: fix exception when -thread-info fails
See merge request espressif/esp-idf!10720
2020-10-09 19:36:36 +08:00
Michael (XIAO Xufeng)
953c046550
esp32s3/bootloader: extend IRAM usage to 0x6000
...
The bootloader cannot fit in the size of iram_loader_seg when built under -O0. Extend the IRAM size to fix this.
2020-10-09 17:50:17 +08:00
lly
68a6ccba76
ble_mesh: stack: Store kr phase after value changed [Zephyr]
2020-10-09 08:52:01 +00:00
lly
e286cd845f
ble_mesh: stack: Fix rpl not check by proxy cfg [Zephyr]
2020-10-09 08:52:01 +00:00
Marius Vikhammer
949fb8e63a
SHA: add HAL layer and refactor driver
...
Add a LL and HAL layer for SHA.
2020-10-09 08:24:08 +00:00
Ivan Grokhotkov
a587cd1774
Merge branch 'bugfix/esp32s3_build' into 'master'
...
esp32s3: sync memprot header from esp32s2, fixing compilation error
See merge request espressif/esp-idf!10753
2020-10-09 15:58:11 +08:00
Angus Gratton
d6f8e9dfa8
Merge branch 'bugfix/delete_unneeded_cpu_h' into 'master'
...
esp32s2, esp32s3: delete unneeded cpu.h
See merge request espressif/esp-idf!10716
2020-10-09 13:54:56 +08:00
Angus Gratton
8aa73aea86
esp32s2/3: Add missing stdlib includes
...
All three of these headers refer to stdint types, memprot uses stdbool
2020-10-09 15:05:41 +11:00
Island
646599f6f8
Merge branch 'bugfix/nimble_host_rcv_pkt_length_check' into 'master'
...
NimBLE: host_rcv_pkt event buf size check.
Closes BT-1015
See merge request espressif/esp-idf!10108
2020-10-09 09:16:09 +08:00
Ivan Grokhotkov
aa489dba07
esp32s3: sync memprot header from esp32s2, fixing compilation error
...
Since 497b730e8f
, panic_handler.c calls
esp_memprot_get_active_intr_memtype instead of
esp_memprot_is_assoc_intr_any.
2020-10-08 22:20:39 +02:00
Andrei Gramakov
3164116abd
Update tinyusb_cdcacm_write_flush
to using ticks counting instead of the FreeRTOS timer
2020-10-08 09:42:44 +02:00
Mahavir Jain
c1bfaf7334
Merge branch 'bugfix/protocomm_mem_failure' into 'master'
...
protocomm_console.c: Check if memory is allocated to buf and if not then...
See merge request espressif/esp-idf!10733
2020-10-08 15:30:23 +08:00
Angus Gratton
4289ca3e0e
Merge branch 'feature/freertos_timer_task_optional' into 'master'
...
freertos: save up to 4 kB of RAM if timer functionality is not used by the app
See merge request espressif/esp-idf!10721
2020-10-08 11:26:13 +08:00
Martin Vychodil
497b730e8f
* memprot support for RTC_SLOW
...
* API upgrade
JIRA IDF-1636
2020-10-08 11:19:23 +08:00
Angus Gratton
e28cd68839
esp_system: Add test case for using deep sleep wake stub when stack is in RTC memory
...
This test currently fails on ESP32 & ESP32-S2, fix will be in next commit.
2020-10-08 11:17:27 +11:00
kewal shah
9a16b551ef
protocomm_console.c: Check if memory is allocated to buf and if not then return ESP_ERR_NO_MEM error
2020-10-06 10:13:40 +05:30
Angus Gratton
26a0df0423
Merge branch 'bugfix/bootloader_anti_rollback_mmap' into 'master'
...
bootloader_support: fix issue in memory mapping for getting app descriptor
Closes IDFGH-4038
See merge request espressif/esp-idf!10679
2020-10-06 07:44:37 +08:00
Angus Gratton
4b36da3f33
Merge branch 'feature/parttool_add_options_to_info_cmd' into 'master'
...
partition_table: Extend the get_partition_info command
See merge request espressif/esp-idf!10537
2020-10-06 07:35:32 +08:00
Chinmay Chhajed
3c0f06adb2
NimBLE: host_rcv_pkt event buf size check.
...
Check if the size of HCI event buffer is greater than the received HCI
packet. If not then abort with the error message.
2020-10-05 12:14:47 +00:00
KonstantinKondrashov
55dc1524ee
partition_table: Extend the get_partition_info command
...
A manufactory tool needs to retrieve info about partitions. With a new flag - "--part_list" we can get a list of partitions with the same type/subtype and easily iterate by it.
- name and flag arguments
- added flag "--part_list" to get a list of partitions with the same type/subtype
- save prev behavior of the get_partition_info command (return the only first item)
- added host test
2020-10-05 17:56:43 +08:00
David Čermák
28d2b7a9b3
Merge branch 'bugfix/esp_netif_non_lwip' into 'master'
...
esp-netif: Enable use of the ESP-IDF with a non-LWIP (and non-BSD-style) IP stack.
Closes IDFGH-3971
See merge request espressif/esp-idf!10472
2020-10-05 16:16:11 +08:00
David Čermák
f1eb4b827e
Merge branch 'bugfix/lwip_netdb_cpp_guards' into 'master'
...
lw-IP: Changed to C linkage in netdb.h for fixing bug when using mixed C/C++ code
Closes IDFGH-4027
See merge request espressif/esp-idf!10681
2020-10-05 15:51:00 +08:00
David Čermák
39b9e46273
Merge branch 'bugfix/optionally_set_smi_gpio' into 'master'
...
esp_eth_mac_esp32: optionally setup SMI GPIO's
Closes IDFGH-4030
See merge request espressif/esp-idf!10589
2020-10-05 15:24:11 +08:00
Angus Gratton
1eefe6494c
Merge branch 'feature/rsa_caps' into 'master'
...
RSA: add max RSA bit len as a soc caps
See merge request espressif/esp-idf!10594
2020-10-05 12:56:28 +08:00
Michael (XIAO Xufeng)
637ca4b15d
bootloader_support: fix fix spi flash clock config error
...
Relates to: https://github.com/espressif/esp-idf/issues/5099
2020-10-03 04:37:52 +00:00
Michael (XIAO Xufeng)
a263d9a8e4
Merge branch 'fix/esp_flash_idle_logic' into 'master'
...
esp_flash: fix the incorrect check_idle logic in LL and chip_driver
See merge request espressif/esp-idf!10530
2020-10-03 09:18:41 +08:00
Ivan Grokhotkov
654124adf0
freertos: don't create timer task if timer APIs are not used
...
Saves 2496 bytes of heap for the hello-world app on the ESP32,
and 4080 bytes of heap on the ESP32-S2 (due to IRAM savings).
2020-10-02 17:58:36 +02:00
Ivan Grokhotkov
8c246fd4f3
driver: add diagnostic information into UART test, enable flow control
2020-10-02 17:33:35 +02:00
Ivan Grokhotkov
5eebdd1de2
espcoredump: fix exception when -thread-info fails
...
GDB "-thread-info N" command (for a specific thread N) may fail if
GDB can not perform a backtrace. At the same time, "-thread-info"
command succeeds in this situation, returning information for all
threads.
Replace repeated calls to "-thread-info N" with a single call to
"-thread-info", also reducing the total execution time.
2020-10-02 16:54:32 +02:00
Angus Gratton
001a6be9b1
Merge branch 'bugfix/esp_pm_ignore_failing_test' into 'master'
...
esp_pm: temporarily disable failing test
See merge request espressif/esp-idf!10683
2020-10-02 14:01:28 +08:00
Michael (XIAO Xufeng)
fe37db3271
esp_flash: fix the incorrect check_idle logic in LL and chip_driver
2020-10-02 05:34:36 +00:00
Mahavir Jain
92b72aa6c8
Merge branch 'bugfix/http_digest_auth' into 'master'
...
esp_http_client: Include port in host field, fix return type in API declaration
Closes IDFGH-1344
See merge request espressif/esp-idf!10590
2020-10-01 16:47:26 +08:00
Mahavir Jain
b9c14aa65d
Merge branch 'bugfix/esp_coredump_fixes_for_s2' into 'master'
...
esp_coredump: rename all config options to have generic `ESP` prefix
See merge request espressif/esp-idf!10697
2020-10-01 16:40:13 +08:00
Ivan Grokhotkov
db09f9815b
Merge branch 'bugfix/apptrace_opt2_build' into 'master'
...
apptrace: Fixes multiple defs of '__esp_apptrace_trax_eri_updated' for O2 builds
See merge request espressif/esp-idf!10690
2020-09-30 22:57:46 +08:00
Mahavir Jain
20af94ff53
Coredump config option rename throughout IDF
2020-09-30 20:22:27 +05:30
Mahavir Jain
bd19088125
esp_system: initialize coredump for ESP32-S2
...
This was regression introduced in recent refactoring changes
from startup code.
2020-09-30 20:22:27 +05:30
Mahavir Jain
237087a5ca
espcoredump: remove ESP32 prefix from config options
...
- This component is applicable for ESP32 and ESP32-S2, hence the change
- Backward compatibility is maintained using `sdkconfig.rename` file
2020-09-30 20:22:27 +05:30
Shubham Kulkarni
b06035443f
esp_http_client: Include port in host field
...
Closes: https://github.com/espressif/esp-idf/issues/3628
2020-09-30 15:39:42 +05:30
Renz Bagaporo
72176e275d
esp32s2, esp32s3: delete unneeded cpu.h
2020-09-30 17:58:00 +08:00
Shubham Kulkarni
661c18c578
esp_http_client.h: Fix return type in declaration of esp_http_client_flush_response.
...
Closes: https://github.com/espressif/esp-idf/pull/5845
2020-09-30 11:25:07 +05:30
Mahavir Jain
ab988ab5ca
bootloader_support: move anti rollback API to common loader section
...
API `bootloader_common_get_partition_description` is required for
anti-rollback feature and should be part of common loader code.
2020-09-30 11:13:13 +05:30
Mahavir Jain
5b344610c9
bootloader_support: fix issue in memory mapping for getting app descriptor
...
For getting secure_version field in anti rollback case, bootloader tries
to map whole firmware partition but fails for cases where partition size
is beyond available MMU free pages capacity.
Fix here insures to map only required length upto application descriptor
size in firmware partition.
Closes https://github.com/espressif/esp-idf/issues/5911
2020-09-30 11:13:13 +05:30
Jiang Jiang Jian
c34c961910
Merge branch 'bugfix/coex_some_bugfix_about_ble_dyn_prio' into 'master'
...
components/coex: Some bugfix about ble dynamic prio
Closes BT-1025
See merge request espressif/esp-idf!10189
2020-09-30 10:48:12 +08:00
Angus Gratton
83a7891f84
Merge branch 'feature/intr_alloc' into 'master'
...
feature/intr_alloc: moved interrupt allocator to the esp-system and refactored it moving all platform specific code to its place
Closes IDF-1913
See merge request espressif/esp-idf!10267
2020-09-30 07:44:12 +08:00
Felipe Neves
2e826b7a8f
intr_alloc: split interrupt allocator into common-code and platform-code
...
esp_system: removed repeated interrupt allocator code and moved common code to esp_system
xtens: moved xtensa specific code from freertos to the xtensa component
hal/interrupt_controller: added interrupt controller hal and ll files
docs: update the doxyfile with new location of esp_itr_alloc.h file
xtensa: fixed dangerous relocation problem after moving xtensa interrupt files out of freertos
docs: removed Xtensa reference from intr_allocator api-reference
xtensa: pushed the interrupt function that manages non iram interrupts to the xtensa layer
esp_system/test: fixed platform dependent setting for intr_allocator tests
hal: rename the functions used to manage non iram interrupt mask.
2020-09-30 07:44:12 +08:00
Alexey Gerenkov
1850941550
apptrace: Fixes multiple defs of '__esp_apptrace_trax_eri_updated' for O2 builds
2020-09-29 18:19:34 +03:00
baohongde
628655b6be
components/coex: Some bugfix about ble dynamic prio
...
Rewrite ble dynamic prio to fix ble disconn in conn_param_update/channel_map_update
Rewrite ble dynamic prio in connection establishment
Fix ble dynamic prio with latency
Fix status bit set error when conn fail
2020-09-29 21:08:13 +08:00
Jiang Jiang Jian
07499cc898
Merge branch 'feature/8021x_sha256_akm_support' into 'master'
...
esp_wifi: Add support for 802.1x sha256 auth key mode
Closes WIFI-2773
See merge request espressif/esp-idf!10412
2020-09-29 20:45:12 +08:00
Renz Bagaporo
04c67e83f3
esp_pm: temporarily disable failing test
2020-09-29 18:35:47 +08:00
kapil.gupta
ebc0b42c75
esp_wifi: Add support for 802.1x sha256 auth key mode
...
Closes https://github.com/espressif/esp-idf/issues/5805
2020-09-29 15:23:39 +05:30
mathiasbredholt
8a102926f8
lwip: Changed to C linkage for fixing bug when using mixed C/C++ code
...
Merges https://github.com/espressif/esp-idf/pull/5900
2020-09-29 11:47:32 +02:00
Jiang Jiang Jian
96d59ff3e9
Merge branch 'bugfix/fix_bredr_read_rssi_delta' into 'master'
...
Bugfix/Fix Read Rssi Delta Bug in Bredr
Closes IDFGH-3739
See merge request espressif/esp-idf!10574
2020-09-29 16:47:43 +08:00
Michael (XIAO Xufeng)
f4aacbef9b
Merge branch 'feature/support_access_internal_i2c_register' into 'master'
...
feature(rtc): add new APIs support access internal i2c register
See merge request espressif/esp-idf!10039
2020-09-29 08:08:51 +08:00
Sachin Billore
e34204c9c1
HMAC: adds test case for downstream JTAG Re-enable support
...
Closes IDF-802
2020-09-28 23:41:52 +05:30
Sachin Billore
0e5cf0f34d
HMAC: adding downstream JTAG Re-enable support
...
Closes IDF-802
2020-09-28 23:40:59 +05:30
Island
a46ab4ae84
Merge branch 'bugfix/channel_map_send_time' into 'master'
...
component/bt: Insert the llcp packet to the top of the tx_preg linked list.
Closes BT-993
See merge request espressif/esp-idf!10170
2020-09-28 21:49:48 +08:00
Mahavir Jain
79f52a0658
Merge branch 'fix/mbedtls_target_library_link' into 'master'
...
mbedtls: Fixed target library linking when using the DS peripheral
See merge request espressif/esp-idf!10650
2020-09-28 20:35:30 +08:00
Michael (XIAO Xufeng)
c449a0efe2
Merge branch 'bugfix/gdma_ll_tx_fifo' into 'master'
...
gdma: fix incorrect calculation of tx fifo size
See merge request espressif/esp-idf!10610
2020-09-28 15:51:25 +08:00
Jiang Jiang Jian
1dc850b95b
Merge branch 'bugfix/update_esp32_phy_v4500' into 'master'
...
esp_wifi: update esp32 phy v4500
See merge request espressif/esp-idf!10621
2020-09-28 15:44:47 +08:00
Michael (XIAO Xufeng)
4e781d1263
Merge branch 'bugfix/flash_clear_WEL_rom_patch' into 'master'
...
spi_flash: ROM patch for clearing WEL bit for unlock
See merge request espressif/esp-idf!10540
2020-09-28 15:36:19 +08:00
Aditya Patwardhan
db3cbf91f9
mbedtls: Fixed target library linking when using the DS peripheral
2020-09-28 12:58:54 +05:30
Jiang Jiang Jian
caba103d51
Merge branch 'bugfix/add_clear_bond_complete_evt' into 'master'
...
componenet_bt/bugfix: add remove bond device complete event
Closes BT-1013
See merge request espressif/esp-idf!10342
2020-09-28 14:39:40 +08:00
Cao Sen Miao
f448e97fea
flash:patch for clearing WEL in ROM
2020-09-28 12:53:06 +08:00
ChenJianxing
f3813c9062
esp_wifi: update esp32 phy v4500
...
improve frequence offset feature.
2020-09-28 11:42:05 +08:00
Michael (XIAO Xufeng)
c7264f04c6
Merge branch 'bugfix/fix_incorrect_i2s_pdm_clk_issue' into 'master'
...
Bugfix(I2S): Fix I2S PDM clock incorrect issue when using APLL.
Closes IDFGH-3423 and IDFGH-3106
See merge request espressif/esp-idf!9101
2020-09-28 11:35:31 +08:00
Michael (XIAO Xufeng)
60fb1a6ef3
Merge branch 'bugfix/spi_add_flash' into 'master'
...
spi_flash: fix a logic bug in checking ex_flash and psram
Closes IDFGH-2230
See merge request espressif/esp-idf!10009
2020-09-28 10:47:07 +08:00
Jiang Jiang Jian
b963dd3b32
Merge branch 'bugfix/no_event_for_connect' into 'master'
...
esp_wifi: fix the bug that no event when run connect twice
Closes WIFI-2390
See merge request espressif/esp-idf!10515
2020-09-27 23:16:49 +08:00
Jiang Jiang Jian
07f7ae7df0
Merge branch 'bugfix/bredr_bugfix_release_for_qa_dummy_disconnect' into 'master'
...
component_bt/bugfix: fix a2dp test case dummy and disconnect
Closes BT-706
See merge request espressif/esp-idf!10184
2020-09-27 21:15:43 +08:00
baohongde
acce9e5fea
components/bt: Replace task post with btc_inter_profile_call, when post message from btc_dm to btc_gap
2020-09-27 19:55:12 +08:00
baohongde
dac798afbb
components/bt: Fix crash in BTM_SetPowerMode after disconnect
...
Introduced by commit 0583a049
2020-09-27 19:55:12 +08:00
baohongde
ecd75ec652
components/bt: Fix clear bond fail when connected without ble included
2020-09-27 19:55:12 +08:00