Jiang Jiang Jian
97ed80f415
Merge branch 'nimble/fix_ble_sm_sc_pub_key_v4.2' into 'release/v4.2'
...
NimBLE: Fix MITM vulnerability and free AES context (v4.2)
See merge request espressif/esp-idf!13597
2021-05-25 14:17:55 +00:00
Jiang Jiang Jian
b18f37b2e2
Merge branch 'bugfix/ag_use_dynamic_memory_error_v4.2' into 'release/v4.2'
...
Fix ag use dynamic memory error
See merge request espressif/esp-idf!13551
2021-05-25 14:17:18 +00:00
Prasad Alatkar
0ca5134d5f
NimBLE: Fix MITM vulnerability and free AES context (v4.2)
2021-05-25 09:21:12 +00:00
Jiang Jiang Jian
bab80796ca
Merge branch 'bugfix/remove_redundant_other_core_cache_disable_v4.2' into 'release/v4.2'
...
[system]: Remove redundant othercore cache disable (backport v4.2)
See merge request espressif/esp-idf!13357
2021-05-25 09:05:33 +00:00
Jiang Jiang Jian
c219c9dcb2
Merge branch 'bugfix/fix_set_channel_error_after_wifi_stop_v4.2' into 'release/v4.2'
...
esp_wifi: Fix setting channel error after WiFi stop (backport v4.2)
See merge request espressif/esp-idf!13447
2021-05-25 08:09:39 +00:00
Michael (XIAO Xufeng)
18a262a6fa
Merge branch 'ci/decrease_flash_performance_thr_4.2' into 'release/v4.2'
...
ci: decrease the flash performance threshold (4.2)
See merge request espressif/esp-idf!13632
2021-05-25 07:11:14 +00:00
xiongweichao
8e7f7dfe59
Remove btc_hf_idx_by_bdaddr in both btc_hf_init and btc_hf_deinit functions
2021-05-25 07:06:22 +00:00
xiongweichao
b257ad7d9e
fix ag use dynamic memory error
2021-05-25 07:06:22 +00:00
Michael (XIAO Xufeng)
d2715324e5
Merge branch 'bugfix/fix_touch_sensor_power_source_v4.2' into 'release/v4.2'
...
touch_sensor: fix esp32s2 touch sensor default power source (Backport v4.2)
See merge request espressif/esp-idf!13485
2021-05-25 03:13:32 +00:00
Michael (XIAO Xufeng)
899c7852a4
ci: decrease the flash performance threshold
2021-05-21 13:03:36 +08:00
Island
d9ec7df393
Merge branch 'nimble/fix_host_flow_ctrl_v4.2' into 'release/v4.2'
...
NimBLE: Fix host flow control in NimBLE porting layer and host (release/v4.2)
See merge request espressif/esp-idf!13571
2021-05-19 08:52:23 +00:00
Angus Gratton
71cddbdf8f
Merge branch 'bugfix/fe_example_test_args' into 'release/v4.2'
...
ci: fix flash encryption example test esptool args (4.2)
See merge request espressif/esp-idf!13539
2021-05-19 06:58:48 +00:00
Angus Gratton
a699475df2
Merge branch 'bugfix/fix_ppos_ci_python3' into 'release/v4.2'
...
CI: fix ppos test app python3 error (v4.2)
See merge request espressif/esp-idf!13592
2021-05-19 06:58:41 +00:00
Marius Vikhammer
b5976a7167
CI: fix error when running pppos test app with python3
...
Socket.sendall expects bytes in python3, not strings
2021-05-19 11:42:42 +08:00
Prasad Alatkar
1c7340d229
NimBLE: Update submodule to fix host flow control bugs.
2021-05-18 18:10:19 +05:30
Prasad Alatkar
b3e1829f10
NimBLE: Fix host flow control in NimBLE porting layer.
...
- Register `ble_hs_flow_acl_free` callback in NimBLE porting layer.
2021-05-17 14:16:19 +05:30
Kang Zuoling
2515cd72c1
touch_sensor: fix esp32s2 touch sensor default power source
2021-05-15 13:52:37 +08:00
Jiang Jiang Jian
8a841d7cdf
Merge branch 'bugfix/gtk_reinstallation_fix_v4.2' into 'release/v4.2'
...
wpa_supplicant: Prevent reinstallation of an already in-use group key (v4.2)
See merge request espressif/esp-idf!13182
2021-05-13 04:30:53 +00:00
Hrudaynath Dhabe
31d05a5072
wpa_supplicant: Group key reinstallation fixes
...
This commit reverts previous commit for GTK reinstallation fix
and corrects original fix.
2021-05-13 12:30:44 +08:00
Jiang Jiang Jian
bfb7c66a9f
Merge branch 'bugfix/timer_spinlock_iram_v4.2' into 'release/v4.2'
...
timer: add IRAM_ATTR to spinlock give/take API (v4.2)
See merge request espressif/esp-idf!13512
2021-05-13 04:30:02 +00:00
Marius Vikhammer
3bb84e7738
ci: fix flash encryption example test esptool args
...
Esptool submodule got updated which changed the function signature for EncryptFlashDataArgs.
Update example test script to reflect the new function signature
2021-05-13 11:05:32 +08:00
Marius Vikhammer
ff4ca61cc6
timer: add IRAM_ATTR to spinlock give/take API
...
Closes https://github.com/espressif/esp-idf/issues/6824
2021-05-11 15:32:37 +08:00
Angus Gratton
f195a1d8ae
Merge branch 'bugfix/otatool_wrong_switch_ota_partition_slots_v4.2' into 'release/v4.2'
...
otatool: Fix incorrect using otadata.seq&crc in switch_ota_partition cmd (v4.2)
See merge request espressif/esp-idf!13368
2021-05-11 01:27:53 +00:00
Angus Gratton
d52331849e
Merge branch 'bugfix/flash_rodata_any_alignement_v4.2' into 'release/v4.2'
...
build: Fix cache issue and add dedicated section for (Custom) App version info (backport v4.2)
See merge request espressif/esp-idf!13465
2021-05-11 01:03:12 +00:00
Jiang Jiang Jian
d29cce7f0a
Merge branch 'bugfix/fix_some_pm_issue_v4.2' into 'release/v4.2'
...
esp_pm: add an interface to get pm configuration (backport to v4.2)
See merge request espressif/esp-idf!13124
2021-05-10 03:45:55 +00:00
Jiang Jiang Jian
6b47fcdbdc
Merge branch 'bugfix/correct_cod_check_v4.2' into 'release/v4.2'
...
esp-idf: Corrected check of Class of Device for discovered devices (v4.2)
See merge request espressif/esp-idf!13020
2021-05-10 03:45:35 +00:00
Jiang Jiang Jian
9a2362b5c7
Merge branch 'nimble/add_error_prints_acl_buf_v4.2' into 'release/v4.2'
...
NimBLE: Add error prints for ACL buffer exhaustion in NPL (v4.2)
See merge request espressif/esp-idf!12969
2021-05-10 03:45:08 +00:00
Jiang Jiang Jian
abe7a9d020
Merge branch 'bugfix/wifi_softap_deep_sleep_current_opt_v4.2' into 'release/v4.2'
...
backport v4.2: optimize deep sleep current in wifi softap mode
See merge request espressif/esp-idf!13393
2021-05-10 03:44:29 +00:00
Jiang Jiang Jian
9f63baf061
Merge branch 'bugfix/generate_value_0_when_prov_auth_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Fix provisioning input or output count number should be at least 1 (v4.2)
See merge request espressif/esp-idf!13479
2021-05-10 03:42:24 +00:00
Omar Chebib
bf4320ba68
ci: fix flasher_args.json parser (iterate over dictionary)
...
Closes IDFCI-347
2021-05-10 11:18:09 +08:00
Omar Chebib
5c175721e9
ci: use "encrypted" information in flasher_args.json
...
Take into account the new field "encrypted" that is part of the
partition entries in flasher_args.json file
Closes IDF-2231
2021-05-10 11:18:09 +08:00
Omar Chebib
78ea042e7d
esptool: Update esptool to have merge adjacent sections feature
2021-05-10 11:18:09 +08:00
Ivan Grokhotkov
af7b21851e
freertos: fix TLS run-time address calculation
...
Since dd849ffc
, _rodata_start label has been moved to a different
linker output section from where the TLS templates (.tdata, .tbss)
are located. Since link-time addresses of thread-local variables are
calculated relative to the section start address, this resulted in
incorrect calculation of THREADPTR/$tp registers.
Fix by introducing new linker label, _flash_rodata_start, which points
to the .flash.rodata output section where TLS variables are located,
and use it when calculating THREADPTR/$tp.
Also remove the hardcoded rodata section alignment for Xtensa targets.
Alignment of rodata can be affected by the user application, which is
the issue dd849ffc
was fixing. To accommodate any possible alignment,
save it in a linker label (_flash_rodata_align) and then use when
calculating THREADPTR. Note that this is not required on RISC-V, since
this target doesn't use TPOFF.
2021-05-10 11:18:09 +08:00
Omar Chebib
974b8dd4c4
build: (Custom) App version info is now on a dedicated section, independent of the rodata alignment
...
It is now possible to have any alignment restriction on rodata in the user
applicaiton. It will not affect the first section which must be aligned
on a 16-byte bound.
Closes https://github.com/espressif/esp-idf/issues/6719
Closes https://github.com/espressif/esp-idf/issues/6976
2021-05-10 11:17:58 +08:00
Jiang Jiang Jian
87da4bccd4
Merge branch 'bugfix/btdm_fix_multi-con_pair_failed_and_cancle_con_state_err_v4.2' into 'release/v4.2'
...
fix multi con pair failed and cancel con state err (backport v4.2)
See merge request espressif/esp-idf!13475
2021-05-08 12:53:35 +00:00
wangjialiang
c68f520389
ble_mesh: stack: Fix provisioning input or output count number should be at least 1
...
Closes https://github.com/espressif/esp-idf/issues/6863
2021-05-08 11:49:25 +08:00
Krzysztof Budzynski
232786235b
Merge branch 'docs/update_CN_buildsystem_v4.2' into 'release/v4.2'
...
update CN translation for build-system for v4.2
See merge request espressif/esp-idf!13291
2021-05-08 03:36:01 +00:00
Dai Zi Yan
61fdb62c54
update CN translation for build-system for v4.2
2021-05-08 11:35:56 +08:00
Island
c4155d4b47
Merge branch 'bugfix/endianness_in_output_or_input_oob_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Fix endianness error in output or input oob data of number (v4.2)
See merge request espressif/esp-idf!13255
2021-05-07 13:45:15 +00:00
zwj
34e8265821
update con state when getting connection cancle complete
2021-05-07 20:47:34 +08:00
zwj
3ebcb25fb1
fix multi-connection pair failed
2021-05-07 20:46:50 +08:00
Wang Meng Yang
7223c8db5b
Merge branch 'bugfix/btdm_incorrectly_spelled_v4.2' into 'release/v4.2'
...
component/bt: fix Spelling mistakes (release v4.2)
See merge request espressif/esp-idf!12816
2021-05-07 08:10:02 +00:00
Angus Gratton
fc7bf950f3
Merge branch 'bugfix/freertos_addition_overflow_v4.2' into 'release/v4.2'
...
freertos: Fix addition overflow (v4.2)
See merge request espressif/esp-idf!13423
2021-05-07 07:52:31 +00:00
wangjialiang
c37b15fa22
ble_mesh: stack: Fix endianness error in output or input oob data of number
...
Closes https://github.com/espressif/esp-idf/issues/6862
2021-05-07 03:33:59 +00:00
Michael (XIAO Xufeng)
e3fd4b097b
Merge branch 'bugfix/spi_fix_duplex_switch_v4.2' into 'release/v4.2'
...
spi_master: fix duplex mode switch issue for multi devices (4.2)
See merge request espressif/esp-idf!11233
2021-05-06 07:43:40 +00:00
xiehang
86141ad01c
esp_wifi: Fix setting channel error after WiFi stop
2021-05-06 11:40:57 +08:00
He Yin Ling
223cf48c26
Merge branch 'bugfix/python3_target_test_4.2' into 'release/v4.2'
...
ci: run target test with python3
See merge request espressif/esp-idf!12755
2021-05-06 02:19:19 +00:00
Angus Gratton
6d9d40e888
Merge branch 'bugfix/fix_bootloader_time_too_long_bug_v4.2' into 'release/v4.2'
...
esp32s2: decrease boot up and cpu start up time (backport v4.2)
See merge request espressif/esp-idf!12729
2021-05-06 02:03:10 +00:00
Angus Gratton
45c90be913
Merge branch 'update/version_4_2_1' into 'release/v4.2'
...
Update version to 4.2.1
See merge request espressif/esp-idf!13390
2021-05-05 23:12:32 +00:00
Krzysztof Budzynski
e7dc6eb8da
Merge branch 'bugfix/doxygen_input_file_bug_v4.2' into 'release/v4.2'
...
docs: fix doxygen compile warnings for doxygen 1.9.1 (v4.2)
See merge request espressif/esp-idf!13076
2021-05-05 10:14:19 +00:00