Jiang Jiang Jian
683d0f4edb
Merge branch 'nimble/fix_misc_coverity_issue_v4.2' into 'release/v4.2'
...
Nimble: Fix misc issues in NimBLE NVS, `ble_eddystone`, recursive call and L2CAP CoC (v4.2)
See merge request espressif/esp-idf!11390
2020-12-17 16:53:46 +08:00
Wei Tian Hua
c1d5ad61b5
Free ACL RX Buf in EM when disconnection [backport v4.2]
2020-12-17 16:47:43 +08:00
Artem Godlevskyi
d315bf722f
Added missing MYNEWT_VAL_BLE_L2CAP_COC_MPS definition
...
Signed-off-by: Prasad Alatkar <prasad.alatkar@espressif.com>
Merges https://github.com/espressif/esp-idf/pull/5825
2020-12-17 07:21:02 +00:00
Prasad Alatkar
210bd3787d
NimBLE: Fix misc coverity issues in NimBLE host
...
- NimBLE NVS : Additional check to account for NVS operation failure
- NimBLE host: Fix minor bug in ble_eddystone_set_adv_data_gen
- NimBLE host: remove recursive call, upstream PR: https://github.com/apache/mynewt-nimble/pull/857
2020-12-17 07:21:02 +00:00
Jiang Jiang Jian
211a2a9957
Merge branch 'fixbug/baidu_tcp_recv_assert_for_4.2' into 'release/v4.2'
...
lw-ip:fix bug for tcp recv assert(backport 4.2)
See merge request espressif/esp-idf!11601
2020-12-16 17:31:42 +08:00
David Čermák
6a723ad1e7
Merge branch 'bugfix/lwip_netdb_cpp_guards_v4.2' into 'release/v4.2'
...
lw-IP: Changed to C linkage in netdb.h for fixing bug when using mixed C/C++ code (v4.2)
See merge request espressif/esp-idf!11089
2020-12-16 04:13:12 +08:00
Ivan Grokhotkov
a82d0cf9f1
Merge branch 'bugfix/panic_instr_fetch_prohibited_v4.2' into 'release/v4.2'
...
panic: don't interrupt the backtrace for InstrFetchProhibited exceptions (v4.2)
See merge request espressif/esp-idf!10293
2020-12-16 04:09:37 +08:00
David Čermák
26bca96029
Merge branch 'bugfix/fix_transport_ssl_blocking_v4.2' into 'release/v4.2'
...
transport: fix transport ssl blocking (v4.2)
See merge request espressif/esp-idf!10691
2020-12-16 02:59:03 +08:00
Anton Maklakov
9fb05897db
Merge branch 'bugfix/ci_py2_warnings_fix_v4.2' into 'release/v4.2'
...
ci: Python 2 warnings fix (v4.2)
See merge request espressif/esp-idf!11617
2020-12-15 19:06:33 +08:00
David Čermák
7fcb8ffe0a
Merge branch 'feature/mqtt_submodule_update_23c8e1ec_v4.2' into 'release/v4.2'
...
MQTT: Update submodule reference to da850b (config, error flags, minor fixes) (v4.2)
See merge request espressif/esp-idf!11312
2020-12-15 16:13:03 +08:00
David Čermák
cbd0af7217
Merge branch 'bugfix/mdns_src_addr_cpy_v4.2' into 'release/v4.2'
...
mdns: Fix wrong mdns source address if lwIP IPv6 zoning disabled (v4.2)
See merge request espressif/esp-idf!11310
2020-12-15 16:10:55 +08:00
David Čermák
3b63476e31
Merge branch 'bugfix/backport_v4.2_fix_websocket_issue' into 'release/v4.2'
...
websocket_client: fix some issues for websocket client (backport v4.2)
See merge request espressif/esp-idf!11276
2020-12-15 16:10:12 +08:00
mathiasbredholt
440b5f6e7b
lwip: Changed to C linkage for fixing bug when using mixed C/C++ code
...
Merges https://github.com/espressif/esp-idf/pull/5900
2020-12-15 08:09:14 +00:00
xutao
c0e3aa1ef8
transport: fix transport ssl blocking
...
In SSL mode, if `esp_transport_poll_read` function is used, the cache data in mebdtls will be blocked
2020-12-15 08:07:18 +00:00
Anton Maklakov
f5f91a4d05
tools: Redirect some warnings to stderr
2020-12-15 13:16:50 +07:00
xueyunfei
72dbf03b6c
fix bug for tcp recv assert
2020-12-14 17:42:51 +08:00
Scott Shell
fad8a27cf7
Make the UserAgent string in esp-http-client configurable
...
Signed-off-by: Shubham Kulkarni <shubham.kulkarni@espressif.com>
Merges https://github.com/espressif/esp-idf/pull/6044
2020-12-14 14:02:50 +05:30
Shubham Kulkarni
465d911052
http_auth.c: Fix crash when opaque field is not present in challenge string
...
Closes: https://github.com/espressif/esp-idf/issues/5888
2020-12-14 13:58:29 +05:30
Shubham Kulkarni
b951b5adec
esp_http_client: Skip check for redirection counter if status code is success.
...
Set disable_auto_redirect in esp_http_client example to validate this condition in CI
2020-12-14 13:58:28 +05:30
Jiang Jiang Jian
18a1bc9e7f
Merge branch 'bugfix/decouple_wifi_bt_with_coex_v4.2' into 'release/v4.2'
...
esp_wifi: decouple Wi-Fi and bluetooth with coexist to reduce binary file size(backport v4.2)
See merge request espressif/esp-idf!11542
2020-12-14 12:17:23 +08:00
lly
5f2a5cdcab
ble_mesh: stack: Need uuid when adding device for provisioning
2020-12-11 13:15:54 +00:00
Island
938b9f3098
Merge branch 'feat/ble_mesh_node_local_data_func_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Add node local netkey/appkey func (v4.2)
See merge request espressif/esp-idf!11575
2020-12-11 21:13:57 +08:00
Krzysztof Budzynski
c923c99f09
Merge branch 'feature/python2-deprecation-warn_v4.2' into 'release/v4.2'
...
Tools: Add Python 2 deprecation warning (v4.2)
See merge request espressif/esp-idf!11524
2020-12-11 17:26:06 +08:00
lly
7505e1458f
ble_mesh: stack: Fix wrong declaration of node bind AppKey func
2020-12-11 17:19:02 +08:00
lly
d4575ccfe9
ble_mesh: stack: Add node local netkey/appkey func
2020-12-11 17:18:22 +08:00
Ivan Grokhotkov
71e7f000c4
Merge branch 'bugfix/log-error-run-esptool_v4.2' into 'release/v4.2'
...
parttool.py: Add file stream parameter and log stdout and stderr to same stream (v4.2)
See merge request espressif/esp-idf!10516
2020-12-11 16:51:48 +08:00
martin.gano
d0d7c53ee1
Tools: add Python 2 deprecation warning
2020-12-11 09:14:57 +01:00
lly
da8a577408
ble_mesh: stack: Add a Kconfig option to make Health Server model optional
2020-12-10 09:32:10 +00:00
lly
2b2abcd6f9
ble_mesh: stack: Split model Kconfig menu into foundation and others
2020-12-10 09:32:10 +00:00
lly
e4451376f3
ble_mesh: stack: Add Kconfig options to make server models optional
2020-12-10 09:32:10 +00:00
lly
2602f26753
ble_mesh: stack: Use Kconfig option to make client models optional
2020-12-10 09:32:10 +00:00
lly
9c8c56f081
ble_mesh: stack: Make some internal static functions inline
2020-12-10 09:32:10 +00:00
lly
f27a151478
ble_mesh: stack: Add a Kconfig option to make deinit optional
2020-12-10 09:32:10 +00:00
lly
01d0843c4d
ble_mesh: stack: Introduce a new header file mesh_config.h
2020-12-10 09:32:10 +00:00
Jiang Jiang Jian
22b33adb2f
Merge branch 'optimization/AP_STAIPASSIGNED_passes_IP_send_through_event_data_for_4.2' into 'release/v4.2'
...
esp-event:AP_STAIPASSIGNED now passes the IP through 'event_data'(backport 4.2)
See merge request espressif/esp-idf!11241
2020-12-09 22:32:19 +08:00
Jiang Jiang Jian
e287e3ef9d
Merge branch 'bugfix/backport_some_lwip_bugs_1120_v4.2' into 'release/v4.2'
...
lw-ip:backport bugfix lwip for v4.2(backport 4.2)
See merge request espressif/esp-idf!11307
2020-12-09 22:31:32 +08:00
Jiang Jiang Jian
f03d543139
Merge branch 'bugfix/blufi_config_potential_double_free_v4.2' into 'release/v4.2'
...
Bugfix/blufi config potential double free v4.2
See merge request espressif/esp-idf!11163
2020-12-09 22:26:19 +08:00
Xia Xiaotian
5a17387c3d
esp_wifi: decouple Wi-Fi and bluetooth with coexist to reduce binary file size
2020-12-09 20:42:35 +08:00
Island
f5c45576cf
Merge branch 'feature/btdm_support_some_ble_new_features_v4.2' into 'release/v4.2'
...
components/bt: backport some new features for Bluedroid BLE(release v4.2)
See merge request espressif/esp-idf!11448
2020-12-09 10:28:56 +08:00
lly
e2cb5ee379
ble_mesh: stack: Store kr phase after value changed [Zephyr]
2020-12-08 11:51:28 +08:00
lly
0c8cf83131
ble_mesh: stack: Fix rpl not check by proxy cfg [Zephyr]
2020-12-08 11:51:23 +08:00
Krzysztof Budzynski
2ef417df5f
Merge branch 'docs/update_rtc_clock_source_description_in_api_references_backport_v4.2' into 'release/v4.2'
...
docs: update the description for RTC Clock Sources for esp32 and esp32s2 (backport/v4.2)
See merge request espressif/esp-idf!11329
2020-12-08 10:47:42 +08:00
Island
c2f08b3e35
Merge branch 'bugfix/ble_mesh_node_deinit_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Persistent storage misc fixes (v4.2)
See merge request espressif/esp-idf!11503
2020-12-08 10:28:46 +08:00
Angus Gratton
49dde3ca91
Merge branch 'bugfix/cast_int_to_size_t_in_cpu_ll_v4.2' into 'release/v4.2'
...
soc: cast int to size_t in cpu_ll (v4.2)
See merge request espressif/esp-idf!11135
2020-12-08 09:10:19 +08:00
Angus Gratton
fb81c46999
Merge branch 'bugfix/esp_idf_version_v4.2' into 'release/v4.2'
...
Add __ASSEMBLER__ flag in esp_idf_version.h to fix build failure with assembly files (v4.2)
See merge request espressif/esp-idf!10899
2020-12-08 09:07:51 +08:00
Angus Gratton
8a47006b72
Merge branch 'bugfix/backport_v4.2_fix_pthread_priority_inheritance' into 'release/v4.2'
...
pthread: fix the priority inheritance (backport v4.2)
See merge request espressif/esp-idf!11260
2020-12-08 09:07:23 +08:00
Angus Gratton
74c7a84c4c
Merge branch 'bugfix/secure_boot_v2_manual_enablement_v4.2' into 'release/v4.2'
...
Secure Boot V2: Fix an issue leading to manual enablement of Secure Boot v2. (v4.2)
See merge request espressif/esp-idf!11228
2020-12-08 09:06:29 +08:00
Angus Gratton
5cc8660a32
Merge branch 'bugfix/rtc_clk_cal_cycles_add_default_vals_for_all_sources_v4.2' into 'release/v4.2'
...
esp32xx: Fix default values for all RTC sources in RTC_CLK_CAL_CYCLES option (v4.2)
See merge request espressif/esp-idf!11412
2020-12-08 09:06:21 +08:00
lly
922abdc51b
ble_mesh: stack: Persistent storage misc fixes
...
* Fix the issue that deinit node with "erase_flash"
set to true, but info is not erased from nvs
* Reuse bt_mesh_cfg_reset() when deinit node
* Optimize Provisioner related erase operations
* No store pending timeout will be used when Node
is not provisioned OR Provisioner is disabled
and erase operation is performed
* Change the default timeout for settings operation
to 0, and rpl store rate to 0
2020-12-07 12:05:56 +00:00
Island
59ad2b48ee
Merge branch 'bugfix/fix_node_test_func_not_set_role_v4.2' into 'release/v4.2'
...
ble_mesh: test: Fix node test function not update role flag (v4.2)
See merge request espressif/esp-idf!11040
2020-12-07 19:56:55 +08:00