Island
afcbf0d311
Merge branch 'bugfix/ble_mesh_macro_OR_v4.1' into 'release/v4.1'
...
ble_mesh: stack: Fix using wrong | for OR between macros (v4.1)
See merge request espressif/esp-idf!12319
2021-02-07 16:37:58 +08:00
Island
47d6b3f2b3
Merge branch 'bugfix/ble_mesh_build_error_c3_merge_master_v4.1' into 'release/v4.1'
...
Bugfix/ble mesh build error merge master (v4.1)
See merge request espressif/esp-idf!12318
2021-02-07 16:37:49 +08:00
lly
eb52b1da96
ble_mesh: stack: Fix using wrong | for OR between macros
2021-02-07 11:36:45 +08:00
lly
4e8a53aec2
ble_mesh: stack: Fix compile warning with BIT macro
2021-02-07 11:33:00 +08:00
lly
938530b193
ble_mesh: stack: Update mesh max conn macro when using bluedroid
2021-02-07 11:32:55 +08:00
Island
c6f7abbe94
Merge branch 'feat/ble_mesh_support_ble_scan_v4.1' into 'release/v4.1'
...
ble_mesh: stack: Add BLE scan callback when mesh is enabled (v4.1)
See merge request espressif/esp-idf!12304
2021-02-07 11:22:50 +08:00
lly
2d04130ce0
ble_mesh: ci: Add ble & ble mesh coex sdkconfig test files
2021-02-05 21:22:52 +08:00
lly
bdf6d3e8cb
ble_mesh: stack: Support reporting normal ble adv packets
2021-02-05 21:22:52 +08:00
lly
e06a5587c7
ble_mesh: stack: Add a btc file for ble coex functions
...
Previously if starting/stopping BLE advertising when BLE Mesh
is enabled, the corresponding events will be notified through
the callback registered by esp_ble_mesh_register_prov_callback().
With this commit, the func esp_ble_mesh_register_ble_callback()
needs to be invoked for resgitering the callback used for BLE
coexistence related functionalities (i.e. ADV/SCAN).
2021-02-05 21:22:52 +08:00
lly
228ab398b9
ble_mesh: stack: Move ble scan funcitons to a single file
2021-02-05 21:22:52 +08:00
lly
9cff5797a1
ble_mesh: stack: Optimize handling received mesh adv packets
2021-02-05 21:22:52 +08:00
Island
53317da676
Merge branch 'optimize/ble_mesh_miscellaneous_v4.1' into 'release/v4.1'
...
Optimize/ble mesh miscellaneous (v4.1)
See merge request espressif/esp-idf!12293
2021-02-05 21:00:35 +08:00
lly
1cdd2b0609
ble_mesh: stack: Move bt_mesh_rand to mesh_common.c
2021-02-05 14:55:38 +08:00
lly
a0da80fe89
ble_mesh: stack: Remove useless BT_DBG_ENABLED in a few files
2021-02-05 14:55:33 +08:00
lly
f3ff34d818
ble_mesh: Replace zephyr integer types with C99 types [Zephyr]
2021-02-05 14:55:11 +08:00
lly
392fb4b916
ble_mesh: stack: Update ARRAY_SIZE definition
2021-02-05 14:54:17 +08:00
Island
8812365c6f
Merge branch 'feat/ble_mesh_multiple_nvs_namespace_v4.1' into 'release/v4.1'
...
ble_mesh: stack: Provisioner supports multiple nvs namespaces (v4.1)
See merge request espressif/esp-idf!12264
2021-02-05 14:49:32 +08:00
Angus Gratton
9d76fd62d7
Merge branch 'test/disable_twai_example_ci_v4.1' into 'release/v4.1'
...
Temporarily disable TWAI network example test (backport v4.1)
See merge request espressif/esp-idf!11562
2021-02-05 13:00:02 +08:00
Mahavir Jain
a60e9c136b
Merge branch 'fix/wolfssl_domain_name_check_v4.1' into 'release/v4.1'
...
esp_tls_wolfssl : Add domain name check (v4.1)
See merge request espressif/esp-idf!11817
2021-02-05 12:07:11 +08:00
lly
968d0fbb13
ble_mesh: ci: Add settings sdkconfig test files
2021-02-05 03:10:47 +00:00
lly
c1f3b20273
ble_mesh: stack: Provisioner supports multiple nvs namespaces
...
Now Provisioner can use different NVS namespaces to store
different instances of mesh information, for example, for
different user accounts.
2021-02-05 03:10:47 +00:00
Fu Hanxi
b91448aa03
Merge branch 'ci/increase_cmake_build_parallel_count_v4.1' into 'release/v4.1'
...
ci: Increase cmake build parallel count
See merge request espressif/esp-idf!12282
2021-02-05 10:46:57 +08:00
Ivan Grokhotkov
fb63cf75ad
Merge branch 'bugfix/idf_monitor_baudrate_arg_crash_v4.1' into 'release/v4.1'
...
idf monitor: fix crash when monitor baudrate argument set (Backport 4.1)
See merge request espressif/esp-idf!9759
2021-02-05 10:08:13 +08:00
Mahavir Jain
834089c4b2
Merge branch 'bugfix/protocomm_http_print_v4.1' into 'release/v4.1'
...
protocomm_httpd: Change an info print to debug print as it isn't really required in the logs (v4.1)
See merge request espressif/esp-idf!12262
2021-02-04 21:28:26 +08:00
lly
a47f4ae9fe
ci: Increase cmake build parallel count
2021-02-04 20:48:22 +08:00
Piyush Shah
6ebb73df7c
protocomm_httpd: Change an info print to debug print as it isn't really required in the logs
2021-02-04 15:04:43 +05:30
Island
52f661fa41
Merge branch 'feat/ble_mesh_provisioner_recv_hb_support_v4.1' into 'release/v4.1'
...
Feat/ble mesh provisioner recv hb support (v4.1)
See merge request espressif/esp-idf!11914
2021-02-04 17:13:20 +08:00
lly
45e0d59b3b
ble_mesh: ci: Add enabling hb recv sdkconfig file
2021-02-04 03:33:45 +00:00
lly
ad718c53cd
ble_mesh: stack: Provisioner supports receiving heartbeat
2021-02-04 03:33:45 +00:00
Island
8ba74ad9f7
Merge branch 'optimize/ble_mesh_provision_dev_uuid_check_v4.1' into 'release/v4.1'
...
ble_mesh: stack: Need uuid when adding device for provisioning (v4.1)
See merge request espressif/esp-idf!11578
2021-02-04 10:57:01 +08:00
lly
1b2748e00f
ble_mesh: ci: Add PB-ADV & PB-GATT sdkconfig test files
2021-02-03 08:45:18 +00:00
lly
ecf8427b1e
ble_mesh: stack: Need uuid when adding device for provisioning
2021-02-03 08:45:18 +00:00
Anton Maklakov
62acc8734f
Merge branch 'bugfix/ttfw_idf_find_artifacts_inaccurate_with_same_prefix_path_v4.1' into 'release/v4.1'
...
CI: fix the bug returns wrong artifact path when app_name is a subset of a longer one (v4.1)
See merge request espressif/esp-idf!12229
2021-02-03 11:34:42 +08:00
Island
d6a07efed5
Merge branch 'bugfix/ble_mesh_node_id_adv_v4.1' into 'release/v4.1'
...
ble_mesh: stack: Fix Node ID adv with wrong timeout (v4.1)
See merge request espressif/esp-idf!11878
2021-02-03 10:48:35 +08:00
Mahavir Jain
83aaee86d8
Merge branch 'bugfix/reenable_encrypted_partition_write_v4.1' into 'release/v4.1'
...
Re-enable encrypted flash read/writes even if flash encryption is disabled (v4.1)
See merge request espressif/esp-idf!12191
2021-02-02 18:31:04 +08:00
Mahavir Jain
6317ef13f8
unit-test-app: disable encrypted flash read/write in psram config to fix build failure
2021-02-02 05:10:34 +00:00
Mahavir Jain
e032384c7f
spi_flash: add config option to enable encrypted partition read/write
...
This feature can be disabled to save some IRAM (approx 1KB) for cases
where flash encryption feature is not required.
2021-02-02 05:10:34 +00:00
Mahavir Jain
0715c86211
Revert "esp_partition: disable encrypted reads/writes if flash encryption is disabled"
...
This reverts commit bf35ef1ce7
.
It has been noticed that there are scenarios where even though firmware is not enabled
with flash encryption config feature, it should be able to write to encrypted partitions.
This revert adds the feature back which was removed around v4.0 timelines, and same
change will be backported to all releases (upto v4.0) for consistency.
2021-02-02 05:10:34 +00:00
Fu Hanxi
aa2400f5f0
CI: fix the bug returns wrong artifact path when app_name is a subset of a longer one
2021-02-02 11:14:18 +08:00
Mahavir Jain
9468af050b
Merge branch 'bugfix/redirection_v4.1' into 'release/v4.1'
...
esp_http_client: Skip check for redirection counter if status code is success, fix issue with digest auth, configurable user agent string. (v4.1)
See merge request espressif/esp-idf!11598
2021-02-01 20:50:03 +08:00
Mahavir Jain
dec0bca0ba
Merge branch 'bugfix/httpd_session_close_lru_v4.1' into 'release/v4.1'
...
esp_http_server: Add flag in sock_db to identify httpd_sess_close is called from httpd_session_close_lru (v4.1)
See merge request espressif/esp-idf!12113
2021-02-01 17:21:55 +08:00
Mahavir Jain
0d2ab9459d
Merge branch 'bugfix/http_client_buffer_overread_v4.1' into 'release/v4.1'
...
esp_http_client: Fix buffer overread, update https_request example to use HTTP/1.1 (v4.1)
See merge request espressif/esp-idf!12109
2021-02-01 17:20:02 +08:00
Scott Shell
3f32d1020d
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
2021-02-01 09:17:43 +00:00
Shubham Kulkarni
34b845e484
http_auth.c: Fix crash when opaque field is not present in challenge string
...
Closes: https://github.com/espressif/esp-idf/issues/5888
2021-02-01 09:17:43 +00:00
Shubham Kulkarni
bffeb8705c
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
2021-02-01 09:17:43 +00:00
Mahavir Jain
64be5f1010
Merge branch 'bugfix/update_howsmyssl_cert_v4.1' into 'release/v4.1'
...
examples/protocols: update www.howsmyssl.com certificate to fix test failures (v4.1)
See merge request espressif/esp-idf!12212
2021-02-01 17:14:39 +08:00
Mahavir Jain
b35c3dd84f
examples/protocols: update www.howsmyssl.com certificate to fix test failures
2021-02-01 11:08:05 +05:30
Mahavir Jain
8b53ac9056
Merge branch 'fix/esp_tls_add_warning_if_ca_chain_has_invalid_cert_v4.1' into 'release/v4.1'
...
esp_tls: Add warning if the CA chain provided contains invalid cert (v4.1)
See merge request espressif/esp-idf!11940
2021-02-01 13:27:31 +08:00
Anton Maklakov
9760595f2f
Merge branch 'bugfix/auto_test_script_only_use_given_branch_v4.1' into 'release/v4.1'
...
CI: limit switching branches for auto_test_script (v4.1)
See merge request espressif/esp-idf!11147
2021-01-30 22:20:31 +08:00
Mahavir Jain
1fec915bdb
Merge branch 'feature/upgrade_mbedtls_to_v4.1' into 'release/v4.1'
...
mbedtls: upgrade to v2.16.9 release (v4.1)
See merge request espressif/esp-idf!11900
2021-01-29 20:35:13 +08:00