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
Island
58afa32a1a
Merge branch 'optimize/ble_mesh_reduce_code_size_v4.2' into 'release/v4.2'
...
Optimize/ble mesh reduce code size (v4.2)
See merge request espressif/esp-idf!11518
2020-12-11 16:50:51 +08:00
daiziyan
81eb9f280f
add CN translation for adding python2 deprecation warning(MR 11115)
2020-12-11 09:16:18 +01:00
martin.gano
d0d7c53ee1
Tools: add Python 2 deprecation warning
2020-12-11 09:14:57 +01:00
Darian Leung
19e6434f37
twai: Temporarily disable network example test
...
Disabling network example test due to issue with synchronizing the
start of each DUT
2020-12-10 21:27:46 +08:00
lly
6f104362c7
ble_mesh: example: Update sdkconfig test files for disabling Health Server model
2020-12-10 09:32:10 +00: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
5fd4d53922
ble_mesh: example: Fix fast provisioning compile error
2020-12-10 09:32:10 +00:00
lly
7f1a0e1552
ble_mesh: ci: Add disabling mesh model sdkconfig test files
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
7e945e5fa8
ble_mesh: ci: Add disabling mesh deinit sdkconfig test files
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
Angus Gratton
1771aea076
Merge branch 'bugfix/increase_ci_build_example_parallel' into 'release/v4.2'
...
ci: Add 1 parallel count for building example
See merge request espressif/esp-idf!11554
2020-12-10 17:09:47 +08:00
lly
c3c0ca0aff
ci: Add 1 parallel count for building example
2020-12-10 13:59:36 +08: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
Krzysztof Budzynski
996e270f90
Merge branch 'doc/update_CN_translation_for_relase/v4.2' into 'release/v4.2'
...
update CN translation for index.rst and vscode-setup.rst in get-started folder (v4.2)
See merge request espressif/esp-idf!11522
2020-12-09 19:13:25 +08:00
Dai Zi Yan
4ff9a93490
update CN translation for index.rst and add CN translation for vscode-setup.rst in get-started folder
2020-12-09 19:13:25 +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
Island
2532ddd9f4
Merge branch 'bugfix/ble_mesh_proxy_cfg_replay_v4.2' into 'release/v4.2'
...
Bugfix/ble mesh proxy cfg replay (v4.2)
See merge request espressif/esp-idf!11509
2020-12-08 15:00:51 +08:00
negativekelvin
d1a9f9ec74
Fix reserved psram region
...
Closes https://github.com/espressif/esp-idf/pull/5373
Closes https://github.com/espressif/esp-idf/issues/5821
2020-12-08 17:42:36 +11: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
Krzysztof Budzynski
452992bcd5
Merge branch 'bugfix/remove_shortcut_to_build_instructions_v4.2' into 'release/v4.2'
...
doc: Getting Started Guide, remove shortcuts to 'build toolchain from scratch' instructions (v4.2)
See merge request espressif/esp-idf!10597
2020-12-08 10:46: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
cf644d4de3
Merge branch 'bugfix/check_doc_links_no_deploy_v4.2' into 'release/v4.2'
...
CI: Only run check_doc_links if we actually deployed (v4.2)
See merge request espressif/esp-idf!10955
2020-12-08 09:08:03 +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
addabc392d
Merge branch 'bugfix/ldgen_unicode_path_v4.2' into 'release/v4.2'
...
tools/ldgen: Parse paths with Unicode characters in archives & fix parsing of section names on Windows (v4.2)
See merge request espressif/esp-idf!10964
2020-12-08 09:07:47 +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
1591141237
Merge branch 'bugfix/err_to_name_paths_windows_v4.2' into 'release/v4.2'
...
tools: fix path handling errors in gen_esp_err_to_name.py for Windows (v4.2)
See merge request espressif/esp-idf!10895
2020-12-08 09:06:59 +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
Angus Gratton
82bcdcaeaf
Merge branch 'bugfix/fix_partition_table_in_flash_encryption_example_v4.2' into 'release/v4.2'
...
example/flash_encryption: Fix partition table (v4.2)
See merge request espressif/esp-idf!10851
2020-12-08 09:06:07 +08:00
Angus Gratton
117be7a870
Merge branch 'bugfix/blecent_example_test_4.2' into 'release/v4.2'
...
Fix CI blecent example test (backport v4.2)
See merge request espressif/esp-idf!11271
2020-12-08 09:01:45 +08:00
Angus Gratton
244922a3e3
tools: Avoid subprocess.run(capture_output) argument for Python <3.7 compatibility
...
In Python 3.5 and 3.6 the equivalent to capture_output=True is to set stdout
and stderr arguments to subprocess.PIPE
2020-12-08 09:44:31 +11: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
Island
0c75a3a8e7
Merge branch 'bugfix/ble_mesh_autorsp_description_v4.2' into 'release/v4.2'
...
esp_ble_mesh: api: fixed comment about autoresp (v4.2)
See merge request espressif/esp-idf!10888
2020-12-07 19:56:52 +08:00
Island
c667af2683
Merge branch 'optimize/ble_mesh_gattc_conn_param_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Update connection parameters used by Central (v4.2)
See merge request espressif/esp-idf!11328
2020-12-07 19:55:51 +08:00
Mahavir Jain
305bc4983f
Merge branch 'fix/protocomm_simple_ble_v4.2' into 'release/v4.2'
...
Protocomm/simple_ble: Fix gatt table map size to number of handles received (v4.2)
See merge request espressif/esp-idf!11264
2020-12-07 16:18:07 +08:00