Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6915 commits 10 branches 75 tags 114 MiB
Commit graph

5124 commits

Author SHA1 Message Date
Nachiket Kukade
6beea28f56 wps: Relax the check on older config methods in case of WPS2.0 (backport v3.1) 
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-12-22 09:08:02 +00:00
xiehang
0169728ddd esp_wifi: Put some rx code to iram 2019-12-17 20:51:26 +08:00
Jiang Jiang Jian
8de1c4b21b Merge branch 'bugfix/btdm_avrc_metadata_length_error_v3.1' into 'release/v3.1' 
components/bt: Fix AVRC metadata length error

See merge request espressif/esp-idf!6886
 2019-12-12 15:54:02 +08:00
Jiang Jiang Jian
f5b7501417 Merge branch 'bugfix/hfp_client_indication_v3.1' into 'release/v3.1' 
component/bt: Fix bugs in HFP feature v3.1

See merge request espressif/esp-idf!6854
 2019-12-12 12:16:27 +08:00
Jiang Jiang Jian
02ba857c69 Merge branch 'bugfix/phy_critical_v3.1' into 'release/v3.1' 
fix bug that phy_enter_critical cannot effect on dual-core

See merge request espressif/esp-idf!6943
 2019-12-12 12:16:21 +08:00
Jiang Jiang Jian
612a25f50c Merge branch 'component_bt/osi_fixed_queue_v3.1' into 'release/v3.1' 
component_bt/: Fix pointer type in fixed_queue v3.1

See merge request espressif/esp-idf!6849
 2019-12-12 12:15:44 +08:00
Jiang Jiang Jian
a340a4e46e Merge branch 'bugfix/btdm_backports_v3.1_1028' into 'release/v3.1' 
bt: backport btdm controller fixes to v3.1

See merge request espressif/esp-idf!6526
 2019-12-09 16:26:49 +08:00
Jiang Jiang Jian
0c4ca580d2 Merge branch 'bugfix/btdm_disable_some_secrity_mask_v3.1' into 'release/v3.1' 
components/bt: Disable some unsupported security mask

See merge request espressif/esp-idf!6728
 2019-12-09 14:06:47 +08:00
Tian Hao
84fccb592d 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:55:05 +08:00
weitianhua
a760a14e2a adaptation for nano-format 2019-11-29 18:00:36 +08:00
baohongde
10fd8a09c7 components/bt: Fix AVRC metadata length error 2019-11-29 16:04:20 +08:00
weitianhua
d8339602d9 component_bt/:bugfix_hfp_client_indication_define_and_cnum_error 2019-11-27 17:09:36 +08:00
weitianhua
6cb0dbe54a component_bt/: Fix pointer type in fixed_queue 3.1 2019-11-27 16:22:47 +08:00
Jiang Jiang Jian
efa1d4d133 Merge branch 'bugfix/fix_timer_deleted_and_run_broken_callback_v3.1' into 'release/v3.1' 
esp_timer: fix the bug that when timeout of timer happens try to run callback(v3.1)

See merge request espressif/esp-idf!6766
 2019-11-25 10:47:59 +08:00
Angus Gratton
07fa97b94c Merge branch 'feature/add_env_tag_for_32khz_xtal_uts_v3.1' into 'release/v3.1' 
soc(esp32&esp32s2beta): Add test_env for 32kHz XTAL unit tests (v3.1)

See merge request espressif/esp-idf!6606
 2019-11-21 11:58:57 +08:00
KonstantinKondrashov
cffeb16104 soc/esp32: Add test_env for 32kHz XTAL unit tests 2019-11-20 16:19:57 +08:00
Jack
4de860ec89 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 23:00:15 +08:00
KonstantinKondrashov
be24e32da9 esp32: Fix a wrong reset of the wdt feed bit 
There was an error with wrong using FEED:
WRITE_PERI_REG(RTC_CNTL_WDTFEED_REG, 1) - wrong [0 bit]
REG_SET_BIT(RTC_CNTL_WDTFEED_REG, RTC_CNTL_WDT_FEED) - right. [31 bit]

Closes: https://github.com/espressif/esp-idf/issues/4295
 2019-11-19 12:59:41 +08:00
baohongde
26550d1cf2 components/bt: Disable some unsupported security mask 2019-11-17 13:57:46 +08:00
baohongde
83a9fd42e0 backport release/v3.1 1028 
Bugfix that bluetooth controller may not be able to enter sleep after end of wake up request
Fix LMP sniff req timeout
 2019-11-04 10:32:28 +08:00
Jiang Jiang Jian
8cbe713ab8 Merge branch 'bugfix/btdm_assert_deinit_a2dp_while_playing_v3.1' into 'release/v3.1' 
components/bt: Fix assert when deinit A2DP while playing music

See merge request espressif/esp-idf!6538
 2019-11-01 11:57:27 +08:00
Jiang Jiang Jian
dbdde2ec8c Merge branch 'bugfix/mdns_invalid_hostname_queries_v3.1' into 'release/v3.1' 
mdns: fix crash for hostname queries (backport v3.1)

See merge request espressif/esp-idf!6500
 2019-10-30 00:52:04 +08:00
baohongde
1aed045de7 components/bt: Fix assert when deinit A2DP while playing music 2019-10-29 20:13:17 +08:00
baohongde
171489153d components/bt: Disable BR/EDR GATT 2019-10-28 11:41:45 +08:00
Marius Vikhammer
f786a25b36 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 10:52:39 +08:00
Jiang Jiang Jian
23f45235de Merge branch 'feature/esptool_v2.8_v3.1' into 'release/v3.1' 
esptool: Bump to v2.8 release (v3.1)

See merge request espressif/esp-idf!6463
 2019-10-25 11:35:22 +08:00
Angus Gratton
9abba6b1fe esptool: Bump to v2.8 release 2019-10-23 09:09:29 +11:00
Roland Dobai
6e25e6a991 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:23:31 +02:00
Jiang Jiang Jian
0c7e7817cb Merge branch 'bugfix/backport_some_wifi_fixes_1009_v3.1' into 'release/v3.1' 
esp32: fix some WiFi fixes 1009 (backport v3.1)

See merge request espressif/esp-idf!6297
 2019-10-21 20:08:32 +08:00
Jiang Jiang Jian
2981e2e95f Merge branch 'bugfix/add_kconfig_help_for_eth_gpio0_output_mode_v3.1' into 'release/v3.1' 
ethernet: add kconfig help for GPIO0 output mode (v3.1)

See merge request espressif/esp-idf!6344
 2019-10-21 10:46:53 +08:00
Jiang Jiang Jian
0fc8a5214f Merge branch 'docs/update_bootloader_chip_revision_print_v3.1' into 'release/v3.1' 
bootloader_support: fix logging prints around chip revision (v3.1)

See merge request espressif/esp-idf!6339
 2019-10-21 10:46:37 +08:00
Jiang Jiang Jian
15e2bfd250 Merge branch 'bugfix/vfs_fat_sdmmc_mount_v3.1' into 'release/v3.1' 
Fix memory leak upon failure of esp_vfs_fat_sdmmc_mount() (v3.1)

See merge request espressif/esp-idf!6396
 2019-10-21 10:43:10 +08:00
Ivan Grokhotkov
84d16f970e pm: prevent interrupt nesting during esp_pm_impl_isr_hook 
Follows the approach proposed in https://github.com/espressif/esp-idf/pull/3110,
but masks the interrupts during the entire ISR hook, not only during
leave_idle. Interrupt nesting during update_ccompare may also cause
issues.

Closes https://github.com/espressif/esp-idf/issues/3057
 2019-10-18 11:33:06 +02:00
Roland Dobai
c934e026b5 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:49 +02:00
Mahavir Jain
0d85e9abbe bootloader_support: fix logging prints around chip revision 2019-10-18 11:18:08 +05:30
Ivan Grokhotkov
d91272f280 Merge branch 'refactor/shrink_bootloader_bin_size_3.1' into 'release/v3.1' 
bootloader: shrink bin size (v3.1)

See merge request espressif/esp-idf!6305
 2019-10-18 13:40:15 +08:00
Angus Gratton
07bcc8c055 Merge branch 'bugfix/reset_periph_modules_v3.1' into 'release/v3.1' 
driver: Add a reset before enabling if a module is off (v3.1)

See merge request espressif/esp-idf!6018
 2019-10-18 13:33:17 +08:00
suda-morris
89d71691d6 ethernet: add kconfig help for GPIO0 output mode 
1. add kconfig help for GPIO0 output mode
2. fix wrong LAN8720 register index
 2019-10-17 08:10:06 +00:00
liu zhifu
907878d606 esp32: fix some WiFi fixes 
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 5.5M signal test bug
9. Move wifi library check to esp32-wifi-lib ci
 2019-10-12 10:18:13 +08:00
Konstantin Kondrashov
1145b0414f rmt/driver: Add module reset before enabling 2019-10-11 19:45:08 +08:00
Konstantin Kondrashov
2d08f86958 pcnt/driver: Add module reset before enabling 2019-10-11 19:45:08 +08:00
Konstantin Kondrashov
aeda8e0c8f sdmmc_host/driver: Add module reset before enabling 2019-10-11 19:45:08 +08:00
Konstantin Kondrashov
89d549c8a4 i2s/driver: Add module reset before enabling 2019-10-11 19:45:08 +08:00
Konstantin Kondrashov
61be3bd1a5 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-11 19:45:08 +08:00
suda-morris
fd9f46a645 bootloader: shrink bin size 
1. write a bootloader version of "getting chip revision" function.
2. reduce wordy log.
 2019-10-10 12:28:39 +08:00
Angus Gratton
f09dc866f8 Merge branch 'bugfix/freertos_xTaskNotifyGive_v3.1' into 'release/v3.1' 
freertos: remove semicolon in xTaskNotifyGive (v3.1)

See merge request espressif/esp-idf!6272
 2019-10-10 11:25:55 +08:00
Angus Gratton
42739580e4 Merge branch 'feature/add_psram_workaround_option_3.1' into 'release/v3.1' 
make psram workaround depend on chip revison (v3.1)

See merge request espressif/esp-idf!6210
 2019-10-10 11:00:56 +08:00
Prasad Alatkar
882dfb5f97 BT/Bluedroid : Add support to set min encryption key requirement (Backport v3.1) 
- Backport(v3.1) 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:15:47 +08:00
suda-morris
54b813ad69 freertos: remove semicolon in xTaskNotifyGive 2019-10-08 18:58:40 +08:00
Jiang Jiang Jian
f5b9366999 Merge branch 'bugfix/multi_heap_printf_backport_v3.1' into 'release/v3.1' 
heap: Fix printf usage in heap poisoning (backport v3.1)

See merge request espressif/esp-idf!6089
 2019-09-29 16:17:29 +08:00
Jiang Jiang Jian
704e2f4a8c Merge branch 'bugfix/btdm_a2dp_sink_media_suspend_cmd_unack_for_v3.1' into 'release/v3.1' 
bugfix/btdm_a2dp_sink_media_suspend_cmd_unack_for_v3.1(backport v3.1)

See merge request espressif/esp-idf!5938
 2019-09-29 16:17:05 +08:00
Jiang Jiang Jian
7a7f2c9110 Merge branch 'bugfix/btdm_backports_v3.1_0903' into 'release/v3.1' 
components/bt: backports release/v3.1 0903

See merge request espressif/esp-idf!5989
 2019-09-29 16:16:43 +08:00
Jiang Jiang Jian
1387ecef6c Merge branch 'bugfix/fix_cache_disable_access_psram_v3.1' into 'release/v3.1' 
esp_wifi: Put g_promis_buf to IRAM (backport v3.1)

See merge request espressif/esp-idf!6164
 2019-09-29 10:35:22 +08:00
suda-morris
b64bda7e4e make psram workaround depend on chip revison 
Since ESP32 revision 3, the PSRAM workaround is not needed.
 2019-09-26 17:32:20 +08:00
Jiang Jiang Jian
83458426ac Merge branch 'bugfix/fix_the_for_smartconfig_send_broadcast_to_phone_v3.1' into 'release/v3.1' 
fix the bugs in smartconfig_ack (backport v3.1)

See merge request espressif/esp-idf!6075
 2019-09-25 12:00:41 +08:00
baohongde
f48dbc09ae components/bt: backports release/v3.1 0903 
Remove xtensa/xruntime.h
Fix sending Lmp_feature_req_ext in a loop
Fix 2 bugs in r_ld_fm_sket_isr
fix memory leak when set tx power
fix data loss and send same pkt twice sometimes
fix adv data error in air sometimes
fix adv start/stop crash sometimes
bugfix btdm sleep twice after wakeup request
Fix connect fail with some speakers
clear BT/BLE interruots after controller disable
 2019-09-23 17:41:58 +08:00
xiehang
e07f7c4456 esp_wifi: Put g_promis_buf to IRAM 2019-09-19 20:37:07 +08:00
suda-morris
c0a5cb07cd support esp32 eco revision 2 and 3 2019-09-19 17:09:37 +08:00
Angus Gratton
d6e333f014 Merge branch 'bugfix/bootloader_factory_reset_with_wake_up_from_deep_sleep_v3.1' into 'release/v3.1' 
bootloader: Blocking the Factory reset during wake up from deep sleep (v3.1)

See merge request espressif/esp-idf!6025
 2019-09-16 15:10:50 +08:00
Angus Gratton
f8798d686d Merge branch 'bugfix/add_flash_config_in_app_startup_v3.1' into 'release/v3.1' 
bugfix(flash): add flash config in app startup (backport v3.1)

See merge request espressif/esp-idf!5925
 2019-09-13 14:32:02 +08:00
KonstantinKondrashov
01d17d8694 bootloader: Factory reset not for deep sleep 
Closes: https://github.com/espressif/esp-idf/issues/3800

Closes: IDFGH-1536
 2019-09-12 22:12:25 +08:00
Darian Leung
4b05708daf 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-09-12 19:27:19 +08:00
Tian Hao
a815e3ede2 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-09-11 20:34:02 +08:00
chenjianqiang
9eb8a740a3 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-09-11 15:53:46 +08:00
chenjianqiang
7904cae9c1 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-09-11 15:37:18 +08:00
zhangyanjiao
8af11f1f89 smartconfig_ack.c: 
1. fix the bug that ESP32 sends broadcast to phone after smartconfig is done
2. fix the declaration of remote_ip in sc_ack_send_task()
 2019-09-11 14:20:26 +08:00
Angus Gratton
7648859a27 Merge branch 'bugfix/flash_encryption_disable_plaintext_v3.1' into 'release/v3.1' 
flash encryption: Add config option to disable any plaintext reflashes (3.1)

See merge request espressif/esp-idf!6049
 2019-09-11 12:10:18 +08:00
Angus Gratton
a4ce828d40 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-10 14:29:20 +10:00
Sagar Bijwe
0449ba7f91 docs: Added more wordings to capture secure boot and flash encryption dependency. 2019-09-10 10:11:44 +10:00
zhangyanjiao
7840d64d2e fix the bug that STA fails to connect WPA_WPA2_PSK Apple AP 2019-09-06 14:24:32 +08:00
liu zhifu
87304cbcf4 esp32: revert WiFi RX optimization 
Revert following commit since it has compatibility issue:
commit 71f1b7f424
esp32: optimize wifi rx
 2019-08-29 11:06:33 +08:00
wangmengyang
7942604c22 bugfix that call of esp_a2d_media_ctrl(ESP_A2D_MEDIA_CTRL_SUSPEND) will not get an ACK from callback on A2DP sink 2019-08-28 15:52:09 +08:00
Angus Gratton
a3d232f053 Merge branch 'test/use_correct_config_for_nvs_compatible_case_v3.1' into 'release/v3.1' 
test: fix nvs compatible case error (backport v3.1)

See merge request espressif/esp-idf!5892
 2019-08-27 13:30:35 +08:00
Jiang Jiang Jian
7e538b88fb Merge branch 'update/cjson_v1_7_12_v3.1' into 'release/v3.1' 
Update cJSON to v1.7.12 (v3.1)

See merge request espressif/esp-idf!5853
 2019-08-26 18:29:52 +08:00
Jiang Jiang Jian
e8f65b958d Merge branch 'bugfix/fix_i2s_channels_swapped_issue_v3.1' into 'release/v3.1' 
Bugfix(i2s): fixed i2s left/right channels swapped issue for v3.1.

See merge request espressif/esp-idf!5897
 2019-08-26 18:29:37 +08:00
Jiang Jiang Jian
87b9f2f660 Merge branch 'bugfix/fix_the_bug_for_softap_set_authmode_v3.1' into 'release/v3.1' 
wifi: fix the bug for softAP set authmode (backport v3.1)

See merge request espressif/esp-idf!5827
 2019-08-26 18:29:18 +08:00
He Yin Ling
2edb9c4761 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 15:15:25 +08:00
redchenjs
61b585ab41 Bugfix(i2s): fixed i2s left/right channels swapped issue for v3.1. 
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 13:55:05 +08:00
He Yin Ling
725eba3378 test: fix nvs compatible case error: 
use new env tag for nvs compatible test case and update test config
file.
 2019-08-26 09:33:19 +08:00
zhangyanjiao
4bf4384846 wifi: fix the bug for softAP set authmode 2019-08-23 16:40:40 +08:00
wangmengyang
4db0d07177 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:31:23 +08:00
Angus Gratton
58dc5049a5 Update cJSON to v1.7.12 
Fixes potential DoS in cJSON_Minify, see https://github.com/DaveGamble/cJSON/issues/354
 2019-08-21 18:59:06 +10:00
chenjianqiang
f21f5fd45b bugfix(flash): add spi dio address bitlen configure in psram init 2019-08-14 21:30:58 +08:00
Sagar Bijwe
da3239c336 wpa_supplicant: Fix sprintf security bugs. 
Revert back to using os_snprintf instead of sprintf.

Closes WIFI-624
 2019-08-12 06:30:02 +00:00
Jiang Jiang Jian
b94341c4e0 Merge branch 'bugfix/fix_wifi_bugs_for_authmode_and_multi_ssid_v3.1' into 'release/v3.1' 
fix wifi bugs for authmode and multi ssid (backport v3.1)

See merge request espressif/esp-idf!5730
 2019-08-11 17:07:48 +08:00
Jiang Jiang Jian
30547ae02c Merge branch 'bugfix/dis_interrupts_up_to_6_level_for_dport_wa_v3.1' into 'release/v3.1' 
esp32: Dis interrupts up to 5 lvl for DPORT (v3.1)

See merge request espressif/esp-idf!5715
 2019-08-11 16:55:39 +08:00
Jiang Jiang Jian
a5db2f0f2d Merge branch 'bugfix/fix_the_watchdog_during_WiFi_scan_BLE_scan_v3.1' into 'release/v3.1' 
fix the watchdog bug during WiFi scan and BLE scan(v3.1)

See merge request espressif/esp-idf!5542
 2019-08-09 14:06:03 +08:00
zhangyanjiao
adf6ed9c8c modify WIFI_CONN_0101 case for wrong authmode of AP 2019-08-08 17:45:28 +08:00
zhangyanjiao
6020bd5261 wifi: fix wifi bugs for authmode and multi ssid 2019-08-08 17:44:14 +08:00
Konstantin Kondrashov
c69a410012 esp32: Add UTs for DPORT and Hi-interrupt 2019-08-08 15:10:23 +08:00
Konstantin Kondrashov
687a62fb1e 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-08-07 20:10:06 +08:00
xiehang
86300427dc esp_wifi: add esp_wifi_internal_ioctl declared 2019-08-07 11:14:18 +08:00
Jiang Jiang Jian
cbf12758c2 Merge branch 'bugfix/fix_wifi_stack_can_freeze_v3.1' into 'release/v3.1' 
esp_wifi: ESP32_WIFI_RX_BA_WIN should be less than ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM (v3.1)

See merge request espressif/esp-idf!5619
 2019-08-04 15:58:46 +08:00
chenjianqiang
963fe19abf bugfix(flash): improve spi cs timing settings for flash 
cs setup time is recomemded to be 1.5T, and cs hold time is recommended to be 2.5T.
(cs_setup = 1, cs_setup_time = 0; cs_hold = 1, cs_hold_time = 1)
 2019-07-31 18:15:44 +08:00
baohongde
ba7a0fa4ec components/bt: Fix memory leak about rfcomm 2019-07-25 17:13:31 +08:00
xiehang
6af07b800a esp_wifi: ESP32_WIFI_RX_BA_WIN should be less than ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM 2019-07-25 14:43:01 +08:00
zhangyanjiao
16a96dccf0 fix the watchdog bug during WiFi scan and BLE scan 2019-07-19 15:04:26 +08:00
Jiang Jiang Jian
a33c5f1713 Merge branch 'bugfix/btdm_fix_rxwinsz_assert_in_wifi_ble_coex_v3.1' into 'release/v3.1' 
component/bt: fix rxwinsz assert in ble and wifi coex(backport v3.1)

See merge request espressif/esp-idf!5451
 2019-07-18 18:37:12 +08:00
Jiang Jiang Jian
da23381ff6 Merge branch 'bugfix/backport_some_wifi_bugs_201907_v3.1' into 'release/v3.1' 
Backport some wifi bugs 201907 v3.1 (backport v3.1)

See merge request espressif/esp-idf!5524
 2019-07-18 18:37:09 +08:00
Angus Gratton
931b3c07af 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-17 13:52:01 +10:00