feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'master' into driver_merge_tmp/merge_uart

Browse Source 
# Conflicts:
#	components/esp32/include/esp_err.h
This commit is contained in:
Wangjialin
2016-11-10 11:57:19 +08:00
parent e452278194 fcba7e278d
commit 6fb2515a5d
135 changed files with 21606 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/driver/include/driver/gpio.h
+1 -1
View File
@@ -314,7 +314,7 @@ esp_err_t gpio_set_pull_mode(gpio_num_t gpio_num, gpio_pull_mode_t pull);
*
* @param gpio_num GPIO number.
*
* @param intr_type GPIO wake-up type. Only GPIO_INTR_LOLEVEL\GPIO_INTR_HILEVEL can be used
* @param intr_type GPIO wake-up type. Only GPIO_INTR_LOW_LEVEL\GPIO_INTR_HIGH_LEVEL can be used.
*
* @return
* - ESP_OK Success