morris
0c7e2a9d14
Merge branch 'bugfix/bod_intr__v5.1' into 'release/v5.1'
...
brownout: Disable the hardware BOD when BOD interrupt is enabled(backportv5.1)
See merge request espressif/esp-idf!24692
2023-07-12 11:17:58 +08:00
morris
a0e8f5aa03
Merge branch 'contrib/github_pr_10811_5.1' into 'release/v5.1'
...
i2c: introduce chip specific cmd register number(backport v5.1)
See merge request espressif/esp-idf!24694
2023-07-12 11:15:03 +08:00
Jiang Jiang Jian
26046c054e
Merge branch 'contrib/github_pr_11810_v5.1' into 'release/v5.1'
...
ledc.c: Fix frequency calculation. (GitHub PR) (v5.1)
See merge request espressif/esp-idf!24696
2023-07-12 10:46:36 +08:00
Island
196fc559b4
Merge branch 'feature/ble_mesh_example_support_duplicate_scan_v5.1' into 'release/v5.1'
...
Feature/ble mesh example support duplicate scan(v5.1)
See merge request espressif/esp-idf!24700
2023-07-12 10:38:05 +08:00
Shu Chen
966312e54f
Merge branch 'backport/ieee802154_feature' into 'release/v5.1'
...
Backport some IEEE802154 related MR to 5.1(Backport 5.1)
See merge request espressif/esp-idf!24678
2023-07-12 07:23:43 +08:00
Jiang Jiang Jian
788f1def16
Merge branch 'bugfix/esp_netif_recieve_returns_v5.1' into 'release/v5.1'
...
esp_netif: Report error if esp_netif_receive() fails (v5.1)
See merge request espressif/esp-idf!24655
2023-07-12 04:07:17 +08:00
Shu Chen
6b2209c41d
Merge branch 'backport/phy_track_pll_to_v51' into 'release/v5.1'
...
Backport: phy track pll logic refactor to V5.1(Backport v5.1)
See merge request espressif/esp-idf!24689
2023-07-12 00:13:50 +08:00
Zim Kalinowski
174c38ba5c
Merge branch 'bugfix/fix-esp-even-compile-error-v5.1' into 'release/v5.1'
...
esp_event: fix build error related to format (v5.1)
See merge request espressif/esp-idf!24664
2023-07-11 17:08:38 +08:00
Island
8e2de1b594
Merge branch 'ble_dev/esp32c6_support_power_save_example_5.1' into 'release/v5.1'
...
ble: support esp32c6 power save example
See merge request espressif/esp-idf!24386
2023-07-11 16:55:22 +08:00
wangjialiang
573755a8d2
feat(ble_mesh: stack: esp32c6/h2): update Kconfig file to support duplicate scan.
2023-07-11 15:54:48 +08:00
IhorNehrutsa
1d158ddd10
fix(ledc): fix frequency calculation
...
ledc.c: Fix frequency calculation.
Round int instead of truncate.
Merges https://github.com/espressif/esp-idf/pull/11810
2023-07-11 15:22:34 +08:00
Marius Vikhammer
efc9761ff0
Merge branch 'fix/heap-test-h2_v5.1' into 'release/v5.1'
...
heap: remove exclusion of esp32h2 as a target for heap pytest (v5.1)
See merge request espressif/esp-idf!24567
2023-07-11 15:05:07 +08:00
Hanno
c2b8a1d95c
i2c: introduce chip specific cmd register number
...
Merges https://github.com/espressif/esp-idf/pull/10811
2023-07-11 14:55:46 +08:00
Cao Sen Miao
f44e8a8a8f
brownout: Disable the hardware BOD when BOD interrupt is enabled
2023-07-11 14:32:40 +08:00
xiaqilin
bdc49fbff4
ieee802154: update test code
2023-07-11 14:28:54 +08:00
xiaqilin
91d17e0073
ieee802154: support ieee802154 test
2023-07-11 14:28:54 +08:00
xiaqilin
c80ee99c6a
ieee802154: add a patch for ieee802154 test
2023-07-11 14:28:54 +08:00
xiaqilin
bba902cc46
ieee802154: add CONFIG_IEEE802154_TEST for supporting ieee802154 test
2023-07-11 14:28:54 +08:00
zhangwenxu
e88adc3401
IEEE802154: match C6 max txpower value with datasheet
2023-07-11 14:28:54 +08:00
xiaqilin
b135270e68
ieee802154: add modem reset and fix ieee802154 test app reg command error
2023-07-11 14:28:54 +08:00
Rahul Tank
a125e8f7ed
Merge branch 'feature/services_proximity_v5.1' into 'release/v5.1'
...
NimBLE : Added proximity sensor as a service (v5.1)
See merge request espressif/esp-idf!24649
2023-07-11 14:04:31 +08:00
Marius Vikhammer
62b20b5518
Merge branch 'bugfix/esp_event_err_docs_v5.1' into 'release/v5.1'
...
fix(core-system/esp event): Fixed missing error return documentation for... (v5.1)
See merge request espressif/esp-idf!24573
2023-07-11 11:46:43 +08:00
zhangwenxu
2bee46a354
esp_phy: phy track pll logic refactor
2023-07-11 10:50:29 +08:00
Mahavir Jain
e9a8456279
Merge branch 'fix/mbedtls_ecdsa_veriy_restartable_v5.1' into 'release/v5.1'
...
mbedtls: update submodule (v5.1)
See merge request espressif/esp-idf!24636
2023-07-11 10:18:27 +08:00
Jiang Jiang Jian
87426b8fbd
Merge branch 'fix/esp32s3_sysview_trace_corrupt_v5.1' into 'release/v5.1'
...
fix(app_trace): Fix apptrace data corruption on ESP32-S3 (v5.1)
See merge request espressif/esp-idf!24680
2023-07-11 08:37:55 +08:00
Jiang Jiang Jian
37ff7a92bf
Merge branch 'bugfix/wps_deauth_sent_before_eap_failure_v5.1' into 'release/v5.1'
...
Fix for sending deauth before Eap-Failure in WPS (v5.1)
See merge request espressif/esp-idf!24368
2023-07-11 06:43:27 +08:00
David Čermák
18a8f86ecb
Merge branch 'bugfix/lwip_dhcps_hook_types_v5.1' into 'release/v5.1'
...
lwip: Fix incorrect invocation of the hook `LWIP_HOOK_DHCPS_POST_APPEND_OPTS` (v5.1)
See merge request espressif/esp-idf!24658
2023-07-11 03:31:31 +08:00
cjin
1dbbd97749
ble: support esp32c6 power save example
2023-07-10 18:08:37 +00:00
Jiang Jiang Jian
0cf0757224
Merge branch 'bugfix/ulp_fsm_ci_v5.1' into 'release/v5.1'
...
ulp-system/ulp-fsm: clean up test cases (v5.1)
See merge request espressif/esp-idf!24070
2023-07-11 01:46:39 +08:00
Jiang Jiang Jian
cf517e3e39
Merge branch 'bugfix/tempsensor_wifi_conflict_v5.1' into 'release/v5.1'
...
temperature_sensor: Fix issue that have conflict with phy / Fix phy pwdet and tsens power cannot be set twice issue (v5.1)
See merge request espressif/esp-idf!24064
2023-07-11 01:38:04 +08:00
harshal.patil
bdbb717be9
mbedtls: update submodule to include:
...
fix: mbedtls_ecdsa_can_do was not being defined when ECDSA_SIGN_ALT is defined but ECDSA_VERIFY_ALT is not defined causing mbedtls_ecdsa_verify_restartable to always fail.
feature: initial version of the sbom.yml file
2023-07-10 14:11:51 +00:00
Jiang Jiang Jian
a09a503073
Merge branch 'bugfix/nan_sd_dp_fixes_v5.1' into 'release/v5.1'
...
NAN Service discovery and datapath bugfixes (Backport v5.1)
See merge request espressif/esp-idf!24383
2023-07-10 21:44:49 +08:00
Alexey Gerenkov
3eacf08267
fix(app_trace): Fix apptrace data corruption on ESP32-S3
...
Close https://github.com/espressif/esp-idf/issues/10604
diff --git a/components/soc/esp32s3/include/soc/tracemem_config.h b/components/soc/esp32s3/include/soc/tracemem_config.h
index 55c9b907dd..75fd87419b 100644
--- a/components/soc/esp32s3/include/soc/tracemem_config.h
+++ b/components/soc/esp32s3/include/soc/tracemem_config.h
@@ -10,7 +10,7 @@ extern "C" {
#endif
#define TRACEMEM_MUX_BLK0_NUM 22
-#define TRACEMEM_MUX_BLK1_NUM 23
+#define TRACEMEM_MUX_BLK1_NUM 26
#if (TRACEMEM_MUX_BLK0_NUM < 6) || (TRACEMEM_MUX_BLK0_NUM > 29)
#error Invalid TRAX block 0 num!
2023-07-10 13:06:02 +03:00
Island
e21fc0dc50
Merge branch 'feature/update_ble_libs_5.1' into 'release/v5.1'
...
ble: Added APIs for QA test
See merge request espressif/esp-idf!24651
2023-07-10 17:21:51 +08:00
Island
e68d4a7177
Merge branch 'feature/update_ble_duplicte_vs_hci_lib_fix_5_1' into 'release/v5.1'
...
Feature/update ble duplicte vs hci lib fix 5 1
See merge request espressif/esp-idf!24638
2023-07-10 15:09:18 +08:00
Zim Kalinowski
e29e39f9d6
esp_event: fix build error related to format
...
Closes https://github.com/espressif/esp-idf/issues/11428
See merge request !23833
2023-07-10 11:28:03 +08:00
Cao Sen Miao
0954babbd6
temperature_sensor: make as a weak link
2023-07-10 11:16:09 +08:00
Armando
a33541f036
phy: fix phy pwdet and tsens power cannot be set twice issue
...
Closes https://github.com/espressif/esp-idf/issues/11627
2023-07-10 11:16:09 +08:00
Cao Sen Miao
e493a99da2
temperature_sensor: Apply new-shared interface in temperature sensor driver
2023-07-10 11:16:09 +08:00
Cao Sen Miao
acc6d99572
temperature_sensor: Add new interface and reference counts so that phy and driver can use together
2023-07-10 11:16:09 +08:00
Jiang Jiang Jian
3b7dc69e90
Merge branch 'feature/sync_libphy_v5.1' into 'release/v5.1'
...
sync libphy to v5.1
See merge request espressif/esp-idf!24588
2023-07-10 10:38:41 +08:00
morris
0930b5ca1e
Merge branch 'bugfix/fix_spi_flash_api_concurrency_issue_v5.1' into 'release/v5.1'
...
spi_flash: fix concurrency issue when concurrently calling esp_flash apis (v5.1)
See merge request espressif/esp-idf!24508
2023-07-10 10:24:51 +08:00
Jiang Jiang Jian
28860655af
Merge branch 'bugfix/update_esp_rom_layout_v5.1' into 'release/v5.1'
...
esp_rom: fix rom layout issues (backport v5.1)
See merge request espressif/esp-idf!24639
2023-07-10 10:23:16 +08:00
aditi_lonkar
33aff4c5a0
Fix for sending deauth before Eap-Failure in WPS
2023-07-10 02:20:51 +00:00
wuyuanyi135
575a433c98
Fix incorrect invocation of the hook LWIP_HOOK_DHCPS_POST_APPEND_OPTS
...
Fix https://github.com/espressif/esp-idf/issues/11373
2023-07-07 14:14:02 +02:00
David Cermak
cf4c39a225
esp_netif: Make esp_netif_receive() return value configurable
2023-07-07 13:56:13 +02:00
David Cermak
39b8218750
esp_netif: Report error if esp_netif_receive() fails
...
Closes https://github.com/espressif/esp-idf/issues/10770
2023-07-07 13:56:13 +02:00
Rahul Tank
a7b62bbcaf
Merge branch 'bufix/fix_assert_while_stack_deinit_v5.1' into 'release/v5.1'
...
NimBLE : Fix assert due to controller event while stack deinit (v5.1)
See merge request espressif/esp-idf!24620
2023-07-07 19:41:52 +08:00
Shen Weilong
027e6ecab9
ble: Added APIs for QA test
2023-07-07 19:40:48 +08:00
Michael (XIAO Xufeng)
5c11366e01
Merge branch 'feature/support_adc_calibration_on_c6_v5.1' into 'release/v5.1'
...
adc_cali: supported adc calibration on esp32c6 (v5.1)
See merge request espressif/esp-idf!23936
2023-07-07 18:29:11 +08:00