Commit Graph

19305 Commits

Author SHA1 Message Date
Zim Kalinowski
ed8df94915 Merge branch 'zim-freertos-upgrade-timers' into 'master'
freertos: upgrade to 10.4.3 - timers

See merge request espressif/esp-idf!14962
2021-08-30 02:10:36 +00:00
Zim Kalinowski
41c0e44185 freertos: Upgrade to 10.4.3 - timers
(cherry picked from commit c22a4c355603318a16adb3b898943744d9b826a5)
2021-08-30 10:10:29 +08:00
Shu Chen
ec31f2338b Merge branch 'bugfix/fix_esp32h2_apb_frequency_temp_fix' into 'master'
[bugfix] esp32h2: fix apb freq err temporarily

See merge request espressif/esp-idf!14982
2021-08-30 00:16:45 +00:00
Mahavir Jain
b63ec47238 Merge branch 'feature/update_cjson_submodule' into 'master'
cJSON: Update submodule to v1.7.15

Closes IDFGH-5595

See merge request espressif/esp-idf!14958
2021-08-27 17:14:34 +00:00
Mahavir Jain
286c035064 Merge branch 'bugfix/rename_newlib_header' into 'master'
esp_rom: remove "newlib.h" header

See merge request espressif/esp-idf!14975
2021-08-27 14:57:03 +00:00
morris
22dddb46d8 Merge branch 'bugfix/check_nego_timeout_when_link_up' into 'master'
eth_phy: dont warn nego timeout if link is down

Closes IDFGH-5415

See merge request espressif/esp-idf!13997
2021-08-27 13:09:17 +00:00
wuzhenghui
32abe5ce42 fix apb freq err temporarily 2021-08-27 19:59:33 +08:00
Martin Vychodil
0bcde21c72 Merge branch 'bugfix/sdcard_example_format_timeout_v4.4' into 'master'
CI: [Examples/Storage] provide sufficient timeout for SD card formatting (v4.4)

Closes IDF-3741

See merge request espressif/esp-idf!14886
2021-08-27 11:56:59 +00:00
Mahavir Jain
f7d2f283b3 Merge branch 'bugfix/bugfix/esp32s2_memprot_no_logging_2' into 'master'
System/Security: ESP32S2 Memprot uses no abort() calls neither does logging

Closes IDF-3634

See merge request espressif/esp-idf!14852
2021-08-27 11:17:31 +00:00
Shu Chen
89b316b6e0 Merge branch 'bugfix/border-agent-mesh-local-prefix' into 'master'
openthread: fix mesh local prefix missing in border agent example

See merge request espressif/esp-idf!14920
2021-08-27 09:10:08 +00:00
Mahavir Jain
d9fdb9dc3f esp_rom: remove "newlib.h" header
We found conflict in "sizeof(time_t)" due to inclusion of this
header over toolchain specific "newlib.h".

Moreover, there are no users for this header and implementation
for API is also not available in ROM. Hence removing it.
2021-08-27 14:33:05 +05:30
Mahavir Jain
3850eba152 Merge branch 'feature/local_control_sec1' into 'master'
Added support for security1 in local control

See merge request espressif/esp-idf!13684
2021-08-27 08:31:33 +00:00
Michael (XIAO Xufeng)
64581b36f7 Merge branch 'refactor/dac_apply_generic_check' into 'master'
apply generic check macro

Closes IDF-3658

See merge request espressif/esp-idf!14944
2021-08-27 07:49:53 +00:00
morris
ab0c5fed25 eth: dont warn nego timeout if link is down 2021-08-27 15:30:46 +08:00
Jiacheng Guo
2213a35156 openthread: fix mesh local prefix missing in border agent example 2021-08-27 14:21:47 +08:00
Cao Sen Miao
c47ad5d22f Merge branch 'bugfix/gpio_cant_hold' into 'master'
GPIO: fix issue that gpio cannot hold during deep-sleep on c3

Closes IDFGH-5738 and IDF-3526

See merge request espressif/esp-idf!14939
2021-08-27 06:16:45 +00:00
Ondrej Kosta
300618e5be Merge branch 'feature/dual_eth' into 'master'
esp_eth: add support for multiple Ethernets modules at a time

Closes IDFGH-5596

See merge request espressif/esp-idf!14640
2021-08-27 06:11:48 +00:00
Shubham Kulkarni
b975bc9d38 cJSON: Update submodule to latest release.
This update fixes NULL pointer dereference issues in previous release

Closes https://github.com/espressif/esp-idf/issues/7317
2021-08-27 12:04:38 +08:00
morris
ba3168d1d5 Merge branch 'zim-missing-semicolon' into 'master'
missing semicolon

See merge request espressif/esp-idf!14965
2021-08-27 03:15:01 +00:00
Marius Vikhammer
2206c5315e Merge branch 'bugfix/aes_unaligned_access' into 'master'
aes: fix unaligned access

Closes IDFGH-5506

See merge request espressif/esp-idf!14659
2021-08-27 01:33:44 +00:00
Shu Chen
ab0d0b7dd2 Merge branch 'festure/add_ot_rcp_base_master' into 'master'
add ot-rcp

See merge request espressif/esp-idf!14609
2021-08-26 11:44:28 +00:00
Jakob Hasse
aee6c09c56 Merge branch 'bugfix/cmake_fix_fpga_build' into 'master'
[cmake]: fixed FPGA setting during early build

See merge request espressif/esp-idf!14867
2021-08-26 10:41:51 +00:00
morris
2deeba9d1a Merge branch 'feature/mcpwm-IRAM_ISR-kconfig' into 'master'
mcpwm: ISR can be placed to IRAM by menuconfig

Closes IDFGH-5732

See merge request espressif/esp-idf!14947
2021-08-26 10:08:16 +00:00
Vikram Dattu
5c41f98942 esp_local_ctrl: Added documentation to chose protocom security
Signed-off-by: Vikram Dattu <vikram.dattu@espressif.com>
2021-08-26 17:35:09 +08:00
Vikram Dattu
5691c9a8e8 Added support for security1 in local control
1. Added config options to chose from protocom security.
    It can be chosen 0/1 or custom.
    Possible to set POP as well

2. Added support in `esp_local_ctrl.py` test script for sec_ver selection

Signed-off-by: Vikram Dattu <vikram.dattu@espressif.com>
2021-08-26 17:35:09 +08:00
Zim Kalinowski
dbdcada2e5 missing semicolon 2021-08-26 16:55:53 +08:00
Michael (XIAO Xufeng)
375145ecdb Merge branch 'feature/mcpwm_bldc_hall_example' into 'master'
mcpwm: bldc hall example

Closes IDF-3648

See merge request espressif/esp-idf!14578
2021-08-26 08:28:27 +00:00
Shu Chen
e770817dc7 openthread: refine ot_rcp example documentation and APIs 2021-08-26 16:10:16 +08:00
SalimTerryLi
e67bcda6d1
mcpwm: ISR can be placed to IRAM by menuconfig
resolves https://github.com/espressif/esp-idf/issues/7449
2021-08-26 15:58:46 +08:00
Martin Vychodil
58aed7df98 ESP32S2: No assert()/abort() in Memprot API, use esp_err_t instead
JIRA IDF-3634
2021-08-26 09:20:00 +02:00
Darian
0d9dc80ec4 Merge branch 'docs/update_translation' into 'master'
docs: update translation for jtag-debugging/index.rst and power_management.rst

See merge request espressif/esp-idf!14710
2021-08-26 06:28:22 +00:00
morris
c2d5af17a2 dac: apply generic check macro 2021-08-26 14:01:24 +08:00
Shu Chen
f8f9e545e8 Merge branch 'feature/support_esp32h2_hw_support' into 'master'
Feature/support esp32h2 hw support

Closes IDF-3378 and IDF-3396

See merge request espressif/esp-idf!14545
2021-08-26 06:00:27 +00:00
Zim Kalinowski
21c05e1b93 Merge branch 'zim-freertos-upgrade-codelayout' into 'master'
freertos: cherrypicked code layout changes from freertos upgrade branch

See merge request espressif/esp-idf!14936
2021-08-26 05:46:04 +00:00
Zim Kalinowski
a8c7db62be freertos: cherrypicked code layout changes from freertos upgrade branch 2021-08-26 13:45:51 +08:00
intern
45925c28fd docs: update translation for jtag-debugging/index.rst and power_management.rst 2021-08-26 12:21:19 +08:00
Aditya Patwardhan
6fea8340d2 Merge branch 'feature/esp_http_client_client_key_password' into 'master'
esp_http_client: Support client key password for HTTPS connections.

Closes IDFGH-5700 and IDFGH-5698

See merge request espressif/esp-idf!14932
2021-08-26 03:28:20 +00:00
sly
11dfd802e0 esp32h2: add rtc clock support 2021-08-26 11:25:39 +08:00
morris
a861575d05 Merge branch 'bugfix/fix_esp32c3_auto_adjust_volt' into 'master'
system: fix esp32c3 auto adjust voltage bug

See merge request espressif/esp-idf!14725
2021-08-26 02:53:22 +00:00
Jakob Hasse
376559d14c [cmake]: fixed FPGA setting during early build 2021-08-26 10:11:56 +08:00
Jiang Jiang Jian
2639e7972a Merge branch 'bugfix/fix_airkiss_esptouch_find_channel_crash_issue' into 'master'
esp_wifi: fix airkiss and esptouch find channel crash issue

See merge request espressif/esp-idf!14924
2021-08-25 16:26:24 +00:00
morris
8bb36a432d Merge branch 'bugfix/mcpwm-capture-hcsr04-example' into 'master'
Bugfix/mcpwm hc-sr04 capture example

Closes IDFGH-5699

See merge request espressif/esp-idf!14941
2021-08-25 13:21:42 +00:00
Jon Maloney
c8b7f7a5d3 esp_http_client: Support client key password for HTTPS connections.
Closes https://github.com/espressif/esp-idf/pull/7420
Closes https://github.com/espressif/esp-idf/issues/7418

Signed-off-by: Aditya Patwardhan <aditya.patwardhan@espressif.com>
2021-08-25 18:27:31 +05:30
muhaidong
5eee64bd16 esp_wifi: fix airkiss and esptouch find channel crash issue 2021-08-25 20:34:27 +08:00
David Čermák
a11b7393e2 Merge branch 'bugfix/mqtt_app_test_evn_cleanup' into 'master'
CI: mqtt test apps: removed unnecessary env.yml

See merge request espressif/esp-idf!14508
2021-08-25 12:04:22 +00:00
Zim Kalinowski
b8733421ac Merge branch 'feature/twai_rx_data_alert' into 'master'
Feature/twai rx data alert

Closes IDFGH-5664 and IDFGH-5652

See merge request espressif/esp-idf!14711
2021-08-25 11:57:21 +00:00
Darian
72ba1866fb twai: TWAI_ALERT_RX_DATA indicates that frames were received
Signed-off-by: Darian Leung <darian@espressif.com>

Closes https://github.com/espressif/esp-idf/pull/7386
Closes https://github.com/espressif/esp-idf/issues/7374
2021-08-25 19:57:10 +08:00
morris
f2f41c3f92 Merge branch 'bugfix/const_buffer_in_tinyusb_cdcacm_write_queue' into 'master'
tinyusb: const in_buf of tinyusb_cdcacm_write_queue

See merge request espressif/esp-idf!14938
2021-08-25 11:46:11 +00:00
morris
aafb628683 Merge branch 'examples/network_folder' into 'master'
examples: Created a new folder structure for generic network examples

Closes IDF-3311

See merge request espressif/esp-idf!14513
2021-08-25 11:45:21 +00:00
Wang Fang
b0cde31953 Merge branch 'doc/update_readme' into 'master'
Docs: Add chip support matrix to the main README

See merge request espressif/esp-idf!14839
2021-08-25 11:43:56 +00:00