Merge branch 'bugfix/gpio_config_pullup' into 'master'

Fix pullups is not configured by gpio_config

https://github.com/espressif/esp-idf/issues/110

https://github.com/espressif/esp-idf/pull/111

See merge request !226
This commit is contained in:
Jeroen Domburg 2016-11-22 12:12:31 +08:00
commit 720a6c1e54

View file

@ -321,9 +321,9 @@ esp_err_t gpio_config(gpio_config_t *pGPIOConfig)
} }
if(pGPIOConfig->pull_up_en) { if(pGPIOConfig->pull_up_en) {
pu_en = 1; pu_en = 1;
REG_SET_BIT(gpio_pu_pd_desc[io_num].reg, gpio_pu_pd_desc[io_num].pd); REG_SET_BIT(gpio_pu_pd_desc[io_num].reg, gpio_pu_pd_desc[io_num].pu);
} else { } else {
REG_CLR_BIT(gpio_pu_pd_desc[io_num].reg, gpio_pu_pd_desc[io_num].pd); REG_CLR_BIT(gpio_pu_pd_desc[io_num].reg, gpio_pu_pd_desc[io_num].pu);
} }
if(pGPIOConfig->pull_down_en) { if(pGPIOConfig->pull_down_en) {
pd_en = 1; pd_en = 1;