Angus Gratton
c6b4fa5a9a
Merge branch 'doc/versions_v3.1' into 'release/v3.1'
...
docs: Add version-specific include files, version documentation (backport v3.1)
See merge request idf/esp-idf!2974
2018-08-13 09:54:13 +08:00
Angus Gratton
8a1adb0d50
Merge branch 'bugfix/spi_flash_mmap_malloc_internal_v3.1' into 'release/v3.1'
...
spi_flash: allocate mmap pages array in internal memory (backport v3.1)
See merge request idf/esp-idf!2961
2018-08-10 13:43:55 +08:00
Angus Gratton
ddb2570849
Merge branch 'mesh/bugfix_parent_switch_backport_v3.1' into 'release/v3.1'
...
mesh: modify parent switch mechanism (backport3.1)
See merge request idf/esp-idf!2977
2018-08-10 13:42:32 +08:00
Jiang Jiang Jian
7f4b77ca5b
Merge branch 'bugfix/add_mutex_for_some_touchpad_apis_v3.1' into 'release/v3.1'
...
fix(touch): add_mutex_for_some_touchpad_apis (backport v3.1)
See merge request idf/esp-idf!2963
2018-08-10 12:18:33 +08:00
qiyuexia
d421663d3f
mesh: modify parent switch mechanism
...
1. modify parent switch mechanism.
2. fix non-root doesn't clear the layer value in nvs.
3. fix retransmit the remove announcement packets.
4. add API esp_mesh_flush_upstream_packets().
5. automatically adjust passsive scan time based on the change of beacon interval.
2018-08-10 11:45:11 +08:00
Jiang Jiang Jian
c455d6f2a0
Merge branch 'feature/nvs_version_check_v3.1' into 'release/v3.1'
...
nvs_flash: Version compatibility check for nvs storage (backport 3.1)
See merge request idf/esp-idf!2958
2018-08-10 11:36:39 +08:00
Jiang Jiang Jian
b3eee7d58f
Merge branch 'bugfix/btdm_hfp_invalid_sco_param_v3.1' into 'release/v3.1'
...
component/bt: modify the invalid retransmission setting for SCO link in HFP(backport v3.1)
See merge request idf/esp-idf!2956
2018-08-10 11:10:55 +08:00
Jiang Jiang Jian
271e2f9419
Merge branch 'bugfix/backport_several_bugfix_to_v3.1' into 'release/v3.1'
...
esp32: backport several WiFi bug fixes to v3.1
See merge request idf/esp-idf!2955
2018-08-10 11:09:35 +08:00
Angus Gratton
70f15bd28e
docs: Combine the common en/zh_CN Makefiles to one common file
2018-08-10 00:28:13 +00:00
Michael (XIAO Xufeng)
607a1abefd
docs: translate the version include script to Chinese
2018-08-10 00:28:13 +00:00
Angus Gratton
8122f7162c
README: Add version-specific links
...
Make it clearer how the README fits in with the docs.
2018-08-10 00:28:13 +00:00
Angus Gratton
cd31a5e3c6
docs: Add version-specific include files, version documentation
...
* "git clone" command and a small version header are generated
depending on git properties.
* Add Versions page with details about each version
* Make it clear using master branch is living on the "bleeding
edge"
2018-08-10 00:28:13 +00:00
Jiang Jiang Jian
8a6c1df041
esp32: backport several WiFi bug fixes to v3.1
...
Backport following bug fixes to v3.1:
1. Bug fix of may connect to wrong AP in all channel scan
2. Station state machine change and fix ap loss
3. Add compatible to ccmp encryption
4. Update libphy.a to v3960:
4.1 Decrease phy_init time from 900us to 347us in sleep wakeup
4.2 Fix RX STBC initialization
4.3 Modify set_chan function to fix interrupt watchdog issue
5. Fix several wpa2 enterprise issues
5.1 Fix heap corrupted bug
5.2 Fix memory leak bug
5.3 Make wpa2 enterprise thread-safe
Closes https://github.com/espressif/esp-idf/issues/1569
6. Bugfix of coex wifi pm
2018-08-09 13:24:16 +00:00
He Yin Ling
7e02cd3498
Merge branch 'bugfix/remove_check_for_reason_assoc_expire_backport_v3.1' into 'release/v3.1'
...
test: remove check for REASON_ASSOC_EXPIRE (backport v3.1)
See merge request idf/esp-idf!2953
2018-08-09 21:23:21 +08:00
Angus Gratton
ef30229e52
Merge branch 'feature/http_firmware_upgrade_v3.1' into 'release/v3.1'
...
esp_https_ota: Add esp_https_ota component (Backport v3.1)
See merge request idf/esp-idf!2954
2018-08-09 08:20:33 +08:00
fuzhibo
6ee884c861
fix(touch): add_mutex_for_some_touchpad_apis
2018-08-08 20:06:54 +08:00
Jitin George
002189cd1a
esp_http_client: Add support for getting transport type
2018-08-08 14:55:35 +05:30
Jitin George
fbe792f33f
esp_https_ota: Add support for HTTPS based ota feature
2018-08-08 14:55:22 +05:30
Ivan Grokhotkov
b88ae6c39f
spi_flash: allocate mmap pages array in internal memory
...
* spi_flash_mmap_pages needs pages array to be in internal memory.
Document and check this.
* Fix a bug that spi_flash_mmap did not allocate pages array in
internal memory.
* Minor style fixes: const-ify pages argument of spi_flash_mmap, add
spaces around operators, mark output arguments with [out].
Closes https://github.com/espressif/esp-idf/issues/2229 .
2018-08-08 11:30:31 +03:00
Angus Gratton
45d7039623
Merge branch 'feature/support_for_XM25QU64A_v3.1' into 'release/v3.1'
...
feature(flash): set QIO mode for XM25QU64A(1V8_8MB_flash) (backport v3.1)
See merge request idf/esp-idf!2950
2018-08-08 16:30:09 +08:00
Angus Gratton
d9a1b5faae
Merge branch 'bugfix/http_chunked_read_v3.1' into 'release/v3.1'
...
esp_http_client: fixed http chunked encoding packet loss & add check data before read for ssl transport (backport v3.1)
See merge request idf/esp-idf!2952
2018-08-08 16:24:04 +08:00
Tuan
b2901d7e2f
esp_http_client: fixed http chunked encoding packet loss & add check data before read for ssl transport (backport v3.1)
2018-08-08 16:24:04 +08:00
Sagar Bijwe
a3b5a23b87
nvs_flash: Version compatibility check for nvs storage
...
This change adds a check for compatibility between the nvs version
found on nvs flash and the one assumed by running code during nvs
initialization. Any mismatch is reported to the user using new error
code ESP_ERR_NVS_NEW_VERSION_FOUND.
2018-08-08 12:43:50 +05:30
Ivan Grokhotkov
eaa48f380a
Merge branch 'bugfix/add_queueset_critical_sections_v3.1' into 'release/v3.1'
...
freertos: Add critical sections to queue sets (backport v3.1)
See merge request idf/esp-idf!2789
2018-08-08 14:46:25 +08:00
wangmengyang
78c083325f
component/bt: modify the invalid retransmission setting for SCO link in HFP
2018-08-08 14:40:22 +08:00
Jiang Jiang Jian
a8d34b8e20
Merge branch 'bugfix/btdm_spp_crash_on_reset_v3.1' into 'release/v3.1'
...
component/bt: Fix bug of SPP crash on reset (backport v3.1)
See merge request idf/esp-idf!2951
2018-08-08 14:36:21 +08:00
He Yin Ling
66e7027e7a
test: update Wi-Fi test cases:
...
1. The test step for error code REASON_ASSOC_EXPIRE is not reliable. SoftAP
could also send error code WIFI_REASON_NOT_AUTHED
2. STA will be disconnected now if softAP restart DHCP server
2018-08-08 13:04:16 +08:00
baohongde
6210272bfd
component/bt: Fix bug of SPP crash on reset
...
In response to: https://github.com/espressif/esp-idf/issues/1998
2018-08-08 12:03:32 +08:00
chenjianqiang
57ed12a019
feature(flash): support for QIO mode of XM25QU64A
2018-08-08 10:58:13 +08:00
Angus Gratton
a4270573e7
Merge branch 'bugfix/ci_github_deploy_v31' into 'release/v3.1'
...
ci: Simplify github deployment (backport v3.1)
See merge request idf/esp-idf!2874
2018-08-08 07:26:01 +08:00
Jiang Jiang Jian
ae5cb25f11
Merge branch 'bugfix/fix_crash_for_http2_request_v3.1' into 'release/v3.1'
...
fix the crash when http2_request example send/recv fail
See merge request idf/esp-idf!2941
2018-08-07 18:36:41 +08:00
zhangyanjiao
bf76c1bc1a
fix the crash when http2_request example send/recv fail
2018-08-07 09:52:31 +08:00
Ivan Grokhotkov
cb05e152b9
Merge branch 'fix/sdio_speed_4bit_v3.1' into 'release/v3.1'
...
backport v3.1: fix(sdio): update sdio to better run in 4bit HS mode
See merge request idf/esp-idf!2759
2018-08-06 15:17:26 +08:00
Jiang Jiang Jian
f999688f2c
Merge branch 'bugfix/coex_pause_v3.1' into 'release/v3.1'
...
fix coex pause cause bluetooth performance decrease (backport v3.1)
See merge request idf/esp-idf!2864
2018-08-06 15:05:19 +08:00
Angus Gratton
762c5fe996
ci: Simplify github deployment
...
CI_COMMIT_REF_NAME lets us use a single line to git push
2018-08-06 16:32:41 +10:00
Angus Gratton
ac19aef689
Merge branch 'feature/mbedtls_2_12_0_v3.1' into 'release/v3.1'
...
mbedtls: update to 2.12.0 (backport v3.1)
See merge request idf/esp-idf!2932
2018-08-06 14:23:10 +08:00
Angus Gratton
d88b705562
Merge branch 'bugfix/fix_uart_tx_bug_when_using_ringbuffer_for_v3.1' into 'release/v3.1'
...
driver(uart): Fixed uart tx_empty interrupt wdt timeout bug for release/v3.1
See merge request idf/esp-idf!2934
2018-08-06 14:22:29 +08:00
Tian Hao
7d9d4d16e5
fix coex pause cause bluetooth performance decrease
...
1. it may cause BLE connection unstable
2. it may cause Classic BT connection unstable
3. it may cause BLE/BREDR scan performance decrease
2018-08-06 11:19:17 +08:00
Jiang Jiang Jian
1e92ad77c4
Merge branch 'bugfix/btdm_fix_sc_mitm_bond_failed_in_smp_for_iphones_v3.1' into 'release/v3.1'
...
Component/bt: fix SC_MITM_BOND failed in smp for iphones for v3.1
See merge request idf/esp-idf!2923
2018-08-05 23:48:29 +08:00
Ivan Grokhotkov
e136fb7e18
mbedtls: update to 2.12.0
2018-08-05 09:17:40 +03:00
Jiang Jiang Jian
4225b9794f
Merge branch 'bugfix/ampdu_duplicate_v3.1' into 'release/v3.1'
...
Wifi: fix ampdu duplicate issue (backport v3.1)
See merge request idf/esp-idf!2797
2018-08-05 07:17:25 +08:00
Jiang Jiang Jian
76b9e36f2b
Merge branch 'bugfix/btdm_a2dp_disconnect_reason_for_v3.1' into 'release/v3.1'
...
bugfix/btdm_a2dp_disconnect_reason(backport v3.1)
See merge request idf/esp-idf!2927
2018-08-04 23:48:42 +08:00
chenyudong
b490f05b95
wifi: fix ampdu duplicate issue
...
fix ampdu duplicate issue
2018-08-04 15:33:55 +00:00
Jiang Jiang Jian
c7ca7872cb
Merge branch 'bugfix/btdm_fix_ble_HIDD_demo_error_for_v3.1' into 'release/v3.1'
...
Component/bt: fix ble HID demo error for v3.1
See merge request idf/esp-idf!2922
2018-08-04 23:26:18 +08:00
Jiang Jiang Jian
97655e05b5
Merge branch 'bugfix/btdm_lmp_trans_coll_state_uncleared_for_v3.1' into 'release/v3.1'
...
bugfix/btdm_lmp_trans_coll_state_uncleared(backport v3.1)
See merge request idf/esp-idf!2929
2018-08-04 23:25:33 +08:00
zhiweijian
512e4d5836
Component/bt: fix SC_MITM_BOND failed in smp for iphones
2018-08-04 17:02:13 +08:00
wangmengyang
9d8a85e2ab
component/bt: bugfix for uncleared LMP transaction collision state after rejecting sniff request from slave
2018-08-03 15:55:23 +08:00
wangmengyang
8a940ccd65
component/bt: retrieve disconnection reason in AVDT when ACL-U link is disconnected
2018-08-03 15:36:44 +08:00
Jiang Jiang Jian
c983bc4d12
Merge branch 'bugfix/btdm_controller_deinit_v3.1' into 'release/v3.1'
...
bt : fix bug that bluetooth controller init/disable/enable/disable may cause exception(backport v3.1)
See merge request idf/esp-idf!2865
2018-08-03 15:09:58 +08:00
zhiweijian
b8582d977d
Component/bt: fix ble HID demo error
2018-08-03 11:35:32 +08:00