diff options
| author | tominabox1 <tjcampie@zmk.local> | 2020-08-23 16:46:04 -0500 |
|---|---|---|
| committer | tominabox1 <tjcampie@zmk.local> | 2020-08-23 16:46:04 -0500 |
| commit | 83ddc8a6381673eeb91793981786b2dcf92d24dc (patch) | |
| tree | 0197db766763deca0977529dbc0e87e6bab12904 /app/boards/arm/nrfmicro/pinmux.c | |
| parent | 6b23c7f554dbb27794cda5bff42545b1532b02c8 (diff) | |
| parent | 6806cd2a55d6f59eb6c056d406de930b3dd8c9ea (diff) | |
Merge branch 'main' of https://github.com/zmkfirmware/zmk into main
Diffstat (limited to 'app/boards/arm/nrfmicro/pinmux.c')
| -rw-r--r-- | app/boards/arm/nrfmicro/pinmux.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/boards/arm/nrfmicro/pinmux.c b/app/boards/arm/nrfmicro/pinmux.c index c02ca92..3792b59 100644 --- a/app/boards/arm/nrfmicro/pinmux.c +++ b/app/boards/arm/nrfmicro/pinmux.c @@ -23,10 +23,14 @@ static int pinmux_nrfmicro_init(struct device *port) gpio_pin_configure(p1, 9, GPIO_OUTPUT); gpio_pin_set(p1, 9, 0); - // enable charger (nRFMicro 1.3 only) +#if CONFIG_BOARD_NRFMICRO_CHARGER gpio_pin_configure(p0, 5, GPIO_OUTPUT); gpio_pin_set(p0, 5, 0); #else + gpio_pin_configure(p0, 5, GPIO_INPUT); +#endif + +#else // enable EXT_VCC (use 0 for nRFMicro 1.3, use 1 for nRFMicro 1.1) gpio_pin_configure(p1, 9, GPIO_OUTPUT); gpio_pin_set(p1, 9, 1); |