Jiang Jiang Jian
9d6cace1fd
Merge branch 'test/detect_exception_in_idf_dut_v3.2' into 'release/v3.2'
...
tiny-test-fw: support detect exception in IDFDUT (backport v3.2)
See merge request idf/esp-idf!4543
2019-04-28 10:26:48 +08:00
Jiang Jiang Jian
a5b007f6bb
Merge branch 'bugfix/msys_cancel_idfpy_v3.2' into 'release/v3.2'
...
tools: re-run idf.py in MSYS with winpty (backport v3.2)
See merge request idf/esp-idf!4456
2019-04-28 10:26:10 +08:00
Jiang Jiang Jian
0beb60e8fc
Merge branch 'test/fix_unit_test_job_pass_even_no_test_executed_v3.2' into 'release/v3.2'
...
test: fix CI UT job pass even ut app bootup fail (backport v3.2)
See merge request idf/esp-idf!4388
2019-04-28 10:25:53 +08:00
Jiang Jiang Jian
9294e4d08d
Merge branch 'feature/poll_v3.2' into 'release/v3.2'
...
VFS: Implement poll() based on select() (backport v3.2)
See merge request idf/esp-idf!4350
2019-04-28 10:24:41 +08:00
Jiang Jiang Jian
193b8e93a8
Merge branch 'bugfix/btdm_abort_if_deinit_spp_without_init_v3.2' into 'release/v3.2'
...
components/bt: Fix abort if call esp_spp_deinit without calling esp_spp_init
See merge request idf/esp-idf!4862
2019-04-26 21:01:35 +08:00
Angus Gratton
8da392aa1d
Merge branch 'feature/esp_http_client_global_ca_store_v3.2' into 'release/v3.2'
...
esp_http_client: add support for using certs from global ca store (backport_v3.2)
See merge request idf/esp-idf!4868
2019-04-26 10:08:23 +08:00
Angus Gratton
c3cee5e3de
Merge branch 'backport/feature_set_redirect_function_v32' into 'release/v3.2'
...
Add a `esp_http_client_set_redirection` function. (backport v3.2)
See merge request idf/esp-idf!4867
2019-04-26 10:07:04 +08:00
Jiang Jiang Jian
0c13ae6b45
Merge branch 'feature/btdm_add_ble_link_timeout_config_v3.2' into 'release/v3.2'
...
Component/bt: add ble link timeout config in menuconfig(backport v3.2)
See merge request idf/esp-idf!4826
2019-04-25 20:05:19 +08:00
Jiang Jiang Jian
306a1173af
Merge branch 'feature/wifi_refactor_softap_power_save_v3.2' into 'release/v3.2'
...
refactor softap power save (backport v3.2)
See merge request idf/esp-idf!4823
2019-04-25 17:05:49 +08:00
Mahavir Jain
2549951498
esp_http_client: add support for using certs from global ca store
...
Closes https://github.com/espressif/esp-idf/issues/3062
(cherry picked from commit 27e00cf7aa
)
2019-04-24 14:06:33 +05:30
Vikram Dattu
b2384dc9ee
Add a esp_http_client_set_redirection
function When using direct operations instead of esp_http_client_perform
, we need a way to set redirection URL when we get 30x response codes. Added the function for the same. User can now check status code and call esp_http_client_set_redirection
function to enable redirection. Related change in adf: https://gitlab.espressif.cn:6688/adf/esp-adf-internal/merge_requests/187
...
Signed-off-by: Vikram Dattu <vikram.dattu@espressif.com>
2019-04-24 13:54:22 +05:30
baohongde
f95826144e
components/bt: Fix abort if call esp_spp_deinit without calling esp_spp_init
2019-04-24 11:34:06 +08:00
Angus Gratton
225bc0f80a
Merge branch 'bugfix/remove_second_sha_enable_v3.2' into 'release/v3.2'
...
esp32/sha: Remove second enabling in esp_sha_lock_engine_common (backport v3.2)
See merge request idf/esp-idf!4780
2019-04-23 07:38:00 +08:00
zhiweijian
96c8343e46
Component/bt: add ble link timeout config in menuconfig
...
- add ble link timeout config in menuconfig
- disable background connection when call gatts_open
2019-04-22 21:55:06 +08:00
XiaXiaotian
3ee11bcafc
refactor softap power save
...
1. Softap support multicast and broadcast saving and flushing
when the associated stations enable IEEE80211 legacy power
save(which is called modem sleep in ESP32).
2. Improve the frame saving and flushing mechanism of softap power
save.
2019-04-19 14:14:33 +08:00
Jiang Jiang Jian
bcb543eb10
Merge branch 'bugfix/coex_decouple_wifi_and_bt_code_with_coexist_v3.2' into 'release/v3.2'
...
Decouple WiFi and BT with coexist to reduce bin size (backport v3.2)
See merge request idf/esp-idf!4811
2019-04-19 13:31:06 +08:00
He Yin Ling
bb73659c9c
Merge branch 'test/modify_mesh_ci_v3.2' into 'release/v3.2'
...
test: update mesh test cases for ci (backport v3.2)
See merge request idf/esp-idf!4650
2019-04-18 11:29:43 +08:00
chenyudong
58bc6be4c0
test:update mesh test cases for ci test(v3.2)
...
add mesh test case in TC_IT_MESH_EST.yml and TC_IT_MESH_COMM.yml
add job form IT_02 to IT_08
2019-04-17 17:25:17 +08:00
XiaXiaotian
5059c7fac3
Decouple WiFi and BT with coexist to reduce bin size
...
1. Do not link WiFi code when only BT or BLE is used and WiFi is not
used.
2. Do not link coexist code when CONFIG_SW_COEXIST_ENABLE is disabled.
2019-04-17 16:59:24 +08:00
Jiang Jiang Jian
cf866f23f2
Merge branch 'bugfix/fix_some_wifi_and_coexist_bugs_0416_v3.2' into 'release/v3.2'
...
esp32: fix some WiFi and coexist bugs (backport v3.2)
See merge request idf/esp-idf!4803
2019-04-17 14:24:32 +08:00
liu zhifu
faec3211bd
esp32: fix some WiFi and coexist bugs
...
Fix following WiFi and coexist bugs:
1. Fix BT disconnecting due to too many reset BB
2. Fix the bug that no TBTT is generated after rx wrong beacon when WiFi/BT coexist
3. Fix a DelBA bug
4. Add out of memory check
5. Fix the bug that STA incorrectly receives packets when scanning in connected status
6. PHY4008: Disable BT TX in force wifi mode, and enable BT TX in un-force wifi mode
2019-04-17 10:02:51 +08:00
Jiang Jiang Jian
c7d0df5451
Merge branch 'bugfix/fix_scan_and_connect_bugs_0415_v3.2' into 'release/v3.2'
...
fix wifi scan and connect bugs (backport v3.2)
See merge request idf/esp-idf!4772
2019-04-16 21:09:15 +08:00
Jiang Jiang Jian
7097cb9c9d
Merge branch 'bugfix/fix_deprecated_warning_with_dfs_init_auto_config_v3.2' into 'release/v3.2'
...
cpu_start: fix warnings with CONFIG_PM_DFS_INIT_AUTO option (v3.2)
See merge request idf/esp-idf!4791
2019-04-16 20:30:09 +08:00
Mahavir Jain
1fcef31195
cpu_start: fix warnings with CONFIG_PM_DFS_INIT_AUTO option
...
Closes https://github.com/espressif/esp-idf/issues/3297
2019-04-16 11:21:26 +05:30
Jiang Jiang Jian
acc882f4dd
Merge branch 'bugfix/btdm_bugx_backport_3.2' into 'release/v3.2'
...
Some bugs backport 3.2
See merge request idf/esp-idf!4773
2019-04-16 10:45:04 +08:00
Angus Gratton
e4c1bcddc5
Merge branch 'bugfix/freemodbus_fix_critical_sections' into 'release/v3.2'
...
freemodbus: fix critical sections to semaphore mutex (backport v3.2)
See merge request idf/esp-idf!4435
2019-04-16 08:53:23 +08:00
Konstantin Kondrashov
b2455219cc
esp32/sha: Remove second enabling in esp_sha_lock_engine_common
2019-04-15 21:14:38 +08:00
zhangyanjiao
de6b7d6520
fix wifi scan and connect bugs:
...
1. fix the bug block scan tiemout before scan finish
2. make menuconfig can set the WiFi mgmt short buffer num
3. modify wifi reason code
4. fix the bug PMK recal too long
2019-04-15 18:59:52 +08:00
Jiang Jiang Jian
fa40e43c8d
Merge branch 'bugfix/btdm_fix_warning_when_disable_logs_v3.2' into 'release/v3.2'
...
components/bt: Fix warning when disable debug logs or in release mode and improve the code structure
See merge request idf/esp-idf!4620
2019-04-15 18:52:09 +08:00
Jiang Jiang Jian
9f29dbf656
Merge branch 'bugfix/btdm_fix_build_warning_when_bluedroid_disable_log_v3.2' into 'release/v3.2'
...
Component/bt: fix build warning when bluedroid disable log (backport v3.2)
See merge request idf/esp-idf!4566
2019-04-15 18:50:58 +08:00
Jiang Jiang Jian
b2d61989f1
Merge branch 'mesh/decouple_addition_v3.2' into 'release/v3.2'
...
Decouple Wifi and ESP-Mesh to reduce bin size (backport v3.2)
See merge request idf/esp-idf!4523
2019-04-15 17:06:00 +08:00
baohongde
bb518afb59
Some bugs backport 3.2
...
1.Fix memory leak when set txpower
2.Fix some bugs
Disconnect with apple device
hci_refresh_enc_key_cmd will be ignore
hci_refresh_enc_key_cmd will crash
2019-04-15 16:51:29 +08:00
chenyudong
37063ea9b6
Decouple Wifi and ESP-Mesh to reduce bin size
...
Do not link mesh code when mesh is not used
2019-04-14 20:36:14 +08:00
Jiang Jiang Jian
f6837e6117
Merge branch 'bugfix/esp_sha_signing_sha256_v3.2' into 'release/v3.2'
...
secure boot: Fix esp_sha INT WDT, switch to using mbedTLS API (backport v3.2)
See merge request idf/esp-idf!4511
2019-04-14 02:57:45 +08:00
Jiang Jiang Jian
c4f39094d3
Merge branch 'bugfix/cmake_component_path_v3.2' into 'release/v3.2'
...
cmake: Set COMPONENT_PATH during early expansion of dependencies (v3.2)
See merge request idf/esp-idf!4594
2019-04-14 02:57:16 +08:00
Jiang Jiang Jian
2da22620f8
Merge branch 'feature/btdm_add_mesh_adv_type_and_srv_uuid_for_dup_scan_except_v3.2' into 'release/v3.2'
...
Component/bt: add mesh beacon adv and svc uuid for duplicate scan exceptional list (backport v3.2)
See merge request idf/esp-idf!4606
2019-04-14 02:56:43 +08:00
Jiang Jiang Jian
f77d0a9cdb
Merge branch 'bugfix/ci_tag_for_cmake_linter_v3.2' into 'release/v3.2'
...
ci: A small CI stabilizing fix (backport v3.2)
See merge request idf/esp-idf!4710
2019-04-14 02:55:38 +08:00
Jiang Jiang Jian
ddf4991024
Merge branch 'bugfix/bootloader_flash_crypt_cnt_ff_v3.2' into 'release/v3.2'
...
flash encryption: reduce FLASH_CRYPT_CNT bit width to 7 bits (v3.2)
See merge request idf/esp-idf!4728
2019-04-14 02:55:21 +08:00
Jiang Jiang Jian
f8597be435
Merge branch 'bugfix/wifi_modify_wifi_kconfig_v3.2' into 'release/v3.2'
...
esp32: modify WiFi Kconfig in order to achieve better compatility and performance (bakcport v3.2)
See merge request idf/esp-idf!4386
2019-04-12 23:11:24 +08:00
Jiang Jiang Jian
6e5e430ef4
Merge branch 'bugfix/mesh_memory_leak_v3.2' into 'release/v3.2'
...
mesh: fix memory leak and group send (backport v3.2)
See merge request idf/esp-idf!4519
2019-04-12 22:02:08 +08:00
Jiang Jiang Jian
065d451e47
Merge branch 'bugfix/btdm_modify_HCI_GET_CMD_BUF_v3.2' into 'release/v3.2'
...
Component/bt: modify HCI_GET_CMD_BUF (backport v3.2)
See merge request idf/esp-idf!4599
2019-04-12 21:58:51 +08:00
Jiang Jiang Jian
c8990eb39d
Merge branch 'bugfix/btdm_add_scan_window_interval_check_v3.2' into 'release/v3.2'
...
Component/bt: add scan window and interval check when set scan params (backport v3.2)
See merge request idf/esp-idf!4311
2019-04-12 21:57:50 +08:00
Jiang Jiang Jian
c90f770599
Merge branch 'bugfix/btdm_fix_blufi_prepare_write_crash_v3.2' into 'release/v3.2'
...
Component/bt: fix blufi prepare write crash (backport V3.2)
See merge request idf/esp-idf!4563
2019-04-12 21:57:23 +08:00
Jiang Jiang Jian
48978c6f2b
Merge branch 'bugfix/btdm_fix_iOS_and_win10_compatibility_error_for_HID_v3.2' into 'release/v3.2'
...
Component/bt: fix iOS and win10 compatibility error for HID (backport v3.2)
See merge request idf/esp-idf!4424
2019-04-12 21:56:40 +08:00
Angus Gratton
5bb5670d69
efuse/flash encryption: Reduce FLASH_CRYPT_CNT to a 7 bit efuse field
...
8th bit is not used by hardware.
As reported https://esp32.com/viewtopic.php?f=2&t=7800&p=40895#p40894
2019-04-12 07:28:57 +00:00
Angus Gratton
7197811861
Merge branch 'bugfix/prov_fix_conn_id_v3.2' into 'release/v3.2'
...
(backport v3.2) Unified Provisioning: Miscellaneous fixes in BLE
See merge request idf/esp-idf!4734
2019-04-12 13:46:06 +08:00
Angus Gratton
892c2be168
esp32: Chunk input blocks for esp_sha() function performance, add perf test
2019-04-12 05:45:05 +00:00
Angus Gratton
5c6be8380e
secure boot: Use mbedtls_sha256() not esp_sha()
...
Latter is probably compiled into most firmwares already, saves some size.
Ref https://github.com/espressif/esp-idf/issues/3127
2019-04-12 05:45:05 +00:00
Angus Gratton
1d8e1c4ce4
esp32 hwcrypto: Prevent esp_sha() from disabling interrupts for extended period
...
* Closes https://github.com/espressif/esp-idf/issues/3127
* Closes IDFGH-681
Also reported at https://esp32.com/viewtopic.php?f=13&t=9506
2019-04-12 05:45:05 +00:00
chenyudong
1778573dad
mesh: fix memory leak and group send
...
fix a bug in group send
fix esp_mesh_set_router when router_t not initialized
fix mesh memory leak with invalid option
2019-04-11 20:43:38 +08:00