Skip to content

Commit d99847b

Browse files
tannewttannewt
committed
Refactor pin reset on ESP
This makes it easier to blanket never reset flash and USB pins. It also allows us to set a custom state after reset. The first case is for the double tap reset that needs to be pulled low. Fixes #5893
1 parent 3762f4e commit d99847b

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)

‎ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@ const uint8_t display_stop_sequence[] = {
110110
};
111111

112112
void board_init(void) {
113-
// USB
114-
common_hal_never_reset_pin(&pin_GPIO19);
115-
common_hal_never_reset_pin(&pin_GPIO20);
116-
117113
// Debug UART
118114
#ifdef DEBUG
119115
common_hal_never_reset_pin(&pin_GPIO43);

‎ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h

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

4343
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO34)
4444
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
45+
46+
#define DOUBLE_TAP_PIN (&pin_GPIO38)

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
#include "shared-bindings/microcontroller/Pin.h"
3030

3131
void board_init(void) {
32-
// USB
33-
common_hal_never_reset_pin(&pin_GPIO19);
34-
common_hal_never_reset_pin(&pin_GPIO20);
3532
}
3633

3734
bool board_requests_safe_mode(void) {

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

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

4747
#define DEFAULT_UART_BUS_RX (&pin_GPIO5)
4848
#define DEFAULT_UART_BUS_TX (&pin_GPIO6)
49+
50+
#define DOUBLE_TAP_PIN (&pin_GPIO38)

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
#include "shared-bindings/microcontroller/Pin.h"
3030

3131
void board_init(void) {
32-
// USB
33-
common_hal_never_reset_pin(&pin_GPIO19);
34-
common_hal_never_reset_pin(&pin_GPIO20);
3532
}
3633

3734
bool board_requests_safe_mode(void) {

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

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

4848
#define DEFAULT_UART_BUS_RX (&pin_GPIO16)
4949
#define DEFAULT_UART_BUS_TX (&pin_GPIO5)
50+
51+
#define DOUBLE_TAP_PIN (&pin_GPIO10)
52+
53+
#define DEBUG_UART_RX DEFAULT_UART_BUS_RX
54+
#define DEBUG_UART_TX DEFAULT_UART_BUS_TX

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,11 @@
2929
#include "shared-bindings/microcontroller/Pin.h"
3030

3131
void board_init(void) {
32-
// USB
33-
common_hal_never_reset_pin(&pin_GPIO19);
34-
common_hal_never_reset_pin(&pin_GPIO20);
35-
3632
// Debug UART
3733
#ifdef DEBUG
3834
common_hal_never_reset_pin(&pin_GPIO43);
3935
common_hal_never_reset_pin(&pin_GPIO44);
4036
#endif
41-
42-
// SPI Flash and RAM
43-
common_hal_never_reset_pin(&pin_GPIO26);
44-
common_hal_never_reset_pin(&pin_GPIO27);
45-
common_hal_never_reset_pin(&pin_GPIO28);
46-
common_hal_never_reset_pin(&pin_GPIO29);
47-
common_hal_never_reset_pin(&pin_GPIO30);
48-
common_hal_never_reset_pin(&pin_GPIO31);
49-
common_hal_never_reset_pin(&pin_GPIO32);
5037
}
5138

5239
bool board_requests_safe_mode(void) {

‎ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/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_GPIO16)
4949
#define DEFAULT_UART_BUS_TX (&pin_GPIO5)
50+
51+
#define DOUBLE_TAP_PIN (&pin_GPIO10)

‎ports/espressif/boards/ai_thinker_esp32-c3s/board.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,11 @@
2929
#include "supervisor/board.h"
3030

3131
void board_init(void) {
32-
3332
// Debug UART
3433
#ifdef DEBUG
3534
common_hal_never_reset_pin(&pin_GPIO20);
3635
common_hal_never_reset_pin(&pin_GPIO21);
3736
#endif
38-
39-
// SPI Flash
40-
common_hal_never_reset_pin(&pin_GPIO11);
41-
common_hal_never_reset_pin(&pin_GPIO12);
42-
common_hal_never_reset_pin(&pin_GPIO13);
43-
common_hal_never_reset_pin(&pin_GPIO14);
44-
common_hal_never_reset_pin(&pin_GPIO15);
45-
common_hal_never_reset_pin(&pin_GPIO16);
46-
common_hal_never_reset_pin(&pin_GPIO17);
4737
}
4838

4939
bool board_requests_safe_mode(void) {

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
#include "shared-bindings/microcontroller/Pin.h"
3030

3131
void board_init(void) {
32-
// USB
33-
common_hal_never_reset_pin(&pin_GPIO19);
34-
common_hal_never_reset_pin(&pin_GPIO20);
35-
3632
// Debug UART
3733
#ifdef DEBUG
3834
common_hal_never_reset_pin(&pin_GPIO43);

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
#include "shared-bindings/microcontroller/Pin.h"
3030

3131
void board_init(void) {
32-
// USB
33-
common_hal_never_reset_pin(&pin_GPIO19);
34-
common_hal_never_reset_pin(&pin_GPIO20);
35-
3632
// Debug UART
3733
#ifdef DEBUG
3834
common_hal_never_reset_pin(&pin_GPIO43);
@@ -42,9 +38,6 @@ void board_init(void) {
4238
// Crystal
4339
common_hal_never_reset_pin(&pin_GPIO15);
4440
common_hal_never_reset_pin(&pin_GPIO16);
45-
46-
// PSRAM
47-
common_hal_never_reset_pin(&pin_GPIO26);
4841
}
4942

5043
bool board_requests_safe_mode(void) {

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,11 @@
2929
#include "shared-bindings/microcontroller/Pin.h"
3030

3131
void board_init(void) {
32-
// USB
33-
common_hal_never_reset_pin(&pin_GPIO19);
34-
common_hal_never_reset_pin(&pin_GPIO20);
35-
3632
// Debug UART
3733
#ifdef DEBUG
3834
common_hal_never_reset_pin(&pin_GPIO43);
3935
common_hal_never_reset_pin(&pin_GPIO44);
4036
#endif /* DEBUG */
41-
42-
// SPI Flash and RAM
43-
common_hal_never_reset_pin(&pin_GPIO26);
44-
common_hal_never_reset_pin(&pin_GPIO27);
45-
common_hal_never_reset_pin(&pin_GPIO28);
46-
common_hal_never_reset_pin(&pin_GPIO29);
47-
common_hal_never_reset_pin(&pin_GPIO30);
48-
common_hal_never_reset_pin(&pin_GPIO31);
49-
common_hal_never_reset_pin(&pin_GPIO32);
5037
}
5138

5239
bool board_requests_safe_mode(void) {

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
#include "shared-bindings/microcontroller/Pin.h"
3030

3131
void board_init(void) {
32-
// USB
33-
common_hal_never_reset_pin(&pin_GPIO19);
34-
common_hal_never_reset_pin(&pin_GPIO20);
35-
3632
// Debug UART
3733
#ifdef DEBUG
3834
common_hal_never_reset_pin(&pin_GPIO43);

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
#include "shared-bindings/microcontroller/Pin.h"
3030

3131
void board_init(void) {
32-
// USB
33-
common_hal_never_reset_pin(&pin_GPIO19);
34-
common_hal_never_reset_pin(&pin_GPIO20);
35-
3632
// Debug UART
3733
#ifdef DEBUG
3834
common_hal_never_reset_pin(&pin_GPIO43);

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,11 @@
2828
#include "supervisor/board.h"
2929

3030
void board_init(void) {
31-
3231
// Debug UART
3332
#ifdef DEBUG
3433
common_hal_never_reset_pin(&pin_GPIO20);
3534
common_hal_never_reset_pin(&pin_GPIO21);
3635
#endif
37-
38-
// SPI Flash
39-
common_hal_never_reset_pin(&pin_GPIO11);
40-
common_hal_never_reset_pin(&pin_GPIO12);
41-
common_hal_never_reset_pin(&pin_GPIO13);
42-
common_hal_never_reset_pin(&pin_GPIO14);
43-
common_hal_never_reset_pin(&pin_GPIO15);
44-
common_hal_never_reset_pin(&pin_GPIO16);
45-
common_hal_never_reset_pin(&pin_GPIO17);
4636
}
4737

4838
bool board_requests_safe_mode(void) {

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -90,29 +90,11 @@ void board_init(void) {
9090
true, // backlight_on_high
9191
false); // SH1107_addressing
9292

93-
// USB
94-
common_hal_never_reset_pin(&pin_GPIO19);
95-
common_hal_never_reset_pin(&pin_GPIO20);
96-
9793
// Debug UART
9894
#ifdef DEBUG
9995
common_hal_never_reset_pin(&pin_GPIO43);
10096
common_hal_never_reset_pin(&pin_GPIO44);
10197
#endif
102-
103-
// SPI Flash and RAM
104-
common_hal_never_reset_pin(&pin_GPIO26);
105-
common_hal_never_reset_pin(&pin_GPIO27);
106-
common_hal_never_reset_pin(&pin_GPIO28);
107-
common_hal_never_reset_pin(&pin_GPIO29);
108-
common_hal_never_reset_pin(&pin_GPIO30);
109-
common_hal_never_reset_pin(&pin_GPIO31);
110-
common_hal_never_reset_pin(&pin_GPIO32);
111-
common_hal_never_reset_pin(&pin_GPIO33);
112-
common_hal_never_reset_pin(&pin_GPIO34);
113-
common_hal_never_reset_pin(&pin_GPIO35);
114-
common_hal_never_reset_pin(&pin_GPIO36);
115-
common_hal_never_reset_pin(&pin_GPIO37);
11698
}
11799

118100
bool board_requests_safe_mode(void) {

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,11 @@
2929
#include "shared-bindings/microcontroller/Pin.h"
3030

3131
void board_init(void) {
32-
// USB
33-
common_hal_never_reset_pin(&pin_GPIO19);
34-
common_hal_never_reset_pin(&pin_GPIO20);
35-
3632
// Debug UART
3733
#ifdef DEBUG
3834
common_hal_never_reset_pin(&pin_GPIO43);
3935
common_hal_never_reset_pin(&pin_GPIO44);
4036
#endif
41-
42-
// SPI Flash and RAM
43-
common_hal_never_reset_pin(&pin_GPIO26);
44-
common_hal_never_reset_pin(&pin_GPIO27);
45-
common_hal_never_reset_pin(&pin_GPIO28);
46-
common_hal_never_reset_pin(&pin_GPIO29);
47-
common_hal_never_reset_pin(&pin_GPIO30);
48-
common_hal_never_reset_pin(&pin_GPIO31);
49-
common_hal_never_reset_pin(&pin_GPIO32);
5037
}
5138

5239
bool board_requests_safe_mode(void) {

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,11 @@
2929
#include "shared-bindings/microcontroller/Pin.h"
3030

3131
void board_init(void) {
32-
// USB
33-
common_hal_never_reset_pin(&pin_GPIO19);
34-
common_hal_never_reset_pin(&pin_GPIO20);
35-
3632
// Debug UART
3733
#ifdef DEBUG
3834
common_hal_never_reset_pin(&pin_GPIO43);
3935
common_hal_never_reset_pin(&pin_GPIO44);
4036
#endif
41-
42-
// SPI Flash and RAM
43-
common_hal_never_reset_pin(&pin_GPIO26);
44-
common_hal_never_reset_pin(&pin_GPIO27);
45-
common_hal_never_reset_pin(&pin_GPIO28);
46-
common_hal_never_reset_pin(&pin_GPIO29);
47-
common_hal_never_reset_pin(&pin_GPIO30);
48-
common_hal_never_reset_pin(&pin_GPIO31);
49-
common_hal_never_reset_pin(&pin_GPIO32);
5037
}
5138

5239
bool board_requests_safe_mode(void) {

0 commit comments

Comments
 (0)