ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed broken InterruptIn.mode() in NRF5x target which didn't do anything: interruptIn always remained with pullup resistor enabled.

pull/7375/head
Melvin van den berg 2018-06-14 16:54:03 +02:00 committed by adbridge
parent 4a5e6a9d7d
commit f59655629e
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
targets/TARGET_NORDIC/TARGET_NRF5x/gpio_api.c
View File

@ -129,8 +129,18 @@ static void gpio_apply_config(uint8_t pin)
cfg.hi_accuracy = false; cfg.hi_accuracy = false;
cfg.is_watcher = false; cfg.is_watcher = false;
cfg.sense = NRF_GPIOTE_POLARITY_TOGGLE; cfg.sense = NRF_GPIOTE_POLARITY_TOGGLE;
switch(m_gpio_cfg[pin].pull) {
case PullUp:
cfg.pull = NRF_GPIO_PIN_PULLUP;
break;
case PullDown:
cfg.pull = NRF_GPIO_PIN_PULLDOWN;
break;
default:
cfg.pull = NRF_GPIO_PIN_NOPULL;
break;
}
if (m_gpio_cfg[pin].used_as_irq) { if (m_gpio_cfg[pin].used_as_irq) {
cfg.pull = NRF_GPIO_PIN_PULLUP;
nrf_drv_gpiote_in_init(pin, &cfg, gpiote_irq_handler); nrf_drv_gpiote_in_init(pin, &cfg, gpiote_irq_handler);
if ((m_gpio_irq_enabled & ((gpio_mask_t)1 << pin)) if ((m_gpio_irq_enabled & ((gpio_mask_t)1 << pin))
&& (m_gpio_cfg[pin].irq_rise || m_gpio_cfg[pin].irq_fall)) && (m_gpio_cfg[pin].irq_rise || m_gpio_cfg[pin].irq_fall))
@ -139,17 +149,6 @@ static void gpio_apply_config(uint8_t pin)
} }
} }
else { else {
switch(m_gpio_cfg[pin].pull) {
case PullUp:
cfg.pull = NRF_GPIO_PIN_PULLUP;
break;
case PullDown:
cfg.pull = NRF_GPIO_PIN_PULLDOWN;
break;
default:
cfg.pull = NRF_GPIO_PIN_NOPULL;
break;
}
nrf_gpio_cfg_input(pin,cfg.pull); nrf_gpio_cfg_input(pin,cfg.pull);
} }
} }