Commit Graph

22746 Commits

Author SHA1 Message Date
Wang Meng Yang
58544cfbca Merge branch 'feature/add_ext_adv_instance_check_v4.4' into 'release/v4.4'
NimBLE: Added ble_gap_ext_adv_active() to check if extended advertising instance is active or not (v4.4)

See merge request espressif/esp-idf!23546
2023-06-20 17:36:02 +08:00
Jiang Jiang Jian
e0550972c0 Merge branch 'bugfix/fix_chip_broken_bug_in_monitor_mode_c3s2s3_to_v4.4' into 'release/v4.4'
ESP32S2/C3/S3: fixed S2 dangerous power parameters in sleep modes and support S2/C3/S3 different sleep mode(v4.4)

See merge request espressif/esp-idf!23758
2023-06-20 16:46:12 +08:00
Jiang Jiang Jian
13a2e49818 Merge branch 'bugfix/fix_Cache_Count_Flash_bug_v4.4' into 'release/v4.4'
cache: patch some rom cache api, rename those apis in ld (backport v4.4)

See merge request espressif/esp-idf!24293
2023-06-20 16:08:36 +08:00
Jiang Jiang Jian
167557829e Merge branch 'bugfix/install_keys_after_successful_4_of_4_tx_v4.4' into 'release/v4.4'
esp_wifi: Install keys after successful transmission of EAPOL 4/4 Message(backport v4.4)

See merge request espressif/esp-idf!23620
2023-06-20 14:14:24 +08:00
morris
564e20dd6b Merge branch 'refactor/improve_adc_power_maintanance_v4.4' into 'release/v4.4'
adc: improve power logic (v4.4)

See merge request espressif/esp-idf!23275
2023-06-20 10:52:46 +08:00
morris
ea9d916f2a Merge branch 'fix/usb_wakeup_resume' into 'release/v4.4'
[USBD] Fix usb resume bug on esp32sx (v4.4)

See merge request espressif/esp-idf!23589
2023-06-19 17:39:18 +08:00
wanglei
c7d8e50fdb cache: patch some rom cache api, rename those apis in ld
1. Cache_Count_Flash_Pages, fix this api return enexpected + 1
2. Cache_Suspend_I/DCache, add wait cache idle after suspend cache
3. Cache_Freeze_I/DCache_Enable, add wait cache idle after freeze
2023-06-19 15:55:37 +08:00
Shreyas Sheth
128aba4892 esp_wifi: Install keys after eapol and NVS store security values
1. Bugfix store authmode security in NVS
2. Install keys after successful transmission of EAPOL 4/4 Message
2023-06-18 02:48:15 +05:30
Roland Dobai
8b94183c9c Merge branch 'feature/submodules_sbom_v4.4' into 'release/v4.4'
tools: add sbom information for submodules (v4.4)

See merge request espressif/esp-idf!24244
2023-06-15 21:07:58 +08:00
Frantisek Hrbata
7f9a5a8b71 tools: add sbom information for submodules
Conflicts:
- protobuf-c submodule version and hash changed to v1.4.0
- removed pytest dependency

This adds SBOM information for submodules, which are not managed
by Espressif. Meaning there is no fork for them in the espressif
namespace. Other submodules should add sbom.yml manifest file to
the root of their git repository.

The SBOM information for submodules is stored in the .gitmodules file.
Each SBOM related variable has the "sbom-" prefix and the following
variables may be used:

sbom-version:
   submodule version

sbom-cpe:
   CPE record if available in NVD. This will be used by the SBOM
   tool to check for possible submodule vulnerabilities. The
   version in the CPE can be replaced with the "{}" placeholder,
   which will be replaced by the "sbom-version" value from above.

sbom-supplier:
   Person or organization who is providing the submodule.
   It has to start with "Person:" or "Organization:" prefix
   as required by the SPDX-2.2 standard.

sbom-url:
   URL to the project if exists, e.g. github.

sbom-description:
   Project description.

sbom-hash:
   Submodule SHA as recorded in the git-tree. This field is used by
   CI to check that the submodule checkout hash and info in .gitmodules
   are in sync. IOW if submodule is updated and it has SBOM info in
   .gitmodules, the .gitmodules has to be updated too. The test is
   part of this commit. The checkout has of the submodule can be found
   by using "git submodule status".

Example for micro-ecc submodule
---8<---
[submodule "components/bootloader/subproject/components/micro-ecc/micro-ecc"]
	path = components/bootloader/subproject/components/micro-ecc/micro-ecc
	url = ../../kmackay/micro-ecc.git
	sbom-version = 1.0
	sbom-cpe = cpe:2.3🅰️micro-ecc_project:micro-ecc:{}:*:*:*:*:*:*:*
	sbom-supplier = Person: Ken MacKay
	sbom-url = https://github.com/kmackay/micro-ecc
	sbom-description = A small and fast ECDH and ECDSA implementation for 8-bit, 32-bit, and 64-bit processors
	sbom-hash = d037ec89546fad14b5c4d5456c2e23a71e554966
---8<---

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
2023-06-15 06:45:17 +02:00
morris
2dfabd02a9 Merge branch 'bugfix/mcpwm_legacy_typo_v4.4' into 'release/v4.4'
mcpwm: fix typo in backward compatible macro name (v4.4)

See merge request espressif/esp-idf!24229
2023-06-15 10:13:04 +08:00
Aditya Patwardhan
6afa8e4347 Merge branch 'bugfix/aes_dma_align_issue_v4.4' into 'release/v4.4'
aes: fix DMA descriptor calculation for the alignment case (v4.4)

See merge request espressif/esp-idf!24095
2023-06-14 16:55:42 +08:00
morris
5ef69e8a63 mcpwm: fix typo in backward compatible macro name 2023-06-14 11:40:40 +08:00
Roland Dobai
e33a1808d6 Merge branch 'feature/tools_add_ulp_linux_i686_toolchain_v4.4' into 'release/v4.4'
tools: add ULP toolchain for linux-i686 platform (v4.4)

See merge request espressif/esp-idf!24196
2023-06-13 20:47:57 +08:00
David Čermák
b96c98accf Merge branch 'bugfix/eth_lan8720_ci_v4.4' into 'release/v4.4'
esp_eth: start/stop and L2 test stability improvements (v4.4)

See merge request espressif/esp-idf!22322
2023-06-13 16:42:07 +08:00
Jiang Jiang Jian
a843cdebea Merge branch 'bugfix/fix_wps_with_sae_enabled_ap_v4.4' into 'release/v4.4'
esp_wifi: Fix WPS issue for WPA3+WPA2 mode(v4.4)

See merge request espressif/esp-idf!24156
2023-06-13 16:06:49 +08:00
Anton Maklakov
44b8882458 tools: add ULP toolchain for linux-i686 platform
Closes https://github.com/espressif/esp-idf/issues/11561
2023-06-13 12:50:38 +07:00
Jiang Jiang Jian
aca729aea6 Merge branch 'bugfix/fix_blufi_compilation_issue_v4.4' into 'release/v4.4'
Blufi: Fixed compilation issue in blufi for nimble(v4.4)

See merge request espressif/esp-idf!24021
2023-06-13 10:56:21 +08:00
Jiang Jiang Jian
3d743d525c Merge branch 'feature/efuse_settings_v4.4' into 'release/v4.4'
hal: Explicit setting of efuse time settings (v4.4)

See merge request espressif/esp-idf!23727
2023-06-13 10:53:35 +08:00
Jiang Jiang Jian
4c1705975a Merge branch 'bugfix/spp_notify_v4.4' into 'release/v4.4'
NimBLE: Removed indicate flag from gatt db and added subscription case in spp_server example (v4.4)

See merge request espressif/esp-idf!23536
2023-06-13 10:53:11 +08:00
morris
abb204fa89 Merge branch 'feature/add_log_when_mspi_timing_tuning_is_enabled_v4.4' into 'release/v4.4'
mspi: added timing tuning start, and success log (v4.4)

See merge request espressif/esp-idf!24055
2023-06-13 10:30:04 +08:00
Aditya Patwardhan
5d38b0238c Merge branch 'contrib/github_pr_11402_v4.4' into 'release/v4.4'
esp_ds: ignore releasing mutex if not called from same task (GitHub PR) (v4.4)

See merge request espressif/esp-idf!23842
2023-06-13 01:21:13 +08:00
Ivan Grokhotkov
8bbe92ed90 Merge branch 'bugfix/usb_serial_jtag_select_poll_crash_v4.4' into 'release/v4.4'
vfs: select sanity NULL check (v4.4)

See merge request espressif/esp-idf!23948
2023-06-12 19:22:07 +08:00
Ivan Grokhotkov
4b05ffb03e Merge branch 'fix/sdio_sd_cards_not_detected_correctly_v4.4' into 'release/v4.4'
sdmmc: sdio combination cards correct setup (v4.4)

See merge request espressif/esp-idf!23480
2023-06-12 19:21:33 +08:00
Armando
00bd59dc68 mspi: added timing tuning start, and success log 2023-06-12 16:12:20 +08:00
Krzysztof Budzynski
e14ebdcaa5 Merge branch 'docs/fix_error_in_esp32-s2-devkitc-1_pin_layout_diagram_v4.4' into 'release/v4.4'
Docs/Fix error in esp32-s2-devkitc-1 pin layout diagram (v4.4)

See merge request espressif/esp-idf!24118
2023-06-12 11:56:02 +08:00
morris
f1ba6ced19 Merge branch 'bugfix/fix_mspi_octal_psram_timing_tuning_point_fallback_id_v4.4' into 'release/v4.4'
mspi: modified mspi 80mhz octal psram timing tuning point fallback id on s3 (v4.4)

See merge request espressif/esp-idf!23693
2023-06-12 10:50:12 +08:00
morris
d9d5327dfa Merge branch 'bugfix/add_len_check_per_spi_master_transaction_v4.4' into 'release/v4.4'
spi master: added transaction length check to refuse longer than hardware supported length (v4.4)

See merge request espressif/esp-idf!23749
2023-06-12 10:47:59 +08:00
Kapil Gupta
f46518e42e esp_wifi: Fix WPS issue for WPA3+WPA2 mode 2023-06-09 18:06:56 +05:30
Jiang Jiang Jian
ad08d94ed3 Merge branch 'bugfix/nvs_softap_pmk_v4.4' into 'release/v4.4'
esp_wifi: fix softap nvs <ssid,password,pmk> not matching issue(v4.4)

See merge request espressif/esp-idf!23820
2023-06-09 19:45:28 +08:00
Rahul Tank
b7e5be07de Blufi: Fixed compilation issue in blufi for nimble 2023-06-09 17:10:35 +05:30
Jiang Jiang Jian
7053e483ea Merge branch 'feature/add_bluetooth_nimble_lightsleep_example_v4.4' into 'release/v4.4'
bt: Added an example of Bluetooth using light sleep(v4.4)

See merge request espressif/esp-idf!23694
2023-06-09 19:20:31 +08:00
Jiang Jiang Jian
b4c06edfd6 Merge branch 'bugfix/fix_bleqabr23_250_v4.4' into 'release/v4.4'
Fixed crash when controller initialization fails due to insufficient memory (backport 4.4)

See merge request espressif/esp-idf!24090
2023-06-09 19:19:28 +08:00
Jiang Jiang Jian
4a4fea5746 Merge branch 'bugfix/hfp_ag_idx_invalid_v4.4' into 'release/v4.4'
bt: Fixed out of bounds access due to variable length array(v4.4)

See merge request espressif/esp-idf!23667
2023-06-09 19:18:58 +08:00
Jiang Jiang Jian
ff4ae8df34 Merge branch 'bugfix/hf_cind_ind_index_v4.4' into 'release/v4.4'
bt: Fixed the inconsistency between the indicator event received by the HF application layer and the actually received indicator(v4.4)

See merge request espressif/esp-idf!23562
2023-06-09 19:18:16 +08:00
Jiang Jiang Jian
01cc59c000 Merge branch 'bugfix/a2dp_source_app_state_error_v4.4' into 'release/v4.4'
bt: Fixed the issue that the a2dp source would not send the media start command due to the connection initiated by the peer device(v4.4)

See merge request espressif/esp-idf!23555
2023-06-09 19:17:39 +08:00
Jiang Jiang Jian
4462c00107 Merge branch 'bugfix/a2dp_source_crash_connect_to_Bose_speaker_v4.4' into 'release/v4.4'
Bugfix/a2dp source crash connect to bose speaker (v4.4)

See merge request espressif/esp-idf!23350
2023-06-09 19:17:10 +08:00
Jiang Jiang Jian
c125f0a9f3 Merge branch 'bugfix/mbo_ie_absent_prob_req_v44' into 'release/v4.4'
wpa_supplicant : Add MBO ie in probe request.(backport v4.4)

See merge request espressif/esp-idf!24099
2023-06-09 19:16:46 +08:00
Jiang Jiang Jian
bc05c74022 Merge branch 'bugfix/dpp_retry_start_listening_issue_v4.4' into 'release/v4.4'
esp_dpp: Fix retry with esp_supp_dpp_start_listen after failure (v4.4)

See merge request espressif/esp-idf!23596
2023-06-09 19:15:45 +08:00
Jiang Jiang Jian
5fb50f6848 Merge branch 'bugfix/fix_wakeup_failed_if_powerdown_flash_in_lightsleep_v4.4' into 'release/v4.4'
Power Management: fixed flash funcs called in sleep wakeup process (backport v4.4)

See merge request espressif/esp-idf!24007
2023-06-09 19:14:37 +08:00
Jiang Jiang Jian
2771f0cb0b Merge branch 'bugfix/close_phy_tsens_before_sleep_v4.4' into 'release/v4.4'
sleep: fix deepsleep current leakage caused by phy_tsens (backport v4.4)

See merge request espressif/esp-idf!23908
2023-06-09 19:13:50 +08:00
Jiang Jiang Jian
72007647cd Merge branch 'feature/example_deep_sleep_wake_stub_backport_v4.4' into 'release/v4.4'
example: add deepsleep_wake stub example (backport v4.4)

See merge request espressif/esp-idf!23360
2023-06-09 19:11:20 +08:00
Zim Kalinowski
b04cd385f8 Merge branch 'bugfix/sync-contribution-guide_v4.4' into 'release/v4.4'
docs: updated contribution agreement (v4.4)

See merge request espressif/esp-idf!23837
2023-06-09 13:48:09 +08:00
Jiang Jiang Jian
f583d58779 Merge branch 'bugfix/fix_reduce_phy_tx_power_when_brownout_reset_invisible_issue' into 'release/v4.4'
fix reduce phy tx power when brownout reset invisible issue

See merge request espressif/esp-idf!23359
2023-06-09 12:04:39 +08:00
Jiang Jiang Jian
e6df66522a Merge branch 'feature/usb_host_interface_claim_debug_info_v4.4' into 'release/v4.4'
USB Host: better debugging information during usb_host_interface_claim() (backport v4.4)

See merge request espressif/esp-idf!23445
2023-06-09 12:02:59 +08:00
Jiang Jiang Jian
61a0c12c29 Merge branch 'lwip/dhcp_fine_tmr_bug_fix_backport' into 'release/v4.4'
lwip/dhcp: Fixed ondemand fine timers leakage bug (v4.4)

See merge request espressif/esp-idf!23315
2023-06-09 12:01:44 +08:00
Roland Dobai
06c08def3d Merge branch 'feature/extend_proj_desc_json_v4.4' into 'release/v4.4'
extend information in project_description.json (v4.4)

See merge request espressif/esp-idf!24129
2023-06-09 01:59:27 +08:00
Frantisek Hrbata
53f271ce10 tools: extend information in project_description.json
This extends information provided in the project_description.json file.
Newly added information can be used in the SBOM generating tool and
also to improve hints regarding the the component dependency issues.

Added fields

version:
   This adds versioning to the project_description.json file,
   so it's easy to identify if it contains the required information.

project_version:
   Can be used as a version for the resulting binary e.g. `hello_world.bin`.

idf_path:
   This one is probably not necessary, but it allows tools to run even without
   esp-idf environment exported(e.g. export.sh).

c_compiler:
   The `CMAKE_C_COMPILER` value with full path to the compiler binary. This can
   be used to get information about toolchain, which was used to build the project.

common_component_reqs:
   List of common components as presented in cmake's __COMPONENT_REQUIRES_COMMON
   and set in tools/cmake/build.cmake:__build_init().

build_component_info:
   Detailed information about components used during build. It's a
   dictionary with the component name as a key and each component has
   a dictionary with detailed information. Following is an example for
   the efuse component.

   "efuse": {
       "alias": "idf::efuse",
       "target": "___idf_efuse",
       "prefix": "idf",
       "dir": "/home/fhrbata/work/esp-idf/components/efuse",
       "type": "LIBRARY",
       "lib": "__idf_efuse",
       "reqs": [],
       "priv_reqs": [ "bootloader_support", "soc", "spi_flash" ],
       "managed_reqs": [],
       "managed_priv_reqs": [],
       "file": "/home/fhrbata/work/blink/build/esp-idf/efuse/libefuse.a",
       "sources": [ "/home/fhrbata/work/esp-idf/components/efuse/esp32s3/esp_efuse_table.c", ... ],
       "include_dirs": [ "include", "esp32s3/include" ]
   }

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
2023-06-08 18:35:00 +02:00
Frantisek Hrbata
ee505a9960 tools: fix make_json_list to return empty json list for empty cmake list
Currently make_json_list() returns '[ "" ]' for empty cmake list. Fix this
so empty json list is returned instead.

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
2023-06-08 15:32:36 +02:00
morris
3f0ccda84e Merge branch 'contrib/github_pr_11113_v4.4' into 'release/v4.4'
Fix usb enumeration stage error for some device (GitHub PR) (v4.4)

See merge request espressif/esp-idf!23334
2023-06-08 18:00:27 +08:00