Jiang Jiang Jian
0cd97cecb2
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-08 19:16:34 +08:00
Ivan Grokhotkov
f61dcf4d1a
Merge branch 'bugfix/freertos_eventgroup_isr_test' into 'master'
...
freertos/Fix Event Group ISR test case
See merge request !1733
2018-01-08 16:51:27 +08:00
Ivan Grokhotkov
ddf3d92a25
Merge branch 'bugfix/esp_log_local_level' into 'master'
...
Log: fix definition of LOG_LOCAL_LEVEL, fix typos
See merge request !1747
2018-01-08 16:41:42 +08:00
Angus Gratton
f9ad17eee4
Merge branch 'bugfix/BLE_SM_Security_Flags_pr1320' into 'master'
...
bt: Fix ble sm security flags (Github PR 1320)
See merge request !1740
2018-01-08 07:35:19 +08:00
Jiang Jiang Jian
a1b59679f9
Merge branch 'bugfix/btdm_standardize_code' into 'master'
...
component/bt: Standardize code
See merge request !1696
2018-01-05 18:56:08 +08:00
Jiang Jiang Jian
4d4c055a1a
Merge branch 'bugfix/recompile_with_new_psram_toolchain' into 'master'
...
recompile wifi lib with new toolchain 1.22.0-78-g4b87650
See merge request !1730
2018-01-05 16:40:30 +08:00
Ivan Grokhotkov
3a6962b8ec
log: fix typos in header files
2018-01-05 16:10:58 +08:00
Ivan Grokhotkov
6a5c105753
log: define LOG_LOCAL_LEVEL before using it, don't use type cast
...
LOG_LOCAL_LEVEL is now used in a construct like:
#if (LOG_LOCAL_LEVEL >= ESP_LOG_INFO)
Make sure that LOG_LOCAL_LEVEL is defined, and don't use a type cast in
its definition, because preprocessor can not parse that.
2018-01-05 16:10:58 +08:00
Ivan Grokhotkov
30aacb79d5
Merge branch 'bugfix/uart_semaphore_pr1387' into 'master'
...
uart driver: Remove unnecessary xSemaphoreGive()
See merge request !1739
2018-01-05 11:05:05 +08:00
Angus Gratton
eb659e401d
Merge branch 'feature/esp_intr_set_in_iram' into 'master'
...
Add esp_intr_set_in_iram (Github PR)
See merge request !1629
2018-01-04 06:04:05 +08:00
Angus Gratton
6e23ee704b
Merge branch 'refactor/spi_clk_pre_cal' into 'master'
...
bugfix(spi_master): improve spi time cost for each transfer.
See merge request !1670
2018-01-04 06:03:12 +08:00
Tim Cook
2b24177d2b
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-03 14:14:24 +11:00
Tim Cook
5b87177831
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-03 14:14:24 +11:00
Alexey Morozov
25b8642835
uart driver: Remove unnecessary xSemaphoreGive()
...
avoid unnecessary call of xSemaphoreGive(p_uart_obj[uart_num]->tx_mux);
Merges https://github.com/espressif/esp-idf/pull/1387
2018-01-03 13:44:19 +11:00
baohongde
2530e0aeb9
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-03 10:31:30 +08:00
JoveToo
6746d31620
fix typo
...
Merges https://github.com/espressif/esp-idf/pull/1430
2018-01-03 10:50:50 +11:00
Per Malmberg
f7f52414ec
Removed logging in RMT driver which skews the timing. Issue #1345
...
Merges https://github.com/espressif/esp-idf/pull/1450
2018-01-03 10:50:03 +11:00
Darian Leung
9df9e2363e
freertos/Fix Event Group ISR test case
...
This commit fixes and reimplements the Event Group ISR test case. The test
case tests xEventGroupSetBitsFromISR() and xEventGroupClearBitsFromISR()
2018-01-02 18:57:28 +08:00
baohongde
e55b5433aa
component/bt: Fix bug when add device to whitelist twice
2018-01-02 17:20:34 +08:00
Jiang Jiang Jian
c401a74bfb
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-02 16:15:39 +08:00
XiaXiaotian
3fd421ab01
recompile wifi lib with new toolchain 1.22.0-78-g4b87650
2018-01-02 14:23:37 +08:00
Angus Gratton
e798957d16
Merge branch 'bugfix/ci_log_examples' into 'master'
...
Fix a sporadic bug in building of the examples
See merge request !1723
2018-01-02 07:55:26 +08:00
Ivan Grokhotkov
f82048018b
Merge branch 'bugfix/i2c_regression' into 'master'
...
Bugfix/i2c regression (Github PR 1443)
See merge request !1725
2017-12-29 15:19:38 +08:00
Per Malmberg
f2370b2830
Removed logging from pthread conditional variable which completely drowned out any other logging and also had negative effects on the RMT due to sharing the same log system. Related to #1345 / TW#16842
2017-12-28 15:21:00 +01:00
Per Malmberg
5fb16d9b2b
Fix regression in i2c_master_read() which rejected all data lenths.
2017-12-28 14:54:15 +01:00
Anton Maklakov
301751ede0
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'
2017-12-28 19:21:34 +08:00
Ivan Grokhotkov
98dff491c8
Merge branch 'bugfix/static_mem_workaround' into 'master'
...
esp32: Change 192KB runtime static limit workaround to a 176KB link time workaround
See merge request !1704
2017-12-28 18:52:47 +08:00
wangmengyang
1bbd67f7d7
component/bt: disable Secure Connections(Host Supported) of classic Bluetooth to workaround AES encryption issue in controller
...
1. ESP32 is found to suffer from AES encryption start/resume failure with specific device. Therefore temporarily disable BR/EDR Secure Connections for a workaround
2. BR/EDR Secure Connections is a feature for BT Classic introduced in Bluetooth 4.1. This change disables the setting of Secure Connections(Host Supported), and will result in the use of legacy authentication instead of secure authentication, and E0 encryption(legacy) instead of AES-CCM encryption. BLE security procedures are not affected.
2017-12-28 14:51:19 +08:00
michael
2552fdccd1
chore(spi): add log to show native pins or not when configure pins.
2017-12-28 12:03:29 +08:00
michael
f4be6ac84d
fix(spi_master): fix the logic in the ISR to prevent re-config registers when device is not changed.
2017-12-28 12:03:29 +08:00
michael
7a7b8fc182
refactor(spi_master): move the clock calculation from ISR to initialization.
2017-12-28 12:03:28 +08:00
Jiang Jiang Jian
7d0d2854d3
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:03:38 +08:00
Jiang Jiang Jian
566fab02df
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:03:13 +08:00
Ivan Grokhotkov
cbfd162ea8
Merge branch 'bugfix/idle_task_deletes_currently_running_task' into 'master'
...
freertos: prvCheckTasksWaitingTermination bugfix
See merge request !1686
2017-12-27 16:44:06 +08:00
Jiang Jiang Jian
8051ac469a
Merge branch 'cherry-pick-4837f939-2' into 'master'
...
esp_timer:fix three bugs about timer get and timer alarm where overflow is not correct
See merge request !1695
2017-12-27 11:43:52 +08:00
Jiang Jiang Jian
d31b654f3f
Merge branch 'bugfix/btdm_fix_memory_leak_for_SMP' into 'master'
...
component/bt: fix memory leak in SMP
See merge request !1690
2017-12-27 11:43:18 +08:00
Angus Gratton
ec7cac5fe8
Merge branch 'feature/docs_update_rmt_api' into 'master'
...
RMT API docs update, new example
See merge request !1564
2017-12-27 09:23:47 +08:00
Angus Gratton
f8580ea98f
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-27 11:59:54 +11:00
kooho
d78be97154
add NACK for the last byte to read
2017-12-26 21:50:18 +08:00
Darian Leung
c41c02872f
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-26 19:03:49 +08:00
baohongde
1de63e9d90
component/bt: Fix bug of disconnected fail during pairing
2017-12-25 19:24:06 +08:00
baohongde
f5f8dda8a2
component/bt: Fix bug of adding device to white list has no callback when while list is full
2017-12-25 17:45:12 +08:00
Ivan Grokhotkov
6c2562ceb4
Merge branch 'bugfix/spiram_fails_after_esp_restart' into 'master'
...
Make psram function after an esp_restart as well.
See merge request !1694
2017-12-21 13:40:10 +08:00
Jiang Jiang Jian
a567de1576
Merge branch 'feature/btdm_classic_discovery' into 'master'
...
component/bt: implement Classic Bluetooth GAP APIs for device and service discovery
See merge request !1576
2017-12-20 13:30:31 +08:00
zhiweijian
763406b4cc
Component/bt: fix memory leak in SMP
2017-12-20 10:30:31 +08:00
Jiang Jiang Jian
04e1195f41
Merge branch 'bugfix/btdm_send_data_length_req_after_read_feature_complete' into 'master'
...
component/bt: send data length request by host after read feature complete
See merge request !1639
2017-12-19 20:18:50 +08:00
Jack
0a1f81dc01
esp_timer:fix three bugs about timer get and timer alarm where overflow is not correct
2017-12-19 20:05:55 +08:00
Jeroen Domburg
569bfad2e3
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-19 19:12:58 +08:00
Jiang Jiang Jian
709d19f99e
Merge branch 'feature/eth_set_mac_addr' into 'master'
...
emac:add set_eth_mac api
See merge request !1604
2017-12-19 17:40:36 +08:00
Jiang Jiang Jian
9c2db2ea7a
Merge branch 'bugfix/btdm_optimiz_adv_cb_func' into 'master'
...
Bugfix/btdm optimiz adv cb func
See merge request !1619
2017-12-19 17:35:00 +08:00