Ivan Grokhotkov
6aff7125cb
Merge branch 'feature/mdns_3.0' into 'release/v3.0'
...
New mDNS implementation, cherry-pick for 3.0
See merge request !1834
2018-01-23 13:54:28 +08:00
me-no-dev
c68fd9d545
mdns: Fix case where service is NULL and that will cause exception
2018-01-22 23:27:24 +08:00
me-no-dev
d6c06ed0b5
mdns: Fix issue with some mDNS parsers
...
Some mDNS parser have issue with zero terminated TXT lists. This fix targets to overcome this issue. Found and tested with jmdns.
2018-01-22 23:27:20 +08:00
me-no-dev
8baa6b9d8b
Import mDNS changes
2018-01-22 23:27:14 +08:00
Jiang Jiang Jian
3923a2be85
Merge branch 'feature/btdm_ble_spp_docs_for_3.0' into 'release/v3.0'
...
component/bt: add ble spp readme for 3.0
See merge request !1769
2018-01-17 10:19:43 +08:00
Jiang Jiang Jian
e7dc749e2f
Merge branch 'cherry-pick-f0ed4044' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_pair_fail_with_random_address' into 'master'
See merge request !1819
2018-01-16 19:43:52 +08:00
Jiang Jiang Jian
df93f672e3
Merge branch 'bugfix/btdm_pair_fail_with_random_address' into 'master'
...
component/bt: Fix bug when pair with random address
See merge request !1784
2018-01-16 18:18:00 +08:00
Jiang Jiang Jian
4a55009f3e
Merge branch 'bugfix/fix_rare_ci_example_build_errors' into 'release/v3.0'
...
cherry-pick fix rare ci example build errors to release v3.0
See merge request !1813
2018-01-16 17:13:08 +08:00
Jiang Jiang Jian
dfcff0a5bf
Merge branch 'bugfix/btdm_discon_when_upd_conn_params_in_smp_for_v3.0' into 'release/v3.0'
...
component/bt: fix disconnect after connection params update in smp for v3.0
See merge request !1805
2018-01-16 16:41:26 +08:00
Jiang Jiang Jian
ff3566e40b
Merge branch 'bugfix/btdm_fix_conn_params_update_failed_in_SMP_for_v3.0' into 'release/v3.0'
...
Component/bt: fix update connection params error in smp for v3.0
See merge request !1809
2018-01-16 16:38:36 +08:00
Anton Maklakov
63eb620d99
CI: Fix an occasional error caused by reordering the commands along with 'tee' in the script
2018-01-16 09:51:34 +08:00
Anton Maklakov
93c18bb2b4
build system: Fix undefined variables
...
make/project.mk:315: warning: undefined variable `CC'
make/project.mk:316: warning: undefined variable `LD'
make/project.mk:317: warning: undefined variable `AR'
make/project.mk:62: warning: undefined variable `MAKECMDGOALS'
components/partition_table/Makefile.projbuild:24: warning: undefined variable `quote'
components/bootloader/Makefile.projbuild:123: warning: undefined variable 'BOOTLOADER_DIGEST_BIN'
components/bootloader/Makefile.projbuild:123: warning: undefined variable 'SECURE_BOOTLOADER_KEY'
2018-01-16 09:51:08 +08:00
Anton Maklakov
3c6bce1d81
CI: Fix a sporadic bug when building of the examples. Add logs to the artifacts
2018-01-16 09:50:55 +08:00
Jiang Jiang Jian
90b9c42dc0
Merge branch 'bugfix/wifi_cal_real_rx_bcn_time_v3.0' into 'release/v3.0'
...
Fix two wifi bugs
See merge request !1798
2018-01-15 22:30:54 +08:00
XiaXiaotian
c5f63bf701
Fix two wifi bugs
...
1. Fix the bug that receiving beacon time is not correct.
2. close github issue#233 esp_wifi_restore() bug.
2018-01-15 20:42:44 +08:00
zhiweijian
ced95c7fb0
Component/bt: fix update connection params error in smp for v3.0
2018-01-15 19:55:50 +08:00
Jiang Jiang Jian
309fb23ffc
Merge branch 'cherry-pick-c401a74b' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_aes_encrypt_workaround' into 'master'
See merge request !1800
2018-01-15 18:49:25 +08:00
Jiang Jiang Jian
e9a230c20c
Merge branch 'cherry-pick-0cd97cec' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_error_when_add_device_to_whitelist_twice' into 'master'
See merge request !1799
2018-01-15 18:49:11 +08:00
Jiang Jiang Jian
b0c7f28aed
Merge branch 'bugfix/fix_qos_bug_in_11g_mode_v3.0' into 'release/v3.0'
...
Bugfix/fix qos bug in 11g mode v3.0
See merge request !1790
2018-01-15 18:26:30 +08:00
zhiweijian
7bc1e7608c
component/bt: fix disconnect after connection params update in smp
2018-01-15 17:12:23 +08:00
Jiang Jiang Jian
449ce1bad9
Merge branch 'bugfix/btdm_aes_encrypt_workaround' into 'master'
...
component/bt: disable Secure Connections to workaround AES encryption issue
See merge request !1719
2018-01-15 14:47:28 +08:00
Jiang Jiang Jian
424a5e2705
Merge branch 'bugfix/btdm_error_when_add_device_to_whitelist_twice' into 'master'
...
component/bt: Fix bug when add device to whitelist twice
See merge request !1700
2018-01-15 14:46:13 +08:00
xiewenxiang
d8f311c980
component/bt: add ble spp readme for 3.0
2018-01-12 15:40:02 +08:00
Liu Zhi Fu
9b0c252e67
esp32: fix qos bug in 11g mode
...
Fix qos bug in 11g mode (release/v3.0 - 8e861901)
2018-01-12 14:14:20 +08:00
Ivan Grokhotkov
2a55629556
Merge branch 'feature/toolchain-80-g6c4433a-v30' into 'release/v3.0'
...
Toolchain: Update to version 1.22.0-80-g6c4433a (v3.0 backport)
See merge request !1772
2018-01-11 21:45:11 +08:00
Angus Gratton
b523660199
build: Remove explict -lstdc++-psram-workaround
...
This is now handled internally to the toolchain.
2018-01-11 10:32:28 +11:00
Jiang Jiang Jian
150be549eb
Merge branch 'cherry-pick-675844c4' into 'release/v3.0'
...
Merge branch 'bugfix/assert_in_PSRAM_WIFI' into 'master'
See merge request !1773
2018-01-10 20:58:47 +08:00
Jiang Jiang Jian
10898a33ed
Merge branch 'cherry-pick-16391c27' into 'release/v3.0'
...
Merge branch 'bugfix/full_calibration_will_not_use_init_data' into 'master'
See merge request !1774
2018-01-10 20:58:33 +08:00
Jiang Jiang Jian
dddfc61411
Merge branch 'bugfix/btdm_fix_cant_remove_boned_device_if_its_connected_v30' into 'release/v3.0'
...
Component/bt: fix can not remove boned device if it is connected for v3.0
See merge request !1770
2018-01-10 20:49:24 +08:00
Jiang Jiang Jian
404a6b3782
Merge branch 'bugfix/full_calibration_will_not_use_init_data' into 'master'
...
Fix bug that when we do full calibration init data bin is not used
See merge request !1746
2018-01-10 17:02:08 +08:00
Jiang Jiang Jian
29f999361e
Merge branch 'bugfix/assert_in_PSRAM_WIFI' into 'master'
...
bug fix of assert happen in PSRAM
See merge request !1745
2018-01-10 16:48:04 +08:00
Angus Gratton
32eeac0b12
Toolchain: Update to version 1.22.0-80-g6c4433a
...
Includes updated prebuilt Windows MSYS2 environment.
2018-01-10 16:41:27 +11:00
zhiweijian
7d3e8998d8
Component/bt: fix can not remove boned device if it is connected
2018-01-10 10:46:11 +08:00
Jiang Jiang Jian
e276b98fe4
Merge branch 'bugfix/BLE_SM_Security_Flags_pr1320_v30' into 'release/v3.0'
...
bt: Fix ble sm security flags (v3.0 backport)
See merge request !1754
2018-01-09 15:49:04 +08:00
Jiang Jiang Jian
de7381b77e
Merge branch 'bugfix/btdm_avrc_connect_state_evt_for_v3.0' into 'release/v3.0'
...
component/bt: add AVRC event for remote features indication
See merge request !1734
2018-01-09 15:39:02 +08:00
wangmengyang
645d9b9590
component/bt: add AVRC event for remote features indication
...
1. remove the feature mask parameter from AVRC connection state event, as the AVCTP connection can be initiated by remote device before service discovery to remote device is performed. \
In this case, AVRCP connection state event may not be reported after connection initated by remote device is established.
2. remove ESP_AVRC_CT_MAX_EVT
3. add more documentations to AVRC APIs
2018-01-08 19:43:54 +08:00
Jiang Jiang Jian
2ad618e068
Merge branch 'bugfix/btdm_standardize_code_3.0' into 'release/v3.0'
...
component/bt: Standardize code
See merge request !1751
2018-01-08 19:24:26 +08:00
Tim Cook
eb408e50c4
n btm_sec_save_le_key() set BTM_SEC_LE_LINK_KEY_KNOWN (and BTM_SEC_LE_LINK_KEY_AUTHED if MITM was used) when process a local Long Term Key (key type BTM_LE_KEY_LENC). This is because these flags share bits with the BTM_SEC_FLAG_LKEY_KNOWN (and BTM_SEC_FLAG_LKEY_AUTHED) flag in btm_api.h. Without this code a link that is encrypted via SM pairing where only the local device exchanges the LTK (peer does not send its LTK) will not allow GATT operations that require encryption (request will be incorrectly rejected with insufficient authentication reason, regardless of if MITM is required).
...
Merges https://github.com/espressif/esp-idf/pull/1320
2018-01-08 10:37:19 +11:00
Tim Cook
60da98ee0b
set ble_rsp_key member of structure bte_appl_cfg in function bta_dm_co_ble_set_rsp_key_req (function incorrectly uses ble_init_key member).
...
Merges https://github.com/espressif/esp-idf/pull/1320
2018-01-08 10:37:18 +11:00
baohongde
314f6f371c
component/bt: Standardize code
...
Reported from github:
https://github.com/espressif/esp-idf/issues/1402
https://github.com/espressif/esp-idf/issues/1403
2018-01-05 19:31:53 +08:00
Jiang Jiang Jian
6c69d5e6fd
Merge branch 'feature/btdm_add_bluetooth_examples_tutorials_v3.0' into 'release/v3.0'
...
Feature/btdm add bluetooth examples tutorials v3.0
See merge request !1709
2018-01-03 13:06:13 +08:00
island
90ea0bb7e8
component/bt: change pictures from .pdf to .png
2018-01-03 11:46:02 +08:00
island
6ba817038c
component/bt: Modify docs to be compatible with "Github Standard Markdown"
2018-01-03 11:45:53 +08:00
island
e54f8a96a0
component/bt: add link of tutorial in README.rst
2018-01-03 11:45:18 +08:00
island
2f9edfebac
component/bt: Add bluetooth example tutorials
2018-01-03 11:45:18 +08:00
XiaXiaotian
27c28eb1e6
Close socket request will abort tcp write/connect
...
When tcp write/connect is running, close socket request will abort
it and continue to delete netconn and close tcp. Do not immediately
return after aborting tcp write/connect. Otherwise, tcp close
requeset will block and tcp write/connect will crash.
2018-01-03 11:23:57 +08:00
Angus Gratton
6f339ff7a5
Merge branch 'bugfix/i2c_regression_v30' into 'release/v3.0'
...
Fix regression in i2c_master_read() which rejected all data lengths (v3.0 backport)
See merge request !1731
2018-01-03 07:27:11 +08:00
Per Malmberg
2cc07d0c4c
Fix regression in i2c_master_read() which rejected all data lenths.
2018-01-02 10:01:23 +11:00
Jiang Jiang Jian
da81b97e17
Merge branch 'bugfix/recompile_with_new_psram_toolchain_v3.0' into 'release/v3.0'
...
recompile wifi lib with new toolchain 1.22.0-78-g4b87650
See merge request !1729
2017-12-29 18:33:46 +08:00
Jiang Jiang Jian
15e65aad1b
Merge branch 'bugfix/build_bt_lib_with_updated_toolchain' into 'release/v3.0'
...
component/bt: build libbtdm_app.a with updated toolchain for ESP-IDF v3.0
See merge request !1727
2017-12-29 18:26:41 +08:00