Krzysztof Budzynski
6aa3179d71
Merge branch 'doc/feedback_target_exact_version' into 'master'
...
doc: Add exact git version & target SoC to feedback form parameters
See merge request espressif/esp-idf!8123
2020-03-30 01:20:46 +08:00
Jiang Jiang Jian
bc3b95f68b
Merge branch 'bugfix/fix_log_printf_level_err' into 'master'
...
esp_wifi: Fix wifi log print level error
See merge request espressif/esp-idf!8120
2020-03-28 18:52:23 +08:00
Ivan Grokhotkov
d14aad7e6d
Merge branch 'feature/install_export_in_fish' into 'master'
...
Add export and install scripts for fish shell
Closes IDFGH-2324 and IDFGH-2899
See merge request espressif/esp-idf!8134
2020-03-28 01:17:19 +08:00
Ivan Grokhotkov
b07b29f5bf
Merge branch 'bugfix/xtensa_sign_conversion' into 'master'
...
xtensa: fix sign-conversion warning (Github PR)
See merge request espressif/esp-idf!8131
2020-03-28 00:42:26 +08:00
Mahavir Jain
73304d6f63
Merge branch 'bugfix/esp_https_server_fix_def_init_order' into 'master'
...
esp_https_server: fix HTTPD_SSL_CONFIG_DEFAULT
See merge request espressif/esp-idf!8138
2020-03-27 23:12:57 +08:00
Aditya Patwardhan
22b1607405
esp_https_server: fix HTTPD_SSL_CONFIG_DEFAULT
...
This macro doesn't compile on C++. Order is fixed now.
Signed-off-by: Jean Pierre Dudey <jeandudey@hotmail.com>
Co-Authored-By: xkevin190 <kevinvelasco193@gmail.com>
Merges https://github.com/espressif/esp-idf/pull/4981
2020-03-27 23:12:57 +08:00
Michael (XIAO Xufeng)
a304421124
Merge branch 'feat/spi_bus_lock' into 'master'
...
SPI: support running SPI master and esp_flash on the same bus
See merge request espressif/esp-idf!6520
2020-03-27 19:59:43 +08:00
Jiang Jiang Jian
79e92b0e6a
Merge branch 'bugfix/ble_mesh_add_test_function' into 'master'
...
ble_mesh: Add ble mesh white list test function
See merge request espressif/esp-idf!8046
2020-03-27 19:53:54 +08:00
morris
39fd234576
tool: fix install.fish
2020-03-27 18:11:01 +08:00
Angus Gratton
2415531f44
Merge branch 'refactor/esp_event_examples_new_interface' into 'master'
...
Examples: esp event examples use new register API
See merge request espressif/esp-idf!7928
2020-03-27 18:05:45 +08:00
Elia Bieri
0c1577fdcd
Add export and install scripts for fish shell
...
Closes https://github.com/espressif/esp-idf/issues/4459
Merges https://github.com/espressif/esp-idf/pull/4944
2020-03-27 17:46:37 +08:00
Michael (XIAO Xufeng)
7fa491a00f
Merge branch 'feature/esp32s2beta_merge_fix_modbus_examples' into 'master'
...
freemodbus: feature esp32s2beta fix modbus examples
Closes IDF-1028
See merge request espressif/esp-idf!6365
2020-03-27 16:20:22 +08:00
Alex Lisitsyn
16e6e63694
driver: fix driver set rx timeout feature of uart
...
tout_thr - move calculation and masking into hal layer update driver and uart_ll (add uart_ll_set_rx_tout)
move tout calculation into uart_ll
move calculation of time out in bit time for esp32s2 into low level uart_ll.h file
move uart_hal_get_symb_len() into hal
update set_rx_timeout() to warn user about incorrect value
update HAL, LL 1
fix uart_xx_set_rx_tout() to convert symbol time into bit time
update param description
update tout calculation in LL
update uart_hal_get_max_rx_timeout_thrd() and uart_ll_get_max_rx_timeout_thrd()
2020-03-27 16:20:21 +08:00
Michael (XIAO Xufeng)
c91b53377b
Merge branch 'bugfix/fix_uart_driver_missing_txfifo_reset_issue' into 'master'
...
bugfix(UART): fix uart driver missing txfifo reset issue.
Closes IDFGH-2848
See merge request espressif/esp-idf!7992
2020-03-27 15:55:02 +08:00
Angus Gratton
f68dbd77e9
Merge branch 'bugfix/make_system_using_rom_time_funcs' into 'master'
...
esp_rom: Fix esp32.rom.newlib-time.ld should includes all time ROM functions/data
Closes IDFGH-2868
See merge request espressif/esp-idf!8008
2020-03-27 15:43:38 +08:00
Jiang Jiang Jian
e8a9dcded2
Merge branch 'bugfix/nimble_rpa_build_failure' into 'master'
...
NimBLE: Fix build failures due to non static declarations in RPA feature
See merge request espressif/esp-idf!8056
2020-03-27 14:06:56 +08:00
Prasad Alatkar
38fc242914
NimBLE: Fix build failures due to non static declarations in RPA feature
...
CLoses IDFGH-2891
2020-03-27 14:06:55 +08:00
Jiang Jiang Jian
23304ff20e
Merge branch 'nimble/fix_esp_nimble_cfg' into 'master'
...
NimBLE: Fix `NIMBLE_HS_FLOW_CTRL_TX_ON_DISCONNECT` in `esp_nimble_cfg` and `bleprph` README
See merge request espressif/esp-idf!7982
2020-03-27 14:05:33 +08:00
Prasad Alatkar
2bc28bbd5a
NimBLE: Fix NIMBLE_HS_FLOW_CTRL_TX_ON_DISCONNECT
in esp_nimble_cfg
and bleprph
README
2020-03-27 14:05:32 +08:00
Angus Gratton
88bf21b21e
Merge branch 'nimble/iram_allocation_strategy' into 'master'
...
NimBLE: Add support to IRAM allocation strategy
See merge request espressif/esp-idf!8015
2020-03-27 13:54:25 +08:00
Mahavir Jain
0b834d1a9f
Merge branch 'feature/add_psk_support_for_wolfSSL' into 'master'
...
esp_tls_wolfSSL: Add support for PSK
See merge request espressif/esp-idf!7942
2020-03-27 13:25:42 +08:00
KonstantinKondrashov
9aeac7f6cb
esp_rom: Fix esp32.rom.newlib-time.ld should includes all time ROM functions/data
...
- Added UT
Closes: https://github.com/espressif/esp-idf/issues/4925
2020-03-27 04:57:42 +00:00
xiehang
8bcf5cbfed
esp_wifi: Fix wifi log print level error
2020-03-27 12:37:56 +08:00
Jiang Jiang Jian
4fe04f1151
Merge branch 'bugfix/fix_esp32s2_receive_pkts_err' into 'master'
...
esp_wifi: fix esp32s2 sometimes receive ack/cts pkts err.
See merge request espressif/esp-idf!8100
2020-03-27 12:21:52 +08:00
Angus Gratton
cf6dca29f2
Merge branch 'feature/hmac_upstream' into 'master'
...
HMAC: adding upstream message support
Closes IDF-800
See merge request espressif/esp-idf!7689
2020-03-27 11:27:23 +08:00
Angus Gratton
ef7ebbe39c
doc: Add exact git version & target SoC to feedback form parameters
...
Currently squeezed into the "version" field as we don't have separate fields for these.
2020-03-27 11:29:59 +11:00
Angus Gratton
02fe8fb1eb
Merge branch 'bugfix/monitor_encrypted_target' into 'master'
...
tools: Fix flashing encrypted binaries from IDF Monitor
Closes IDF-822
See merge request espressif/esp-idf!8090
2020-03-27 08:11:38 +08:00
Michael (XIAO Xufeng)
3ee81e0046
ci: split test config psram_2 into psram_3
2020-03-26 22:08:26 +08:00
Michael (XIAO Xufeng)
49a48644e4
spi: allow using esp_flash and spi_master driver on the same bus
2020-03-26 22:08:26 +08:00
Michael (XIAO Xufeng)
f3bf9c5ae0
hal: put rodata into dram for hal functions
2020-03-26 22:08:25 +08:00
Aditya Patwardhan
d712453114
esp_tls_wolfssl: Added mutex to allow only one TLS conn using PSK at a time
2020-03-26 17:30:05 +05:30
Mahavir Jain
7cbc593ef6
Merge branch 'bugfix/http2_request_example' into 'master'
...
Fixed broken http2_request example.
See merge request espressif/esp-idf!8000
2020-03-26 19:45:10 +08:00
Jakob Hasse
ea47bbb118
HMAC: adding upstream message support
2020-03-26 19:00:27 +08:00
Krzysztof Budzynski
b56993cc3f
Merge branch 'docs/hw-reference/esp32-s2-saola-1' into 'master'
...
Add ESP32-S2-Saola-1 User Guide
See merge request espressif/esp-idf!8057
2020-03-26 18:40:05 +08:00
Wang Ning
a0c37ae1bd
Add ESP32-S2-Saola-1 User Guide
2020-03-26 18:40:05 +08:00
Aditya Patwardhan
46643ab40f
esp_tls_wolfssl: Add support for PSK using wolfSSL,
...
enable SNI and ALPN
2020-03-26 16:02:57 +05:30
Michael (XIAO Xufeng)
296d095e53
Merge branch 'bugfix/remove_dependency_in_timergroup_caps' into 'master'
...
remove dependency of timer_group_caps.h on soc.h
See merge request espressif/esp-idf!8116
2020-03-26 18:18:45 +08:00
Ivan Grokhotkov
042285d938
Merge branch 'docs/update_xtensa-esp-elf_to_xtensa-esp32-elf' into 'master'
...
Update toolchain xtensa-esp-elf to xtensa-esp32-elf by modifying the dict TOOLCHAIN_NAMES
Closes DOC-68 and DOC-72
See merge request espressif/esp-idf!8103
2020-03-26 18:15:40 +08:00
Wang Fang
d10e24fb94
Update toolchain xtensa-esp-elf to xtensa-esp32-elf by modifying the dict TOOLCHAIN_NAMES
2020-03-26 18:15:37 +08:00
Ivan Grokhotkov
7f18576e23
Merge branch 'bugfix/inline_get_cpu_id_hal_func' into 'master'
...
soc: put hal function to get core id in IRAM
See merge request espressif/esp-idf!8107
2020-03-26 18:14:51 +08:00
morris
0c6e1b9482
remove dependency of timer_group_caps.h on soc.h
2020-03-26 17:15:19 +08:00
Angus Gratton
dd8d1deacb
Merge branch 'bugfix/malloc_zero_return_null' into 'master'
...
bugfix/multi_heap: fix malloc(0) returning valid pointer in some poisoning configurations
Closes IDF-1482
See merge request espressif/esp-idf!8012
2020-03-26 16:19:39 +08:00
Roland Dobai
9b16594444
tools: Fix flashing encrypted binaries from IDF Monitor
2020-03-26 07:51:59 +01:00
Angus Gratton
928fc0016c
Merge branch 'bugfix/doc_soc_caps_file_path' into 'master'
...
doc: correct soc caps file path
See merge request espressif/esp-idf!8097
2020-03-26 10:32:12 +08:00
Michael (XIAO Xufeng)
826cc7ecb6
Merge branch 'feature/bringup_723_cmake_rmt_driver_update' into 'master'
...
RMT new features in ESP32S2
Closes IDF-1286
See merge request espressif/esp-idf!7401
2020-03-26 10:24:18 +08:00
Michael (XIAO Xufeng)
661f4c430d
Merge branch 'feature/esp32s2_i2c_driver' into 'master'
...
Feature: Add esp32-s2 I2C driver.
Closes IDF-1278 and IDF-1026
See merge request espressif/esp-idf!7680
2020-03-26 10:20:40 +08:00
Michael (XIAO Xufeng)
42c552242b
Merge branch 'feature/fix_touch_driver_for_esp32s2' into 'master'
...
driver(touch): fix touch sensor driver for esp32s2
See merge request espressif/esp-idf!7664
2020-03-26 09:50:42 +08:00
Angus Gratton
2adc263ff5
Merge branch 'refactor/watchdog_hal' into 'master'
...
Add LL and HAL for watchdog timers
Closes IDF-1249
See merge request espressif/esp-idf!7137
2020-03-26 07:06:51 +08:00
Darian Leung
91841a53ff
WDT: Add LL and HAL for watchdog timers
...
This commit updates the watchdog timers (MWDT and RWDT)
in the following ways:
- Add seprate LL for MWDT and RWDT.
- Add a combined WDT HAL for all Watchdog Timers
- Update int_wdt.c and task_wdt.c to use WDT HAL
- Remove most dependencies on LL or direct register access
in other components. They will now use the WDT HAL
- Update use of watchdogs (including RTC WDT) in bootloader and
startup code to use the HAL layer.
2020-03-26 02:14:02 +08:00
Krzysztof Budzynski
e2e4cd1a7f
Merge branch 'docs/api-guides/linker-script-generation' into 'master'
...
Add translation for linker script generation
See merge request espressif/esp-idf!7903
2020-03-26 00:48:58 +08:00