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

Change to config-based resets

This commit is contained in:
Lucian Copeland 2020-12-07 13:57:47 -05:00
parent c7b5928833
commit c1a2ea27ce
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ports/esp32s2/common-hal/microcontroller/Pin.c
View File

@ -44,6 +44,19 @@ STATIC uint32_t in_use[2];
bool apa102_mosi_in_use; bool apa102_mosi_in_use;
bool apa102_sck_in_use; bool apa102_sck_in_use;
STATIC void floating_gpio_reset(gpio_num_t pin_number) {
// This is the same as gpio_reset_pin(), but without the pullup.
// Note that gpio_config resets the iomatrix to GPIO_FUNC as well.
gpio_config_t cfg = {
.pin_bit_mask = BIT64(pin_number),
.mode = GPIO_MODE_DISABLE,
.pull_up_en = false,
.pull_down_en = false,
.intr_type = GPIO_INTR_DISABLE,
};
gpio_config(&cfg);
}
void never_reset_pin_number(gpio_num_t pin_number) { void never_reset_pin_number(gpio_num_t pin_number) {
if (pin_number == -1 ) { if (pin_number == -1 ) {
return; return;
@ -63,7 +76,7 @@ void reset_pin_number(gpio_num_t pin_number) {
never_reset_pins[pin_number / 32] &= ~(1 << pin_number % 32); never_reset_pins[pin_number / 32] &= ~(1 << pin_number % 32);
in_use[pin_number / 32] &= ~(1 << pin_number % 32); in_use[pin_number / 32] &= ~(1 << pin_number % 32);
gpio_matrix_out(pin_number, 0x100, 0, 0); floating_gpio_reset(pin_number);
#ifdef MICROPY_HW_NEOPIXEL #ifdef MICROPY_HW_NEOPIXEL
if (pin_number == MICROPY_HW_NEOPIXEL->number) { if (pin_number == MICROPY_HW_NEOPIXEL->number) {
@ -85,7 +98,7 @@ void reset_all_pins(void) {
(never_reset_pins[i / 32] & (1 << i % 32)) != 0) { (never_reset_pins[i / 32] & (1 << i % 32)) != 0) {
continue; continue;
} }
gpio_matrix_out(i, 0x100, 0, 0); floating_gpio_reset(i);
} }
in_use[0] = 0; in_use[0] = 0;
in_use[1] = 0; in_use[1] = 0;