summaryrefslogtreecommitdiff
path: root/atmel-samd
diff options
context:
space:
mode:
authorScott Shawcroft <scott.shawcroft@gmail.com>2017-01-16 15:32:23 -0800
committerScott Shawcroft <scott.shawcroft@gmail.com>2017-01-16 15:32:23 -0800
commitd239dbdc2807322c86d5dc5563dc263fa47087d1 (patch)
tree0ef2c0ea2b4a85a4b3e652804450bb86f2792652 /atmel-samd
parentdf96823deed7af4587cb9ebfa7f5d471417f90f1 (diff)
More fixes to pin pull thanks to jerryn:
* Correct atmel-samd pin pull state. * Correct conversion from python pull objects to C enum.
Diffstat (limited to 'atmel-samd')
-rw-r--r--atmel-samd/common-hal/nativeio/DigitalInOut.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/atmel-samd/common-hal/nativeio/DigitalInOut.c b/atmel-samd/common-hal/nativeio/DigitalInOut.c
index 119832ff6..a002050e4 100644
--- a/atmel-samd/common-hal/nativeio/DigitalInOut.c
+++ b/atmel-samd/common-hal/nativeio/DigitalInOut.c
@@ -175,7 +175,7 @@ enum digitalinout_pull_t common_hal_nativeio_digitalinout_get_pull(
"Cannot get pull while in output mode."));
return PULL_NONE;
} else {
- if (port_base->PINCFG[pin % 32].bit.PULLEN != 0) {
+ if (port_base->PINCFG[pin % 32].bit.PULLEN == 0) {
return PULL_NONE;
} if ((port_base->OUT.reg & pin_mask) > 0) {
return PULL_UP;