chenyudong
|
f67f9d5b4e
|
mesh: remove coexist warnings in ESP_WIFI_MESH
1. remove warning log when mesh is started:
Error! Should use default passive scan time parameter for WiFi scan when Bluetooth is enabled!!!!!!
2. remove abort when mesh is started:
Error! Should enable WiFi modem sleep when both WiFi and Bluetooth are enabled!!!!!!
Closes: https://github.com/espressif/esp-idf/issues/5357
Closes: https://github.com/espressif/esp-idf/issues/5440
Closes: https://github.com/espressif/esp-idf/issues/5210
|
2020-06-29 11:28:16 +08:00 |
|
Ivan Grokhotkov
|
45fff86e05
|
Merge branch 'feature/usb_console_ig' into 'master'
add USB CDC as a console option
Closes IDF-1620
See merge request espressif/esp-idf!8459
|
2020-06-29 05:16:15 +08:00 |
|
Ivan Grokhotkov
|
3e7506ccda
|
examples/console: error out if built with USB CDC enabled
|
2020-06-26 15:38:49 +02:00 |
|
Ivan Grokhotkov
|
b767e6191d
|
examples/console: add check for CONFIG_ESP_CONSOLE_UART_NUM
|
2020-06-26 15:38:49 +02:00 |
|
Ivan Grokhotkov
|
f07a7805a6
|
esptool: update for CDC stub support
|
2020-06-26 15:38:49 +02:00 |
|
Ivan Grokhotkov
|
5985c07ab7
|
docs: add section about USB CDC console
|
2020-06-26 15:38:49 +02:00 |
|
Ivan Grokhotkov
|
9548aea3e4
|
examples: add console_usb example for USB CDC
|
2020-06-26 15:38:49 +02:00 |
|
Ivan Grokhotkov
|
e94848556b
|
esp32, esp32s2: update console initialization
|
2020-06-26 15:38:49 +02:00 |
|
Ivan Grokhotkov
|
fc8cd4048d
|
vfs: add vfs_cdcacm driver (aka USB CDC)
|
2020-06-26 15:38:49 +02:00 |
|
Ivan Grokhotkov
|
34f441249b
|
esp32s2: add internal usb_console API
|
2020-06-26 15:38:49 +02:00 |
|
Ivan Grokhotkov
|
6dfb2d83a7
|
bootloader: combine console code for ESP32 and S2, add USB support
|
2020-06-26 15:38:49 +02:00 |
|
Ivan Grokhotkov
|
5ee75165f2
|
esp_common: add "USB CDC" option for console output
|
2020-06-26 15:38:49 +02:00 |
|
Mahavir Jain
|
7c5a5617a8
|
Merge branch 'bugfix/http_server_lru' into 'master'
esp_http_server: Update LRU counter on accepting a new connection
Closes IDFGH-1594
See merge request espressif/esp-idf!9345
|
2020-06-26 14:48:04 +08:00 |
|
Angus Gratton
|
d02edc2bd1
|
Merge branch 'bugfix/esp32_encrypted_flash_write' into 'master'
spi_flash: esp32: fix regression in encrypted flash write
See merge request espressif/esp-idf!9286
|
2020-06-26 14:35:43 +08:00 |
|
Shubham Kulkarni
|
0ec5096742
|
esp_http_server: Update LRU counter on accepting a new connection
Closes https://github.com/espressif/esp-idf/issues/3851
|
2020-06-26 05:29:00 +00:00 |
|
Anton Maklakov
|
398b6a5b69
|
Merge branch 'bugfix/ut_job_count' into 'master'
ci: increase the number of unit test jobs
See merge request espressif/esp-idf!9346
|
2020-06-26 12:47:42 +08:00 |
|
Ivan Grokhotkov
|
81ba01b9c5
|
ci: increase the number of unit test jobs
|
2020-06-25 19:24:46 +02:00 |
|
Ivan Grokhotkov
|
0f3aa8f520
|
Merge branch 'feature/idfpy_serial_ext_formatting' into 'master'
Tools: Update formatting at serial_ext.py
See merge request espressif/esp-idf!8954
|
2020-06-25 17:40:06 +08:00 |
|
Ivan Grokhotkov
|
ebe62ee6d0
|
Merge branch 'bugfix/exception_crash_workaround' into 'master'
toolchain: C++ exception workarounds
Closes IDF-1128, IDF-1301, and IDF-1804
See merge request espressif/esp-idf!8967
|
2020-06-25 17:39:20 +08:00 |
|
Angus Gratton
|
22d9ff5b05
|
Merge branch 'feature/block_sha_fallback' into 'master'
esp32s2 SHA: fallback to hashing block by block for non DMA memory
Closes IDF-1529
See merge request espressif/esp-idf!8293
|
2020-06-25 09:30:39 +08:00 |
|
Angus Gratton
|
40d7ea68af
|
Merge branch 'bugfix/ci_softap_example_test' into 'master'
Set sleep time to allow wlan0 to connect to softap
See merge request espressif/esp-idf!9258
|
2020-06-25 09:06:55 +08:00 |
|
Shivani Tipnis
|
76232fd263
|
ci: Set sleep time to allow wlan0 to connect to softap
|
2020-06-24 23:07:46 +05:30 |
|
Ivan Grokhotkov
|
4f8c42ca73
|
esp_rom: add patch to set USB device serial descriptor to MAC address
|
2020-06-24 15:50:51 +02:00 |
|
Ivan Grokhotkov
|
4901917ea3
|
esp_rom: add USB related headers from the ROM code
|
2020-06-24 15:50:51 +02:00 |
|
Ivan Grokhotkov
|
dafc6676ae
|
examples/console: allow not registering sleep related commands
|
2020-06-24 15:50:51 +02:00 |
|
Ivan Grokhotkov
|
002c50540b
|
vfs: move line ending definitions into esp_vfs_common
|
2020-06-24 15:50:51 +02:00 |
|
Ivan Grokhotkov
|
012f9702ad
|
driver: make sure UART is idle before starting the test
|
2020-06-24 15:50:51 +02:00 |
|
Ivan Grokhotkov
|
0620890028
|
bootloader, rtc: don't disable PLL if it is already enabled
|
2020-06-24 15:50:51 +02:00 |
|
Ivan Grokhotkov
|
19c73192ba
|
ble_mesh_coex_test: fix deprecated Kconfig option name
|
2020-06-24 15:50:51 +02:00 |
|
Ivan Grokhotkov
|
f54d771cd3
|
linenoise: actively flush the output stream, in case it is buffered
|
2020-06-24 15:50:51 +02:00 |
|
Angus Gratton
|
440574d13b
|
Merge branch 'ci/http_client_remove_httpbin_redirect' into 'master'
ci: Temporarily remove the esp_http_client httpbin redirect tests
See merge request espressif/esp-idf!9298
|
2020-06-24 21:03:04 +08:00 |
|
Krzysztof Budzynski
|
09de90eda3
|
Merge branch 'doc/fix_formatting_issues_described_in_DOC_257' into 'master'
fix the formatting issues described in DOC-257
See merge request espressif/esp-idf!9285
|
2020-06-24 18:16:12 +08:00 |
|
Jakob Hasse
|
f4c2f680f7
|
toolchain: C++ exception workarounds
* enable C++ exception crash workaround
* disable C++ crash workaround
Closes https://github.com/espressif/esp-idf/issues/5360
Closes IDF-1128
Closes IDF-1301
Closes IDF-1804
|
2020-06-24 17:55:35 +08:00 |
|
He Yin Ling
|
23801b3517
|
Merge branch 'bugfix/ci_debug_backend_import' into 'master'
CI: Ignore error if py_debug_backend is not installed
See merge request espressif/esp-idf!9269
|
2020-06-24 14:44:44 +08:00 |
|
Angus Gratton
|
40f5ac4cd4
|
ci: Temporarily remove the esp_http_client httpbin redirect tests
Need to host httpbin ourselves or wait for
postmanlabs/httpbin/issues/617 to be resolved
|
2020-06-24 03:26:39 +00:00 |
|
Wang Fang
|
256571a4f4
|
fix the formatting issues described in DOC-257
|
2020-06-24 02:47:12 +00:00 |
|
Angus Gratton
|
e036d92449
|
Merge branch 'bugfix/ble_mesh_fix_make_fail' into 'master'
ble_mesh: ci: Fix failing to compile when using make
See merge request espressif/esp-idf!9299
|
2020-06-24 10:25:35 +08:00 |
|
lly
|
973f2481ec
|
ble_mesh: ci: Fix failing to compile when using make
|
2020-06-24 09:43:33 +08:00 |
|
Michael (XIAO Xufeng)
|
91310381d5
|
Merge branch 'test/fix_psram_readid_redundant' into 'master'
spiram: fix the read id failure
See merge request espressif/esp-idf!9275
|
2020-06-24 00:34:59 +08:00 |
|
Jiang Jiang Jian
|
2955342e9c
|
Merge branch 'doc/add_UUID_description_in_gattc_demo' into 'master'
docs:add 128-bit UUID description
Closes BCI-202
See merge request espressif/esp-idf!9189
|
2020-06-23 22:01:58 +08:00 |
|
Ivan Grokhotkov
|
46bcea0f21
|
Merge branch 'refactor/common_rom_crc_apis' into 'master'
esp_rom: extract common CRC apis into esp_rom_crc.h
See merge request espressif/esp-idf!9253
|
2020-06-23 21:21:13 +08:00 |
|
Ivan Grokhotkov
|
16a9252d4b
|
Merge branch 'feature/add_esp32s3_soc_description_files' into 'master'
soc: add soc descriptions for esp32s3
See merge request espressif/esp-idf!9238
|
2020-06-23 21:19:56 +08:00 |
|
Ivan Grokhotkov
|
bc97a1c433
|
Merge branch 'bugfix/idf_py_help_env_var' into 'master'
Tools: Mention ESPPORT and ESPBAUD in idf.py --help
Closes IDFGH-3506
See merge request espressif/esp-idf!9287
|
2020-06-23 21:15:32 +08:00 |
|
Roland Dobai
|
50e817fc77
|
CI: Ignore error if py_debug_backend not installed
|
2020-06-23 13:45:12 +02:00 |
|
Roland Dobai
|
995676010e
|
Tools: Mention ESPPORT and ESPBAUD in idf.py --help
Closes https://github.com/espressif/esp-idf/issues/5461
|
2020-06-23 13:40:19 +02:00 |
|
Island
|
3266511582
|
Merge branch 'bugfix/ble_mesh_split_tinycrypt' into 'master'
Bugfix/ble mesh split tinycrypt
See merge request espressif/esp-idf!9098
|
2020-06-23 19:07:31 +08:00 |
|
Island
|
07b15b0d36
|
Merge branch 'bugfix/ble_mesh_get_node_with_name' into 'master'
ble_mesh: Get node info with pre-configured node name
Closes BMCI-88
See merge request espressif/esp-idf!9089
|
2020-06-23 19:04:06 +08:00 |
|
Island
|
33282d9c94
|
Merge branch 'bugfix/ble_mesh_check_subnet_before_update_beacon_sent' into 'master'
ble_mesh: Check if subnet exists before updating beacon_sent
Closes BLEMESH-198
See merge request espressif/esp-idf!8709
|
2020-06-23 19:03:50 +08:00 |
|
Island
|
5c8cde657f
|
Merge branch 'bugfix/ble_mesh_example_tag_define' into 'master'
ble_mesh: Move TAG definition to each example
See merge request espressif/esp-idf!9092
|
2020-06-23 19:03:24 +08:00 |
|
Island
|
1420b6dd89
|
Merge branch 'bugfix/ble_mesh_bt_hex' into 'master'
ble_mesh: Fix wrong log output with bt_hex
See merge request espressif/esp-idf!9119
|
2020-06-23 19:02:58 +08:00 |
|