djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Must treat NO_PIN cast to uint8_t the same as NO_PIN 

Otherwise, deinitializing a camera with e.g., the powerdown
pin unspecified results in an assertion failure in a debug build.
This commit is contained in:
Jeff Epler 2022-08-04 15:11:54 -05:00
parent 1d1e139379
commit f54c7adddc
No known key found for this signature in database
GPG Key ID: D5BF15AB975AB4DE
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/espressif/common-hal/microcontroller/Pin.c
View File

@ -100,7 +100,9 @@ static const uint64_t pin_mask_reset_forbidden =
void never_reset_pin_number(gpio_num_t pin_number) {
if (pin_number == NO_PIN) {
// Some CircuitPython APIs deal in uint8_t pin numbers, but NO_PIN is -1.
// Also allow pin 255 to be treated as NO_PIN to avoid crashes
if (pin_number == NO_PIN || pin_number == (uint8_t)NO_PIN) {
return;
}
never_reset_pins |= PIN_BIT(pin_number);
@ -141,7 +143,9 @@ STATIC void _reset_pin(gpio_num_t pin_number) {
// Mark pin as free and return it to a quiescent state.
void reset_pin_number(gpio_num_t pin_number) {
if (pin_number == NO_PIN) {
// Some CircuitPython APIs deal in uint8_t pin numbers, but NO_PIN is -1.
// Also allow pin 255 to be treated as NO_PIN to avoid crashes
if (pin_number == NO_PIN || pin_number == (uint8_t)NO_PIN) {
return;
}
never_reset_pins &= ~PIN_BIT(pin_number);
@ -174,7 +178,9 @@ void reset_all_pins(void) {
}
void claim_pin_number(gpio_num_t pin_number) {
if (pin_number == NO_PIN) {
// Some CircuitPython APIs deal in uint8_t pin numbers, but NO_PIN is -1.
// Also allow pin 255 to be treated as NO_PIN to avoid crashes
if (pin_number == NO_PIN || pin_number == (uint8_t)NO_PIN) {
return;
}
in_use |= PIN_BIT(pin_number);