Island
a44f473d4a
Merge branch 'doc/ble_mesh_fixes_v4.0' into 'release/v4.0'
...
doc: Fix some ble mesh description (v4.0)
See merge request espressif/esp-idf!8503
2020-05-06 11:12:57 +08:00
Island
beb64a1af4
Merge branch 'bugfix/ble_mesh_add_missing_cpp_v4.0' into 'release/v4.0'
...
ble_mesh: Add missing #ifdef __cplusplus (v4.0)
See merge request espressif/esp-idf!8506
2020-05-06 11:12:25 +08:00
Island
7b8356ee2f
Merge branch 'bugfix/ble_mesh_time_scene_wrong_name_v4.0' into 'release/v4.0'
...
ble_mesh: Fix time scene wrong macro name (v4.0)
See merge request espressif/esp-idf!8511
2020-05-06 11:11:00 +08:00
lly
b97d4c617b
ble_mesh: Fix time scene wrong macro name
2020-04-27 16:26:23 +08:00
lly
765bd76ba3
ble_mesh: Add missing #ifdef __cplusplus
2020-04-27 15:34:14 +08:00
lly
9370264cac
doc: Fix some ble mesh description
2020-04-27 15:25:46 +08:00
Krzysztof Budzynski
c955b7d133
Merge branch 'docs/backport_6147' into 'release/v4.0'
...
backport changes in 6147
See merge request espressif/esp-idf!8101
2020-04-21 14:34:21 +08:00
liying
4131b51c16
Backport changes made in 6147 to release/4.0
2020-04-20 21:47:26 +08:00
Angus Gratton
1de273a901
Merge branch 'bugfix/error_on_building_in_idf_path_v4.0' into 'release/v4.0'
...
cmake: Error out when building in IDF_PATH dir (v4.0)
See merge request espressif/esp-idf!8298
2020-04-20 15:04:25 +08:00
Jiang Jiang Jian
44d653adff
Merge branch 'bugfix/btdm_backports_v4.0_0328' into 'release/v4.0'
...
Bugfix/btdm backports v4.0 0328
See merge request espressif/esp-idf!8151
2020-04-16 22:01:39 +08:00
Jiang Jiang Jian
41eabbefd6
Merge branch 'bugfix/coredump_no_ext_stacks_v4.0' into 'release/v4.0'
...
core dump: don't allow core dumps to Flash if PSRAM is used for stacks (backport v4.0)
See merge request espressif/esp-idf!8229
2020-04-16 15:24:21 +08:00
Jiang Jiang Jian
8972461611
Merge branch 'bugfix/fix_errors_with_mbedtls_disabled_v4.0' into 'release/v4.0'
...
wpa_supplicant: Fix compilation errors when USE_MBEDTLS is disabled. (v4.0)
See merge request espressif/esp-idf!8357
2020-04-16 15:23:03 +08:00
Angus Gratton
0e6bbdf683
Merge branch 'bufgix/esp_ota_get_app_elf_sha256_v4.0' into 'release/v4.0'
...
app_update: Fix case when elf file SHA256 should be printed by panic handler while cache is disabled (v4.0)
See merge request espressif/esp-idf!8367
2020-04-16 14:32:22 +08:00
Angus Gratton
778ebb4dba
Merge branch 'bugfix/efuse_get_coding_scheme_and_ut_v4.0' into 'release/v4.0'
...
efuse: Fix get_coding_scheme() using ESP_EARLY_LOG* instead of ESP_LOG* (v4.0)
See merge request espressif/esp-idf!8361
2020-04-16 14:29:39 +08:00
Angus Gratton
f87df26cf4
Merge branch 'bugfix/transport_connection_active_v4.0' into 'release/v4.0'
...
fix(transport): Fix a bug of the connection whether be active (v4.0)
See merge request espressif/esp-idf!7743
2020-04-16 14:05:24 +08:00
Marius Vikhammer
93b8fcf664
app_update: fix test failure for get_app_elf_sha256 test
...
Commit fc03161f
updated esp_ota_get_app_elf_sha256 to store and return
X number of bytes of the hash, but the test case still expected 64 bytes.
Updated test case to use CONFIG value for expected length.
2020-04-15 21:13:21 +08:00
KonstantinKondrashov
a78772bbc6
app_update: Fix case when elf file SHA256 should be printed by panic handler while cache is disabled
...
Closes: IDF-1342
2020-04-15 21:06:43 +08:00
KonstantinKondrashov
1490256968
efuse: Fix get_coding_scheme() when CONFIG_SECURE_FLASH_ENC_ENABLED and LOG_LEVEL is Debug
...
Closes: https://github.com/espressif/esp-idf/issues/4862
2020-04-15 20:52:50 +08:00
Sagar Bijwe
5209dff76b
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-15 15:34:35 +05:30
Liu Han
b7f163530b
fix(transport): Fix a bug of the connection whether be active or not by timeout option when the select function return a correct value.
2020-04-15 09:49:03 +00:00
Angus Gratton
a2d0fb348b
Merge branch 'feature/add_rtc_xtal_cal_retry_option_v4.0' into 'release/v4.0'
...
esp32: Add a Kconfig option - Number of attempts to repeat 32k XTAL calibration (v4.0)
See merge request espressif/esp-idf!7932
2020-04-15 16:09:59 +08:00
Jiang Jiang Jian
fe67bedee2
Merge branch 'nimble/fix_ble_hs_reset_v4.0' into 'release/v4.0'
...
NimBLE: Reset master and slave states on host reset and fix build failure (backport v4.0)
See merge request espressif/esp-idf!8218
2020-04-15 13:26:18 +08:00
Jiang Jiang Jian
85b27d3b03
Merge branch 'bugfix/psram_single_bit_error_v4.0' into 'release/v4.0'
...
psram: support psram 2T mode to fix single bit error (backport v4.0)
See merge request espressif/esp-idf!8328
2020-04-15 13:26:02 +08:00
Jiang Jiang Jian
cb466be9d9
Merge branch 'bugfix/fix_supplicant_tlsv12_v4.0' into 'release/v4.0'
...
wpa_supplicant: Fix wpa_supplicant TLS 1.2 issues (v4.0)
See merge request espressif/esp-idf!8204
2020-04-15 13:06:49 +08:00
Sagar Bijwe
64061541f0
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-04-13 16:24:26 +00:00
Krzysztof Budzynski
6825d8e0be
Merge branch 'bugfix/uart_echo_readme_v4.0' into 'release/v4.0'
...
example: Remove duplicate commands and invalid serial port information (v4.0)
See merge request espressif/esp-idf!8336
2020-04-13 23:13:01 +08:00
Jiang Jiang Jian
c4fe416f33
Merge branch 'bugfix/backport_some_wifi_bugs_0326_v4.0' into 'release/v4.0'
...
Bugfix/backport some wifi bugs 0326 (backport v4.0)
See merge request espressif/esp-idf!8309
2020-04-13 22:38:39 +08:00
Roland Dobai
14c978b54f
example: Remove duplicate commands and invalid serial port information
...
Closes https://github.com/espressif/esp-idf/issues/5049
2020-04-13 15:26:22 +02:00
chenjianqiang
a6b08cb025
psram: support psram 2T mode to fix single bit error
...
1. add enable PSRAM 2T mode function
2. abort when himem and 2T mode are enabled meanwhile
3. set SPIRAM_2T_MODE as "n" by default, enable it when needed
2020-04-13 14:52:33 +08:00
Jiang Jiang Jian
acdba0eb46
Merge branch 'feat/ble_mesh_ble_adv_simultaneously_v4.0' into 'release/v4.0'
...
ble_mesh: Support BLE advertising simultaneously (v4.0)
See merge request espressif/esp-idf!8316
2020-04-10 21:07:42 +08:00
lly
3b5eb3caf5
ble_mesh: Support BLE advertising simultaneously
2020-04-10 17:36:44 +08:00
Island
967e66bdf6
Merge branch 'bugfix/ble_mesh_add_test_function_v4.0' into 'release/v4.0'
...
ble_mesh: Add ble mesh white list test function (v4.0)
See merge request espressif/esp-idf!8159
2020-04-10 17:29:07 +08:00
liu zhifu
0b4e1ecdec
esp_wifi: backport some WiFi bugs
...
1. Fix WiFi log print level
2. Optimize WiFi/BT coexist sleep
- If any data tx/rx in WiFi slice, fore wakeup next TBTT
- Increase active timeout time to coex TBTT interval to avoid sleep in WiFi slice
3. Fix esp_wifi_stop() crash
esp_wifi_stop() crashes if it's called when WiFi is not initialized.
4. Fix esp_wifi_stop() leads to memory leak
5. esp_wifi_sta_get_ap_info() returns actual values of group ciphers
2020-04-10 11:18:44 +08:00
Angus Gratton
fd58809899
Merge branch 'bugfix/esp_event_bugfixes_v4.0' into 'release/v4.0'
...
esp_event-related fixes (v4.0)
See merge request espressif/esp-idf!8072
2020-04-09 22:11:16 +08:00
Ivan Grokhotkov
ed3ea95cc2
Merge branch 'bugfix/IDFGH-2910_v4.0' into 'release/v4.0'
...
NVS: bugfix - iterator skipping version 1 blobs (v4.0)
See merge request espressif/esp-idf!8193
2020-04-09 05:45:21 +08:00
Renz Bagaporo
3ba480ba53
cmake: error out on building in IDF_PATH root dir
2020-04-08 19:56:57 +08:00
Michael (XIAO Xufeng)
2628f3ebbd
Merge branch 'bugfix/cpp_extern_v4.0' into 'release/v4.0'
...
Add extern C header guards to some files (backport v4.0)
See merge request espressif/esp-idf!8225
2020-04-07 15:39:48 +08:00
Prasad Alatkar
0fc72b58e1
NimBLE: Reset master and slave states on host reset and fix build failure (backport v4.0)
2020-04-07 10:41:35 +05:30
Mahavir Jain
cfb331e71b
Merge branch 'bugfix/size_calculation_in_ota_v4.0' into 'release/v4.0'
...
Fix size calculation to erase partition range for OTA image (v4.0)
See merge request espressif/esp-idf!8267
2020-04-06 18:04:11 +08:00
Shubham Kulkarni
d74995736c
esp_ota_ops.c: Fix size calculation to erase partition range for OTA image
...
Closes https://github.com/espressif/esp-idf/issues/4953
2020-04-06 13:39:51 +05:30
Ivan Grokhotkov
c8a05bae78
Merge branch 'bugfix/nvs_no_throw' into 'release/v4.0'
...
NVS: Changed all new to new (nothrow) (backport v4.0)
See merge request espressif/esp-idf!7847
2020-04-03 16:38:01 +08:00
Michael (XIAO Xufeng)
127fa7094a
Merge branch 'bugfix/gpio_pin_bit_mask_truncation_v4.0' into 'release/v4.0'
...
driver: fix gpio pin_bit_mask truncation in sdspi_host and others (backport v4.0)
See merge request espressif/esp-idf!8227
2020-04-03 13:28:30 +08:00
Ivan Grokhotkov
ccc6363a21
core dump: don't allow core dumps to Flash if PSRAM is used for stacks
...
It is not possible to write to Flash when the stack is located in
PSRAM, and it is not possible to write PSRAM buffers into Flash when
malloc can not be used.
2020-04-02 23:44:47 +02:00
Ivan Grokhotkov
8ffb38265c
driver: fix gpio pin_bit_mask truncation in sdspi_host and others
...
Closes https://github.com/espressif/esp-idf/issues/4348
2020-04-02 23:38:17 +02:00
boarchuz
17bd6e8fab
Add missing extern "C" to rtc_cntl.h
...
Related: https://github.com/espressif/arduino-esp32/issues/3149
2020-04-02 23:36:14 +02:00
Ivan Grokhotkov
192c20c9f7
clk.h: add extern C guards
...
Closes https://github.com/espressif/esp-idf/issues/4215
2020-04-02 23:22:41 +02:00
Gabriel Durante
c7ac9a296d
Added Cpp compatibility for components/spi_flash/include/esp_flash_spi_init.h
...
Merges https://github.com/espressif/esp-idf/pull/4260
2020-04-02 23:22:10 +02:00
Island
50073a7e61
Merge branch 'nimble/misc_host_flow_ctrl_changes_v4.0' into 'release/v4.0'
...
NimBLE: Misc fixes in NimBLE host (backport v4.0)
See merge request espressif/esp-idf!7949
2020-04-02 19:43:52 +08:00
Jiang Jiang Jian
f69f96edab
Merge branch 'bugfix/btdm_dont_dequeue_the_command_queue_v4.0' into 'release/v4.0'
...
component/bt: fix don't dequeue the command queue after process the read_by_type_req(backport v4.0)
See merge request espressif/esp-idf!8182
2020-04-01 17:56:05 +08:00
Mahavir Jain
2ee765ffaf
Merge branch 'bugfix/secure_boot_ecdsa_config_v4.0' into 'release/v4.0'
...
secure boot: Ensure mbedTLS enables ECDSA if signatures are checked in app
See merge request espressif/esp-idf!8196
2020-04-01 16:42:47 +08:00