Fix masking issue causing pin claim problems

hierophect · hierophect · commit a854da35d33f · 2020-11-25T12:14:56.000-05:00
diff --git a/ports/esp32s2/common-hal/microcontroller/Pin.c b/ports/esp32s2/common-hal/microcontroller/Pin.c
@@ -96,7 +96,7 @@ void reset_all_pins(void) {
 }
 
 void claim_pin(const mcu_pin_obj_t* pin) {
-    in_use[pin->number / 32] |= (1 << pin->number % 32);
+    in_use[pin->number / 32] |= (1 << (pin->number % 32));
     #ifdef MICROPY_HW_NEOPIXEL
     if (pin == MICROPY_HW_NEOPIXEL) {
         neopixel_in_use = true;
@@ -116,7 +116,7 @@ bool pin_number_is_free(gpio_num_t pin_number) {
     #endif
 
     uint8_t offset = pin_number / 32;
-    uint8_t mask = 1 << pin_number % 32;
+    uint32_t mask = 1 << (pin_number % 32);
     return (never_reset_pins[offset] & mask) == 0 && (in_use[offset] & mask) == 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ void reset_all_pins(void) {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`void claim_pin(const mcu_pin_obj_t* pin) {`
`99`		`- in_use[pin->number / 32] \|= (1 << pin->number % 32);`
	`99`	`+ in_use[pin->number / 32] \|= (1 << (pin->number % 32));`
`100`	`100`	`#ifdef MICROPY_HW_NEOPIXEL`
`101`	`101`	`if (pin == MICROPY_HW_NEOPIXEL) {`
`102`	`102`	`neopixel_in_use = true;`
`@@ -116,7 +116,7 @@ bool pin_number_is_free(gpio_num_t pin_number) {`
`116`	`116`	`#endif`
`117`	`117`
`118`	`118`	`uint8_t offset = pin_number / 32;`
`119`		`- uint8_t mask = 1 << pin_number % 32;`
	`119`	`+ uint32_t mask = 1 << (pin_number % 32);`
`120`	`120`	`return (never_reset_pins[offset] & mask) == 0 && (in_use[offset] & mask) == 0;`
`121`	`121`	`}`
`122`	`122`