Wang Ning
d5877fdf37
Merge branch 'docs/update_two_c3_devkit_user_guides' into 'master'
...
Docs/Update two ESP32-C3 devkit user guides
See merge request espressif/esp-idf!15261
2021-09-18 11:20:53 +00:00
Wang Ning
769a9fa28f
docs/update_two_esp32-c3_devkit_user_guides
2021-09-18 18:46:42 +08:00
morris
ce969ad7fe
Merge branch 'feature/lcd_lvgl_example' into 'master'
...
lcd: lvgl porting example
See merge request espressif/esp-idf!15042
2021-09-18 09:52:28 +00:00
yuanjm
9e2f15ae51
lwip: Support DHCP option length configuration
2021-09-18 17:24:27 +08:00
Xie Wen Xiang
26debca1c5
Merge branch 'bugfix/btdm_ble_event_mask_default_value' into 'master'
...
[BLE] Fixed default LE Event Mask
See merge request espressif/esp-idf!15241
2021-09-18 08:26:01 +00:00
ChenJianxing
ebf577f9e5
esp_wifi: fix esp32s3 rom funcs ptr malloc in psram when psram enable
2021-09-18 15:56:53 +08:00
morris
20ef511d0a
Merge branch 'bugfix/fix_reg_name_charactor_err' into 'master'
...
bugfix: fix reg name character error
See merge request espressif/esp-idf!14169
2021-09-18 07:10:57 +00:00
Jiang Jiang Jian
3b48b7e663
Merge branch 'Fix/update_reset_reason' into 'master'
...
update reset reason for c3/s3/h2
See merge request espressif/esp-idf!14747
2021-09-18 07:03:50 +00:00
Jiang Jiang Jian
bc7b372c24
Merge branch 'bugfix/remove_dis_rtc_ram_boot_efuse_bit' into 'master'
...
efuse: remove DIS_RTC_RAM_BOOT efuse bit
See merge request espressif/esp-idf!13783
2021-09-18 06:58:50 +00:00
Wu Zheng Hui
85651b4791
efuse: remove DIS_RTC_RAM_BOOT efuse bit
2021-09-18 14:58:43 +08:00
Armando (Dou Yiwen)
e3e406b81b
Merge branch 'bugfix/link_spi_flash_rom_func_in_bootloader_stage' into 'master'
...
esp_rom: link rom spi flash functions in bootloader stage
Closes IDFGH-5065 and IDFGH-5800
See merge request espressif/esp-idf!15202
2021-09-18 05:14:23 +00:00
Guo Jia Cheng
0d4126b755
Merge branch 'bugfix/eventfd-isr-mismatch' into 'master'
...
vfs: fix occasional ISR context mismatch in event fd
See merge request espressif/esp-idf!15240
2021-09-18 02:56:11 +00:00
Juraj Sadel
600f3b89a2
tools/idf_tools.py: Changed default AppData seeder to seeder pip
2021-09-17 15:36:44 +02:00
Alex Lisitsyn
cd27a44107
Merge branch 'bugfix/modbus_fix_stack_reinitialization_sequence' into 'master'
...
freemodbus: fix TCP stack/examples reinitialization sequence
Closes IDFGH-4432
See merge request espressif/esp-idf!12123
2021-09-17 11:13:57 +00:00
Alex Lisitsyn
c965b48e77
freemodbus: fix TCP stack/examples reinitialization sequence
2021-09-17 19:13:48 +08:00
Mahavir Jain
8b4c0e71a9
Merge branch 'feature/mbedtls_session_ticket_support' into 'master'
...
Feature/mbedtls session ticket support
Closes IDFGH-5288 and IDF-3242
See merge request espressif/esp-idf!14496
2021-09-17 09:59:02 +00:00
Jiacheng Guo
7eafcb0372
vfs: fix occasional ISR context mismatch in event fd
2021-09-17 17:31:20 +08:00
xiewenxiang
bebc5d543b
component/bt: Fixed default LE Event Mask
2021-09-17 17:12:16 +08:00
morris
72d5be5264
Merge branch 'feature/add_parse_packet_and_sniff_certain_number_of_packet_function_to_simple_sniffer' into 'master'
...
Support sniffer packets in memory, added example test
Closes IDF-3210
See merge request espressif/esp-idf!13595
2021-09-17 08:53:41 +00:00
morris
b8ec4c1a16
Merge branch 'bugfix/timergroup_regression' into 'master'
...
timer: fix unit test regression
Closes IDFCI-889
See merge request espressif/esp-idf!15232
2021-09-17 08:22:08 +00:00
Bao Hong De
eccb1f85d8
Merge branch 'bugfix/btdm_link_error_of_kconfig' into 'master'
...
Bugfix/btdm link error of kconfig
See merge request espressif/esp-idf!15176
2021-09-17 06:26:37 +00:00
Mahavir Jain
62078befb4
Merge branch 'docs/esp_log_custom_cb_note' into 'master'
...
esp_log: add note about reentrancy for custom logging function
See merge request espressif/esp-idf!15194
2021-09-17 04:44:38 +00:00
morris
56e617d747
timer: fix unit test regression
2021-09-17 10:45:06 +08:00
Fu Hanxi
04b36c1c2c
Merge branch 'ci/enable_s3_example_build' into 'master'
...
ci: enable esp32s3 example build
See merge request espressif/esp-idf!15213
2021-09-17 02:30:31 +00:00
Wu Zheng Hui
27241e8213
Merge branch 'bugfix/fix_efuse_err_address' into 'master'
...
fix efuse err address in block0
See merge request espressif/esp-idf!14790
2021-09-17 02:17:09 +00:00
Roland Dobai
9f00a186f2
Merge branch 'feature/run_idf_size_with_overflow' into 'master'
...
Tools: make idf_size work with overflow
Closes IDF-3152 and IDFGH-5133
See merge request espressif/esp-idf!14853
2021-09-16 15:50:53 +00:00
Jiang Jiang Jian
a015123a1d
Merge branch 'feature/rename_apbctrl_to_syscon' into 'master'
...
rename apbctrl to syscon
See merge request espressif/esp-idf!14524
2021-09-16 12:58:07 +00:00
Wu Zheng Hui
1080e4f6a2
rename APB_CTRL ro SYS_CON
...
save
2021-09-16 20:57:57 +08:00
baohongde
b310c062cd
components/bt: move config BT_RESERVE_DRAM from bluedroid to ESP32 controller
2021-09-16 20:26:35 +08:00
Mahavir Jain
334e314933
Merge branch 'feature/add_convenient_ws_send' into 'master'
...
Convenient websocket send functions
See merge request espressif/esp-idf!12690
2021-09-16 12:22:54 +00:00
simon.chupin
844dd5075f
Tools: make idf_size work with overflow
...
Closes https://github.com/espressif/esp-idf/issues/6914
closes https://github.com/espressif/esp-idf/issues/4234
2021-09-16 14:12:46 +02:00
wuzhenghui
9c5d1c7fcf
fix s3 efuse err address in block0
2021-09-16 20:08:59 +08:00
wuzhenghui
8e1b8194f5
fix s2 efuse err address in block0
2021-09-16 20:08:59 +08:00
wuzhenghui
61b2c2d458
fix h2 efuse err address in block0
2021-09-16 20:08:59 +08:00
wuzhenghui
352ffbb78d
fix c3 efuse err address in block0
2021-09-16 20:08:59 +08:00
Alex Lisitsyn
f40ae9cae9
Merge branch 'bugfix/fix_esp_restart_does_not_reset_timer_groups_periph' into 'master'
...
driver: fix esp_restart() does not reset timer group peripheral
Closes IDFGH-4652
See merge request espressif/esp-idf!12188
2021-09-16 11:45:42 +00:00
Alex Lisitsyn
c5d0d89508
driver: fix timer driver initialization sequence to not trigger interrupt immediately
...
add timer_hal_reset_periph()
fix timer_init() to reset timer counter during init
2021-09-16 19:45:33 +08:00
Ondrej Kosta
d9d1fbb892
Merge branch 'eth_examples/esp32s3_support' into 'master'
...
Eth_examples: added support of ESP32-S3 chip
Closes IDF-3573
See merge request espressif/esp-idf!14805
2021-09-16 11:18:35 +00:00
Armando (Dou Yiwen)
b9ea273e78
Merge branch 'feature/suppport_self_icode_calibration_on_s3' into 'master'
...
adc: support self calibration icode on s3
Closes IDF-3913
See merge request espressif/esp-idf!15195
2021-09-16 11:14:58 +00:00
Roland Dobai
aaa7bc2504
Merge branch 'bugfix/monitor_backtrace_esp32h2' into 'master'
...
tools: gdb_panic_server: enable esp32h2 support
Closes IDF-3795
See merge request espressif/esp-idf!15206
2021-09-16 10:30:38 +00:00
Ivan Grokhotkov
ca73236f8e
Merge branch 'bugfix/vfs_io_disabled_console' into 'master'
...
Fix console output flushing when CONFIG_VFS_SUPPORT_IO is disabled
Closes IDF-3892
See merge request espressif/esp-idf!15210
2021-09-16 10:27:04 +00:00
Roland Dobai
05d5fa1863
Merge branch 'feature/idf_tools_support_xz' into 'master'
...
tools: idf_tools.py: add support for .tar.xz archives
See merge request espressif/esp-idf!15167
2021-09-16 09:59:21 +00:00
Ivan Grokhotkov
3c5e7b89ab
spi_flash: extern spi_flash_chip_generic_timeout
...
spi_flash_generic_timeout is currently defined in the header file,
which makes it a common symbol between translation units where this
header file is included. It is also defined in
spi_flash_chip_generic.c.
Add an explicit `extern` to prevent multiple definition errors.
2021-09-16 11:07:54 +02:00
Ivan Grokhotkov
b5606f5e81
esp_system: make the abort operation compatible with clang
...
Clang warns that the original code wouldn't have any effect:
warning: indirection of non-volatile null pointer will be deleted,
not trap [-Wnull-dereference]
note: consider using __builtin_trap() or qualifying pointer
with 'volatile'
__builtin_trap translates to 'break 1, 15' instruction on Xtensa,
which might be okay in this case. However to absolutely certainly not
break anything for GCC builds, add 'volatile' instead.
2021-09-16 11:07:54 +02:00
Ivan Grokhotkov
82f0488f77
argtable: move GCC-specific pragma to cmake/make files
...
...and only add it when building with GCC.
2021-09-16 11:07:54 +02:00
Ivan Grokhotkov
d0f960a634
newlib: don't use gcc-specific pragmas for clang
2021-09-16 11:07:54 +02:00
Ivan Grokhotkov
1e2b1238c6
cbor: add a workaround for -ffreestanding being passed to clang
...
Toolchain CMake files for clang currently pass -ffreestanding option
to prevent clang from picking the wrong copy of stdint.h. This is a
temporary hack until we fix clang distributions to not include the
GCC version of stdint.h. This hack, however, results in setting
__STDC_HOSTED__=0, which is being checked by cbor header files,
making some required functions unavailable as a result.
Undefine __STDC_HOSTED__ as a workaround. This flag is only passed
when compiling cbor itself.
2021-09-16 11:07:54 +02:00
Ivan Grokhotkov
81b97b9a6b
spi_flash: only add GCC-specific flags when building with GCC
2021-09-16 11:07:54 +02:00
Ivan Grokhotkov
370473b772
spiffs: only add GCC-specific flags when building with GCC
2021-09-16 11:07:54 +02:00
Ivan Grokhotkov
3177df4986
cmake: temporarily silence additional warnings produced by clang
2021-09-16 11:07:54 +02:00