David Čermák
651dc8788f
Merge branch 'bugfix/ws_stop_deadlock_v3.3' into 'release/v3.3'
...
Websocket client: avoid deadlock if stop called from event handler (Backport v3.3)
See merge request espressif/esp-idf!10229
2020-10-13 14:12:52 +08:00
David Čermák
31d272e460
Merge branch 'bugfix/openss_strict_verify_mode_3.3' into 'release/v3.3'
...
openssl: made verification mode conversion to mbetls modes more strict (v3.3)
See merge request espressif/esp-idf!10502
2020-10-13 14:10:54 +08:00
Island
b4338b61a2
Merge branch 'bugfix/ble_mesh_node_deinit_v3.3' into 'release/v3.3'
...
ble_mesh: stack: Persistent storage misc fixes (v3.3)
See merge request espressif/esp-idf!10815
2020-10-13 14:06:23 +08:00
Jiang Jiang Jian
5d1da96e3e
Merge branch 'bugfix/ipv6_address_get_fail_after_wifi_disconnect_for_3.3' into 'release/v3.3'
...
lw-ip:ipv6 address get fail after wifi disconnect for 3.3(backport 3.3)
See merge request espressif/esp-idf!10792
2020-10-13 12:28:46 +08:00
lly
542b6bdbc1
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-10-13 10:55:58 +08:00
Island
733aaa4af0
Merge branch 'bugfix/ble_mesh_settings_fix_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh settings fix (v3.3)
See merge request espressif/esp-idf!10786
2020-10-13 10:50:07 +08:00
Marius Vikhammer
0b42900063
Websocket client: avoid deadlock if stop called from event handler
2020-10-12 10:15:55 +00:00
David Cermak
4a1016411b
openssl: made verification mode conversion to mbetls modes more strict
2020-10-12 10:14:21 +00:00
xueyunfei
a9f6748de9
lw-ip:ipv6 address get fail after wifi disconnect for 3.3
2020-10-12 10:58:50 +08:00
lly
b4c3c87c75
ble_mesh: stack: Use settings_core_erase when deinit
2020-10-12 10:02:05 +08:00
lly
3940ab80a3
ble_mesh: stack: Fix storing next net_idx and app_idx
2020-10-12 10:02:05 +08:00
lly
d7c2d66d55
ble_mesh: stack: Continue restore even if failure happens
...
Previously we have used this solution for node info
restore. Here use the same solution for other mesh
information restore.
2020-10-12 10:02:05 +08:00
lly
4fc62b7983
ble_mesh: stack: Split model settings store and clear
2020-10-12 10:02:05 +08:00
lly
de15e502a7
ble_mesh: stack: Erase netkey and appkey with key index
2020-10-12 10:02:05 +08:00
lly
d51431fff5
ble_mesh: stack: Add clear hb_pub in settings
2020-10-12 10:02:05 +08:00
lly
d4651bbb30
ble_mesh: stack: Transport rx reset settings update
...
When reset the rx info of transport layer, the
rpl list will always cleared, and rpl stored
in the nvs will only be erased when erase flag
is true and BLE_MESH_SETTINGS is enabled.
Compared with the previous solution, it should
be more clear.
2020-10-12 10:02:05 +08:00
lly
e202225bd1
ble_mesh: stack: Use erase settings functions
2020-10-12 10:02:05 +08:00
lly
1a3515ab76
ble_mesh: stack: Use mutex for settings operation
...
Also expose the settings functions with the parameter
bt_mesh_nvs_handle_t, which will be used for further
updates.
2020-10-12 10:02:05 +08:00
lly
a662d14a4e
ble_mesh: stack: Add role check before enabling device
2020-10-12 10:02:05 +08:00
lly
4dcbe2bd7a
ble_mesh: stack: Define a type for mesh nvs handle
2020-10-12 10:01:47 +08:00
lly
22d01ba674
ble_mesh: ci: Enable settings in sdkconfig.ci.xxx
2020-10-12 08:49:52 +08:00
Jiang Jiang Jian
4782dde73a
Merge branch 'bugfix/fix_ble_hci_desync_deadlock_v3.3' into 'release/v3.3'
...
components/bt: Fix for HCI desync deadlock issue in BLE controller.
See merge request espressif/esp-idf!10625
2020-10-09 19:52:42 +08:00
Jiang Jiang Jian
151e4e156f
Merge branch 'bugfix/nimble_host_rcv_pkt_length_check_v3.3' into 'release/v3.3'
...
NimBLE: host_rcv_pkt event buf size check. (v3.3)
See merge request espressif/esp-idf!10761
2020-10-09 15:19:47 +08:00
Chinmay Chhajed
1aa40de934
NimBLE: host_rcv_pkt event buf size check.
...
Check if the size of HCI event buffer is greater than the received HCI
packet. If not then abort with the error message.
2020-10-09 09:32:37 +05:30
Angus Gratton
471d79edae
Merge branch 'bugfix/ci_auto_checkout_revision_of_project_used_in_ci_v3.3' into 'release/v3.3'
...
CI: get git describe from annotated tags (v3.3)
See merge request espressif/esp-idf!10676
2020-10-08 16:44:49 +08:00
Mahavir Jain
1ffeff5948
Merge branch 'bugfix/bootloader_anti_rollback_mmap_v3.3' into 'release/v3.3'
...
bootloader_support: fix issue in memory mapping for getting app descriptor (v3.3)
See merge request espressif/esp-idf!10737
2020-10-08 16:31:35 +08:00
Angus Gratton
0f6b7ad3cf
Merge branch 'bugfix/bootloader_common_get_sha256_of_partition_v3.3' into 'release/v3.3'
...
bootloader_support: Fix bootloader_common_get_sha256_of_partition(), can handle a long image (v3.3)
See merge request espressif/esp-idf!9955
2020-10-08 13:11:46 +08:00
Angus Gratton
111e0361c9
ci: Check version tags are always annotated
...
Closes https://github.com/espressif/esp-idf/issues/3114
2020-10-07 13:53:45 +11:00
Angus Gratton
6c2bffe53c
build system: Also get IDF version from annotated tags only
...
Builds on previous commit.
Note: Getting the project version still pases --tags so still works with plain
tags, to keep compatibility for existing projects
2020-10-07 13:53:45 +11:00
Mahavir Jain
0167a5e96d
bootloader_support: fix issue in memory mapping for getting app descriptor
...
For getting secure_version field in anti rollback case, bootloader tries
to map whole firmware partition but fails for cases where partition size
is beyond available MMU free pages capacity.
Fix here ensures to map only required length upto application descriptor
size in firmware partition.
Closes https://github.com/espressif/esp-idf/issues/5911
2020-10-06 14:43:12 +05:30
Michael (XIAO Xufeng)
021e1189c5
Merge branch 'bugfix/mcpwm_fault_init_copypaste_typo_bp3.3' into 'release/v3.3'
...
MCPWM: Fix PWM-fault init function that read config incorrectly (backport v3.3)
See merge request espressif/esp-idf!9550
2020-10-02 14:20:12 +08:00
He Yin Ling
936c803ccb
CI: get git describe from annotated tags:
...
we should only parse IDF version from annotated tags
2020-09-30 11:34:28 +08:00
Chinmay Chhajed
02893a2038
components/bt: Fix for HCI desync deadlock issue in BLE controller.
2020-09-29 21:35:15 +05:30
Jiang Jiang Jian
cd86bc9d8d
Merge branch 'bugfix/confirmed_bugfix_from_baidu_proj_3.3' into 'release/v3.3'
...
Confirmed bugfix from Baidu Project 3.3
See merge request espressif/esp-idf!10548
2020-09-29 20:48:50 +08:00
Jiang Jiang Jian
9401c59f89
Merge branch 'bugfix/customer_baidu_int_wdt_v3.3' into 'release/v3.3'
...
backport v3.3: add soft solution for esp32 eco3 live lock issue
See merge request espressif/esp-idf!9217
2020-09-29 14:04:00 +08:00
Jiang Jiang Jian
a55f0ebbd5
Merge branch 'bugfix/wifi_spin_lock_allocation_in_PSRAM_v3.3' into 'release/v3.3'
...
wifi: Fix spin lock allocation in PSRAM bug(v3.3)
See merge request espressif/esp-idf!10550
2020-09-27 12:49:32 +08:00
Jiang Jiang Jian
e49a6b95ed
Merge branch 'bugfix/fix_ipv6_nd6_max_queue_num_v3.3' into 'release/v3.3'
...
lw-ip: fix IPv6 ND6 queue too much pkts cause no mem issue(backport v3.3)
See merge request espressif/esp-idf!10177
2020-09-27 12:47:30 +08:00
Jiang Jiang Jian
4a037fa911
Merge branch 'bugfix/can_mmap_after_get_enough_free_mmu_pages_v3.3' into 'release/v3.3'
...
flash_mmap: can mmap after get enough free MMU pages (backport v3.3)
See merge request espressif/esp-idf!10587
2020-09-27 12:46:42 +08:00
Island
0b792c44eb
Merge branch 'optimize/ble_mesh_provisioner_delete_dev_v3.3' into 'release/v3.3'
...
ble_mesh: stack: Optimize Provisioner delete device function (v3.3)
See merge request espressif/esp-idf!10606
2020-09-27 10:53:19 +08:00
lly
81354cf24f
ble_mesh: stack: Optimize Provisioner delete device function
...
Since we have provided separate functions for deleting node
information with node's unicast address, device uuid, etc.
So we update the behavior of this function, which will only
be used to delete device information which is not provisioned
or just under provisioning.
2020-09-25 14:04:58 +08:00
Angus Gratton
fcadbaf97c
Merge branch 'update/release_v3.3.4' into 'release/v3.3'
...
v3.3: Update to v3.3.4
See merge request espressif/esp-idf!10520
2020-09-25 10:21:30 +08:00
ChenJianxing
186ad2f6aa
lwip: fix IPv6 ND6 queue too much pkts cause no mem issue and add menuconfig item for this params.
2020-09-24 10:43:23 +08:00
jiangguangming
4f3ddbb299
flash_mmap: restore interrupt and cache before err return
2020-09-24 10:06:18 +08:00
jiangguangming
9debc7248a
flash_mmap: can mmap after get enough free MMU pages
2020-09-24 10:06:18 +08:00
Jiang Jiang Jian
fb18b12efe
Merge branch 'bugfix/bt_linkup_fallback_event_v3.3' into 'release/v3.3'
...
Bluedroid: Fixes cases having fallback to link up event. (v3.3)
See merge request espressif/esp-idf!9805
2020-09-22 16:44:07 +08:00
Jiang Jiang Jian
251676181a
Merge branch 'bugfix/backport_some_lwip_bugs_0910_v3.3' into 'release/v3.3'
...
lw-ip:backport bugfix lw-ip for v3.3
See merge request espressif/esp-idf!10409
2020-09-22 14:18:30 +08:00
dongyou
e12593a79f
Fix spin lock allocation in PSRAM bug
2020-09-22 14:11:25 +08:00
weitianhua
7f9a4d25ef
Confirmed bugfix from Baidu Project
2020-09-22 11:57:00 +08:00
Michael (XIAO Xufeng)
4afc8facde
Merge branch 'fixbug/sdmmc_spi_highspeed_v3.3' into 'release/v3.3'
...
sdmmc: fix the probe issue that forbid sdspi working in highspeed mode(backport v3.3)
See merge request espressif/esp-idf!9838
2020-09-21 11:10:09 +08:00
Angus Gratton
c73a00e073
Merge branch 'bugfix/espcoredump_fix_error_reported_for_blank_partition_v33' into 'release/v3.3'
...
Bugfix/espcoredump fix error reported for blank partition (backport v3.3)
See merge request espressif/esp-idf!9625
2020-09-21 10:45:05 +08:00