Merge pull request #4205 from hierophect/esp32s2-fix-pinfree

dhalbert · web-flow · commit 5ccbb0be62bd · 2021-02-15T15:12:34.000-05:00
ESP32S2: pin_number_is_free should not check never_reset tables
diff --git a/ports/esp32s2/common-hal/microcontroller/Pin.c b/ports/esp32s2/common-hal/microcontroller/Pin.c
@@ -134,7 +134,7 @@ bool pin_number_is_free(gpio_num_t pin_number) {
 
     uint8_t offset = pin_number / 32;
     uint32_t mask = 1 << (pin_number % 32);
-    return (never_reset_pins[offset] & mask) == 0 && (in_use[offset] & mask) == 0;
+    return (in_use[offset] & mask) == 0;
 }
 
 bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) {

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ bool pin_number_is_free(gpio_num_t pin_number) {`
`134`	`134`
`135`	`135`	`uint8_t offset = pin_number / 32;`
`136`	`136`	`uint32_t mask = 1 << (pin_number % 32);`
`137`		`- return (never_reset_pins[offset] & mask) == 0 && (in_use[offset] & mask) == 0;`
	`137`	`+ return (in_use[offset] & mask) == 0;`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) {`