alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,842 Commits 20 Branches 148 Tags 384 MiB
79288f25e4
Commit Graph

8709 Commits

Author SHA1 Message Date
Anton Maklakov
445e847274 Merge branch 'bugfix/ci_app_test_dependency' into 'master' 
CI: correct example vs. custom tests dependency

See merge request espressif/esp-idf!8258
 2020-04-09 14:02:13 +08:00
Angus Gratton
766d8844e6 Merge branch 'bugfix/test_sha_ccomp_timer' into 'master' 
esp32s2 sha test: update "Test esp_sha" to use cache compensated timer for performance measuring

See merge request espressif/esp-idf!8237
 2020-04-09 12:25:58 +08:00
Ivan Grokhotkov
2e14149bff Merge branch 'feat/monitor_remake_with_serial_arg' into 'master' 
idf_monitor: support to re-flash with the using port

Closes IDFGH-2479 and IDF-836

See merge request espressif/esp-idf!6373
 2020-04-09 05:43:32 +08:00
Ivan Grokhotkov
8bf18d868a Merge branch 'bugfix/crt_bundle_mem_leak' into 'master' 
cert bundle: Fix memory leak during cert verification

Closes IDFGH-2950

See merge request espressif/esp-idf!8117
 2020-04-09 05:41:41 +08:00
Ivan Grokhotkov
7a972c7191 Merge branch 'bugfix/nvs_erase_more_graceful' into 'master' 
NVS: more graceful behavior for erasing partitions

See merge request espressif/esp-idf!7885
 2020-04-09 05:41:17 +08:00
David Cermak
6d07bcd611 mqtt-tests: rename tests to match the actual group 2020-04-08 14:41:05 +02:00
Ivan Grokhotkov
651dbe48e7 Merge branch 'feature/gcovr' into 'master' 
app_trace: Add coverage generations by gcovr

Closes IDF-780

See merge request espressif/esp-idf!8168
 2020-04-08 15:57:08 +08:00
Angus Gratton
9300f0e7b0 Merge branch 'bugfix/logging_compilation_fix_anti_rollback' into 'master' 
Minor fix logging issue hindering compilation on anti rollback.

See merge request espressif/esp-idf!8105
 2020-04-08 15:53:48 +08:00
Angus Gratton
2bdf22b25d Merge branch 'bugfix/sha_alloc_fallback' into 'master' 
sha: add fallback for when memory alloc fails

See merge request espressif/esp-idf!8177
 2020-04-08 14:15:52 +08:00
Angus Gratton
573d5f4eb0 Merge branch 'bugfix/flash_target_deps_on_spiffs_gen_images' into 'master' 
spiffs: restore dependency of flash targets on spiffs images

See merge request espressif/esp-idf!8277
 2020-04-08 12:43:11 +08:00
Angus Gratton
73825cfd8a Merge branch 'bugfix/elf_dir' into 'master' 
cmake: add elf dir information

See merge request espressif/esp-idf!8264
 2020-04-08 12:41:23 +08:00
Angus Gratton
5d3591c037 Merge branch 'bugfix/mpu_hal' into 'master' 
soc: mpu hal fixes

See merge request espressif/esp-idf!7895
 2020-04-08 12:40:53 +08:00
Jakob Hasse
4943b1cbf0 CXX: make __attribute__((init_priority(n))) work 
* Added corresponding test case
* Moved all C++ init tests to separate file

Closes https://github.com/espressif/esp-idf/issues/5038
 2020-04-08 09:11:54 +08:00
Marius Vikhammer
832599718d cert bundle: add server_root.pem incase bundle needs to be regenerated 2020-04-07 18:51:26 +08:00
Marius Vikhammer
9ccc5e6d84 cert bundle: Fix memory leak during cert verification 
Also refactors the unit tests and fixes the test case, as it was giving false positives.

Closes IDFGH-2950

Closes https://github.com/espressif/esp-idf/issues/4983
 2020-04-07 18:50:30 +08:00
Renz Bagaporo
07f9978df7 cmake: add elf dir information 
Solves https://www.esp32.com/viewtopic.php?f=13&t=14784&p=57557&hilit=assumes#p57557
 2020-04-07 17:19:33 +08:00
Renz Bagaporo
9a020cbb40 spiffs: restore dependency of flash targets on spiffs images 
Closes https://github.com/espressif/esp-idf/issues/5066
 2020-04-07 17:01:58 +08:00
Renz Bagaporo
d2ad5d937e soc: add test for setting mpu illegal access 2020-04-07 11:38:26 +08:00
Renz Bagaporo
ece80dbc8e soc: mpu hal fixes 2020-04-07 11:38:26 +08:00
ronghulin
c65c30c60a bugfix: fix esp_wifi_stop crash issue 2020-04-07 11:12:43 +08:00
Angus Gratton
604360b98c Merge branch 'feature/efuse_purpose_api' into 'master' 
efuse: Add an API to return the efuse descriptor for a key block's purpose field

See merge request espressif/esp-idf!8269
 2020-04-07 08:26:45 +08:00
michael
862fa815ff esptool: add quotes to allow complicated serial port path 
Especially for Windows COM format: \\\.\COMx, introduced in
b00cea250f
 2020-04-07 01:31:39 +08:00
Ivan Grokhotkov
f7ca36513e Merge branch 'feature/semihosting_refactoring' into 'master' 
Feature/semihosting refactoring

See merge request espressif/esp-idf!7475
 2020-04-06 23:44:52 +08:00
Mahavir Jain
9d67c1548e Merge branch 'bugfix/esp_http_client_add_warning' into 'master' 
Add error print in http_header_generate_string if buffer size

Closes IDFGH-2996

See merge request espressif/esp-idf!8265
 2020-04-06 18:02:41 +08:00
Anton Maklakov
fa3131b870 Merge branch 'bugfix/bash_bin_env' into 'master' 
global: use '/usr/bin/env bash' instead of '/usr/bin/bash' in shebangs

Closes IDFGH-708

See merge request espressif/esp-idf!8235
 2020-04-06 17:51:43 +08:00
Angus Gratton
16ad24dd00 efuse: Add an API to return the efuse descriptor for a key block's purpose field 2020-04-06 18:33:11 +10:00
Shubham Kulkarni
471b40b0f0 http_header.c: Add error print in http_header_generate_string if buffer size is less than required size 
Closes: https://github.com/espressif/esp-idf/issues/5028
 2020-04-06 13:22:08 +05:30
Marius Vikhammer
0a41bd3833 esp32s2 sha test: update "Test esp_sha" to use cache compensated timer for performance measuring 2020-04-06 06:37:28 +00:00
Jiang Jiang Jian
7d0f1536e4 Merge branch 'bugfix/fix_adc_init_code_setting_for_esp32s2' into 'master' 
driver(adc): fix adc calibration for esp32s2

See merge request espressif/esp-idf!8209
 2020-04-04 16:06:16 +08:00
fuzhibo
406b8f423d driver(adc): add adc initial code before app_main for esp32s2. 
update phy v301
 2020-04-04 10:15:30 +08:00
Andrei Gramakov
305592f1aa vfs: semihosting driver update supporting semihosting_common handler from OpenOCD 
- implemented SYS_DRVINFO syscall and version handling for the semihosting driver
- removed a support of old oocd versions

renamed kconfig options:
- CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN to CONFIG_VFS_SEMIHOSTFS_HOST_PATH_MAX_LEN
- CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS to CONFIG_VFS_SEMIHOSTFS_MAX_MOUNT_POINTS
 2020-04-03 16:19:06 +02:00
Michael (XIAO Xufeng)
a0e66fef08 spi: fix the memory accessed while cache disabled issue in the bus lock when log level is verbose 
When CONFIG_LOG_DEFAULT_LEVEL is verbose, the ESP_(EARLY_)LOGx will try
to print with format string and tag out of the DRAM while the cache is
disabled. This commit puts the TAG into DRAM, and uses the
'ESP_DRAM_LOGx` to fix the cache miss bug.

Also fixes a LoadProhibited issue when last_dev is NULL.
 2020-04-03 15:04:52 +02:00
Ivan Grokhotkov
60086d1bd0 Merge branch 'refactor/systimer_hal' into 'master' 
systimer: add HAL layer

See merge request espressif/esp-idf!8115
 2020-04-03 18:17:18 +08:00
Michael (XIAO Xufeng)
61ce037fc1 Merge branch 'feat/esp_flash_support_mxic' into 'master' 
esp_flash: support MXIC flash chips

See merge request espressif/esp-idf!8037
 2020-04-03 16:04:49 +08:00
Michael (XIAO Xufeng)
2f8a13c89b Merge branch 'feat/esp_dram_log' into 'master' 
log: new macros to log when the cache is disabled

See merge request espressif/esp-idf!8135
 2020-04-03 14:51:02 +08:00
Angus Gratton
a7c2e86f87 Merge branch 'feature/ds_peripheral' into 'master' 
Security: ESP32S2 Digital Signature HW support

See merge request espressif/esp-idf!8080
 2020-04-03 12:10:13 +08:00
Jakob Hasse
98b1da9e60 NVS: more graceful behavior for erasing partitions 2020-04-03 11:48:07 +08:00
Ivan Grokhotkov
e94288da31 global: use '/usr/bin/env bash' instead of '/usr/bin/bash' in shebangs 
Using the method from @cemeyer
(https://github.com/espressif/esp-idf/pull/3166):

find . -name \*.sh -exec sed -i "" -e 's|^#!.*bin/bash|#!/usr/bin/env bash|' {} +

Closes https://github.com/espressif/esp-idf/pull/3166.
 2020-04-03 01:10:02 +02:00
Jiang Jiang Jian
79eb0d7a7d Merge branch 'bugfix/fix_ble_hci_desync_deadlock' into 'master' 
components/bt: Fix for HCI desync deadlock issue in BLE controller

See merge request espressif/esp-idf!8106
 2020-04-02 22:22:17 +08:00
Krzysztof Budzynski
7a92dd431f Merge branch 'bugfix/partition_types_cxx' into 'master' 
docs: Explain custom partition types/subtypes in more detail

Closes IDFGH-2882

See merge request espressif/esp-idf!8192
 2020-04-02 21:52:52 +08:00
Jiang Jiang Jian
59660c67cd Merge branch 'mesh/power_save_function_with_local_duty' into 'master' 
mesh/ps: add mesh network power save function

See merge request espressif/esp-idf!8203
 2020-04-02 19:43:12 +08:00
Angus Gratton
dcaa9e385a Merge branch 'bugfix/restore_rtc_wdt_driver' into 'master' 
Restore rtc_wdt driver

Closes IDF-1514

See merge request espressif/esp-idf!8148
 2020-04-02 19:11:49 +08:00
sushant.chougule
4cd6f09427 components/bt: Fix for HCI desync deadlock issue in BLE controller 2020-04-02 09:54:16 +00:00
Michael (XIAO Xufeng)
188240d5c7 log: new macros to log when the cache is disabled 2020-04-02 15:35:13 +08:00
David Čermák
3de8b7922f Merge branch 'bugfix/reenable_esp32s2_ut' into 'master' 
Re-enable mqtt/esp-netif unit tests for esp32s2

Closes IDF-1398 and IDF-1396

See merge request espressif/esp-idf!8038
 2020-04-02 14:43:21 +08:00
Jiang Jiang Jian
037ad6f64e Merge branch 'bugfix/fix_supplicant_tlsv12' into 'master' 
wpa_supplicant: Fix wpa_supplicant TLS 1.2 issues

Closes WIFI-2003

See merge request espressif/esp-idf!8147
 2020-04-02 12:17:59 +08:00
Jiang Jiang Jian
20a972d91e Merge branch 'feat/ble_mesh_ble_adv_simultaneously' into 'master' 
ble_mesh: Support BLE advertising simultaneously

Closes BLEMESH-125

See merge request espressif/esp-idf!7802
 2020-04-02 12:17:42 +08:00
Jiang Jiang Jian
881cdbd743 Merge branch 'nimble/fix_ble_hs_reset' into 'master' 
NimBLE: Reset master and slave states on host reset

Closes IDFGH-2743

See merge request espressif/esp-idf!8139
 2020-04-02 12:16:49 +08:00
Michael (XIAO Xufeng)
15026d1b84 Merge branch 'bugfix/fix_adc_driver_for_esp32s2' into 'master' 
Bugfix/fix adc driver for esp32s2

Closes IDF-1448, IDF-1449, IDF-1450, IDF-1451, and IDF-1458

See merge request espressif/esp-idf!7776
 2020-04-02 11:02:21 +08:00
lly
a919e20c1a ble_mesh: Support BLE advertising simultaneously 2020-04-02 01:03:25 +00:00
Angus Gratton
d76bf19ffd docs: Explain custom partition types/subtypes in more detail 
Including how to use with C++ (closes https://github.com/espressif/esp-idf/pull/1832)
 2020-04-02 10:00:17 +11:00
qiyuexia
6d01dc4cfa mesh/ps: add mesh network power save function 2020-04-01 22:09:23 +08:00
Michael (XIAO Xufeng)
3b429766bc esp_flash: support MXIC flash chips 
The default chip driver (chip_generic) use command 01H + 2 bytes to
clear the QE bit. However this will accidently change the configuration
register value of the MXIC chip.

MXIC chip driver is added to fix that.
 2020-04-01 20:54:23 +08:00
Vikram Dattu
60dc4285f4 Fixed esp_tls_conn_write documentation. 
Return value `0` in actual is case of partial write and not error as per `mbedtls_ssl_write`
Modified documentation of `esp_tls_conn_write` accordingly.

Even `esp_wolfssl_write` API considers just negative returns as errors.

Signed-off-by: Vikram Dattu <vikram.dattu@espressif.com>
 2020-04-01 11:04:09 +00:00
Ivan Grokhotkov
168660aebf Merge branch 'feature/toolchain_2020r1-RC1' into 'master' 
Toolchain 2020r1 support bringing (esp32, esp32s2)

See merge request espressif/esp-idf!7509
 2020-04-01 18:17:28 +08:00
Prasad Alatkar
be8c847b06 NimBLE: Reset master and slave states on host reset 
Closes IDFGH-2743 & IDFGH-2956
 2020-04-01 10:09:26 +00:00
morris
890fc0fe67 esp_timer: alias esp_timer_get_time 
alias esp_timer_get_time to improve performance
 2020-04-01 16:51:43 +08:00
morris
2d1885b906 systimer: add HAL layer 2020-04-01 16:51:43 +08:00
Darian Leung
53928ab98b Restore rtc_wdt driver 
This commit restores rtc_wdt.c and rtc_wdt.h that were removed
in commit 91841a53.
 2020-04-01 16:13:35 +08:00
David Cermak
4fad90b0b1 esp-netif: reenabled dhcp unit tests for esp32s2 2020-04-01 07:06:13 +00:00
David Cermak
db677e6898 mqtt: reenable outbox unit tests for esp32s2 2020-04-01 07:06:13 +00:00
Jakob Hasse
0b02e5358e Digital Signature HW: adding S2 support 2020-04-01 13:47:13 +08:00
fuzhibo
baa7898e35 driver(adc/dac): fix adc dac driver for esp32s2 
1. update register file about adc; 2. fix adc driver; 3. add UT for adc/dac;

See merge request espressif/esp-idf!7776
 2020-04-01 12:41:51 +08:00
fuzhibo
dfbb108ab4 Driver(touch): fix touch sensor driver for esp32s2. 
1.update touch sensor driver for esp32s2;
2.update unit test for touch sensor;
3.update register files about touch sensor;
 2020-04-01 12:41:51 +08:00
espressif
c0d752c3b9 mcpwm: fix the issue of wrong period 2020-04-01 10:59:00 +08:00
Marius Vikhammer
1863a8ce82 sha: add fallback for when memory alloc fails 2020-04-01 02:07:44 +00:00
Shubham Kulkarni
c82a4d59ee esp_ota_ops.c: Fix size calculation to erase partition range for OTA image 
Closes https://github.com/espressif/esp-idf/issues/4953
 2020-03-31 14:58:32 +00:00
Sagar Bijwe
a830ddd9ba wpa_supplicant: Fix wpa_supplicant TLS 1.2 issues 
1) Fixed compilation issues.
2) Added tlsprf.c from upstream
3) Enabled SHA256 in supplicant compilation.
 2020-03-31 17:16:10 +05:30
Jiang Jiang Jian
dcc2963d43 Merge branch 'bugfix/btdm_dont_dequeue_the_command_queue' into 'master' 
component/bt: fix don't dequeue the command queue after process the read_by_type_req

See merge request espressif/esp-idf!8161
 2020-03-31 19:03:37 +08:00
Jiang Jiang Jian
c08bb08d2d Merge branch 'bugfix/crypto_test_mem_align' into 'master' 
crypto tests: fix mallocs that were missing MALLOC_CAP_8BIT

See merge request espressif/esp-idf!8132
 2020-03-31 18:11:38 +08:00
Angus Gratton
9a5e4f9acb Merge branch 'bugfix/secure_boot_v2_wrdis' into 'master' 
secure boot v2: esp32: Prevent read disabling additional efuses

Closes IDF-1502

See merge request espressif/esp-idf!8045
 2020-03-31 16:08:01 +08:00
xiewenxiang
5d0b6da6a0 component/bt: fix don't dequeue the command queue after process the read_by_type_req 2020-03-31 15:10:01 +08:00
Supreet Deshpande
0a52f2db50 Fixes logging issue hindering compilation on anti rollback. 2020-03-31 11:19:27 +05:30
Angus Gratton
92a646aa4e Merge branch 'feature/add_rtc_xtal_cal_retry_option' into 'master' 
esp32: Add a Kconfig option - Number of attempts to repeat 32k XTAL calibration

Closes IDF-1479

See merge request espressif/esp-idf!7930
 2020-03-31 06:03:19 +08:00
Jiang Jiang Jian
1a4f894c7d Merge branch 'bugfix/coex_sleep_opt' into 'master' 
esp_wifi: optimize coexistence sleep

See merge request espressif/esp-idf!8078
 2020-03-30 23:58:13 +08:00
Michael (XIAO Xufeng)
1cdbaf5b50 Merge branch 'bugfix/freemodbus_fix_long_frame_buffer_issue' into 'master' 
freemodbus: fix long buffer failure (no temp frame buffer)

Closes IDFGH-2371

See merge request espressif/esp-idf!7418
 2020-03-30 22:05:49 +08:00
Alex Lisitsyn
3abdd2207d freemodbus: fix long buffer failure 
check master read write functions with array of registers)
fix master serial processing code and modbus controller to work with register array
modbus_master: add reading and writing of test value array (58 registers) to check failure is gone
remove parameter temporary buffer from modbus controller to allow more than 24 byte writes
driver: fix issue with TOUT feature
driver: fix uart_rx_timeout issue
driver: fix issue with rxfifo_tout_int_raw not triggered when received fifo_len = 120 byte and all bytes read out of fifo as result of rxfifo_full_int_raw
driver: add function uart_internal_set_always_rx_timeout() to always handle tout interrupt
examples: call uart_internal_set_always_rx_timeout() to handle tout interrupt correctly
examples: update examples to use tout feature
driver: reflect changes of uart_set_always_rx_timeout() function, change uart.c
driver: change conditions to trigger workaround for tout feature in uart.c
driver: change uart_set_always_rx_timeout()
freemodbus: fix tabs, remove commented code
driver: remove uart_ll_is_rx_idle()
 2020-03-30 22:05:48 +08:00
Roland Dobai
26695df5c8 app_trace: Add coverage generation by gcovr 2020-03-30 13:34:06 +02:00
Anton Maklakov
1441b671d6 Merge branch 'bugfix/ci_static_analysis_fail_on_new_issue' into 'master' 
ci: update static analysis rules to fail on any new issue

Closes IDF-686 and IDF-973

See merge request espressif/esp-idf!6424
 2020-03-30 15:36:42 +08:00
Angus Gratton
25aa5b0e28 esp32: Enable flash encryption by setting FLASH_CRYPT_CNT to max 
Previous method was to write-protect this efuse, however on ECO3
the write protect field also covers the UART_DOWNLOAD_DIS efuse.

Doing it this way keeps the possibility of disabling UART download
mode, later.
 2020-03-30 18:13:42 +11:00
Angus Gratton
142f69448f secure boot v2: esp32: Prevent read disabling additional efuses 
Also reduce the number of eFuse write cycles during first boot when
Secure Boot and/or Flash Encryption are enabled.
 2020-03-30 18:00:40 +11:00
Marius Vikhammer
d1d91ec3dd crypto tests: fix mallocs that were missing MALLOC_CAP_8BIT 
Tests had the potential to fail they got non byte-accessible memory allocated.
 2020-03-30 10:40:59 +07:00
Xia Xiaotian
3488603002 esp_wifi: optimize coexistence sleep 
1. Increase delay time before sending NULL1 to enter sleep to
       fix compatible problem of some APs.
    2. Do not force sending NULL0 if no data tx/rx in previous Wi-Fi
       slice.
 2020-03-30 11:18:08 +08:00
Marius Vikhammer
32f16e8c30 crypto tests: fix mallocs that were missing MALLOC_CAP_8BIT 
Tests had the potential to fail they got non byte-accessible memory allocated.
 2020-03-30 11:12:20 +08:00
Michael (XIAO Xufeng)
16d6604ab4 Merge branch 'feature/spi_unit_test_slave_byte_length' into 'master' 
spi: add unit test for slave receiving length

See merge request espressif/esp-idf!6357
 2020-03-30 10:41:45 +08:00
Ivan Grokhotkov
f822e81617 Merge branch 'feature/trax_parsing_script' into 'master' 
xtensa: add a script for parsing CPU traces (TRAX)

See merge request espressif/esp-idf!7729
 2020-03-30 05:21:02 +08:00
Ivan Grokhotkov
cb766fb3d6 Merge branch 'bugfix/IDFGH-2910' into 'master' 
NVS: bugfix - iterator skipping version 1 blobs

Closes IDFGH-2910

See merge request espressif/esp-idf!8049
 2020-03-30 05:18:38 +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
David Cermak
585633b254 console: ignore static analysis warnings 2020-03-27 19:19:20 +01:00
David Cermak
06c46837ce panic: ignore deliberate null dereference to pass static analysis 2020-03-27 19:18:40 +01:00
David Cermak
62f9f42b54 wpa_supplicant: ignore static analysis violations 2020-03-27 19:17:36 +01:00
David Cermak
2e28ab29c7 freertos: silence the static analysis warning referencing the workitem 2020-03-27 18:46:39 +01:00
David Cermak
9b821ddd6b sdmmc: fix possible null dereference in output parameter assignement, whilst it was null checked as an input parameter 2020-03-27 18:46:39 +01:00
David Cermak
72d54b68a6 lwip: dhcp-server fix static analysis warnings 
1) kill_oldest_dhcps_pool() is only called when list has at least two members (assured with kconfig value limit), added assertion to ensure this function is used only when prerequisities are met
2) use after free reported in two places, since the analyzer checks also the scenario when the linked list has loops, added ignore tags
 2020-03-27 18:46:39 +01: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
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
Ivan Grokhotkov
455dbf28f4 esp32: use ccomp_timer in SHA test 2020-03-27 20:07:02 +07:00
Ivan Grokhotkov
cc1d287133 newlib: use --specs=nano.specs to enable "nano" version of C library 
esp2020r1 toolchain includes a nano.specs file, which instructs GCC to
substitute libc.a with libc_nano.a.

In the build system, this simplifies handling of the nano formatting
option, eliminating LIBC and LIBM global variables.
 2020-03-27 20:04:47 +07:00
Jeroen Domburg
419848549e Add fixes for gcc8 psram fix improvement 2020-03-27 20:04:47 +07: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