Merge pull request #10627 from dhalbert/pio-wait-pin-check

tannewt · web-flow · commit c382b55a6ddd · 2025-09-11T10:23:39.000-07:00
ports/raspberrypi/rp2pio/StateMachine.c: fix wait pin validation
diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -523,9 +523,10 @@ static void consider_instruction(introspect_t *state, uint16_t full_instruction,
         }
     }
     if (instruction == pio_instr_bits_wait) {
-        uint16_t wait_source = (full_instruction & 0x0060) >> 5;
-        uint16_t wait_index = (full_instruction & 0x001f) + state->inputs.pio_gpio_offset;
-        if (wait_source == 0 && !PIO_PINMASK_IS_SET(state->inputs.pins_we_use, wait_index)) { // GPIO
+        const uint16_t wait_source = (full_instruction & 0x0060) >> 5;
+        const uint16_t wait_index = full_instruction & 0x001f;
+        const uint16_t wait_pin = wait_index + state->inputs.pio_gpio_offset;
+        if (wait_source == 0 && !PIO_PINMASK_IS_SET(state->inputs.pins_we_use, wait_pin)) { // GPIO
             mp_raise_ValueError_varg(MP_ERROR_TEXT("%q[%u] uses extra pin"), what_program, i);
         } else if (wait_source == 1) { // Input pin
             if (!state->inputs.has_in_pin) {

Original file line number	Diff line number	Diff line change
`@@ -523,9 +523,10 @@ static void consider_instruction(introspect_t *state, uint16_t full_instruction,`
`523`	`523`	`}`
`524`	`524`	`}`
`525`	`525`	`if (instruction == pio_instr_bits_wait) {`
`526`		`- uint16_t wait_source = (full_instruction & 0x0060) >> 5;`
`527`		`- uint16_t wait_index = (full_instruction & 0x001f) + state->inputs.pio_gpio_offset;`
`528`		`- if (wait_source == 0 && !PIO_PINMASK_IS_SET(state->inputs.pins_we_use, wait_index)) { // GPIO`
	`526`	`+ const uint16_t wait_source = (full_instruction & 0x0060) >> 5;`
	`527`	`+ const uint16_t wait_index = full_instruction & 0x001f;`
	`528`	`+ const uint16_t wait_pin = wait_index + state->inputs.pio_gpio_offset;`
	`529`	`+ if (wait_source == 0 && !PIO_PINMASK_IS_SET(state->inputs.pins_we_use, wait_pin)) { // GPIO`
`529`	`530`	`mp_raise_ValueError_varg(MP_ERROR_TEXT("%q[%u] uses extra pin"), what_program, i);`
`530`	`531`	`} else if (wait_source == 1) { // Input pin`
`531`	`532`	`if (!state->inputs.has_in_pin) {`