Island
a97a16202e
Merge branch 'bugfix/ble_mesh_compile_error' into 'master'
...
bugfix: ble mesh proxy compile error
See merge request espressif/esp-idf!9334
2020-07-01 11:17:26 +08:00
Island
b91f05ba74
Merge branch 'bugfix/ble_mesh_set_recv_rssi' into 'master'
...
Bugfix/ble mesh set recv rssi
Closes IDFGH-3556 and BMCI-96
See merge request espressif/esp-idf!9381
2020-07-01 11:13:25 +08:00
Jiang Jiang Jian
abef43bf09
Merge branch 'mesh/bugfix_coexist_warning' into 'master'
...
mesh: remove coexist warnings in ESP_WIFI_MESH
Closes WIFI-2458, IDFGH-3385, IDFGH-3211, and IDFGH-3481
See merge request espressif/esp-idf!9218
2020-06-30 19:34:36 +08:00
Michael (XIAO Xufeng)
a21d3441cc
Merge branch 'feature/twai_support_esp32s2' into 'master'
...
TWAI: Add ESP32-S2 support
Closes IDF-1455
See merge request espressif/esp-idf!8973
2020-06-30 19:19:47 +08:00
Darian Leung
97721d469c
TWAI: Add ESP32-S2 support
...
This commit adds TWAI driver support for the
ESP32-S2. The following features were added:
- Expanded BRP support
- Expanded CLKOUT Divider Support
- Updated example READMEs
2020-06-30 16:56:03 +08:00
Angus Gratton
8912462d95
Merge branch 'bugfix/adjtime_return_outdelta_before_new_delta_set' into 'master'
...
newlib: Fix adjtime, returns the amount of time remaining from any previous adjustment
Closes IDFGH-3192 and IDFGH-3187
See merge request espressif/esp-idf!9105
2020-06-30 13:15:23 +08:00
Jiang Jiang Jian
f84ddd983d
Merge branch 'feature/bt_secure_conn_downgrade_check' into 'master'
...
Bluedroid: Authentication fixes in Legacy and Secure Connection.
Closes BLE-60
See merge request espressif/esp-idf!8541
2020-06-30 11:24:55 +08:00
Jiang Jiang Jian
ce1f1ea000
Merge branch 'bugfix/fix_ping_specify_length_issue' into 'master'
...
bugfix: fix ICMP specify length issue
Closes WIFI-2497
See merge request espressif/esp-idf!9280
2020-06-29 21:12:12 +08:00
lly
6aef6c5f1c
ble_mesh: stack: Copy recv_rssi for other received messages
...
Follow the commit: 2b80cb6883
,
copy the recv_rssi for other mesh messages.
2020-06-29 20:07:42 +08:00
mbroek
2b80cb6883
When a generic mesh model message is received "bt_mesh_generic_server_cb_evt_to_btc" copies the
...
ctx values to cb_params for the mesh stack.
recv_rssi was not copied.
This means the rssi could not be read when receiving generic server messages using ble_mesh.
2020-06-29 19:54:23 +08:00
Ivan Grokhotkov
84833bf0df
Merge branch 'feature/light_sleep_reject' into 'master'
...
sleep: enable sleep reject when entering light sleep
Closes IDF-1678 and WIFI-1185
See merge request espressif/esp-idf!9242
2020-06-29 15:57:49 +08:00
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
lly
c8112454c3
ble_mesh: stack: Fix compile error when only proxy enabled
...
Also remove some redundant CONFIG_BLE_MESH_PROXY checks, because
when the following options are satisfied, the CONFIG_BLE_MESH_PROXY
option will be selected mandatorily.
2020-06-28 23:09:47 +00: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
ronghulin
9230e0d26d
bugfix: fix ICMP specify length issue
2020-06-28 10:46:43 +08:00
Ivan Grokhotkov
f07a7805a6
esptool: update for CDC stub support
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
Chinmay Chhajed
e3350e7861
Bluedroid: Authentication fixes in Legacy and Secure Connection.
...
Prevent a remote device from doing a Bluetooth Impersonation Attack
(BIAS) by:
- Preventing remote device to downgrade secure connection
feature mask. Secure connection feature mask should remain same or
increase to enabled in link key generation and authentication.
- Doing a mutual authentication during Legacy Authentication.
Signed-off-by: Chinmay Chhajed <chinmay.chhajed@espressif.com>
2020-06-25 15:37:01 +05:30
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
Ivan Grokhotkov
4e30e8801c
sleep: enable sleep reject when entering light sleep
2020-06-24 15:45:42 +00:00
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
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
f54d771cd3
linenoise: actively flush the output stream, in case it is buffered
2020-06-24 15:50:51 +02: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
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
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
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
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
Island
371d590ca7
Merge branch 'bugfix/ble_mesh_not_define_bool' into 'master'
...
Bugfix/ble mesh not define bool
Closes IDFGH-3078 and BMCI-71
See merge request espressif/esp-idf!9135
2020-06-23 19:02:05 +08:00
Island
b73101d436
Merge branch 'bugfix/ble_mesh_check_model_status' into 'master'
...
ble_mesh: stack: Check model status with variable length
See merge request espressif/esp-idf!9257
2020-06-23 19:01:52 +08:00
Mahavir Jain
5b9b5d9636
spi_flash: esp32: fix regression in encrypted flash write
...
In commit 309376f51a
, it seems like regression
was added to use ROM level API for disabling flash write protection. This
started random firmware crashes (on specific modules) with exception
`IllegalInstruction` during encrypted flash writes.
Fix here removes relevant ROM API call, since disabling flash write protection
is already ensured by caller of this API.
Closes https://github.com/espressif/esp-idf/issues/5467
2020-06-23 16:08:04 +05:30
morris
a34409cffc
esp_rom: extract common CRC apis into esp_rom_crc.h
2020-06-23 16:40:14 +08:00
Hrishikesh Dhayagude
636d685eab
Update tinycbor submodule in ESP-IDF
2020-06-23 08:20:16 +00:00
morris
4857dc5e2b
soc: add soc descriptions for esp32s3
2020-06-23 15:10:09 +08:00
Michael (XIAO Xufeng)
26272af3b4
Merge branch 'test/esp_flash_rw_performance_thr' into 'master'
...
esp_flash: decrease some of the performance threshold
See merge request espressif/esp-idf!8843
2020-06-23 14:34:19 +08:00