jebbatime
/
micropython
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nrf: Add support for reading output pin state 

Current adoption on top of nrfx only reads the GPIO->IN register.
In order to read back an output state, nrf_gpio_pin_out_read has
to be called.

This patch concatinate the two read functions such that, if
either IN or OUT register has a value 1 it will return this,
else 0.

Updating lib/nrfx submodule to latest version of master to get
the new GPIO API to read pin direction.
(nrfx: d37b16f2b894b0928395f6f56ca741287a31a244)
pull/1/head
Glenn Ruben Bakke 2018-04-19 22:29:42 +02:00 committed by Damien George
parent 6011441342
commit b7ce2f1460
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nrfx

@ -1 +1 @@
Subproject commit cf78ebfea1719d85cf4018fe6c08cc73fe5ec719
Subproject commit d37b16f2b894b0928395f6f56ca741287a31a244

2
ports/nrf/mphalport.h
View File

@ -64,7 +64,7 @@ const char * nrfx_error_code_lookup(uint32_t err_code);
#define mp_hal_get_pin_obj(o) pin_find(o)
#define mp_hal_pin_high(p) nrf_gpio_pin_set(p->pin)
#define mp_hal_pin_low(p) nrf_gpio_pin_clear(p->pin)
#define mp_hal_pin_read(p) nrf_gpio_pin_read(p->pin)
#define mp_hal_pin_read(p) (nrf_gpio_pin_dir_get(p->pin) == NRF_GPIO_PIN_DIR_OUTPUT) ? nrf_gpio_pin_out_read(p->pin) : nrf_gpio_pin_read(p->pin)
#define mp_hal_pin_write(p, v) do { if (v) { mp_hal_pin_high(p); } else { mp_hal_pin_low(p); } } while (0)
#define mp_hal_pin_od_low(p) mp_hal_pin_low(p)
#define mp_hal_pin_od_high(p) mp_hal_pin_high(p)