diff options
| author | Lennart <lekaiser@uos.de> | 2020-07-25 20:50:23 +0200 |
|---|---|---|
| committer | Lennart <lekaiser@uos.de> | 2020-07-25 20:50:23 +0200 |
| commit | 714e5788be7b89f937fe8dbf270b8035c4f7d436 (patch) | |
| tree | e05ae1a2b421840847ae28d053a26d8538fe89c1 /include/arch/msp430fr5969lp/driver | |
| parent | 5c4045862bf55be0b8dc755ac3d5c5bd24b5fedf (diff) | |
| parent | d0ea0a521a582549dfd9a98b47e7c12d8bcd0de6 (diff) | |
Merge branch 'master' into state-duration-timers
Diffstat (limited to 'include/arch/msp430fr5969lp/driver')
| -rw-r--r-- | include/arch/msp430fr5969lp/driver/gpio.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/arch/msp430fr5969lp/driver/gpio.h b/include/arch/msp430fr5969lp/driver/gpio.h index d279e31..65b5567 100644 --- a/include/arch/msp430fr5969lp/driver/gpio.h +++ b/include/arch/msp430fr5969lp/driver/gpio.h @@ -66,14 +66,19 @@ class GPIO { inline void input(unsigned char const pin) { if (pin < p2_0) { P1DIR &= ~(1 << pin); + P1REN &= ~(1 << pin); } else if (pin < p3_0) { P2DIR &= ~(1 << (pin - p2_0)); + P2REN &= ~(1 << (pin - p2_0)); } else if (pin < p4_0) { P3DIR &= ~(1 << (pin - p3_0)); + P3REN &= ~(1 << (pin - p3_0)); } else if (pin < pj_0) { P4DIR &= ~(1 << (pin - p4_0)); + P4REN &= ~(1 << (pin - p4_0)); } else if (pin < PIN_INVALID) { PJDIR &= ~(1 << (pin - pj_0)); + PJREN &= ~(1 << (pin - pj_0)); } } inline void input(unsigned char const pin, unsigned char const pull) { |