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
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
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
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
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
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
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
XiaXiaotian
281874d380
recompile wifi lib with new toolchain 1.22.0-78-g4b87650
2017-12-29 16:42:05 +08:00
wangmengyang
3f3d8746fc
component/bt: build libbtdm_app.a with updated toolchain for ESP-IDF v3.0
2017-12-29 15:24:02 +08:00
Angus Gratton
9065498a5a
esp32: Change 192KB runtime static limit workaround to a 176KB link time workaround
...
Turns out some app memory around 0x3ffdc000 is also used by APP CPU.
This is a workaround until code to remove the 176KB limit is committed.
2017-12-29 09:11:50 +11:00
Jiang Jiang Jian
c695a4e468
Merge branch 'cherry-pick-566fab02' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_disconnect_fail_during_pairing' into 'master'
See merge request !1716
2017-12-28 22:07:46 +08:00
Jiang Jiang Jian
755b163d4e
Merge branch 'cherry-pick-7d0d2854' into 'release/v3.0'
...
Merge branch 'bugfix/btdm_error_when_white_list_is_full' into 'master'
See merge request !1715
2017-12-28 22:07:27 +08:00
Jiang Jiang Jian
b6ebbb5662
Merge branch 'bugfix/btdm_disconnect_fail_during_pairing' into 'master'
...
component/bt: Fix bug of disconnected fail during pairing
See merge request !1672
2017-12-27 18:05:24 +08:00
Jiang Jiang Jian
38d58f1c2e
Merge branch 'bugfix/btdm_error_when_white_list_is_full' into 'master'
...
component/bt: Fix bug of adding device to white list has no callback when while list is full
See merge request !1689
2017-12-27 18:04:25 +08:00
Darian Leung
ecc6080117
freertos: prvCheckTasksWaitingTermination bugfix
...
Bugfix to prevent a self deleting no affinity task's memory from being freed by the
idle task of the other core before the self deleting no affinity task is able to context
switch out. prvCheckTasksWaitingTermination now checks if the task is still on
pxCurrentTCB before freeing task memory.
2017-12-27 16:54:29 +08:00
krzychb
9b57d4aa0d
RMT API docs update, new example
2017-12-27 16:54:28 +08:00
kooho
48fda0f27b
add NACK for the last byte to read
2017-12-27 16:54:27 +08:00
Jeroen Domburg
41baf59287
Fix the clock subsystem so it doesn't undo the weird condition spiram_psram.c jams the enable/reset bits of SPI3 in when 80MHz mode is selected anymore
2017-12-27 16:54:26 +08:00
Angus Gratton
87f7d1875d
esp32: Fix backwards compatibility for pre-v2.1 bootloaders
...
Older bootloaders don't set RTC_XTAL_FREQ_REG or call rtc_clk_init(),
app needs to pick this up.
Reported at
https://esp32.com/viewtopic.php?f=2&t=3939&p=17836
2017-12-27 16:54:25 +08:00
Piyush Shah
545c7e5cdd
freertos/ringbuf: Added an API xRingbufferCreateNoSplit()
...
This is a wrapper API for creating a Ring Buffer, which ensures that
the ringbuffer can hold the given number of items, each item being of the
same given length.
Signed-off-by: Piyush Shah <piyush@espressif.com>
2017-12-27 16:54:25 +08:00
Piyush Shah
ef6fe211b8
freertos/ringbuf: Add an API xRingbufferIsNextItemWrapped()
...
Useful to check if the next item to receive is wrapped or not.
This is valid only if the ring buffer is initialised with type
RINGBUF_TYPE_ALLOWSPLIT.
This is as per the feature request here:
https://github.com/espressif/esp-idf/issues/806
Signed-off-by: Piyush Shah <piyush@espressif.com>
2017-12-27 16:54:25 +08:00
Piyush Shah
50637f638f
freertos/ringbuf: Add an API xRingbufferGetCurFreeSize() to fetch current free size available
...
The earlier available API (xRingbufferGetMaxItemSize())just gives
a static max entry value possible for given ring buffer.
There was a feature request for an API which could provide
a real time available buffer size. See below:
https://github.com/espressif/esp-idf/issues/806
Signed-off-by: Piyush Shah <piyush@espressif.com>
2017-12-27 16:54:25 +08:00
Angus Gratton
c4b861ad65
log: Remove non-static TAG variables
2017-12-27 16:54:24 +08:00
Chuck Todd
492b926d50
i2c: rx <-> tx typo's, NULLing free'd variable, consistent CRITICAL sects
...
A couple of typos referencing tx_ring_buf when rx_ring_buf, slv_tx_mux
instead of slv_rx_mux.
Also, I2C_ENTER_CRITICAL()/I2C_EXIT_CRITICAL() usage was not consistent.
Only some of the _set_ functions had them. Most of the _get_ function
had them? It is my understanding that they should be wrapped around
writes, not reads? (I think we still need the lock for reading pairs of consistent values)
Also, the ticks_to_wait timeout handling in i2c_master_cmd_begin() would
not handle integer rollover correctly.
Merges https://github.com/espressif/esp-idf/pull/1180
2017-12-27 16:54:24 +08:00
Fabiano Kovalski
b5f8cf0f03
driver(i2c): corrected timeout range for i2c_set_timeout.
...
Merges https://github.com/espressif/esp-idf/pull/1353
2017-12-27 16:54:24 +08:00
Wangjialin
c4bb528c61
bugfix(i2c): use queue instead of event group for internal commands
...
Reported from github:
https://github.com/espressif/esp-idf/issues/1312
https://github.com/espressif/esp-idf/issues/1193
Issues:
1. We used to use event group in the driver, which would cause:
a. longer operation time since the event group are based on FreeRTOS timer.
b. Operation fails if the timer queue is not long enough.
2. There might be some issue with event group, we will still try to provide a small test code in other branch.
modification:
1. use queue instead of event-bit for internal commands
2. use queue overwrite for cmd_done event
2017-12-27 16:54:23 +08:00
Kewal
5afafb0050
fix typo for heap cap free size
2017-12-27 16:54:22 +08:00
Ivan Grokhotkov
42e411dafc
bootloader: don't log anything before uart_console_configure is called
2017-12-27 16:54:21 +08:00
Ivan Grokhotkov
fbff8eb95b
esp32: fix incorrect clock enable bit name for UART0
...
Closes https://github.com/espressif/esp-idf/issues/1301
2017-12-27 16:54:21 +08:00
Ivan Grokhotkov
c778951547
fatfs: fix double free in bailout path of esp_vfs_fat_sdmmc_mount
...
Fixes https://github.com/espressif/esp-idf/issues/1370
2017-12-27 16:54:21 +08:00