Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ESP32-S2: Add IDF pin resets to Microcontroller #3643

Merged
merged 7 commits into from
Dec 15, 2020
Merged

ESP32-S2: Add IDF pin resets to Microcontroller #3643

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
472a5a9
Add API reset to reset_pin_number
hierophect Nov 3, 2020
8669426
Merge remote-tracking branch 'upstream/main' into esp32-pin-reset
hierophect Nov 23, 2020
1c9f33a
Replace reset with mux change
hierophect Nov 24, 2020
40a5369
Merge remote-tracking branch 'upstream/main' into esp32-pin-reset
hierophect Dec 7, 2020
c7b5928
Fix submodule desync
hierophect Dec 7, 2020
c1a2ea2
Change to config-based resets
hierophect Dec 7, 2020
d793ec2
Change pinfunc to default of 0 at reset
hierophect Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions ports/esp32s2/common-hal/microcontroller/Pin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,19 @@ STATIC uint32_t in_use[2];
bool apa102_mosi_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) {
if (pin_number == -1 ) {
return;
Expand All @@ -63,6 +76,8 @@ void reset_pin_number(gpio_num_t pin_number) {
never_reset_pins[pin_number / 32] &= ~(1 << pin_number % 32);
in_use[pin_number / 32] &= ~(1 << pin_number % 32);

floating_gpio_reset(pin_number);

#ifdef MICROPY_HW_NEOPIXEL
if (pin_number == MICROPY_HW_NEOPIXEL->number) {
neopixel_in_use = false;
Expand All @@ -83,9 +98,7 @@ void reset_all_pins(void) {
(never_reset_pins[i / 32] & (1 << i % 32)) != 0) {
continue;
}
gpio_set_direction(i, GPIO_MODE_DEF_INPUT);
gpio_pullup_dis(i);
gpio_pulldown_dis(i);
floating_gpio_reset(i);
}
in_use[0] = 0;
in_use[1] = 0;
Expand Down