alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-24 01:20:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitlab.espressif.cn:27227/idf/esp-idf into feature/disable_phy_rf_when_disable_wifi_bt

Browse Source
This commit is contained in:
XiaXiaotian
2017-02-21 01:20:48 +08:00
parent 12a7293b31 7eaf1c76dc
commit 678ec0bd04
16 changed files with 536 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp32/include/soc/soc.h
View File

@@ -268,10 +268,10 @@
* 2 1 extern level
* 3 1 extern level
* 4 1 extern level WBB
* 5 1 extern level BT Controller
* 5 1 extern level BT/BLE Controller
* 6 1 timer FreeRTOS Tick(L1) FreeRTOS Tick(L1)
* 7 1 software Reserved Reserved
* 8 1 extern level BLE Controller
* 8 1 extern level BT/BLE BB(RX/TX)
* 9 1 extern level
* 10 1 extern edge Internal Timer
* 11 3 profiling