alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
31,396 Commits 20 Branches 148 Tags 384 MiB
40bea117e4
Commit Graph

31396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marius Vikhammer
40bea117e4 Merge branch 'bugfix/s3_irom_addr_v5.1' into 'release/v5.1' 
soc: fix SOC_IROM_MASK_HIGH for esp32s3 (v5.1)

See merge request espressif/esp-idf!27136
 2023-12-20 10:00:39 +08:00
Roland Dobai
b88e73f3ed Merge branch 'fix/sbom_validation_post_commit_v5.1' into 'release/v5.1' 
fix: do sbom manifest validation in post-commit (v5.1)

See merge request espressif/esp-idf!28012
 2023-12-20 00:03:18 +08:00
Frantisek Hrbata
a537dafa74 fix: do sbom manifest validation in post-commit 
Following commit c3afbebf23 ("fix: bump esp-idf-sbom to v0.13.0 in pre-commit"),
the validation of submodule hash now relies solely on the information recorded
in the git-tree. Previously, the hash verification used submodule's
working tree hash if available. Since the new submodule hash is recorded
in git-tree only after the commit is created, we need to move the check
into post-commit, otherwise the hash validation checks the old value.

For example:

1. in .gitmodules

	[submodule "components/json/cJSON"]
	   sbom-hash = cb8693b058ba302f4829ec6d03f609ac6f848546

2. update the cJSON

	$ git -C components/json/cJSON checkout b45f48e600671feade0b6bd65d1c69de7899f2be

3. update cJSON hash in .gitmodules

	[submodule "components/json/cJSON"]
	   sbom-hash = b45f48e600671feade0b6bd65d1c69de7899f2be

4. commit the changes

	$ git commit -a -s

Step 4. will fail, because the validation is currently started in pre-commit stage,
where the hash for cJSON recorded in git-tree is still
cb8693b058ba302f4829ec6d03f609ac6f848546. The new hash b45f48e600671feade0b6bd65d1c69de7899f2be
will be stored in git-tree after the new commit is created.

Note that this means we cannot prevent the commit creation, but only
notify user about the hash inconsistency. If he/she still decides to
push it, it will fail in pre-commit checks in CI.

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
 2023-12-19 12:30:37 +01:00
Roland Dobai
c61b2c4790 Merge branch 'feature/add_fatfs_sbom_v5.1' into 'release/v5.1' 
feat(storage/fatfs): add sbom file manifest for FatFs (v5.1)

See merge request espressif/esp-idf!27480
 2023-12-19 16:47:52 +08:00
Tomas Rohlinek
641ac3ee71 feat(storage/fatfs): add sbom file manifest for FatFs (v5.1) 2023-12-19 16:47:51 +08:00
Anton Maklakov
dbeb870635 Merge branch 'feature/update-gdb-to-12.1_20231023_v5.1' into 'release/v5.1' 
feat(tools): update gdb version to 12.1_20231023 (v5.1)

See merge request espressif/esp-idf!27377
 2023-12-19 14:11:20 +08:00
Island
fae6ce0e7d Merge branch 'bugfix/ble_stack_disable_v5.1' into 'release/v5.1' 
Bugfix/ble stack disable v5.1(backport v5.1)

See merge request espressif/esp-idf!27650
 2023-12-19 12:00:04 +08:00
Island
08d54a6436 Merge branch 'backport/fix_ble_menuconfig_v5.1' into 'release/v5.1' 
Backport/fix ble menuconfig v5.1(backport v5.1)

See merge request espressif/esp-idf!27497
 2023-12-19 11:59:29 +08:00
Jiang Jiang Jian
2abb36bc7f Merge branch 'optimize/When_psram_is_enable_the_number_of_ooseq_is_not_limited_5.1' into 'release/v5.1' 
optimize(lwip):when psram is enable the number of ooseq is not limited 5.1

See merge request espressif/esp-idf!27945
 2023-12-19 10:44:08 +08:00
Jiang Jiang Jian
9ed598aefe Merge branch 'backport/uart_select_malloc_5.1' into 'release/v5.1' 
fix(vfs): fix uart malloc when locates ISR context in IRAM(Backport 5.1)

See merge request espressif/esp-idf!27382
 2023-12-19 10:43:13 +08:00
Aditya Patwardhan
602cdf2fb4 Merge branch 'fix/cleanup_deleted_menuconfig_option_entries_v5.1' into 'release/v5.1' 
fix(mbedtls): Fix menuconfig option entries (v5.1)

See merge request espressif/esp-idf!27464
 2023-12-18 18:18:18 +08:00
Alexey Lapshin
8e11721c40 feat(tools): update gdb version to 12.1_20231023 2023-12-18 17:44:22 +08:00
zhanghaipeng
103656e7a2 feat(bt/bluedroid): Support ble create sync report disable and filter duplicate 2023-12-18 11:51:29 +08:00
zhanghaipeng
e0a0ee9ae9 fix(bt/bluedroid): Fix bluedroid menuconfig 2023-12-18 11:51:29 +08:00
zhanghaipeng
8d78433dea fix(bt/bluedroid): Fix BLE SMP register log level 2023-12-18 11:51:29 +08:00
zhanghaipeng
d0e9b33f5d docs(bt/bluedroid): Update ble example document 2023-12-18 11:51:29 +08:00
zhanghaipeng
55409e2395 fix(bt/bluedroid): Fix ble adv and scan status when deinit bluedroid 2023-12-18 11:47:50 +08:00
Aditya Patwardhan
25144125d6 fix(mbedtls): Removed redundant menuconfig entry 2023-12-18 11:19:00 +08:00
Mahavir Jain
fa7383162f Merge branch 'fix/esp32s3_soc_drom_high_addr_v5.1' into 'release/v5.1' 
fix(soc): esp32s3/Fix the DROM_HIGH_ADDR (v5.1)

See merge request espressif/esp-idf!27822
 2023-12-17 16:31:41 +08:00
Rahul Tank
36ca229332 Merge branch 'bugfix/add_peer_null_check_v5.1' into 'release/v5.1' 
fix(nimble): Added NULL peer addr check (v5.1)

See merge request espressif/esp-idf!27939
 2023-12-16 15:55:00 +08:00
Rahul Tank
3c49099503 fix(nimble): Added NULL peer addr check 2023-12-15 18:06:40 +05:30
Rahul Tank
8a6d244a21 Merge branch 'bugfix/fix_sm_inject_return_value_v5.1' into 'release/v5.1' 
fix(nimble): Added change to return success for API execution (v5.1)

See merge request espressif/esp-idf!27727
 2023-12-15 19:33:16 +08:00
morris
7a32d046bd Merge branch 'fix/spi_lcd_example_fix_border_pixel_display_v5.1' into 'release/v5.1' 
fix(spi_master): fixed lcd example block border pixel issue (v5.1)

See merge request espressif/esp-idf!27920
 2023-12-15 16:03:30 +08:00
Xue yun fei
965c1da3e0 optimize(lwip):when psram is enable the number of ooseq is not limited 2023-12-15 14:11:38 +08:00
Rahul Tank
820d4a92d2 Merge branch 'feature/current_time_service_v5.1' into 'release/v5.1' 
feat(nimble): Added Example support for Current Time Service (v5.1)

See merge request espressif/esp-idf!27262
 2023-12-15 13:18:24 +08:00
Jiang Jiang Jian
e51e8a0948 Merge branch 'bugfix/fix_esp32h2_system_retention_restore_backup_v5.1' into 'release/v5.1' 
fix(esp_hw_support): fix esp32h2 system link restore override cpu clk configuration(v5.1)

See merge request espressif/esp-idf!27814
 2023-12-15 10:38:24 +08:00
Rahul Tank
4c288321cb fix(nimble): Added change to return success for API execution 2023-12-14 20:57:30 +05:30
Rahul Tank
694c9ccdf5 Merge branch 'bugfix/authcomplete_failure_v5.1' into 'release/v5.1' 
fix(nimble): Fixed authcomplete failure caused by a mismatch in the c1 value (v5.1)

See merge request espressif/esp-idf!27620
 2023-12-14 23:19:14 +08:00
Roshan Bangar
e8503d6efe feat(nimble): Added example support for Current Time Service 2023-12-14 20:24:20 +05:30
David Čermák
24e4b87925 Merge branch 'feature/eth_spi_abstraction_v5.1' into 'release/v5.1' 
Abstraction of SPI driver for SPI Ethernet modules (v5.1)

See merge request espressif/esp-idf!27640
 2023-12-14 21:49:00 +08:00
zhanghaipeng
bd1dc8dfaf fix(bt/bluedroid): Fix ble gattc deregister 2023-12-14 17:53:22 +08:00
wanlei
94fb5232ce fix(spi_master): fixed lcd example block border pixel issue 2023-12-14 17:17:36 +08:00
Darshan Dobariya
6bae5e5d6f fix(nimble): Fixed authcomplete failure caused by a mismatch in the c1 value (v5.1) 2023-12-14 14:13:45 +05:30
Rahul Tank
3ed9c70aa3 Merge branch 'bugfix/remove_rpa_rec_v5.1' into 'release/v5.1' 
fix(nimble): Handled the deletion of RPA mapping(v5.1).

See merge request espressif/esp-idf!27319
 2023-12-14 16:40:23 +08:00
Abhinav Kudnar
eef85a92f4 fix(nimble): Handled the deletion of RPA mapping. 2023-12-14 09:41:07 +05:30
Jiang Jiang Jian
87cd764d6c Merge branch 'bugfix/fix_issuse_in_scan_and_mesh_v5.1' into 'release/v5.1' 
fix(wifi): fix issues in scan and wifi mesh (backport v5.1)

See merge request espressif/esp-idf!27844
 2023-12-14 12:09:31 +08:00
Rahul Tank
0eec2b50be Merge branch 'bugfix/add_legacy_adv_clear_vsc_v5.1' into 'release/v5.1' 
fix(nimble): Add support for VSC to clear legacy adv memory (v5.1)

See merge request espressif/esp-idf!27471
 2023-12-14 12:01:09 +08:00
morris
eb7022dd06 Merge branch 'contrib/github_pr_12559_v5.1' into 'release/v5.1' 
fix(spi): Correct REG_SPI_BASE(i) macro for all targets (GitHub PR) (v5.1)

See merge request espressif/esp-idf!27714
 2023-12-14 11:08:03 +08:00
morris
1b78d57496 Merge branch 'bugfix/bod_reset_c6_h2_v5.1' into 'release/v5.1' 
fix(bod): Reset brownout in configuration to avoid RF cannot be enabled again(backport v5.1)

See merge request espressif/esp-idf!27723
 2023-12-14 11:05:55 +08:00
Roland Dobai
e3ca11c83a Merge branch 'contrib/github_pr_12683_v5.1' into 'release/v5.1' 
fix(tools): fix path delimiter in gdbinit for Windows (v5.1)

See merge request espressif/esp-idf!27575
 2023-12-13 19:21:58 +08:00
Ondrej Kosta
51aad1d75b feat(esp_eth): abstraction of SPI driver for SPI Ethernet modules 2023-12-13 10:44:23 +01:00
GuyBrush
293bd9a0df fix(tools): fix path delimiter in gdbinit for Windows 
Merges https://github.com/espressif/esp-idf/pull/12683

Signed-off-by: Alexey Lapshin <alexey.lapshin@espressif.com>
 2023-12-13 09:27:08 +00:00
Roland Dobai
6dc9cc81cc Merge branch 'bugfix/coredump_detect_v5.1' into 'release/v5.1' 
tools: idf.py: fix detection of raw core dump file (v5.1)

See merge request espressif/esp-idf!27842
 2023-12-13 17:25:19 +08:00
Roland Dobai
5bbb04ce46 Merge branch 'fix/bump_precommit_esp_idf_sbom_v5.1' into 'release/v5.1' 
fix: bump esp-idf-sbom to v0.13.0 in pre-commit (v5.1)

See merge request espressif/esp-idf!27879
 2023-12-13 17:03:03 +08:00
zhangyanjiao
ed2a5f0f0e fix(wifi): fix issues in scan and wifi mesh 
1. fix(wifi): fix the crash issue when clear scan ap list
2. fix the bug that station can't found AP when the authmode is WPA
3. fix wifi mode error when mesh start after station has connected to router
 2023-12-13 17:02:13 +08:00
zhangyanjiao
6e218ceefe feat(wifi): add new api to get one scan ap record 2023-12-13 16:49:04 +08:00
Roland Dobai
598a86e40a Merge branch 'tools/use_recommended_tool_priority_backport_v_5_1' into 'release/v5.1' 
fix(idf_tools): Opt for the recommended tool in tools.json rather than the supported one (v5.1)

See merge request espressif/esp-idf!27795
 2023-12-13 16:38:30 +08:00
Frantisek Hrbata
09ac0b47f9 fix: bump esp-idf-sbom to v0.13.0 in pre-commit 
v0.13.0 contains fix for the submodule hash validation. Let's
bump its version in pre-commit, so the fix is used.

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
 2023-12-13 07:31:22 +01:00
Island
c6a9a06856 Merge branch 'bugfix/fix_some_ble_bugs_v5.1' into 'release/v5.1' 
Fixed some BLE bugs (backport v5.1)

See merge request espressif/esp-idf!27695
 2023-12-13 11:55:52 +08:00
Martin Vychodil
7a7d6aad41 Merge branch 'fix/esp_vfs_fat_sdcard_format_workbuf_leak_v5.1' into 'release/v5.1' 
fix: esp_vfs_fat_sdcard_format workbuf memory leak (v5.1)

See merge request espressif/esp-idf!27504
 2023-12-12 22:15:52 +08:00