Merge pull request #1006 from dhalbert/3.x-fix-pull

kattni · web-flow · commit 85a5276f36fb · 2018-07-09T17:53:47.000-04:00
must set pull after setting direction with gpio_set_pin routines
diff --git a/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c b/ports/atmel-samd/common-hal/digitalio/DigitalInOut.c
@@ -40,8 +40,9 @@ digitalinout_result_t common_hal_digitalio_digitalinout_construct(
     claim_pin(pin);
     self->pin = pin;
 
-    gpio_set_pin_pull_mode(pin->pin, GPIO_PULL_OFF);
+    // Must set pull after setting direction.
     gpio_set_pin_direction(pin->pin, GPIO_DIRECTION_IN);
+    gpio_set_pin_pull_mode(pin->pin, GPIO_PULL_OFF);
     return DIGITALINOUT_OK;
 }
 
@@ -154,9 +155,9 @@ void common_hal_digitalio_digitalinout_set_pull(
         default:
             break;
     }
-    // Set pull first to avoid glitches.
-    gpio_set_pin_pull_mode(self->pin->pin, asf_pull);
+    // Must set pull after setting direction.
     gpio_set_pin_direction(self->pin->pin, GPIO_DIRECTION_IN);
+    gpio_set_pin_pull_mode(self->pin->pin, asf_pull);
 }
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,9 @@ digitalinout_result_t common_hal_digitalio_digitalinout_construct(`
`40`	`40`	`claim_pin(pin);`
`41`	`41`	`self->pin = pin;`
`42`	`42`
`43`		`- gpio_set_pin_pull_mode(pin->pin, GPIO_PULL_OFF);`
	`43`	`+ // Must set pull after setting direction.`
`44`	`44`	`gpio_set_pin_direction(pin->pin, GPIO_DIRECTION_IN);`
	`45`	`+ gpio_set_pin_pull_mode(pin->pin, GPIO_PULL_OFF);`
`45`	`46`	`return DIGITALINOUT_OK;`
`46`	`47`	`}`
`47`	`48`
`@@ -154,9 +155,9 @@ void common_hal_digitalio_digitalinout_set_pull(`
`154`	`155`	`default:`
`155`	`156`	`break;`
`156`	`157`	`}`
`157`		`- // Set pull first to avoid glitches.`
`158`		`- gpio_set_pin_pull_mode(self->pin->pin, asf_pull);`
	`158`	`+ // Must set pull after setting direction.`
`159`	`159`	`gpio_set_pin_direction(self->pin->pin, GPIO_DIRECTION_IN);`
	`160`	`+ gpio_set_pin_pull_mode(self->pin->pin, asf_pull);`
`160`	`161`	`}`
`161`	`162`
`162`	`163`	`digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(`