Commit graph

6050 commits

Author SHA1 Message Date
zhiweijian bdb1391eeb component/bt: allow to send stop adv again and fix tx prog crash 2020-02-20 14:26:47 +08:00
xiehang ecb5370ca6 lw-ip: Add option to ipv6 stateless address configuration 2020-02-20 14:26:19 +08:00
Jiang Jiang Jian 59f2b3f036 Merge branch 'bugfix/enable_ipv6_address_autoconfig_v3.2' into 'release/v3.2'
lw-ip: Enable IPv6 stateless address autoconfiguration (backport v3.2)

See merge request espressif/esp-idf!7660
2020-02-20 12:44:58 +08:00
Michael (XIAO Xufeng) aaf98c14fd Merge branch 'bugfix/i2s_timergroup_some_issues_v3.2' into 'release/v3.2'
bugfix(driver): fix i2s and timergroup some issues(backport v3.2)

See merge request espressif/esp-idf!7174
2020-02-20 00:20:54 +08:00
Jiang Jiang Jian 491c64e337 Merge branch 'bugfix/controller_initializer_order_3.2' into 'release/v3.2'
Fix the initializer order

See merge request espressif/esp-idf!7624
2020-02-19 17:10:50 +08:00
zhangyanjiao 1b21573901 fix the bug for Airkiss can't get the ip of the cellphone 2020-02-19 10:38:05 +08:00
xiehang 297146c410 lw-ip: Enable IPv6 stateless address autoconfiguration 2020-02-18 19:38:09 +08:00
Hrishikesh Dhayagude 3452d579ac Unified Provisioning - BLE: Fix characteristics read response issue
Fix the issue when number of bytes to be read is an exact multiple of [MTU-1]
2020-02-18 14:59:26 +05:30
weitianhua 714afdec6d Fix the initializer order 2020-02-17 16:10:53 +08:00
xueyunfei c2f1cd5bc0 bugfix for add random udp port for 3.2 2020-02-14 22:00:16 +08:00
Jiang Jiang Jian eb3f02a41a Merge branch 'hfp_a2dp_coex_iphone_3.2' into 'release/v3.2'
components bt/: Disable sniff mode during (e)SCO connection for HFP. [backport 3.2]

See merge request espressif/esp-idf!7251
2020-02-14 17:12:03 +08:00
Jiang Jiang Jian 263c670342 Merge branch 'bugfix/wifi_clear_phy_status_when_cpu_start_v3.2' into 'release/v3.2'
soc: clear PHY status when cpu start (backport v3.2)

See merge request espressif/esp-idf!7591
2020-02-14 11:35:14 +08:00
Xia Xiaotian 2a7d2a7795 soc: clear PHY status when cpu start 2020-02-13 14:28:33 +08:00
liu zhifu 448dd7c6ca esp32: fix the crash caused by double free BAR buffer 2020-02-12 16:38:47 +08:00
Angus Gratton b83749988c Merge branch 'bugfix/esp_timer_stucks_into_esp_timer_impl_set_alarm_v3.2' into 'release/v3.2'
esp_timer/esp32: Fix esp_timer_impl_set_alarm() when CPU and APB freqs are changed (v3.2)

See merge request espressif/esp-idf!7442
2020-02-06 14:31:17 +08:00
KonstantinKondrashov ab0f6aceac esp_timer/esp32: Fix case when alarm_reg > counter_reg but FRC_TIMER_INT_STATUS is not set
Closes: WIFI-1576
Closes: https://github.com/espressif/esp-idf/issues/2954
2020-02-05 10:43:47 +00:00
Hrudaynath Dhabe e789da12bd Fix wps config for support with gnu++11 as well as c99. 2020-01-31 05:57:58 +00:00
Angus Gratton 923cd98b9e soc: Fix esp_ptr_executable() for single core ESP32 config & cache memory
In single core mode, APP CPU cache region is added to the available range.
2020-01-29 10:04:19 +11:00
Angus Gratton 3b7777e22d Merge branch 'bugfix/mqtt_submodule_ref_update_v3.2' into 'release/v3.2'
mqtt: update submodule to point to latest commit (backport v3.2)

See merge request espressif/esp-idf!7288
2020-01-22 11:29:18 +08:00
Jiang Jiang Jian a9d3b625c4 Merge branch 'bugfix/wa_dport_and_intr_v3.2' into 'release/v3.2'
esp32: Fix for DPORT (v3.2)

See merge request espressif/esp-idf!7351
2020-01-21 10:47:35 +08:00
xiehang db635956fb lwip: Drop packets larger than MTU 2020-01-20 08:01:59 +00:00
Xia Xiaotian 9f8efed1eb esp_wifi: fix WiFi scan and connect bugs when coexist with Bluetooth
1. Fix WiFi scan leads to poor performance of Bluetooth.
    2. Improve WiFi connect success ratio when coexist with Bluetooth.
    3. Check if WiFi is still connected when CSA or beacon timeout happen.
    4. add coex pre init
2020-01-20 08:01:59 +00:00
xiehang 644591b0d5 Update wifi lib
1,Fix wifi block scan crash issue.
2,Fix association request RSN information length too big lead crash
3,Fix wifi stop bug when sniffer enable
4,coex:fix wifi scan and connect bugs
5,Fix some wifi timer bugs
6,Fix wifi RX bug
7,Fix the bugs for bandwidth
8,Fix the bug for espnow
9,Fix AMSDU decrypt bug
10,Fix wifi reload issue
2020-01-20 08:01:59 +00:00
zhangyanjiao 0e8f66e017 fix the bugs for espnow and bandwidth 2020-01-20 08:01:59 +00:00
ronghulin d62bb227b7 esp32: fix a WiFi RX bug
Support WiFi/BT MAC register writting when the WiFi/BT common clock is disabled.
2020-01-20 08:01:59 +00:00
baohongde 9463114e27 components/bt: backport release/v3.2
Fix A2DP stuck when BLE's interval is too small
Fix assert due to no free element from
Bugfix that bluetooth controller may not be able to enter sleep after end of wake up request
Fix LMP sniff req timeout
2020-01-16 16:19:14 +08:00
KonstantinKondrashov a22a543636 esp32: Add UT for DPORT 2020-01-16 14:36:26 +08:00
KonstantinKondrashov adf8131c20 esp32: Fix esp_dport_access_reg_read 2020-01-16 14:36:26 +08:00
zhiweijian 02687b9b40 component/bt: fix blufi prepare write buf len invalid 2020-01-14 17:49:41 +08:00
zhiweijian 0193e34c62 Component/bt: Fix GATTC trigger open event multiple times 2020-01-14 17:49:32 +08:00
Marius Vikhammer e22d3dd804 mqtt: update submodule to point to latest commit.
Adds bugfixes for:
 - Too early publishing
 - Potential mutex memory leak
 - CI related issues.
 - Wait for entire connack message
 - Event loop not getting cleaned up

Adds support for ALPN, configurable reconnect time, QEMU CI tests and password
protected client key.

MQTT MR: esp-mqtt/merge_requests/46
Closes IDF-1162
Closes https://github.com/espressif/esp-mqtt/issues/137

MQTT MR: esp-mqtt/merge_requests/47
Closes IDF-1126

MQTT MR: esp-mqtt/merge_requests/48
Closes IDFGH-2197
Closes https://github.com/espressif/esp-idf/issues/4349
Closes https://github.com/espressif/esp-mqtt/issues/140

MQTT MR: esp-mqtt/merge_requests/48
Closes IDFGH-2235
Closes https://github.com/espressif/esp-idf/issues/4384

MQTT MR: esp-mqtt/merge_requests/49
Closes https://github.com/espressif/esp-idf/issues/4433
Closes IDFGH-2293

MQTT MR: esp-mqtt/merge_requests/50
Closes FCS-254

MQTT MR: esp-mqtt/merge_requests/53
Closes FCS-267
2020-01-14 10:53:01 +08:00
Angus Gratton 287bee03b3 Merge branch 'bugfix/mdns_send_sdptr_answer_v3.2' into 'release/v3.2'
mdns: respond to discovery with the proper pseudo name _services._dns-sd._udp (v3.2)

See merge request espressif/esp-idf!7244
2020-01-09 13:00:53 +08:00
Jiang Jiang Jian 1a897da635 Merge branch 'bugfix/btdm_avrc_category_v3.2' into 'release/v3.2'
components/bt: Choose AVRC category according to A2DP role

See merge request espressif/esp-idf!7178
2020-01-09 11:34:59 +08:00
weitianhua 344c86bc3e hfp a2dp iphone 3.2 2020-01-08 19:44:23 +08:00
David Cermak 7a74262858 mdns: respond to discovery with the proper pseudo name _services._dns-sd._udp
Closes https://github.com/espressif/esp-idf/issues/4369
Closes IDFGH-2219
2020-01-08 10:22:27 +01:00
liu zhifu 1d7c633349 esp32: fix WiFi performance issue 2020-01-06 21:28:18 +08:00
baohongde b3f58ed2a1 components/bt: Choose AVRC category according to A2DP role 2019-12-31 15:50:44 +08:00
xiongyu 393464d45e bugfix(driver): fix i2s and timergroup some issues
* fix i2s and timergroup dev array used by isr crash issue

* Closes IDFGH-2432

* Closes https://github.com/espressif/esp-idf/issues/4545

* fix i2s adc data inv issue

* Closes IDFGH-2444

* Closes https://github.com/espressif/esp-idf/issues/4557
2019-12-31 14:58:30 +08:00
baohongde 8711e67e44 components/bt: Revert changes of security mask 2019-12-25 20:16:54 +08:00
Jiang Jiang Jian fd921ea6e5 Merge branch 'bugfix/put_more_rx_code_to_iram_v3.2' into 'release/v3.2'
wifi: Put some rx code to iram (backport v3.2)

See merge request espressif/esp-idf!7012
2019-12-18 16:40:13 +08:00
Angus Gratton 0446bfe1f4 Merge branch 'feature/can_support_low_bit_rates_backport_v3.2' into 'release/v3.2'
can: Add support for lower bit rates (backport v3.2)

See merge request espressif/esp-idf!6390
2019-12-18 07:46:27 +08:00
xiehang eecd5efec5 esp_wifi: Put some rx code to iram 2019-12-17 20:40:53 +08:00
Angus Gratton a4b21ff6f1 Merge branch 'bufgix/esp_timer_set_alarm_v3.2' into 'release/v3.2'
esp_timer: Fix set_alarm. Case when timestamp < now_time (v3.2)

See merge request espressif/esp-idf!6998
2019-12-17 11:54:26 +08:00
Darian Leung 09ae962c33 can: Add support for lower bit rates
This commit adds support for lower bit rates in the CAN Driver for
ESP32 Rev 2 or later chips.
2019-12-16 07:45:59 +00:00
Jiang Jiang Jian ef4c513834 Merge branch 'bugfix/btdm_avrc_metadata_length_error_v3.2' into 'release/v3.2'
components/bt: Fix AVRC metadata length error

See merge request espressif/esp-idf!6885
2019-12-16 12:06:31 +08:00
Jiang Jiang Jian d787e2a564 Merge branch 'bugfix/coex_fix_some_bugs_v3.2' into 'release/v3.2'
Coexist: fix some coexist bugs (backport v3.2)

See merge request espressif/esp-idf!6307
2019-12-16 12:05:30 +08:00
KonstantinKondrashov 648f25e275 esp_timer: Add Test case when set_alarm needs set timer < now_time 2019-12-14 04:36:41 +08:00
KonstantinKondrashov 8061659b5f esp_timer: Fix set_alarm. Case when timestamp < now_time
arg1 = MAX(int64_t arg1, uint64_t arg2) gave the wrong result, if arg1 < 0, it was presented as a larger value.
And ALARM_REG = (uin32_t)arg1. This leads to an infinite loop.
Fixed: both args are int64_t.

Closes: WIFI-1511
2019-12-12 14:44:13 +08:00
Jiang Jiang Jian f8bcf2f459 Merge branch 'bugfix/hfp_client_indication_v3.2' into 'release/v3.2'
component/bt: Fix bugs in HFP feature v3.2

See merge request espressif/esp-idf!6853
2019-12-12 13:53:54 +08:00
Jiang Jiang Jian c1d6c0a5bc Merge branch 'bugfix/jump_time_54_sec_v3.2' into 'release/v3.2'
esp_timer: Fix time jumps back ~ 54sec (v3.2)

See merge request espressif/esp-idf!6470
2019-12-12 13:53:33 +08:00
Jiang Jiang Jian 32f2e7f509 Merge branch 'bugfix/wifi_internal_memory_v3.2' into 'release/v3.2'
wifi: Include DMA reserved pool when allocating internal-only memory (v3.2)

See merge request espressif/esp-idf!6629
2019-12-12 13:53:14 +08:00
Jiang Jiang Jian 887decf42a Merge branch 'component_bt/osi_fixed_queue_v3.2' into 'release/v3.2'
component_bt/: fix pointer type in fixed_queue v3.2

See merge request espressif/esp-idf!6848
2019-12-12 12:16:59 +08:00
Jiang Jiang Jian 65db2bf87c Merge branch 'bugfix/btdm_disable_some_secrity_mask_v3.2' into 'release/v3.2'
components/bt: Disable some unsupported security mask

See merge request espressif/esp-idf!6727
2019-12-09 22:03:54 +08:00
Jiang Jiang Jian 26272b46cb Merge branch 'bugfix/phy_critical_v3.2' into 'release/v3.2'
fix bug that phy_enter_critical cannot effect on dual-core

See merge request espressif/esp-idf!6942
2019-12-09 22:00:29 +08:00
Tian Hao a05cc294eb fix bug that phy_enter_critical cannot effect on dual-core
Sometimes, libphy.a call phy_enter_critical() to protect accessing critical sections, such like
operating on I2C, but it may not effect when both the CPU core call it. It may cause accessing
I2C blocking and cannot recover by esp_restart(), until do HW reboot.
2019-12-09 12:52:36 +08:00
Roland Dobai f3aa9cc800 expat: Update library from 2.2.5 to 2.2.9 2019-12-05 09:22:01 +01:00
weitianhua b584cecea2 adaptation for nano-format 2019-11-29 17:58:52 +08:00
baohongde 3357b475f7 components/bt: Fix AVRC metadata length error 2019-11-29 16:00:30 +08:00
Xia Xiaotian 9130b255f5 Coexist: fix some coexist bugs
1. Fix high beacon and broadcast packets loss ratio of WiFi to make
   MDNS test pass.
2. Improve stability of WiFi performance with a little
   sacrifice of throughput.
3. Improve BLE advertising and connection performance with dynamic
   priority. It sacrifices a little WiFi throughput, but achieves balance
   between WiFi and Bluetooth.
2019-11-28 11:29:45 +00:00
Jiang Jiang Jian 42d7524b91 Merge branch 'bugfix/http_client_buffer_overflow_v3.2' into 'release/v3.2'
Fix HTTP client buffer overflow (v3.2)

See merge request espressif/esp-idf!6669
2019-11-28 11:53:50 +08:00
weitianhua 2a13317e44 component_bt/:bugfix_hfp_client_indication_define_and_cnum_error 2019-11-27 17:06:18 +08:00
weitianhua e3b5a38cf6 component_bt/: fix pointer type in fixed_queue 2019-11-27 16:17:16 +08:00
Jiang Jiang Jian 7a557368e3 Merge branch 'bugfix/fix_timer_deleted_and_run_broken_callback_v3.2' into 'release/v3.2'
esp_timer: fix the bug that when timeout of timer happens try to run callback(v3.2)

See merge request espressif/esp-idf!6767
2019-11-25 10:34:26 +08:00
KonstantinKondrashov 3a402fa7b2 soc/esp32: Add test_env for 32kHz XTAL unit tests 2019-11-20 16:07:17 +08:00
Jack 9d557afe26 esp_timer: fix the bug that when timeout of timer happens try to run callback, and high priority task delete the timer and break the callback 2019-11-19 22:58:05 +08:00
David Cermak 1176d8be6f http_client: added comments to http header generation function 2019-11-19 14:07:54 +00:00
David Cermak 0d0cb3b991 http_client: possible buffer overflow fixed when determining last header item to be written
closes IDF-694
2019-11-19 14:07:54 +00:00
baohongde 63feac091d components/bt: Disable some unsupported security mask 2019-11-17 13:54:17 +08:00
Jiang Jiang Jian 99ab26ac32 Merge branch 'bugfix/backport_some_wifi_fixes_1009_v3.2' into 'release/v3.2'
esp32: fix some WiFi bugs 1009 (backport v3.2)

See merge request espressif/esp-idf!6296
2019-11-12 11:28:02 +08:00
Angus Gratton da8103bb59 bt: Include DMA reserved pool when allocating internal-only memory
Fix for root cause of https://github.com/espressif/esp-idf/issues/3592
2019-11-08 11:38:29 +08:00
Angus Gratton ce44590c8b wifi: Include DMA reserved pool when allocating internal-only memory
Fix for root cause of https://github.com/espressif/esp-idf/issues/3592
2019-11-08 11:38:29 +08:00
KonstantinKondrashov ee84cbdf4e esp_timer: Fix System time jumps back ~54secs
Closes: https://github.com/espressif/esp-idf/issues/2513
2019-11-05 12:47:17 +00:00
KonstantinKondrashov 48a3f7d716 esp32: Add UTs to check the System time does not jump back 2019-11-05 12:47:17 +00:00
Ivan Grokhotkov 01007698b7 esp_timer: handle esp_timer_delete in timer task
Closes https://github.com/espressif/esp-idf/issues/3458
2019-11-05 12:47:17 +00:00
Chen Zheng Wei e5d7addcf7 bugfix(i2s_bootloader_random_disable): fix bug about i2s bootloader_random_disable for release/v3.2
bootloader_random_disable disables the ADC incorrectly, causing the ADC to sometimes fail to work. Fix this bug
2019-11-05 17:04:42 +08:00
Jiang Jiang Jian b8243b5fbe Merge branch 'bugfix/btdm_disable_bt_gatt_v3.2' into 'release/v3.2'
components/bt: Disable BR/EDR GATT

See merge request espressif/esp-idf!6508
2019-11-01 13:58:40 +08:00
Angus Gratton a456543b8a Merge branch 'bugfix/multi_heap_printf_backport_v3.2' into 'release/v3.2'
heap: Fix printf usage in heap poisoning (backport v3.2)

See merge request espressif/esp-idf!6090
2019-11-01 13:24:27 +08:00
Jiang Jiang Jian 81c45ffe14 Merge branch 'bugfix/btdm_assert_deinit_a2dp_while_playing_v3.2' into 'release/v3.2'
components/bt: Fix assert when deinit A2DP while playing music

See merge request espressif/esp-idf!6537
2019-11-01 11:57:39 +08:00
liu zhifu 09e657460f esp32: fix some WiFi bugs
Fix following WiFi bugs:
1. Fix the bug for API_CHECK_ENABLED
2. Fix the bug that wpa2 enterprise sta can connect open AP
3. Fix TKIP/CCMP PN replay attack detection bug
4. Increase buffer number type from uint8_t to uint16_t to support more than 255 buffers
5. Avoid recalculating PMK if esp_wifi_set_config() is not called
6. Fix the bug that WiFi stop leads to task watchdog
7. Fix smartconfig IPC crash
8. Fix the crash bug that sniffer may access flash when cached is disabled
9. Fix 5.5M signal test bug
2019-11-01 03:34:06 +00:00
Ivan Grokhotkov 077bd351e4 Merge branch 'bugfix/can_driver_assertions_v3.2' into 'release/v3.2'
drivers/can: fix skipped function calls when assertions disabled (backport v3.2)

See merge request espressif/esp-idf!6407
2019-10-30 03:53:45 +08:00
baohongde 840a011c01 components/bt: Fix assert when deinit A2DP while playing music 2019-10-29 20:11:26 +08:00
Darian Leung 896ba6a83e can: Fix reset mode entry and exit calls
This commit fixes multiple bugs caused by incorrect calls to
can_enter_reset_mode() and can_exit_reset_mode. Example test
scripts also updated to match new runners.
2019-10-28 15:35:42 +08:00
baohongde 56afe0fdca components/bt: Disable BR/EDR GATT 2019-10-28 11:36:52 +08:00
Marius Vikhammer e94215443b mdns: fix crash for hostname queries
Receiving TXT, PTR, SDPTR and SRV record type queries would crash the application if the hostname
 was used as instance name.

Closes https://github.com/espressif/esp-idf/issues/4224
2019-10-28 11:04:46 +08:00
Jiang Jiang Jian d3ac9cc863 Merge branch 'feature/esptool_v2.8_v3.2' into 'release/v3.2'
esptool: Bump to v2.8 release (v3.2)

See merge request espressif/esp-idf!6462
2019-10-25 11:35:53 +08:00
Jiang Jiang Jian 1d3b83e2c0 Merge branch 'bugfix/btdm_a2dp_sink_media_suspend_cmd_unack_for_v3.2' into 'release/v3.2'
bugfix/btdm_a2dp_sink_media_suspend_cmd_unack_for_v3.2(backport v3.2)

See merge request espressif/esp-idf!5920
2019-10-25 10:58:28 +08:00
Angus Gratton 5067ecaebe Merge branch 'bugfix/select_with_sdmmc_mount_v3.2' into 'release/v3.2'
VFS: Fix bug which occurs when driver is installed during a select() call (v3.2)

See merge request espressif/esp-idf!6431
2019-10-24 11:29:02 +08:00
Angus Gratton 54e217b8d4 Merge branch 'bugfix/mqtt_disconnect_crash_3.2' into 'release/v3.2'
mqtt: referenced esp-mqtt master to close disconnection issues (backport 3.2)

See merge request espressif/esp-idf!5882
2019-10-24 10:28:13 +08:00
Angus Gratton e98ff1beb7 Merge branch 'bugfix/remove_mbedtls_would_block_v32' into 'release/v3.2'
Remove check for would_block in mbedtls (Backport v3.2)

See merge request espressif/esp-idf!6397
2019-10-23 17:00:36 +08:00
Angus Gratton e41ef9396f esptool: Bump to v2.8 release 2019-10-23 09:09:07 +11:00
Roland Dobai ab7e411f4e VFS: Fix bug which occurs when driver is installed during a select() call
Closes https://github.com/espressif/esp-idf/issues/3554
2019-10-22 08:26:43 +02:00
Angus Gratton 696a9fa0ba Merge branch 'bugfix/ticks_to_wait_for_uart_and_i2c_v3.2' into 'release/v3.2'
driver: Fix ticks_to_wait for uart and i2c (v3.2)

See merge request espressif/esp-idf!5248
2019-10-22 13:18:00 +08:00
wangmengyang 360b966938 bugfix that call of esp_a2d_media_ctrl(ESP_A2D_MEDIA_CTRL_SUSPEND) will not get an ACK from callback on A2DP sink 2019-10-21 13:19:41 +00:00
Jiang Jiang Jian 7ed6748534 Merge branch 'test/fix_mesh_test_case_3.2' into 'release/v3.2'
test: fix test case MESH_EST_2403 (backport 3.2)

See merge request espressif/esp-idf!5910
2019-10-21 20:13:36 +08:00
David Cermak 7d8ff31c59 mqtt: referenced esp-mqtt master to fix disconnect crash issue and
update docs generation for mqtt library

Backport of 6fb085dbc9e6d8bc232e7b8f506217f680d50ed0
2019-10-21 05:49:54 +00:00
Jiang Jiang Jian 2dc1d1b568 Merge branch 'docs/update_bootloader_chip_revision_print_v3.2' into 'release/v3.2'
bootloader_support: fix logging prints around chip revision (v3.2)

See merge request espressif/esp-idf!6338
2019-10-21 10:48:46 +08:00
Jiang Jiang Jian a1c1175fa7 Merge branch 'bugfix/add_kconfig_help_for_eth_gpio0_output_mode_v3.2' into 'release/v3.2'
ethernet: add kconfig help for GPIO0 output mode (v3.2)

See merge request espressif/esp-idf!6343
2019-10-21 10:48:44 +08:00
Jiang Jiang Jian 5adc487133 Merge branch 'bugfix/wps_workaround_for_Telstra_AP_v3.2' into 'release/v3.2'
wps: Relax the check on older config methods in case of WPS2.0 (backport v3.2)

See merge request espressif/esp-idf!5922
2019-10-21 10:46:15 +08:00
Jiang Jiang Jian eea3e63c39 Merge branch 'bugfix/fix_the_for_smartconfig_send_broadcast_to_phone_v3.2' into 'release/v3.2'
fix the bug that ESP32 sends broadcast to phone after smartconfig is done(backport v3.2)

See merge request espressif/esp-idf!6074
2019-10-21 10:45:34 +08:00
Ivan Grokhotkov cbe8274651 drivers/can: fix skipped function calls when assertions disabled
When CONFIG_FREERTOS_ASSERT_DISABLE is set, the function calls wrapped
inside the assertion macros would be removed from the code.

Closes https://github.com/espressif/esp-idf/issues/4143
2019-10-18 11:28:35 +02:00
Kedar Sovani 700976f709 Remove check for would_block in mbedtls
Basically, in the portability layer, it is checked if the socket is
NON-block, and if not, then even the EAGAIN and EWOULDBLOCK errors are
diverted to a RECV error. This causes a problem for sockets with
receive timeouts set. When such a timeout is set, the condition for
NON_BLOCK isn't met and hence a hard error is returned.

Searching for EAGAIN and EWOULDBLOCK in lwip returns only 3 results
(accept, recvfrom, close) and all of them look to be genuine cases for
EWOULDBLOCK. So removing this check to make receive timeout with TLS
work.
2019-10-18 14:18:34 +05:30
Roland Dobai 5519afe675 Fix memory leak upon failure of esp_vfs_fat_sdmmc_mount()
Closes https://github.com/espressif/esp-idf/issues/4165
2019-10-18 10:28:24 +02:00
Angus Gratton f819b7da90 Merge branch 'bugfix/reset_periph_modules_v3.2' into 'release/v3.2'
driver: Add a reset before enabling if a module is off (v3.2)

See merge request espressif/esp-idf!6017
2019-10-18 13:34:15 +08:00
Darian Leung f4201de05d heap: Fix printf usage in heap poisoning
This commit fixes the bug where printf() is used in
verify_allocated_region() when ets_printf() should be used.
2019-10-16 13:21:30 +00:00
Konstantin Kondrashov db8ddf050f driver: Add uart and i2c UTs to check ticks_to_wait in some functions 2019-10-16 15:18:31 +08:00
Konstantin Kondrashov e64f3d43ad i2c: Fix ticks_to_wait when 0 or time expired
Closes: https://github.com/espressif/esp-idf/issues/3301

Closes: IDFGH-964
2019-10-16 15:18:31 +08:00
Konstantin Kondrashov 2bd77056bb rmt/driver: Add module reset before enabling 2019-10-16 05:49:26 +00:00
Konstantin Kondrashov 4be011785e pcnt/driver: Add module reset before enabling 2019-10-16 05:49:26 +00:00
Konstantin Kondrashov 5ce96ab227 sdmmc_host/driver: Add module reset before enabling 2019-10-16 05:49:26 +00:00
Konstantin Kondrashov b8d4a53260 i2s/driver: Add module reset before enabling 2019-10-16 05:49:26 +00:00
Konstantin Kondrashov fc31437236 can/driver: Add module reset before enabling 2019-10-16 05:49:26 +00:00
Konstantin Kondrashov dc63c2e9cb uart/driver: Add module reset before enabling
This commit prevents infinite restarts caused due to an interrupt flag
was left uncleared.

Closes: https://github.com/espressif/esp-idf/issues/1981

Closes: IDF-188
2019-10-16 05:49:26 +00:00
Mahavir Jain d3d4787335 bootloader_support: fix logging prints around chip revision 2019-10-15 10:35:23 +05:30
chenjianqiang ae39c659d0 esp32: cpu_start: read binary image header via cache
When flash encryption is enabled, reading via cache also decrypts the
data, whereas spi_flash_read does not.
2019-10-15 12:08:04 +08:00
chenjianqiang 3349c99882 bugfix(flash): add flash config in app startup
We fixed some flash bugs in bootloader, but for the users used the old
vrsion bootloader, they can not fix these bugs via OTA, the solution is
add these updates in app startup.

These updates include:
1. SPI flash gpio matrix and drive strength configuration
2. SPI flash clock configuration
3. SPI flash read dummy configuration
4. SPI flash cs timing configuration
5. Update flash id of g_rom_flashchip
2019-10-15 12:08:04 +08:00
Jiang Jiang Jian 093214c86f Merge branch 'feature/add_psram_workaround_option_3.2' into 'release/v3.2'
make psram workaround depend on chip revison (v3.2)

See merge request espressif/esp-idf!6304
2019-10-14 21:45:34 +08:00
Angus Gratton f55cb56380 Merge branch 'feature/handle_icy_uris_v32' into 'release/v3.2'
Modified http_parser to handle ICY uris (Backport v3.2)

See merge request espressif/esp-idf!6326
2019-10-14 18:56:01 +08:00
Angus Gratton f612a39127 Merge branch 'bugfix/freertos_xTaskNotifyGive_v3.2' into 'release/v3.2'
freertos: remove semicolon in xTaskNotifyGive (v3.2)

See merge request espressif/esp-idf!6271
2019-10-14 11:20:41 +08:00
suda-morris ae2cec834e ethernet: add kconfig help for GPIO0 output mode
1. add kconfig help for GPIO0 output mode
2. fix a bug when select gpio0 output mode and initialize psram
3. make default config to official development board
4. fix wrong LAN8720 register index
2019-10-14 10:50:49 +08:00
Vikram Dattu 31c720602d Modified http_parser to handle ICY uris.
ICY URIs e.g `http://uk1.internet-radio.com/proxy/vombat?mp=/;` need to
be handled differently.

For basic use case, these URIs are similar to HTTP with exception that they reply with `ICY 200` etc in place of `HTTP/1.1 200`.

In http_parser, we now also parse ICY URIs to be able to handle these similar to HTTP.

Signed-off-by: Vikram Dattu <vikram.dattu@espressif.com>
2019-10-11 16:24:31 +05:30
Jiang Jiang Jian 0b4faeb781 Merge branch 'bugfix/btdm_backports_v3.2_0903' into 'release/v3.2'
Bugfix/btdm backports v3.2 0903

See merge request espressif/esp-idf!5987
2019-10-11 18:34:31 +08:00
suda-morris ef796860d7 bootloader: shrink bin size
1. write a bootloader version of "getting chip revision" function.
2. reduce wordy log.
2019-10-10 12:08:34 +08:00
suda-morris 9742acc33d make psram workaround depend on chip revison
Since ESP32 revision 3, the PSRAM workaround is not needed.
2019-10-10 11:55:16 +08:00
Prasad Alatkar cf26a8b0f0 BT/Bluedroid : Add support to set min encryption key requirement (Backport v3.2)
- Backport(v3.2) of IDF MR!6122
- Modifies `smp_utils.c` to add check on encryption key size received from
  peer.
- Modifies `esp_ble_gap_set_security_param` API to add minimum encryption key
  size requirement.
2019-10-09 16:19:48 +08:00
Angus Gratton 14098b4832 Merge branch 'fix/add_parentheses_to_spi_swap_data_tx_3.2' into 'release/v3.2'
spi: Put argument of macro SPI_SWAP_DATA_TX/RX in parentheses (backport v3.2)

See merge request espressif/esp-idf!6110
2019-10-09 12:51:55 +08:00
suda-morris 5088758640 freertos: remove semicolon in xTaskNotifyGive 2019-10-08 12:39:28 +08:00
baohongde ca824d0ddf components/bt: backports release/v3.2 0903
Remove xtensa/xruntime.h
Fix sending Lmp_feature_req_ext in a loop
Fix 2 bugs in r_ld_fm_sket_isr
fix data loss and send same pkt twice sometimes
fix adv data error in air sometimes
fix adv start/stop crash sometimes
2019-09-23 17:53:29 +08:00
suda-morris eb4c8d9991 support esp32 eco revision 2 and 3 2019-09-19 17:05:08 +08:00
Martin Thierer d56892b563 spi: Put argument of macro SPI_SWAP_DATA_TX/RX in parentheses
Close https://github.com/espressif/esp-idf/pull/3996
2019-09-16 17:40:40 +08:00
Angus Gratton b1ee664367 Merge branch 'bugfix/bootloader_factory_reset_with_wake_up_from_deep_sleep_v3.2' into 'release/v3.2'
bootloader: Blocking the Factory reset during wake up from deep sleep (v3.2)

See merge request espressif/esp-idf!6024
2019-09-16 15:11:38 +08:00
Angus Gratton ee5604cad0 Merge branch 'bugfix/dis_interrupts_up_to_6_level_for_dport_wa_v3.2' into 'release/v3.2'
esp32: Dis interrupts up to 5 lvl for DPORT (v3.2)

See merge request espressif/esp-idf!5714
2019-09-16 15:11:33 +08:00
Angus Gratton 88d8e93223 Merge branch 'update/cjson_v1_7_12_v3.2' into 'release/v3.2'
Update cJSON to v1.7.12 (v3.2)

See merge request espressif/esp-idf!5852
2019-09-16 08:20:59 +08:00
KonstantinKondrashov 2b22f3e853 app_update: Fix UTs for FACTORY_RESET and APP_TEST 2019-09-12 22:07:05 +08:00
KonstantinKondrashov 70954c0b3e bootloader: Factory reset not for deep sleep
Closes: https://github.com/espressif/esp-idf/issues/3800

Closes: IDFGH-1536
2019-09-12 22:07:05 +08:00
Konstantin Kondrashov 69be477885 esp32: Add UTs for DPORT and Hi-interrupt 2019-09-12 13:47:48 +00:00
Konstantin Kondrashov 76f97f3abd esp32: Dis interrupts up to 5 lvl for DPORT
Disable interrupts for both DPORT workarounds up to 5 lvl.

Closes: https://esp32.com/viewtopic.php?f=2&t=10981&sid=d125cec233070ed4d2c5410bf5d3d74a
Closes: IDF-728
2019-09-12 13:47:48 +00:00
chenyudong d0bfde2ceb test: fix test case MESH_EST_2403 2019-09-12 02:51:06 +00:00
zhangyanjiao b937de7df2 fix the bug that ESP32 sends broadcast to phone after smartconfig is done 2019-09-11 11:50:58 +08:00
Chinmay fa952e5d30 esp_http_server : Bugfix in parsing of empty header values
This MR is intended to fix incorrect parsing of HTTP requests when empty header values are present.

The issue is was due to asymmetric behavior of `http_parser` library, which in case of:
* non-empty header values : invokes callbacks with the pointer to the start of a value
* empty header values : invokes callbacks with pointer to the start of next header or section

Since HTTP server relies on this pointer (along with length of the value) to locate the end of a value, and replace the line terminators (CRLFs) with null characters, the second case needed to be handled correctly.

Closes IDFGH-1539

Closes https://github.com/espressif/esp-idf/issues/3803

Backports !5663
2019-09-09 08:57:29 +00:00
Jiang Jiang Jian ca1e5e5bc5 Merge branch 'bugfix/fix_the_bug_for_WPA_WPA2_PSK_connection_fail_v3.2' into 'release/v3.2'
fix the bug for WPA_WPA2_PSK connection fail(backport v3.2)

See merge request espressif/esp-idf!6007
2019-09-06 11:44:09 +08:00
zhangyanjiao 23b3d97099 1. fix the bug that STA fails to connect WPA_WPA2_PSK Apple AP
2. fix the bug for softAP set authmode
2019-09-05 20:08:52 +08:00
Angus Gratton 0a0f5a3bdc Merge branch 'bugfix/flash_encryption_disable_plaintext_v3.2' into 'release/v3.2'
flash encryption: Add config option to disable any plaintext reflashes (v3.2)

See merge request espressif/esp-idf!5998
2019-09-05 17:26:04 +08:00
Angus Gratton ec331b3979 flash encryption: Add config option to disable any plaintext reflashes
Enabled by default when Secure Boot is on, so Flash Encryption protection
is always available in case of a Secure Boot bypass.
2019-09-05 18:54:29 +10:00
Angus Gratton 73e040e584 Merge branch 'test/use_correct_config_for_nvs_compatible_case_v3.2' into 'release/v3.2'
test: fix nvs compatible case error (backport v3.2)

See merge request espressif/esp-idf!5893
2019-09-05 16:51:30 +08:00
Angus Gratton d1f40c15ac Merge branch 'bugfix/fix_i2s_channels_swapped_issue_v3.2' into 'release/v3.2'
Bugfix(i2s): fixed i2s left/right channels swapped issue for release/v3.2.

See merge request espressif/esp-idf!5898
2019-09-03 13:36:29 +08:00
Jiang Jiang Jian 7718234acc Merge branch 'bugfix/coex_bb_reset_lock_v3.2' into 'release/v3.2'
fix bug that wifi start/stop may cause crash

See merge request espressif/esp-idf!5969
2019-09-02 14:26:03 +08:00
Tian Hao 01cd149cb7 fix bug that wifi start/stop may cause crash
1. fix bug bb reset lock flag to avoid bb reset lock unhandle,
   may cause assert in vPortCPUReleaseMutexIntsDisabledInternal.
2. fix bug wifi reset mac cause task watch dog timeout
3. fix bug wifi reset mac position
2019-08-30 22:13:01 +08:00
Angus Gratton 7dd4923190 Merge branch 'bugfix/httpd_sess_close_v3.2' into 'release/v3.2'
httpd_sess_close: Check for session validity before closing (v3.2)

See merge request espressif/esp-idf!5744
2019-08-29 10:29:41 +08:00
Nachiket Kukade 151ddb4cda wps: Relax the check on older config methods in case of WPS2.0 (backport v3.2)
Some APs incorrectly advertize newer WPS2.0 config method bits
without setting bits for the corresponding older methods. This
results in failures during 8-way handshake. Add a workaround to
relax this check so that WPS handshake can proceed.
2019-08-27 14:10:43 +05:30
Jiang Jiang Jian 1fab985f63 Merge branch 'bugfix/btdm_security_vulnerability_on_encryption_key_size_v3.2' into 'release/v3.2'
components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link

See merge request espressif/esp-idf!5873
2019-08-26 18:01:01 +08:00
redchenjs 548844b5cc Bugfix(i2s): fixed i2s left/right channels swapped issue for release/v3.2.
The right channel data is in the high position, so the I2S_TX_MSB_RIGHT & I2S_RX_MSB_RIGHT bits should be set.
2019-08-26 14:02:27 +08:00
He Yin Ling 9bc71370b7 test: fix integration test jobs not executed:
naming rule for parallel test job config file is different.
rename test job config file to make it unified.
2019-08-26 14:01:34 +08:00
He Yin Ling 66118ab580 test: fix nvs compatible case error:
use new env for nvs compatible test case and update test config
2019-08-26 09:36:32 +08:00
wangmengyang fae3bad007 components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link for preventing KNOB attack.
This patch is to address the CVE-2019-9506 vulnerability.
2019-08-23 08:30:23 +08:00
Ivan Grokhotkov 48e5dcd9b5 Merge branch 'power_management/i2s+i2c-v3.2' into 'release/v3.2'
Power management/i2s+i2c (backport v3.2)

See merge request espressif/esp-idf!5863
2019-08-22 23:29:52 +08:00
Sachin Parekh eeb9a0359c PM: I2S and I2C added in the Power Management docs
Signed-off-by: Sachin Parekh <sachin.parekh@espressif.com>
2019-08-21 18:15:51 +05:30
Sachin Parekh 4cdf488de8 I2S: Enable Power Management locks
Acquires PM_APB_FREQ_MAX lock when carrying any transaction on I2S if
Power Management Framework is enabled.

Signed-off-by: Sachin Parekh <sachin.parekh@espressif.com>
2019-08-21 18:15:41 +05:30
Sachin Parekh c56f147d48 I2C: Enable Power Management locks
Acquires PM_APB_FREQ_MAX lock when carrying any transaction on I2C if
Power Management Framework is enabled.

Signed-off-by: Sachin Parekh <sachin.parekh@espressif.com>
2019-08-21 18:15:29 +05:30
Angus Gratton 1d953831bd Update cJSON to v1.7.12
Fixes potential DoS in cJSON_Minify, see https://github.com/DaveGamble/cJSON/issues/354
2019-08-21 18:58:37 +10:00
Michael (XIAO Xufeng) a393bb6f1b sdio_slave: fix the send_flush infinite loop issue
Also add some helper functions.
2019-08-20 17:00:21 +08:00
chenjianqiang 3bf6c5b604 bugfix(flash): add spi dio address bitlen configure in psram init 2019-08-15 10:34:04 +08:00
Jiang Jiang Jian 90747cc8b3 Merge branch 'bugfix/fix_wifi_bugs_for_authmode_and_multi_ssid_v3.2' into 'release/v3.2'
fix wifi bugs for authmode and multi ssid (backport v3.2)

See merge request espressif/esp-idf!5729
2019-08-11 17:14:53 +08:00
Angus Gratton 91451d31be sha: Add fault injection checks reading hash digest state
Vulnerability reported by LimitedResults under Espressif Bug Bounty Program.
2019-08-11 13:19:21 +10:00
Angus Gratton 8fe9e4b09f aes: Add fault injection checks when writing key to hardware
Vulnerability reported by LimitedResults under Espressif Bug Bounty Program.
2019-08-11 13:19:21 +10:00
Angus Gratton 910cede38d hwcrypto: Add AES fault injection check
Hardware AES-CBC performance changes:

Release config 11.0MB/sec -> 10.8MB/sec
Debug config 9.4MB/sec -> 9.8MB/sec

(Unrolling the loop to optimize the check improves
performance at -Og, even with the fault check.)
2019-08-11 13:19:21 +10:00
Piyush Shah 107d927547 httpd_sess_close: Check for session validity before closing
If httpd_sess_trigger_close() gets called twice for the same socket,
the first httpd_sess_close() cb closes the correct socket, but the second
invocation closes the wrong socket which was just accepted and added to
the socket db. Checking for the lru counter will help identify this as the
counter is set only for requests actually served.
2019-08-09 14:58:28 +05:30
baohongde dc1db1c4e7 components/bt: Backport 3 bugfixs into release v3.2
1. Bugfix btdm sleep twice after wakeup request
2. Fix connect fail duo to loop of send extended feature request
3. Clear BT/BLE interrupts after controller_disable to overwrite the default non-zero value of intcntl registers
2019-08-09 03:04:40 +00:00
Jiang Jiang Jian db898de8fb Merge branch 'bugfix/lwip_prefer_allocate_memory_in_psram_v3.2' into 'release/v3.2'
Try to allocate some Lw-ip memories in SPIRAM first. If failed, try to allocate in internal RAM then.(Backport v3.2)

See merge request espressif/esp-idf!5719
2019-08-09 10:56:54 +08:00
Jiang Jiang Jian d657a679a2 Merge branch 'feature/move_gettimeofday_in_clock_gettime_v3.2' into 'release/v3.2'
newlib: Move _gettimeofday_r call in clock_gettime (v3.2)

See merge request espressif/esp-idf!5718
2019-08-08 22:02:43 +08:00
zhangyanjiao e451282f18 modify WIFI_CONN_0101 case for wrong authmode of AP 2019-08-08 16:54:35 +08:00
zhangyanjiao f3ffce3096 wifi: fix wifi bugs for authmode and multi ssid 2019-08-08 16:48:50 +08:00
Xia Xiaotian 754a292309 lwip: Try to allocate some LWIP memories in SPIRAM first. If failed, try to allocate in internal RAM then. 2019-08-07 21:11:06 +08:00
Jiang Jiang Jian 00f1ac748b Merge branch 'bugfix/add_wifi_internal_ioctl_declared_v3.2' into 'release/v3.2'
esp_wifi: add esp_wifi_internal_ioctl declared (v3.2)

See merge request espressif/esp-idf!5707
2019-08-07 20:48:58 +08:00
raldone01 b0cff945cf newlib: Move _gettimeofday_r call in clock_gettime
Signed-off-by: KonstantinKondrashov <konstantin@espressif.com>
Merges: https://github.com/espressif/esp-idf/pull/3789
2019-08-07 20:37:25 +08:00
Angus Gratton 1beac49f3a Merge branch 'feature/mqtt_improve_recv_3.2' into 'release/v3.2'
MQTT improved receive (backport 3.2)

See merge request espressif/esp-idf!5098
2019-08-07 16:05:07 +08:00
xiehang 207438f2da esp_wifi: add esp_wifi_internal_ioctl declared 2019-08-07 11:17:39 +08:00
Jiang Jiang Jian 83e5e6b24c Merge branch 'bugfix/improve_spi_timing_for_flash_v3.2' into 'release/v3.2'
bugfix(flash): improve spi cs timing settings for flash (backport v3.2)

See merge request espressif/esp-idf!5513
2019-07-31 23:39:07 +08:00
Angus Gratton 6510c6f495 Merge branch 'bugfix/select_init_sem_v3.2' into 'release/v3.2'
VFS: Allocate socket select semaphore outside ISR (backport v3.2)

See merge request espressif/esp-idf!4989
2019-07-31 16:11:57 +08:00
Angus Gratton b460718954 Merge branch 'bugfix/libsodium_test_timeouts_v3.2' into 'release/v3.2'
test: Set timeout of libsodium ed25519_convert test to 60s (v3.2)

See merge request espressif/esp-idf!5555
2019-07-30 21:59:51 +08:00
Angus Gratton b7196d21c9 Merge branch 'bugfix/gpio_intr_enable_bug_v3.2' into 'release/v3.2'
bugfix(GPIO): Fixed GPIO  interrupts bug for v3.2

See merge request espressif/esp-idf!5651
2019-07-30 14:10:29 +08:00
Angus Gratton 1a307a417d test: Set timeout of libsodium ed25519_convert test to 60s
Test takes 28s-29s to run in some configs, can fail in CI.
2019-07-30 04:44:30 +00:00
kooho f6a9f76401 bugfix(GPIO): Fixed the bug that GPIO enables interrupts on one core,
but registers interrupt service routines on another core for release/v3.2
2019-07-29 19:22:59 +08:00
xiehang e34aeae1a0 esp_wifi: ESP32_WIFI_RX_BA_WIN should be less than ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM 2019-07-27 06:40:01 +00:00
Jiang Jiang Jian 43600262a8 Merge branch 'bugfix/mesh_scan_done_crash_3.2' into 'release/v3.2'
mesh: fix scan done crash caused by uint8_t overflow (backport 3.2)

See merge request espressif/esp-idf!5614
2019-07-27 14:38:39 +08:00
Jiang Jiang Jian 8fdea83505 Merge branch 'bugfix/btdm_mem_leak_v3.2' into 'release/v3.2'
components/bt: Fix memory leak about rfcomm

See merge request espressif/esp-idf!5623
2019-07-27 14:38:28 +08:00
Mahavir Jain 7e77f67777 Merge branch 'feature/tcp_transport_http_client_v3.2' into 'release/v3.2'
Minor bugfixes in esp_http_client and tcp_transport (backport v3.2)

See merge request espressif/esp-idf!5221
2019-07-25 19:37:26 +08:00
Jiang Jiang Jian e1518b4112 Merge branch 'bugfix/sec_boot_ota_fail_v32' into 'release/v3.2'
Bugfix: ota fails with secure boot on for image size greater than 3.2MB (backport v3.2)

See merge request espressif/esp-idf!5580
2019-07-25 18:04:39 +08:00
baohongde 151638fdbb components/bt: Fix memory leak about rfcomm 2019-07-25 17:10:52 +08:00
Jiang Jiang Jian b3a5dc869f Merge branch 'bugfix/supplicant_security_fixes_v3.2' into 'release/v3.2'
wpa_supplicant: Fix sprintf security bugs. (v3.2)

See merge request espressif/esp-idf!5465
2019-07-25 12:18:19 +08:00
chenyudong 87947004c4 mesh: fix scan done crash caused by uint8_t overflow 2019-07-25 11:16:53 +08:00
chenyudong f892937780 test: move wifi library check to esp32-wifi-lib ci 2019-07-22 11:17:04 +08:00
Jitin George 105e3302a7 esp_http_client: Fix header sent event bug 2019-07-21 07:25:23 +00:00
Jitin George 19fd2b3d93 tcp_transport: Fix case sensitive header comparison
Closes https://github.com/espressif/esp-idf/issues/3106
2019-07-21 07:25:23 +00:00
xiehang 8be97410a4 WiFi: Modify the wifi_country struct in VNC to keep it consistent with IDF.
1. Modfy wifi_country struct
2. Add md5 check esp_wifi_types.h
3. Add md5 check esp_wifi.h
2019-07-21 10:30:45 +08:00
liu zhifu 6af16447f8 mesh: fix the bug that esp_mesh_stop doesn't return 2019-07-21 10:26:17 +08:00
xiehang eee568ddc5 wps: add overlap event 2019-07-21 10:23:01 +08:00
liu zhifu c119a1a0f4 esp32: fix wifi stop bug
Fix the bug that WiFi stop causes esp_wifi_internal_reg_rxcb() fails.
2019-07-21 10:20:25 +08:00
liu zhifu ed6b453346 esp32: fix WPS/WPA2-Enterprise memory leak
Fix WPS and WPA2-Enterprise memory leak bug.
2019-07-21 10:15:19 +08:00
liu zhifu ba69e61ed5 esp32: fix smartconfig crash when no AP is found
Fix the bug that smartconfig crashes when no AP is found during smartconfig scan.
2019-07-21 09:59:37 +08:00
Jiang Jiang Jian 6ba62f7b0b Merge branch 'bugfix/fix_the_watchdog_during_WiFi_scan_BLE_scan_v3.2' into 'release/v3.2'
fix the watchdog bug during WiFi scan and BLE scan (v3.2)

See merge request espressif/esp-idf!5541
2019-07-19 18:08:56 +08:00