kingkevin
/
esp32-s2_dfu
1
0
Fork 0
Code Issues Releases Activity

update for s3

This commit is contained in:
hathach 2022-01-16 13:26:50 +07:00
parent e1e4577616
commit cb57f047e7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/bsp/esp32s2/boards/esp32s2.c
View File

@ -99,10 +99,11 @@ static void configure_pins(usb_hal_context_t *usb)
} else { } else {
esp_rom_gpio_connect_in_signal(iopin->pin, iopin->func, false); esp_rom_gpio_connect_in_signal(iopin->pin, iopin->func, false);
#if ESP_IDF_VERSION_MAJOR > 4 #if ESP_IDF_VERSION_MAJOR > 4
if ((iopin->pin != GPIO_MATRIX_CONST_ZERO_INPUT) && (iopin->pin != GPIO_MATRIX_CONST_ONE_INPUT)) { if ((iopin->pin != GPIO_MATRIX_CONST_ZERO_INPUT) && (iopin->pin != GPIO_MATRIX_CONST_ONE_INPUT))
#else #else
if ((iopin->pin != GPIO_FUNC_IN_LOW) && (iopin->pin != GPIO_FUNC_IN_HIGH)) { if ((iopin->pin != GPIO_FUNC_IN_LOW) && (iopin->pin != GPIO_FUNC_IN_HIGH))
#endif #endif
{
gpio_ll_input_enable(&GPIO, iopin->pin); gpio_ll_input_enable(&GPIO, iopin->pin);
} }
} }

9
hw/bsp/esp32s3/boards/esp32s3.c
View File

@ -70,7 +70,7 @@ void board_init(void)
#endif #endif
// Button // Button
gpio_pad_select_gpio(BUTTON_PIN); esp_rom_gpio_pad_select_gpio(BUTTON_PIN);
gpio_set_direction(BUTTON_PIN, GPIO_MODE_INPUT); gpio_set_direction(BUTTON_PIN, GPIO_MODE_INPUT);
gpio_set_pull_mode(BUTTON_PIN, BUTTON_STATE_ACTIVE ? GPIO_PULLDOWN_ONLY : GPIO_PULLUP_ONLY); gpio_set_pull_mode(BUTTON_PIN, BUTTON_STATE_ACTIVE ? GPIO_PULLDOWN_ONLY : GPIO_PULLUP_ONLY);
@ -98,7 +98,12 @@ static void configure_pins(usb_hal_context_t *usb)
esp_rom_gpio_connect_out_signal(iopin->pin, iopin->func, false, false); esp_rom_gpio_connect_out_signal(iopin->pin, iopin->func, false, false);
} else { } else {
esp_rom_gpio_connect_in_signal(iopin->pin, iopin->func, false); esp_rom_gpio_connect_in_signal(iopin->pin, iopin->func, false);
if ((iopin->pin != GPIO_FUNC_IN_LOW) && (iopin->pin != GPIO_FUNC_IN_HIGH)) { #if ESP_IDF_VERSION_MAJOR > 4
if ((iopin->pin != GPIO_MATRIX_CONST_ZERO_INPUT) && (iopin->pin != GPIO_MATRIX_CONST_ONE_INPUT))
#else
if ((iopin->pin != GPIO_FUNC_IN_LOW) && (iopin->pin != GPIO_FUNC_IN_HIGH))
#endif
{
gpio_ll_input_enable(&GPIO, iopin->pin); gpio_ll_input_enable(&GPIO, iopin->pin);
} }
} }