diff options
| author | Dave Hylands <davehylands@fullstory.com> | 2020-08-11 12:44:51 -0700 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2020-08-21 13:42:47 +1000 |
| commit | 8727c4e2eca9026494c173061c5905d54fa5f73d (patch) | |
| tree | a1f082c3220240245567f102d05bb09ebfb2462b | |
| parent | e76c7466b62c940150cf1b5000e18f60a5efa2e3 (diff) | |
stm32/pin_defs_stm32: Fix pin printing to show IN mode correctly.
Prior to this commit, if you configure a pin as an output type (I2C in this
example) and then later configure it back as an input, then it will report
the type incorrectly. Example:
>>> import machine
>>> b6 = machine.Pin('B6')
>>> b6
Pin(Pin.cpu.B6, mode=Pin.IN)
>>> machine.I2C(1)
I2C(1, scl=B6, sda=B7, freq=420000)
>>> b6
Pin(Pin.cpu.B6, mode=Pin.ALT_OPEN_DRAIN, pull=Pin.PULL_UP, af=Pin.AF4_I2C1)
>>> b6.init(machine.Pin.IN)
>>> b6
Pin(Pin.cpu.B6, mode=Pin.ALT_OPEN_DRAIN, af=Pin.AF4_I2C1)
With this commit the last print now works:
>>> b6
Pin(Pin.cpu.B6, mode=Pin.IN)
| -rw-r--r-- | ports/stm32/pin_defs_stm32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/stm32/pin_defs_stm32.c b/ports/stm32/pin_defs_stm32.c index 0aef5f95f..a3f9d039d 100644 --- a/ports/stm32/pin_defs_stm32.c +++ b/ports/stm32/pin_defs_stm32.c @@ -8,9 +8,9 @@ uint32_t pin_get_mode(const pin_obj_t *pin) { GPIO_TypeDef *gpio = pin->gpio; uint32_t mode = (gpio->MODER >> (pin->pin * 2)) & 3; - if (mode != GPIO_MODE_ANALOG) { + if (mode == GPIO_MODE_OUTPUT_PP || mode == GPIO_MODE_AF_PP) { if (gpio->OTYPER & pin->pin_mask) { - mode |= 1 << 4; + mode |= 1 << 4; // Converts from xxx_PP to xxx_OD } } return mode; |