Angus Gratton
0ea6d39686
Merge branch 'bugfix/secure_boot_v2_fixes_v4.1' into 'release/v4.1'
...
Small secure boot v2 fixes (v4.1)
See merge request espressif/esp-idf!9019
2020-06-03 12:34:55 +08:00
Angus Gratton
b00f38f91c
secure boot v2: Add anti-FI check that secure boot not enabled yet
...
Prevent a fault from causing bootloader to trust the provided signature incorrectly.
2020-06-02 16:14:01 +10:00
Angus Gratton
3c6b1b4c0a
secure boot v2: Don't check efuse BLK2 if only boot-time signature verification is enabled
2020-06-02 16:14:01 +10:00
Angus Gratton
2c531d5bb3
secure boot v2: Don't log warnings when BLK2 is empty as expected
...
If BLK2 is empty then it's OK to continue with a warning (otherwise it may spook users into thinking
something this is wrong, but this is the expected workflow.)
If BLK2 is not empty and doesn't match then we need to fail because it won't be possible to
trust the signature.
2020-06-02 16:14:01 +10:00
Angus Gratton
69895387ee
Merge branch 'bugfix/kconfig_hex_values_v4.1' into 'release/v4.1'
...
kconfig: Fix two cases of hex values being handled incorrectly (v4.1)
See merge request espressif/esp-idf!8787
2020-06-01 14:48:37 +08:00
Angus Gratton
7708bf6158
Merge branch 'bugfix/ci_push_to_github_on_label_v4.1' into 'release/v4.1'
...
ci: Don't push to Github or deploy docs on customized pipelines (v4.1)
See merge request espressif/esp-idf!8937
2020-05-29 12:43:11 +08:00
Jiang Jiang Jian
10f3d92f6c
Merge branch 'bugfix/add_so_linger_to_menuconfig_for_4.1' into 'release/v4.1'
...
lw-ip:add LINGER to menuconfig for 4.1(backport4.1)
See merge request espressif/esp-idf!8758
2020-05-29 11:13:52 +08:00
Jiang Jiang Jian
5fb93a14ae
Merge branch 'bufix/fix_v4.1_bluedroid_bugs_mr' into 'release/v4.1'
...
component/bt: fix notify malloc failed , fix no BLE_AUTH_CMPL_EVT and fix bluedroid btc deinit crash(backport 4.1)
See merge request espressif/esp-idf!8756
2020-05-29 11:13:20 +08:00
Jiang Jiang Jian
63592b667c
Merge branch 'nimble/config_option_sdkconfig_rename_v4.1' into 'release/v4.1'
...
Add NimBLE config options in sdkconfig.rename (v4.1)
See merge request espressif/esp-idf!8735
2020-05-29 11:12:44 +08:00
zhiweijian
8793aab0e3
add congest direct callback and fix malloc failed when multi_connection notify performance test
2020-05-28 12:07:58 +00:00
wangcheng
d32ee233af
fix bta_dm_deinit_cb crash
2020-05-28 12:07:58 +00:00
wangcheng
049402ae8d
master missing BLE_AUTH_CMPL_EVT after restart
2020-05-28 12:07:58 +00:00
Jiang Jiang Jian
977d98cb6d
Merge branch 'bugfix/ble_mesh_check_timer_init_v4.1' into 'release/v4.1'
...
ble_mesh: Check the result of creating timer (v4.1)
See merge request espressif/esp-idf!8958
2020-05-28 15:27:42 +08:00
Jiang Jiang Jian
983a4be42e
Merge branch 'nimble/update_nimble_submodule_v4.1' into 'release/v4.1'
...
NimBLE: Include upstream fixes and use macros for log level filtering (backport v4.1)
See merge request espressif/esp-idf!8794
2020-05-28 15:25:12 +08:00
lly
0c87b1c12d
ble_mesh: Check the result of creating timer
2020-05-28 10:27:06 +08:00
Island
5ea193115b
Merge branch 'bugfix/ble_mesh_sync_zephyr_fixes_v4.1' into 'release/v4.1'
...
Bugfix/ble mesh sync zephyr fixes (v4.1)
See merge request espressif/esp-idf!8948
2020-05-28 10:15:53 +08:00
Island
6971cdbad5
Merge branch 'bugfix/ble_mesh_not_use_same_private_key_v4.1' into 'release/v4.1'
...
ble_mesh: Not using pre-initialized private key (v4.1)
See merge request espressif/esp-idf!8945
2020-05-28 10:14:21 +08:00
Island
0af793f6ef
Merge branch 'bugfix/ble_mesh_comp_data_store_restore_v4.1' into 'release/v4.1'
...
ble_mesh: Same func for storing/restoring comp data (v4.1)
See merge request espressif/esp-idf!8942
2020-05-28 10:12:12 +08:00
David Čermák
e1ce31483d
Merge branch 'bugfix/ws_client_fragmented_send_v4.1' into 'release/v4.1'
...
ws_client: fix fragmented send setting proper opcodes (v4.1)
See merge request espressif/esp-idf!8690
2020-05-28 01:27:41 +08:00
Mahavir Jain
55b56a1557
Merge branch 'bugfix/coap_component_build_issue_v4.1' into 'release/v4.1'
...
coap: move mbedTLS config options from component to examples (v4.1)
See merge request espressif/esp-idf!8929
2020-05-27 18:41:53 +08:00
lly
2f73d76768
ble_mesh: Transport tx fields overflow [Zephyr]
...
The transport segmented TX nack and seg_pending fields must be at least
6 bits to avoid overflow for 32 segment messages. This change rearranges
the seg_tx fields to gather all state flag fields in one byte, while
making the counter fields whole bytes.
2020-05-27 17:46:29 +08:00
lly
63c8dd2981
ble_mesh: Friend with unknown appkey [Zephyr]
...
Ensures that friend messages are enqueued, even if the packet is
received with an appkey is unknown to the friend. Previously, sdu_recv
would return EINVAL if the appkey was unknown, which would prevent the
lower transport layer from adding the packet to the friend queue. This
is irrelevant for the logic in lower transport, and should not be
returned as an error.
2020-05-27 17:46:23 +08:00
Krzysztof Budzynski
a02a782ee9
Merge branch 'doc/add_types_api_ref_v4.1' into 'release/v4.1'
...
doc: add peripheral_types.h as API reference for peripheral docs (v4.1)
See merge request espressif/esp-idf!8895
2020-05-27 17:44:30 +08:00
lly
0c06be9bcd
ble_mesh: Not using pre-initialized private key
2020-05-27 17:39:50 +08:00
lly
d3921346a9
ble_mesh: Same func for storing/restoring comp data
2020-05-27 17:30:31 +08:00
Island
c3d33f4232
Merge branch 'bugfix/ble_mesh_uses_deprecated_config_v4.1' into 'release/v4.1'
...
ble_mesh: Fix using old config for duplicate scan (v4.1)
See merge request espressif/esp-idf!8900
2020-05-27 17:24:13 +08:00
Angus Gratton
ad4dfed632
ci: Don't push to Github or deploy docs on customized pipelines
...
BOT_TRIGGER_WITH_LABEL must be empty (meaning all tests are running).
2020-05-27 19:05:02 +10:00
Marius Vikhammer
7d3d56ff9a
doc: add peripheral_types.h as API reference for peripheral docs
...
Closes DOC-136
Closes IDF-1673
2020-05-27 12:38:38 +08:00
Mahavir Jain
edb84c19dd
coap: move mbedTLS config options from component to examples
...
CoAP component relies on some mbedTLS crypto configuration
options, e.g. DTLS and PSK. These configuration options if
selected, have footprint impact on generic TLS examples like
https_request or https_ota as well.
Footprint of https_request example with/without change is per below:
$ ./tools/idf_size.py new_https_request.map --diff old_https_request.map
<CURRENT> MAP file: new_https_request.map
<REFERENCE> MAP file: old_https_request.map
Difference is counted as <CURRENT> - <REFERENCE>, i.e. a positive number means that <CURRENT> is larger.
Total sizes of <CURRENT>: <REFERENCE> Difference
DRAM .data size: 14796 bytes 14796
DRAM .bss size: 23560 bytes 23680 -120
Used static DRAM: 38356 bytes ( 142380 available, 21.2% used) 38476 -120 ( +120 available, +0 total)
Used static IRAM: 89045 bytes ( 42027 available, 67.9% used) 89045 ( +0 available, +0 total)
Flash code: 554231 bytes 563823 -9592
Flash rodata: 179000 bytes 181224 -2224
Total image size:~ 860632 bytes (.bin may be padded larger) 872568 -11936
This commit moves relevant config options to CoAP specific examples
and also adds some run time warnings if they are kept disabled.
Closes https://github.com/espressif/esp-idf/issues/5262
2020-05-26 20:05:33 +05:30
lly
3b89497b39
ble_mesh: Fix using old config for duplicate scan
2020-05-25 16:53:30 +08:00
xueyunfei
841aba8948
add LINGER to menuconfig
2020-05-25 11:36:05 +08:00
Jiang Jiang Jian
84b51781c8
Merge branch 'bugfix/espnow_fetch_peer_crash_v4.1' into 'release/v4.1'
...
wifi: fix the crash issue when fetch peer after delete cur_peer (backport v4.1)
See merge request espressif/esp-idf!8824
2020-05-22 23:10:48 +08:00
Jiang Jiang Jian
58f0a94cdf
Merge branch 'bugfix/fix_memleak_in_wpa3_feature_v4.1' into 'release/v4.1'
...
fix(wpa_supplicant): fix memleak in wpa3 feature(backport v4.1)
See merge request espressif/esp-idf!8656
2020-05-22 21:23:43 +08:00
Island
3cfd7eebd1
Merge branch 'example/ble_mesh_structural_adjust_v4.1' into 'release/v4.1'
...
Example/ble mesh structural adjust (v4.1)
See merge request espressif/esp-idf!8856
2020-05-22 19:15:57 +08:00
Island
4775176d7f
Merge branch 'bugfix/ble_mesh_provisioner_fail_to_pub_v4.1' into 'release/v4.1'
...
ble_mesh: Fix Provisioner failed to publish (v4.1)
See merge request espressif/esp-idf!8873
2020-05-22 19:14:14 +08:00
lly
eeff638c97
ble_mesh: Fix Provisioner failed to publish
2020-05-22 15:47:40 +08:00
David Cermak
ca01e8698f
ws_client: fix fragmented send setting proper opcodes
...
Previous implementation violated the RFC by having both the actual opcode and WS_FIN flag set for all fragments of a message.
Fixed by setting the opcode only for the first fragment and WS_FIN for the last one
Closes IDFGH-2938
Closes https://github.com/espressif/esp-idf/issues/4974
2020-05-22 06:14:48 +00:00
Angus Gratton
db7e28b8c7
Merge branch 'bugfix/doc_version_links_v4.1' into 'release/v4.1'
...
doc: Fix broken Release page links when building a stable version (v4.1)
See merge request espressif/esp-idf!8820
2020-05-22 13:59:27 +08:00
lly
13537ce279
ble_mesh: Fix tutorial links in examples README.md
2020-05-22 05:43:57 +00:00
lly
cc187a43b3
ble_mesh: Rename esp_fast_prov_* to ble_mesh_fast_prov_*
2020-05-22 05:43:57 +00:00
lly
b4588f7d92
ble_mesh: Rename the folders ble_mesh_fast_prov_* to fast_prov_*
2020-05-22 05:43:57 +00:00
lly
59b313fdcf
ble_mesh: Rename ble mesh example main & init files
...
- Rename ble_mesh_demo_main.c to main.c
- Rename ble_mesh_demo_init.* to ble_mesh_example_init.*
2020-05-22 05:43:57 +00:00
lly
74056dea91
ble_mesh: Move the example init to the common_components
2020-05-22 05:43:57 +00:00
lly
2eadacbf29
ble_mesh: Move the button component to common_components
2020-05-22 05:43:57 +00:00
lly
3c32f5a726
ble_mesh: Change the EXTRA_COMPONENT_DIRS used by examples
2020-05-22 05:43:57 +00:00
lly
55cd9206d5
ble_mesh: Rename common_vendor_models to common_components
...
Since the scripts of CI will bypass common_components when
trying to get ALL_EXAMPLES, and these BLE Mesh components
will only be used by other mesh examples, i.e. no need to
be compiled as a single example, so we rename the folder
to common_componnets.
2020-05-22 05:43:57 +00:00
zhangyanjiao
80412dfbb8
wifi: fix the crash issue when fetch peer after delete cur_peer
2020-05-22 11:04:46 +08:00
Island
502a2aed2a
Merge branch 'bugfix/ble_mesh_friend_init_flag_v4.1' into 'release/v4.1'
...
Bugfix/ble mesh friend init flag (v4.1)
See merge request espressif/esp-idf!8848
2020-05-22 10:51:13 +08:00
Island
d075bcab98
Merge branch 'doc/ble_mesh_fix_v4.1' into 'release/v4.1'
...
ble_mesh: Doc miscellaneous fixes (v4.1)
See merge request espressif/esp-idf!8858
2020-05-22 10:49:53 +08:00
lly
88f6e2b60d
ble_mesh: Doc miscellaneous fixes
...
- Update ble mesh architecture
2020-05-21 17:46:28 +08:00