Island
d7353cd2ea
Merge branch 'bugfix/ble_mesh_readme_fix_v3.3' into 'release/v3.3'
...
ble_mesh: example: Fix example README & tutorial link error (v3.3)
See merge request espressif/esp-idf!9437
2020-07-02 11:29:54 +08:00
Island
742f40a211
Merge branch 'bugfix/ble_mesh_compile_error_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh compile error (v3.3)
See merge request espressif/esp-idf!9433
2020-07-02 11:29:15 +08:00
lly
144ae4a7fd
ble_mesh: example: Fix example README & tutorial link error
2020-07-01 14:40:42 +08:00
fuzhibo
44887f5fde
Driver(adc): Disable the synchronization operation function of ADC1 and DAC
...
Closes IDF-1585
2020-07-01 06:16:35 +00:00
lly
7a939c148c
ble_mesh: ci: Add different proxy configurations
2020-07-01 12:36:08 +08:00
lly
f835011e2f
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-07-01 12:32:04 +08:00
Island
021e23ebf7
Merge branch 'bugfix/ble_mesh_check_subnet_before_update_beacon_sent_v3.3' into 'release/v3.3'
...
ble_mesh: Check if subnet exists before updating beacon_sent (v3.3)
See merge request espressif/esp-idf!9398
2020-07-01 11:17:08 +08:00
Island
31b52a5c05
Merge branch 'bugfix/ble_mesh_set_recv_rssi_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh set recv rssi (v3.3)
See merge request espressif/esp-idf!9392
2020-07-01 11:15:48 +08:00
Jiang Jiang Jian
46bc9e5dc4
Merge branch 'feature/bt_secure_conn_downgrade_check_v3.3' into 'release/v3.3'
...
Bluedroid: Authentication fixes in Legacy and Secure Connection.
See merge request espressif/esp-idf!9332
2020-06-30 15:12:21 +08:00
lly
9f6375db50
ble_mesh: Check if subnet exists before updating beacon_sent
...
- Before updating the "beacon_sent" of a subnet, we need to check
if the subnet still exists, especially for a Provisioner.
- Fix a bug which will cause Provisioner failed to send Secure
Network Beacon if no device is provisioned
2020-06-30 09:23:28 +08:00
lly
96865524c7
ble_mesh: stack: Copy recv_rssi for other received messages
...
Follow the commit: 2b80cb6883
,
copy the recv_rssi for other mesh messages.
2020-06-30 09:06:42 +08:00
mbroek
86cad8b825
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-30 09:06:31 +08:00
Mahavir Jain
d6a63531ce
Merge branch 'bugfix/http_server_lru_v3.3' into 'release/v3.3'
...
esp_http_server: Update LRU counter on accepting a new connection (v3.3)
See merge request espressif/esp-idf!9353
2020-06-29 12:57:43 +08:00
Island
370bb55f42
Merge branch 'bugfix/ble_mesh_get_node_with_name_v3.3' into 'release/v3.3'
...
ble_mesh: Get node info with pre-configured node name (v3.3)
See merge request espressif/esp-idf!9304
2020-06-28 20:25:13 +08:00
Island
70b7a4b868
Merge branch 'bugfix/ble_mesh_example_tag_define_v3.3' into 'release/v3.3'
...
ble_mesh: Move TAG definition to each example (v3.3)
See merge request espressif/esp-idf!9308
2020-06-28 20:24:44 +08:00
Island
1fb6ffecad
Merge branch 'bugfix/ble_mesh_bt_hex_v3.3' into 'release/v3.3'
...
ble_mesh: Fix wrong log output with bt_hex (v3.3)
See merge request espressif/esp-idf!9311
2020-06-28 20:23:56 +08:00
Island
036828a172
Merge branch 'bugfix/ble_mesh_not_define_bool_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh not define bool (v3.3)
See merge request espressif/esp-idf!9318
2020-06-28 20:22:50 +08:00
Island
b9cc633b50
Merge branch 'bugfix/ble_mesh_check_model_status_v3.3' into 'release/v3.3'
...
ble_mesh: stack: Check model status with variable length (v3.3)
See merge request espressif/esp-idf!9321
2020-06-28 20:22:11 +08:00
Shubham Kulkarni
673e433281
esp_http_server: Update LRU counter on accepting a new connection
...
Closes https://github.com/espressif/esp-idf/issues/3851
2020-06-26 19:25:42 +05:30
Chinmay Chhajed
99d572700d
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.
2020-06-25 13:59:14 +00:00
Anton Maklakov
f4333c8e3a
Merge branch 'feature/toolchain_gcc52_psram_fixes_v3.3' into 'release/v3.3'
...
Update the toolchain for backport PSRAM workaround and memw fixes (v3.3)
See merge request espressif/esp-idf!9228
2020-06-25 10:38:27 +08:00
lly
42378c8e19
ble_mesh: Move TAG definition to each example
...
Move the TAG definition of each example to the corresponding
source file (previously it is defined in the common example
intialization header file), which can avoid the redefinition
of TAG in some situations.
2020-06-24 12:06:58 +00:00
Anton Maklakov
ff29e3e7a2
Update toolchain to 1.22.0-96-g2852398
...
PSRAM workaround fixes,
Volatile loads with memw fixes
2020-06-24 11:56:59 +00:00
lly
ad970addf0
ble_mesh: Get node info with pre-configured node name
...
Also add a function to get the entry of the nodes table.
Closes https://github.com/espressif/esp-idf/issues/5397
2020-06-24 11:53:59 +00:00
lly
adbc337023
ble_mesh: Fix wrong log output with bt_hex
...
- This issue was introduced in the commit: a788e7cd3d
which updated the bt_hex() function incorrectly.
- And in bt_hex(), we use 2 for the two-dimensional array, because currently
at most two bt_hex() will be used at the same time. Also this will save
some DRAM compared with using 4.
2020-06-24 11:50:58 +00:00
lly
1dbbc55cc0
ble_mesh: Remove boolean type definitions
2020-06-24 11:46:51 +00:00
Nikolaos Strikos
0526de4536
ble_mesh: Do not #define bool when compiling in C++
2020-06-24 11:46:51 +00:00
lly
366dd9759d
ble_mesh: stack: Check model status with variable length
2020-06-24 11:41:58 +00:00
Anton Maklakov
f0b4c08e77
Merge branch 'bugfix/python_lint_v3.3' into 'release/v3.3'
...
tools: fix python lint (v3.3)
See merge request espressif/esp-idf!9328
2020-06-24 19:37:22 +08:00
morris
9b9502451a
tools: fix python lint
2020-06-24 15:14:22 +08:00
Jiang Jiang Jian
39e5184159
Merge branch 'bugfix/fix_event_bug_in_GAP_API_release_v3.3' into 'release/v3.3'
...
Bugfix/fix event bug in GAP API [backport v3.3]
See merge request espressif/esp-idf!9195
2020-06-23 12:19:04 +08:00
David Čermák
e3f3e0ae0f
Merge branch 'feature/ws_timeout_v3.3' into 'release/v3.3'
...
websocket: add configurable timeout for PONG not received (v3.3)
See merge request espressif/esp-idf!8911
2020-06-19 02:22:08 +08:00
Island
2ea53169ad
Merge branch 'bugfix/blufi_buffer_overflow_report_v3.3' into 'release/v3.3'
...
blufi: When the format of the received data packet is wrong, reply with an error response(backport 3.3)
See merge request espressif/esp-idf!9198
2020-06-18 13:45:34 +08:00
Michael (XIAO Xufeng)
2aaf254d44
Merge branch 'bugfix/fix_fifo_cnt_bug_v3.3' into 'release/v3.3'
...
bugfix(uart): fix esp32 uart fifo_cnt bug(backport v3.3)
See merge request espressif/esp-idf!9042
2020-06-18 01:43:04 +08:00
David Čermák
e25b710a02
Merge branch 'bugfix/ws_send_abort_v3.3' into 'release/v3.3'
...
websocket client: the client now aborts the connection if send fails (v3.3)
See merge request espressif/esp-idf!8903
2020-06-17 15:05:48 +08:00
wangcheng
563c9901ca
blufi: When the format of the received data packet is wrong, reply with an error response
2020-06-17 12:32:57 +08:00
liqigan
02f9eaa31a
components/bt: Adjust the description of esp_bt_gap_start_discovery
and esp_bt_gap_cancel_discovery
.
...
Add some comments to explain why `ESP_BT_GAP_DISC_STATE_CHANGED_EVT` is not reported.
2020-06-17 11:27:37 +08:00
Marius Vikhammer
b478dc4ad6
websocket: add configurable timeout for PONG not received
...
Closes IDF-1744
2020-06-17 11:13:26 +08:00
xiongyu
c9d9545310
bugfix(uart): fix esp32 uart fifo_cnt bug
...
When using DPort to read fifo, fifo_cnt is not credible, we need to calculate the real cnt based on the fifo read and write pointer. When using AHB to read FIFO, we can use fifo_cnt to indicate the data length in fifo.
2020-06-15 12:22:33 +08:00
Angus Gratton
332e243f17
Merge branch 'feature/msys2_env_update_v3.3' into 'release/v3.3'
...
windows: Update pre-compiled MSYS2 environment
See merge request espressif/esp-idf!9035
2020-06-12 07:26:41 +08:00
Angus Gratton
5e84ee108c
Merge branch 'bugfix/bootloader_efuse_build_regression_v3.3' into 'release/v3.3'
...
bootloader: add definition of esp_clk_apb_freq (v3.3)
See merge request espressif/esp-idf!9093
2020-06-10 16:01:35 +08:00
Angus Gratton
f17f59fb54
Merge branch 'bugfix/parttool_get_info_wo_info_option_v3.3' into 'release/v3.3'
...
partition_table: Fix parttool.py crashes when retrieving partition info (v3.3)
See merge request espressif/esp-idf!9065
2020-06-10 15:58:01 +08:00
Jiang Jiang Jian
2f6f842d0f
Merge branch 'bugfix/collection_of_confirmed_fixes_from_baidu_project_3.3' into 'release/v3.3'
...
Backport MR for baidu project for release/v3.3
See merge request espressif/esp-idf!8990
2020-06-10 13:08:11 +08:00
weitianhua
282433500e
Backport MR from baid proj
2020-06-10 03:53:21 +00:00
Ivan Grokhotkov
618794e1fb
bootloader: add definition of esp_clk_apb_freq
...
Commit 8cd04c80
has added a dependency of efuse component on
esp_clk_apb_freq, however there was no definition of this function in
the bootloader context.
Reported at https://esp32.com/viewtopic.php?f=13&t=12035
Closes: https://github.com/espressif/esp-idf/issues/5396
2020-06-08 16:45:29 +08:00
Jiang Jiang Jian
eaca5a11e4
Merge branch 'bugfix/authmode_degrade_fix_v3.3' into 'release/v3.3'
...
esp_wifi: Remove auth_changed event and fix wpa2_ent authmode threshold (backport 3.3)
See merge request espressif/esp-idf!9058
2020-06-05 13:59:48 +08:00
Jiang Jiang Jian
b4c89c6607
Merge branch 'bugfix/add_so_linger_to_menuconfig_for_3.3' into 'release/v3.3'
...
lw-ip:add LINGER to menuconfig(backport 3.3)
See merge request espressif/esp-idf!9062
2020-06-05 13:54:22 +08:00
Jiang Jiang Jian
a5a6ba895e
Merge branch 'optimization/DNS_get_function_for_3.3' into 'release/v3.3'
...
lw-ip:optimization DNS get function(backport 3.3)
See merge request espressif/esp-idf!9061
2020-06-05 13:54:07 +08:00
Jiang Jiang Jian
b336851479
Merge branch 'workaround/wps_iot_fixes_v3.3' into 'release/v3.3'
...
wpa_supplicant: WPS Inter operatability Fixes ( backport v3.3)
See merge request espressif/esp-idf!9060
2020-06-05 13:49:24 +08:00
Michael (XIAO Xufeng)
ace2cff01a
Merge branch 'bugfix/sdmmc_check_slot_before_pullup_3.3' into 'release/v3.3'
...
sdmmc: Correctly check function parameters before using them (3.3)
See merge request espressif/esp-idf!9057
2020-06-05 07:19:11 +08:00