Merge pull request #4052 from tannewt/get_pull

Fix DigitalInOut.pull on RP2040
adafruit · Jan 23, 2021 · 97f5d21 · 97f5d21
2 parents 0dfa9fb + dc421a6
commit 97f5d21
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 25 deletions.
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
@@ -22,7 +22,7 @@ CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
 
 SUPEROPT_GC = 0
-CFLAGS_INLINE_LIMIT = 50
+CFLAGS_INLINE_LIMIT = 40
 
 
 # Include these Python libraries in firmware.

diff --git a/ports/atmel-samd/boards/qtpy_m0/mpconfigboard.mk b/ports/atmel-samd/boards/qtpy_m0/mpconfigboard.mk
@@ -11,14 +11,6 @@ LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
 
 SUPEROPT_GC = 0
+SUPEROPT_VM = 0
 
 CFLAGS_BOARD = --param max-inline-insns-auto=15
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-endif
-ifeq ($(TRANSLATION), de_DE)
-RELEASE_NEEDS_CLEAN_BUILD = 1
-CFLAGS_INLINE_LIMIT = 35
-SUPEROPT_VM = 0
-endif
diff --git a/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c b/ports/raspberrypi/common-hal/digitalio/DigitalInOut.c
@@ -76,8 +76,7 @@ digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
         digitalio_drive_mode_t drive_mode) {
     const uint8_t pin = self->pin->number;
     gpio_set_dir(pin, GPIO_OUT);
-    // Turn on "strong" pin driving (more current available). See DRVSTR doc in datasheet.
-    // hri_port_set_PINCFG_DRVSTR_bit(PORT, (enum gpio_port)GPIO_PORT(pin), GPIO_PIN(pin));
+    // TODO: Turn on "strong" pin driving (more current available).
 
     self->output = true;
     common_hal_digitalio_digitalinout_set_drive_mode(self, drive_mode);
@@ -140,18 +139,16 @@ void common_hal_digitalio_digitalinout_set_pull(
 
 digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
         digitalio_digitalinout_obj_t* self) {
-    // uint32_t pin = self->pin->number;
-    // if (self->output) {
-    //     mp_raise_AttributeError(translate("Cannot get pull while in output mode"));
-    //     return PULL_NONE;
-    // } else {
-    //     if (hri_port_get_PINCFG_PULLEN_bit(PORT, GPIO_PORT(pin), GPIO_PIN(pin)) == 0) {
-    //         return PULL_NONE;
-    //     } if (hri_port_get_OUT_reg(PORT, GPIO_PORT(pin), 1U << GPIO_PIN(pin)) > 0) {
-    //         return PULL_UP;
-    //     } else {
-    //         return PULL_DOWN;
-    //     }
-    // }
+    uint32_t pin = self->pin->number;
+    if (self->output) {
+        mp_raise_AttributeError(translate("Cannot get pull while in output mode"));
+        return PULL_NONE;
+    } else {
+        if (gpio_is_pulled_up(pin)) {
+            return PULL_UP;
+        } else if (gpio_is_pulled_down(pin)) {
+            return PULL_DOWN;
+        }
+    }
     return PULL_NONE;
 }