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,903 Commits 20 Branches 148 Tags 384 MiB
d41c130b68
Commit Graph

8758 Commits

Author SHA1 Message Date
michael
fdf983e0c4 spi: fix config break and reduce overhead of the bus lock on SPI1 
The SPI bus lock on SPI1 introduces two side effects:

1. The device lock for the main flash requires the
`CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION` to be selected, however this
option is disabled by default in earlier IDF versions. Some developers
may find their project cannot be built by their old sdkconfig files.

2. Usually we don't need the lock on the SPI1 bus, due to it's
restrictions. However the overhead still exists in this case, the IRAM
cost for static version of semaphore functions, and the time cost when
getting and releasing the lock.

This commit:

1. Add a CONFIG_SPI_FLASH_BYPASS_MAIN_LOCK option, which will forbid the
space cost, as well as the initialization of the main bus lock.

2. When the option is not selected, the bus lock is used, the
`CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION` will be selected explicitly.

3. Revert default value of `CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION`
to `n`.

introduced in 49a48644e4.

Closes https://github.com/espressif/esp-idf/issues/5046
 2020-04-22 16:06:13 +08:00
Wang Jia Lin
e3f85faee5 Merge branch 'bugfix/fix_spi_flash_clock_config_error' into 'master' 
flash: fix spi flash clock config error

Closes IDFGH-3077

See merge request espressif/esp-idf!8384
 2020-04-22 12:44:17 +08:00
Martin Vychodil
7491ea677a esp32s2: IRAM/DRAM memory protection 
* new mem_prot API
* mem_prot on & locked by default (see Kconfig)
* feature activated in start_cpu0_default()

JIRA IDF-1355
 2020-04-21 15:10:58 +02:00
Michael (XIAO Xufeng)
e2fc591a20 Merge branch 'bugfix/esp_flash_revert_qe_clear' into 'master' 
esp_flash: fix the regression of non-quad mode by default chip driver, bugs in add_device and deprecate cs_id

See merge request espressif/esp-idf!8260
 2020-04-21 17:52:42 +08:00
xueyunfei
b2a3b2a4f4 fixbug for set dhcp time fail 2020-04-21 14:28:39 +08:00
Ivan Grokhotkov
1a7dbe22da Merge branch 'bugfix/wrong_cpp_guard' into 'master' 
Bugfix/wrong cpp guard

Closes IDFGH-3129 and IDF-1219

See merge request espressif/esp-idf!8403
 2020-04-20 18:47:28 +08:00
Jiang Jiang Jian
80e5eb896c Merge branch 'optimization/DNS_get_function' into 'master' 
lw-ip:optimization DNS get function

Closes WIFI-1566

See merge request espressif/esp-idf!8244
 2020-04-20 16:52:22 +08:00
morris
5d0860f2e8 fix broken CONFIG_LEGACY_INCLUDE_COMMON_HEADERS 2020-04-20 14:01:09 +08:00
dowster
7b02fdf45a Fix typo with sigmadelta.h #ifdef 2020-04-17 22:52:00 -05:00
Sachin Parekh
1e6c25992e esp32: IRAM_DATA_ATTR and IRAM_BSS_ATTR introduced 
Using these attributes, .data and .bss can be placed in IRAM

Signed-off-by: Sachin Parekh <sachin.parekh@espressif.com>
 2020-04-17 19:35:23 +05:30
Michael (XIAO Xufeng)
9d9d22c920 esp_flash: deprecate the cs_id member, which is no longer used. 
We used to manually specify the CS id. However after the SPI bus lock is
introduced, the lock is responsible to assign the CS lines and provide
the CS id. The esp_flash driver now depends on the ID assigned by the
SPI bus lock, the configuration field is deprecated.
 2020-04-17 18:15:33 +08:00
Michael (XIAO Xufeng)
5404e3d434 esp_flash: fix cache exception when CS pin is through IOMUX 2020-04-17 18:15:33 +08:00
Michael (XIAO Xufeng)
11501dbaa9 esp_flash: fix the cleanup when add device fails 2020-04-17 18:15:32 +08:00
Michael (XIAO Xufeng)
dc26065a72 esp_flash: fix the regression of non-quad mode by default chip driver 
The issue is introduced in 571864e8ae. The
esp_flash API tries to clear the QE bit when the flash is not working in
quad modes.

However this introduces a regression, compared to earlier versions and
the legacy API. When the chip is not detected, the generic chip driver
is used, which cannot 100% handle the QE bit properly for all flash
vendors. There may be some flash chips (e.g. MXIC) that can be used in
dual modes by legacy API, but output wrong data when the esp_flash API
clears the QE bit in a wrong way.

This commit reverts the QE force clearing behavior, so that it's safer
for the generic chip driver to work under dual modes.
 2020-04-17 18:15:31 +08:00
Ivan Grokhotkov
b732abec7f Merge branch 'bugfix/freemodbus_add_cpp_extern' into 'master' 
freemodbus: add extern c block into common header for cpp

Closes IDFGH-3046

See merge request espressif/esp-idf!8281
 2020-04-17 17:56:51 +08:00
Alex Lisitsyn
b1fe4c4cc6 freemodbus: add extern c block into common header for cpp 2020-04-17 17:56:50 +08:00
Ivan Grokhotkov
9003c01b4b Merge branch 'init_priority_fix' into 'master' 
CXX: make __attribute__((init_priority(n))) work

See merge request espressif/esp-idf!8276
 2020-04-17 17:56:10 +08:00
chenjianqiang
ec9cc27e08 flash: fix spi flash clock config error 
Closes https://github.com/espressif/esp-idf/issues/5099
 2020-04-17 16:26:26 +08:00
Mahavir Jain
4e71cb3e68 Merge branch 'bugfix/transport_ssl_reset_state_on_closure' into 'master' 
transport_ssl: reset state on connection closure

See merge request espressif/esp-idf!8355
 2020-04-16 12:38:58 +08:00
David Čermák
d043674b2b Merge branch 'feature/lwip_napt_forward' into 'master' 
lw-IP: NAT support

Closes WIFI-931

See merge request espressif/esp-idf!7681
 2020-04-16 03:03:00 +08:00
Andrei Gramakov
283026a761 vfs: semihost driver bugfix 2020-04-15 15:46:47 +02:00
Ivan Grokhotkov
882fd1b880 Merge branch 'bugfix/make_quoting_esptool_port' into 'master' 
make: Fix quoting when flashing port is set via sdkconfig file

Closes IDFGH-3103 and IDFGH-3083

See merge request espressif/esp-idf!8352
 2020-04-15 20:37:20 +08:00
xiehang
5d20610874 esp_wifi: Update esp32s2 phy lib v303 2020-04-15 20:18:42 +08:00
Mahavir Jain
49ce8d3fe5 transport_ssl: reset state on connection closure 
For url redirection cases (HTTP status 301/302), internal
transport ssl connection state must be reinitialized for
successful (new) connection on updated url.

Closes https://github.com/espressif/esp-idf/issues/4598
 2020-04-15 15:22:32 +05:30
Angus Gratton
100578a9e9 heap: Only fill new heaps with FREE_FILL_PATTERN if Comprehensive poisoning is on 
Significantly speeds up heap initialization at startup when default "Light" heap
poisoning is enabled.

Tip via reddit user LinkeSeitentasche https://www.reddit.com/r/esp32/comments/fnj51a/a_guide_to_improving_esp32_boot_speed/
 2020-04-15 07:16:08 +00:00
Angus Gratton
433c1c9ee1 Merge branch 'bugfix/ds_mpi_lock' into 'master' 
crypto: DS uses RSA peripheral, added shared lock

See merge request espressif/esp-idf!8274
 2020-04-15 15:15:25 +08:00
David Čermák
7993d5c1f7 Merge branch 'bugfix/mqtt_aborts' into 'master' 
esp_mqtt_abort_connection: Fixed an issue which could result in a race condition

Closes IDF-1521

See merge request espressif/esp-idf!8205
 2020-04-15 14:37:01 +08:00
David Čermák
5e51b5dd09 Merge branch 'bugfix/ws_client_fragmented_send' into 'master' 
ws_client: fix fragmented send setting proper opcodes

Closes IDFGH-2938

See merge request espressif/esp-idf!8112
 2020-04-15 14:06:42 +08:00
Jiang Jiang Jian
80cee782a6 Merge branch 'bugfix/make_compile_phy_multiple_bin_error' into 'master' 
bugfix: fix make compile phy multiple bin error

See merge request espressif/esp-idf!8299
 2020-04-15 14:03:27 +08:00
David Čermák
e7b80f2b71 Merge branch 'feature/pppos_client_test' into 'master' 
PPPoS client test

Closes IDF-310, WIFI-1652, IDFGH-2844, and IDFGH-2732

See merge request espressif/esp-idf!7794
 2020-04-15 13:57:36 +08:00
Angus Gratton
90b3676280 make: Fix quoting when flashing port is set via sdkconfig file 
Regression in 862fa815ff

Closes https://github.com/espressif/esp-idf/issues/5124
Closes https://github.com/espressif/esp-idf/issues/5104
 2020-04-15 15:43:36 +10:00
Jiang Jiang Jian
0f1680c752 Merge branch 'feature/dpp_porting' into 'master' 
wpa_supplicant: Port DPP crypto functionality from mainline supplicant repository.

See merge request espressif/esp-idf!7513
 2020-04-15 13:37:30 +08:00
xueyunfei
8b036a8405 optimization DNS get function 2020-04-15 03:06:28 +00:00
ronghulin
f5f2cbcb50 bugfix: fix make compile phy multiple bin error 2020-04-15 10:19:54 +08:00
David Cermak
6aabfd50d5 pppos_client: support for PPPAUTHTYPE_NONE 
Closes https://github.com/espressif/esp-idf/issues/4616
Closes WIFI-1652
 2020-04-14 21:46:07 +02:00
Piyush Shah
6c09993e20 esp_mqtt_abort_connection: Fixed an issue which could result in a race condition and subsequent crash 2020-04-14 16:18:20 +02:00
David Cermak
14992e62c5 ws_client: fix fragmented send setting proper opcodes 
Previous implementation violated the RFC by having both the actual opcode and WS_FIN flag set for all fragments of a message.
Fixed by setting the opcode only for the first fragment and WS_FIN for the last one

Closes IDFGH-2938
Closes https://github.com/espressif/esp-idf/issues/4974
 2020-04-14 16:11:32 +02:00
David Cermak
94d320473c LwIP: NAPT functionality 
Adds Kconfig option to enable experimental NAPT feature for IP packet
forwarding across interfaces.

Closes https://github.com/espressif/esp-idf/issues/1527
 2020-04-14 16:04:37 +02:00
kapil.gupta
ab784bb53a wpa_supplicant: Port dpp feature from supplicant 
Add files required for DPP feature from upstream.
These file expose the functionality to create DPP packets.
Ported crypto layer from openssl to mbedtls.

Interfacing to use these API will be added in seperate commit
 2020-04-14 18:53:35 +05:30
kangping
4883010f40 mbedtls: add configuration options for EC-JPAKE 
Closes https://github.com/espressif/esp-idf/pull/5106
 2020-04-14 12:22:16 +00:00
Mahavir Jain
4f8a88b145 Merge branch 'bugfix/esp_tls_conn_write_doc' into 'master' 
Fixed `esp_tls_conn_write` documentation.

See merge request espressif/esp-idf!7999
 2020-04-14 14:34:08 +08:00
Jiang Jiang Jian
8a7db8f513 Merge branch 'bugfix/fix_errors_with_mbedtls_disabled' into 'master' 
wpa_supplicant: Fix compilation errors when USE_MBEDTLS is disabled.

See merge request espressif/esp-idf!8305
 2020-04-10 21:17:03 +08:00
Marius Vikhammer
71ab83cdfb aes: increase timeout for "mbedtls AES performance" test 
Timeout increased to 60 sec from default 30 sec.

Test would occasionally timeout on S2 due to cache misses.
 2020-04-10 15:49:40 +08:00
Michael (XIAO Xufeng)
69b6ca6a70 Merge branch 'bugfix/mcpwm_period_error_MR' into 'master' 
bugfix(mcpwm_period_error): fix the issue of wrong period

See merge request espressif/esp-idf!7734
 2020-04-10 15:26:12 +08:00
Jiang Jiang Jian
3feffdfe03 Merge branch 'bugfix/psram_single_bit_error' into 'master' 
bugfix(psram): support psram 2T mode to fix single bit error

See merge request espressif/esp-idf!6936
 2020-04-10 15:04:15 +08:00
Wang Jia Lin
b3d8b6a250 Merge branch 'bugfix/fix_esp32s2_soc_bug' into 'master' 
RTC regulator & voltage calibration fixes

See merge request espressif/esp-idf!8137
 2020-04-10 14:25:41 +08:00
Chai Ji’e
dac17709ec RTC regulator & voltage calibration fixes 2020-04-10 14:25:40 +08:00
Sagar Bijwe
665b0b4b3b wpa_supplicant: Fix compilation errors when USE_MBEDTLS is disabled. 
This is a regression from earlier commit related to TLSV12 which used
sha functions that are currently declared static.
Solution: Follow upstream code structure and resolve the errors.
 2020-04-09 16:53:41 +05:30
Marius Vikhammer
a2a204c2b9 crypto: DS uses RSA peripheral, added shared lock 2020-04-09 11:11:04 +00:00
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