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
13,813 Commits 20 Branches 148 Tags 384 MiB
a97a16202e
Commit Graph

13813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Island
9e23affd65 Merge branch 'bugfix/ble_mesh_readme_fix' into 'master' 
ble_mesh: example: Fix example README & tutorial link error

Closes BMCI-97 and IDFGH-3558

See merge request espressif/esp-idf!9379
 2020-07-01 11:11:59 +08:00
Ivan Grokhotkov
1d55a3c430 Merge branch 'bugfix/idf_env_fpga_warning_make' into 'master' 
cmake, make: fix remaining IDF_ENV_FPGA warnings

See merge request espressif/esp-idf!9344
 2020-06-30 22:25:54 +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
lly
aa2a98899b ble_mesh: example: Fix example README & tutorial link error 2020-06-29 19:23:18 +08:00
Angus Gratton
8800fe5241 Merge branch 'bugfix/prov_retry_failures' into 'master' 
ci: Add retries for all provisioning methods, some refactors

See merge request espressif/esp-idf!9343
 2020-06-29 16:29:26 +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
Krzysztof Budzynski
eff2aa8094 Merge branch 'doc/restore_missing_zh_eth_guide' into 'master' 
docs: restore chinese get-started-ethernet-kit guide

See merge request espressif/esp-idf!9368
 2020-06-29 13:38:35 +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
Marius Vikhammer
e690b778a7 docs: restore chinese get-started-ethernet-kit guide 
The chinese translation of get-started-ethernet-kit guide were erroneously
removed in commit 1a90470f02
 2020-06-29 09:40:31 +08:00
lly
e4a115f0e2 ble_mesh: ci: Add different proxy configurations 2020-06-28 23:09:47 +00: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
Angus Gratton
002a13a71a ci provisioning: Add some experiments to check the runner's STA state 
Not clear why sometimes it associates without negotiating a new DHCP lease.
 2020-06-28 22:52:45 +00:00
Angus Gratton
ab55bea55a esp_prov: Extend the timeout for HTTP connection to SoftAP 2020-06-28 22:52:45 +00:00
Angus Gratton
7934df3a6f ci wifi_tools: Log the wpa_supplicant interface state when trying to connect 
Trigger reconnection if wpa_supplicant seems to have dropped the connection.
 2020-06-28 22:52:45 +00:00
Angus Gratton
2e8d607b21 legacy provisioning: Always try to reconnect when disconnected 
Some APs may fail authentication temporarily if they have too many
associated stations, for example.
 2020-06-28 22:52:45 +00:00
Angus Gratton
5bdecb3db2 esp_prov: Refactor to use new 'wait_wifi_connected' function 
Means all provisioning examples will have the same retry behaviour.
 2020-06-28 22:52:45 +00:00
Angus Gratton
e969a5e5ff ci provisioning: Use strings instead of "magic numbers" for connection state 2020-06-28 22:52:45 +00:00
Angus Gratton
05ef08b1d5 ci: Wait up to 60 seconds for client to connect to DUT in provisioning test 2020-06-28 22:52:45 +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
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
Ivan Grokhotkov
1aacb6e2cf tools: build_apps: fix make warning due to unused TEST_GROUPS variable 
TEST_GROUPS can be included in the unit-test-app config file, to
restrict the list of tests to be executed. However this option is not
used at build time, so adding it as a CMake variable along with
TEST_COMPONENTS and other options results in a CMake warning.
Fix by not passing this variable to CMake, and not including it in the
final sdkconfig file.
 2020-06-26 12:17:02 +02:00
Ivan Grokhotkov
23dd439bc8 ci: be more strict when checking for errors/warnings in build logs 
Look for "error|warning" anywhere in the line, not just at the start.
 2020-06-26 11:37:50 +02:00
Ivan Grokhotkov
b736eebf90 cmake: also pass IDF_ENV_FPGA in config.env 2020-06-26 11:37:50 +02:00
Ivan Grokhotkov
0bace4e0ca make: pass IDF_ENV_FPGA=n to confgen and mconf 
Fixes the following warnings:

warning: IDF_ENV_FPGA has 'option env="IDF_ENV_FPGA"', but the environment variable IDF_ENV_FPGA is not set
 2020-06-26 11:37:50 +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
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
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