From 065d45f9ec7d5597bfcfe075d45abb76197c1319 Mon Sep 17 00:00:00 2001 From: Dryw Wade Date: Fri, 8 Nov 2024 12:35:03 -0700 Subject: [PATCH 1/2] rp2/mphalport: Fix mp_hal_pin_low/high() for pin>=32. Fixes issue #16190. Signed-off-by: Dryw Wade --- ports/rp2/mphalport.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h index 33a1073e1df81..956db3ec702fb 100644 --- a/ports/rp2/mphalport.h +++ b/ports/rp2/mphalport.h @@ -182,11 +182,11 @@ static inline void mp_hal_pin_od_high(mp_hal_pin_obj_t pin) { } static inline void mp_hal_pin_low(mp_hal_pin_obj_t pin) { - gpio_clr_mask(1 << pin); + gpio_clr_mask64(UINT64_C(1) << pin); } static inline void mp_hal_pin_high(mp_hal_pin_obj_t pin) { - gpio_set_mask(1 << pin); + gpio_set_mask64(UINT64_C(1) << pin); } enum mp_hal_pin_interrupt_trigger { From 7964a435ea8cafed185e41eeb6dc24b269773650 Mon Sep 17 00:00:00 2001 From: Dryw Wade Date: Sat, 9 Nov 2024 15:04:35 -0700 Subject: [PATCH 2/2] rp2/machine_bitstream: Tweak MP_HAL_BITSTREAM_NS_OVERHEAD for RP2350. See https://github.com/micropython/micropython/issues/16190#issuecomment-2466155919 Signed-off-by: Dryw Wade --- ports/rp2/machine_bitstream.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/rp2/machine_bitstream.c b/ports/rp2/machine_bitstream.c index 4ef97f0c86839..8411179f1ae57 100644 --- a/ports/rp2/machine_bitstream.c +++ b/ports/rp2/machine_bitstream.c @@ -32,7 +32,11 @@ #if MICROPY_PY_MACHINE_BITSTREAM +#if PICO_RP2350 +#define MP_HAL_BITSTREAM_NS_OVERHEAD (5) +#else #define MP_HAL_BITSTREAM_NS_OVERHEAD (9) +#endif #if PICO_RISCV