Skip to content

Commit 5d54d02

Browse files
dhalbertdhalbert
authored
Merge pull request #5894 from tannewt/esp_pin_reset_refactor
Refactor pin reset on ESP
2 parents 3762f4e + 3517571 commit 5d54d02

File tree

57 files changed

+64
-339
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+64
-339
lines changed

‎ports/espressif/boards/adafruit_esp32s2_camera/board.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ uint8_t display_init_sequence[] = {
5151
};
5252

5353
void board_init(void) {
54-
// USB
55-
common_hal_never_reset_pin(&pin_GPIO19);
56-
common_hal_never_reset_pin(&pin_GPIO20);
57-
5854
busio_spi_obj_t *spi = common_hal_board_create_spi();
5955
displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
6056
bus->base.type = &displayio_fourwire_type;

‎ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,5 @@
4444
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
4545
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
4646
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
47+
48+
#define DOUBLE_TAP_PIN (&pin_GPIO42)

‎ports/espressif/boards/adafruit_feather_esp32s2/board.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
#include "common-hal/microcontroller/Pin.h"
3333

3434
void board_init(void) {
35-
// USB
36-
common_hal_never_reset_pin(&pin_GPIO19);
37-
common_hal_never_reset_pin(&pin_GPIO20);
38-
3935
// Turn on I2C
4036
common_hal_never_reset_pin(&pin_GPIO7);
4137
gpio_set_direction(7, GPIO_MODE_DEF_OUTPUT);

‎ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@
4747

4848
#define DEFAULT_UART_BUS_RX (&pin_GPIO38)
4949
#define DEFAULT_UART_BUS_TX (&pin_GPIO39)
50+
51+
#define DOUBLE_TAP_PIN (&pin_GPIO34)

‎ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ uint8_t display_init_sequence[] = {
7171

7272

7373
void board_init(void) {
74-
// USB
75-
common_hal_never_reset_pin(&pin_GPIO19);
76-
common_hal_never_reset_pin(&pin_GPIO20);
77-
7874
// I2C/TFT power pin
7975
common_hal_never_reset_pin(&pin_GPIO21);
8076

‎ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@
4747

4848
#define DEFAULT_UART_BUS_RX (&pin_GPIO2)
4949
#define DEFAULT_UART_BUS_TX (&pin_GPIO1)
50+
51+
#define DOUBLE_TAP_PIN (&pin_GPIO38)

‎ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ uint8_t display_init_sequence[] = {
5050
*/
5151

5252
void board_init(void) {
53-
// USB
54-
common_hal_never_reset_pin(&pin_GPIO19);
55-
common_hal_never_reset_pin(&pin_GPIO20);
56-
5753
// Debug UART
5854
#ifdef DEBUG
5955
common_hal_never_reset_pin(&pin_GPIO43);

‎ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,5 @@
4444
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
4545
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
4646
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
47+
48+
#define DOUBLE_TAP_PIN (&pin_GPIO34)

‎ports/espressif/boards/adafruit_funhouse/board.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ uint8_t display_init_sequence[] = {
5050
};
5151

5252
void board_init(void) {
53-
// USB
54-
common_hal_never_reset_pin(&pin_GPIO19);
55-
common_hal_never_reset_pin(&pin_GPIO20);
56-
5753
// Debug UART
5854
#ifdef DEBUG
5955
common_hal_never_reset_pin(&pin_GPIO37);

‎ports/espressif/boards/adafruit_funhouse/mpconfigboard.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,5 @@
4141

4242
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO33)
4343
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO34)
44+
45+
#define DOUBLE_TAP_PIN (&pin_GPIO38)

0 commit comments

Comments
 (0)