Cao Sen Miao
9aa65db79d
Merge branch 'example/i2c_wifi' into 'master'
...
i2c_app_test: Add i2c work together with wifi test
See merge request espressif/esp-idf!14736
2021-08-17 07:51:40 +00:00
Dai Zi Yan
4ece3b09ea
Merge branch 'docs/update_CN_trans_Flash-encryption' into 'master'
...
docs: update CN trans for flash-encryption
See merge request espressif/esp-idf!14706
2021-08-17 07:02:53 +00:00
Cao Sen Miao
030da50762
i2c_app_test: Add i2c work together with wifi test
2021-08-17 14:46:06 +08:00
Mahavir Jain
012c9e26a4
Merge branch 'fixes/secure_boot' into 'master'
...
secure_boot/esp32(s2,c3): Disable read protecting of efuses
See merge request espressif/esp-idf!14769
2021-08-17 05:05:00 +00:00
Jiang Jiang Jian
75a1942d5c
Merge branch 'bugfix/dual_core_pm_lock_issue' into 'master'
...
fix pm lock issue in dual core mode
Closes WIFI-3905
See merge request espressif/esp-idf!14552
2021-08-17 05:00:52 +00:00
Marius Vikhammer
342da3f86b
Merge branch 'bugfix/readme_links_precheck' into 'master'
...
ci: always run check_readme_links
See merge request espressif/esp-idf!14796
2021-08-17 04:35:35 +00:00
Guo Jia Cheng
9b3b89017f
Merge branch 'bugfix/select-close-return' into 'master'
...
vfs: fix select return value when non-permanent fd closed
Closes IDFCI-612
See merge request espressif/esp-idf!14684
2021-08-17 02:58:20 +00:00
Wang Meng Yang
a77aaf296a
Merge branch 'bugfix/bt_spp_timer_collision' into 'master'
...
Fix timer collision in role switch
Closes IDFGH-5464
See merge request espressif/esp-idf!14575
2021-08-17 02:10:44 +00:00
wangmengyang
ef2a871e2c
controller_hci_uart: rename the example with suffix "_esp32" to differentiate with that of ESP32-C3
2021-08-17 09:49:15 +08:00
wangmengyang
5eb098393b
controller_hci_uart: fixed the deprecated Kconfig options in the example
2021-08-17 09:49:15 +08:00
Anton Maklakov
9ae67e0373
Merge branch 'bugfix/ci_build-idf-exe_needs' into 'master'
...
ci: don't download artifacts for idf.exe build job
See merge request espressif/esp-idf!14804
2021-08-16 11:46:44 +00:00
Omar Chebib
32067f9b6b
Merge branch 'feature/freertos_snapshot_extraction' into 'master'
...
freertos: take tasks snapshot out of tasks.c source code
Closes IDF-3334
See merge request espressif/esp-idf!14675
2021-08-16 11:04:51 +00:00
Juraj Sadel
85f9aa1062
docs: Instructions for Windows download optimization
2021-08-16 12:32:21 +02:00
Cao Sen Miao
f6b1e68675
Merge branch 'example/bringup_s3_blink' into 'master'
...
example: update GPIO num for blink example
See merge request espressif/esp-idf!14801
2021-08-16 08:55:40 +00:00
xiongweichao
ba7252d2ea
Fix that when EXT CRYS is configured but not detected, light sleep is still allowed to be used
2021-08-16 16:51:54 +08:00
daiziyan
c399251eda
docs: update CN trans for flash-encryption
2021-08-16 16:46:04 +08:00
Wang Meng Yang
bdd4b45f6a
Merge branch 'bugfix/btdm_auto_update_PPCP_attribute_value' into 'master'
...
component/bt: fix bluedroid host auto update PPCP attribute value
See merge request espressif/esp-idf!14746
2021-08-16 07:25:50 +00:00
Wang Meng Yang
3e4f147c26
Merge branch 'bugfix/btdm_ble_connection_will_crash_durning_erase_flash' into 'master'
...
component/bt: Fixed ble conn will crash durning erase flash
See merge request espressif/esp-idf!14794
2021-08-16 07:00:50 +00:00
Anton Maklakov
9a9ff2fc57
ci: don't download artifacts for idf.exe build job
2021-08-16 13:40:26 +07:00
Anton Maklakov
85505d03fd
Merge branch 'bugfix/ci_docker_needs' into 'master'
...
ci: don't download artifacts for docker build job
See merge request espressif/esp-idf!14724
2021-08-16 06:31:32 +00:00
Zim Kalinowski
1c690aa5d2
Merge branch 'feature/bootloader_components_kconfig_in_menuconfig' into 'master'
...
bootloader: Kconfig files in bootloader_components is now part of menuconfig
Closes IDF-3696
See merge request espressif/esp-idf!14740
2021-08-16 06:01:50 +00:00
Cao Sen Miao
63d58cb47e
example: update GPIO num for blink example
2021-08-16 12:11:55 +08:00
Jiacheng Guo
f20fb57871
vfs: fix select return value when non-permanent fd closed
2021-08-16 10:49:31 +08:00
Omar Chebib
83c9e1b223
freertos: take tasks snapshot out of tasks.c source code
2021-08-16 10:29:36 +08:00
Marius Vikhammer
6fc8c484ea
ci: always run check_readme_links
2021-08-16 10:29:20 +08:00
jincheng
a523dd3ede
fix timer collision in role switch
...
Closes https://github.com/espressif/esp-idf/issues/7203
2021-08-16 08:54:37 +08:00
Ivan Grokhotkov
ece73a3e55
examples/protocols: fix compilation when CONFIG_EXAMPLE_USE_OPENETH=y
...
The code checked CONFIG_ETH_USE_SPI_ETHERNET (which is usually set),
but CONFIG_EXAMPLE_ETH_SPI_xxx_GPIO options are only defined if
CONFIG_EXAMPLE_USE_SPI_ETHERNET is set. Fix the ifdef accordingly.
Regression from aea901f0
.
2021-08-15 21:58:42 +05:00
Michael (XIAO Xufeng)
a0d2efe1be
Merge branch 'bugfix/xmc_overerase' into 'master'
...
bootloader: add xmc spi_flash startup flow to improve reliability
See merge request espressif/esp-idf!13895
2021-08-13 15:27:48 +00:00
Alex Lisitsyn
5944433424
Merge branch 'bugfix/modbus_allow_master_slave_work_simultaneously' into 'master'
...
freemodbus: fix issues when modbus master and slave work simultaneously
fix slave destroy bug when master and slave init simultaneously
add additional timer group options for master (https://github.com/espressif/esp-idf/issues/4699 )
Closes IDF-3012 and IDFGH-2619
See merge request espressif/esp-idf!12961
2021-08-13 14:46:17 +00:00
Alex Lisitsyn
9693ef4918
freemodbus: fix issues when modbus master and slave work simultaneously
...
fix slave destroy bug when master and slave init simultaneously
add additional timer group options for master
fix master and slave use the same timer group index (https://github.com/espressif/esp-idf/issues/4699 )
2021-08-13 22:46:09 +08:00
Jakob Hasse
f78c8f90c0
Merge branch 'feature/esp_timer_mock' into 'master'
...
[esp_timer]: created mock override component
See merge request espressif/esp-idf!14526
2021-08-13 11:01:53 +00:00
Jakob Hasse
231810a010
Merge branch 'bugfix/add_ruby_check_to_mock_build' into 'master'
...
[build system]: add ruby check before mocking
See merge request espressif/esp-idf!14781
2021-08-13 10:32:40 +00:00
xiewenxiang
2e5f44afa3
component/bt: Fixed ble conn will crash durning erase flash
2021-08-13 17:57:33 +08:00
wuzhenghui
f913a10a22
update reset reason for c3/s3/h2
2021-08-13 17:45:53 +08:00
Jakob Hasse
7029f0537e
[build system]: Fixed common requirement for Linux
2021-08-13 16:50:29 +08:00
Marius Vikhammer
53975c444c
Merge branch 'update_copyright_notice_esp_hw_support_5' into 'master'
...
esp_hw_support: update copyright notice 5
See merge request espressif/esp-idf!14729
2021-08-13 08:40:47 +00:00
Marius Vikhammer
465830312b
Merge branch 'update_copyright_notice_esp_hw_support_4' into 'master'
...
esp_hw_support: update copyright notice 4
See merge request espressif/esp-idf!14728
2021-08-13 08:40:15 +00:00
Sachin Parekh
f430e86c0f
secure_boot/esp32(s2,c3): Disable read protecting of efuses
...
When secure boot is enabled, disable the ability to read protect
efuses that contain the digest.
2021-08-13 13:41:59 +05:30
Jakob Hasse
ca12c92877
[esp_timer]: created mock override component
2021-08-13 15:00:39 +08:00
Jakob Hasse
8750034c19
Merge branch 'feature/hmac_s3' into 'master'
...
[esp_hw_support]: HMAC upstream support for S3
See merge request espressif/esp-idf!14629
2021-08-13 06:44:49 +00:00
Jakob Hasse
dd3f43ca2d
[build system]: add ruby check before mocking
2021-08-13 14:31:44 +08:00
morris
49acb81a87
Merge branch 'feature/pid_speed_control_of_brushed_DC' into 'master'
...
MCPWM example: DC motor speed control
Closes IDF-3142
See merge request espressif/esp-idf!13392
2021-08-13 04:23:48 +00:00
Konstantin Kondrashov
92ce4a8054
Merge branch 'bugfix/unicore_systimer_generate_rtos_tick' into 'master'
...
freertos: Fix settings of systimer for SysTicks in case Unicore
Closes IDF-3692
See merge request espressif/esp-idf!14735
2021-08-13 04:12:28 +00:00
Jakob Hasse
1c3be690ed
[esp_hw_support]: HMAC upstream support for S3
2021-08-13 12:01:06 +08:00
Alex Lisitsyn
a20df743f1
Merge branch 'bugfix/modbus_fix_compiler_err_when_tcp_is_disabled' into 'master'
...
Bugfix/modbus fix compiler err when tcp is disabled
Closes IDFGH-5019 and IDFGH-5376
See merge request espressif/esp-idf!13010
2021-08-12 14:39:26 +00:00
Alex Lisitsyn
1aa7f27468
add compile time checks for MB_MASTER_TCP_ENABLED
...
Signed-off-by: AshUK <github.AshUK@outlook.com>
2021-08-12 22:39:21 +08:00
Alex Lisitsyn
5981aa9cc2
Merge branch 'bugfix/modbus_fix_invalid_error_handling_for_duplicate_param_key' into 'master'
...
freemodbus: fix invalid error handling for duplicate param_key
Closes IDFGH-5641
See merge request espressif/esp-idf!14715
2021-08-12 13:01:26 +00:00
Mahavir Jain
c511f23254
Merge branch 'fix/warning_in_wifi_prov_mgr' into 'master'
...
provisioning: fix wifi warning in wifi_prov_mgr application
Closes IDF-3682
See merge request espressif/esp-idf!14720
2021-08-12 12:05:28 +00:00
Roland Dobai
26bc4971ac
Merge branch 'bugfix/idf_size_wrong_memory_calculations' into 'master'
...
Tools: Fix memory calculations of idf_size.py
Closes IDF-3246 and IDF-2434
See merge request espressif/esp-idf!14347
2021-08-12 11:36:36 +00:00
Pedro Minatel
d4bd603745
Merge branch 'docs/frameworks_and_libs_update' into 'master'
...
Docs Frameworks and libraries update
See merge request espressif/esp-idf!14284
2021-08-12 10:25:22 +00:00