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

Merge pull request #5894 from tannewt/esp_pin_reset_refactor 

Refactor pin reset on ESP
This commit is contained in:
Dan Halbert 2022-01-20 18:13:45 -05:00 committed by GitHub
parent 3762f4e0f0 35175715f9
commit 5d54d02f30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
57 changed files with 64 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/espressif/boards/adafruit_esp32s2_camera/board.c
View File

@ -51,10 +51,6 @@ uint8_t display_init_sequence[] = {
};
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
busio_spi_obj_t *spi = common_hal_board_create_spi();
displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus;
bus->base.type = &displayio_fourwire_type;

2
ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h
View File

@ -44,3 +44,5 @@
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
#define DOUBLE_TAP_PIN (&pin_GPIO42)

4
ports/espressif/boards/adafruit_feather_esp32s2/board.c
View File

@ -32,10 +32,6 @@
#include "common-hal/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Turn on I2C
common_hal_never_reset_pin(&pin_GPIO7);
gpio_set_direction(7, GPIO_MODE_DEF_OUTPUT);

2
ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h
View File

@ -47,3 +47,5 @@
#define DEFAULT_UART_BUS_RX (&pin_GPIO38)
#define DEFAULT_UART_BUS_TX (&pin_GPIO39)
#define DOUBLE_TAP_PIN (&pin_GPIO34)

4
ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c
View File

@ -71,10 +71,6 @@ uint8_t display_init_sequence[] = {
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// I2C/TFT power pin
common_hal_never_reset_pin(&pin_GPIO21);

2
ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h
View File

@ -47,3 +47,5 @@
#define DEFAULT_UART_BUS_RX (&pin_GPIO2)
#define DEFAULT_UART_BUS_TX (&pin_GPIO1)
#define DOUBLE_TAP_PIN (&pin_GPIO38)

4
ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/board.c
View File

@ -50,10 +50,6 @@ uint8_t display_init_sequence[] = {
*/
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

2
ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
View File

@ -44,3 +44,5 @@
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
#define DOUBLE_TAP_PIN (&pin_GPIO34)

4
ports/espressif/boards/adafruit_funhouse/board.c
View File

@ -50,10 +50,6 @@ uint8_t display_init_sequence[] = {
};
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO37);

2
ports/espressif/boards/adafruit_funhouse/mpconfigboard.h
View File

@ -41,3 +41,5 @@
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO33)
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO34)
#define DOUBLE_TAP_PIN (&pin_GPIO38)

4
ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
View File

@ -110,10 +110,6 @@ const uint8_t display_stop_sequence[] = {
};
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

2
ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
View File

@ -42,3 +42,5 @@
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO34)
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
#define DOUBLE_TAP_PIN (&pin_GPIO38)

3
ports/espressif/boards/adafruit_metro_esp32s2/board.c
View File

@ -29,9 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
}
bool board_requests_safe_mode(void) {

2
ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h
View File

@ -46,3 +46,5 @@
#define DEFAULT_UART_BUS_RX (&pin_GPIO5)
#define DEFAULT_UART_BUS_TX (&pin_GPIO6)
#define DOUBLE_TAP_PIN (&pin_GPIO38)

3
ports/espressif/boards/adafruit_qtpy_esp32s2/board.c
View File

@ -29,9 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
}
bool board_requests_safe_mode(void) {

5
ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h
View File

@ -47,3 +47,8 @@
#define DEFAULT_UART_BUS_RX (&pin_GPIO16)
#define DEFAULT_UART_BUS_TX (&pin_GPIO5)
#define DOUBLE_TAP_PIN (&pin_GPIO10)
#define DEBUG_UART_RX DEFAULT_UART_BUS_RX
#define DEBUG_UART_TX DEFAULT_UART_BUS_TX

13
ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/board.c
View File

@ -29,24 +29,11 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
// SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26);
common_hal_never_reset_pin(&pin_GPIO27);
common_hal_never_reset_pin(&pin_GPIO28);
common_hal_never_reset_pin(&pin_GPIO29);
common_hal_never_reset_pin(&pin_GPIO30);
common_hal_never_reset_pin(&pin_GPIO31);
common_hal_never_reset_pin(&pin_GPIO32);
}
bool board_requests_safe_mode(void) {

2
ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h
View File

@ -47,3 +47,5 @@
#define DEFAULT_UART_BUS_RX (&pin_GPIO16)
#define DEFAULT_UART_BUS_TX (&pin_GPIO5)
#define DOUBLE_TAP_PIN (&pin_GPIO10)

10
ports/espressif/boards/ai_thinker_esp32-c3s/board.c
View File

@ -29,21 +29,11 @@
#include "supervisor/board.h"
void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO20);
common_hal_never_reset_pin(&pin_GPIO21);
#endif
// SPI Flash
common_hal_never_reset_pin(&pin_GPIO11);
common_hal_never_reset_pin(&pin_GPIO12);
common_hal_never_reset_pin(&pin_GPIO13);
common_hal_never_reset_pin(&pin_GPIO14);
common_hal_never_reset_pin(&pin_GPIO15);
common_hal_never_reset_pin(&pin_GPIO16);
common_hal_never_reset_pin(&pin_GPIO17);
}
bool board_requests_safe_mode(void) {

4
ports/espressif/boards/ai_thinker_esp_12k_nodemcu/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

7
ports/espressif/boards/artisense_rd00/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
@ -42,9 +38,6 @@ void board_init(void) {
// Crystal
common_hal_never_reset_pin(&pin_GPIO15);
common_hal_never_reset_pin(&pin_GPIO16);
// PSRAM
common_hal_never_reset_pin(&pin_GPIO26);
}
bool board_requests_safe_mode(void) {

13
ports/espressif/boards/atmegazero_esp32s2/board.c
View File

@ -29,24 +29,11 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
// SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26);
common_hal_never_reset_pin(&pin_GPIO27);
common_hal_never_reset_pin(&pin_GPIO28);
common_hal_never_reset_pin(&pin_GPIO29);
common_hal_never_reset_pin(&pin_GPIO30);
common_hal_never_reset_pin(&pin_GPIO31);
common_hal_never_reset_pin(&pin_GPIO32);
}
bool board_requests_safe_mode(void) {

4
ports/espressif/boards/crumpspace_crumps2/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

4
ports/espressif/boards/electroniccats_bastwifi/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

10
ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/board.c
View File

@ -28,21 +28,11 @@
#include "supervisor/board.h"
void board_init(void) {
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO20);
common_hal_never_reset_pin(&pin_GPIO21);
#endif
// SPI Flash
common_hal_never_reset_pin(&pin_GPIO11);
common_hal_never_reset_pin(&pin_GPIO12);
common_hal_never_reset_pin(&pin_GPIO13);
common_hal_never_reset_pin(&pin_GPIO14);
common_hal_never_reset_pin(&pin_GPIO15);
common_hal_never_reset_pin(&pin_GPIO16);
common_hal_never_reset_pin(&pin_GPIO17);
}
bool board_requests_safe_mode(void) {

18
ports/espressif/boards/espressif_esp32s3_box/board.c
View File

@ -90,29 +90,11 @@ void board_init(void) {
true, // backlight_on_high
false); // SH1107_addressing
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
// SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26);
common_hal_never_reset_pin(&pin_GPIO27);
common_hal_never_reset_pin(&pin_GPIO28);
common_hal_never_reset_pin(&pin_GPIO29);
common_hal_never_reset_pin(&pin_GPIO30);
common_hal_never_reset_pin(&pin_GPIO31);
common_hal_never_reset_pin(&pin_GPIO32);
common_hal_never_reset_pin(&pin_GPIO33);
common_hal_never_reset_pin(&pin_GPIO34);
common_hal_never_reset_pin(&pin_GPIO35);
common_hal_never_reset_pin(&pin_GPIO36);
common_hal_never_reset_pin(&pin_GPIO37);
}
bool board_requests_safe_mode(void) {

13
ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/board.c
View File

@ -29,24 +29,11 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
// SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26);
common_hal_never_reset_pin(&pin_GPIO27);
common_hal_never_reset_pin(&pin_GPIO28);
common_hal_never_reset_pin(&pin_GPIO29);
common_hal_never_reset_pin(&pin_GPIO30);
common_hal_never_reset_pin(&pin_GPIO31);
common_hal_never_reset_pin(&pin_GPIO32);
}
bool board_requests_safe_mode(void) {

13
ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/board.c
View File

@ -29,24 +29,11 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
// SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26);
common_hal_never_reset_pin(&pin_GPIO27);
common_hal_never_reset_pin(&pin_GPIO28);
common_hal_never_reset_pin(&pin_GPIO29);
common_hal_never_reset_pin(&pin_GPIO30);
common_hal_never_reset_pin(&pin_GPIO31);
common_hal_never_reset_pin(&pin_GPIO32);
}
bool board_requests_safe_mode(void) {

19
ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/board.c
View File

@ -29,30 +29,11 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
// SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26);
common_hal_never_reset_pin(&pin_GPIO27);
common_hal_never_reset_pin(&pin_GPIO28);
common_hal_never_reset_pin(&pin_GPIO29);
common_hal_never_reset_pin(&pin_GPIO30);
common_hal_never_reset_pin(&pin_GPIO31);
common_hal_never_reset_pin(&pin_GPIO32);
common_hal_never_reset_pin(&pin_GPIO33);
common_hal_never_reset_pin(&pin_GPIO34);
common_hal_never_reset_pin(&pin_GPIO35);
common_hal_never_reset_pin(&pin_GPIO36);
common_hal_never_reset_pin(&pin_GPIO37);
}
bool board_requests_safe_mode(void) {

4
ports/espressif/boards/espressif_hmi_devkit_1/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);

4
ports/espressif/boards/espressif_kaluga_1.3/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

4
ports/espressif/boards/espressif_kaluga_1/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

4
ports/espressif/boards/espressif_saola_1_wroom/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

4
ports/espressif/boards/espressif_saola_1_wrover/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

4
ports/espressif/boards/franzininho_wifi_wroom/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

4
ports/espressif/boards/franzininho_wifi_wrover/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

4
ports/espressif/boards/gravitech_cucumber_m/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

4
ports/espressif/boards/gravitech_cucumber_ms/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

4
ports/espressif/boards/gravitech_cucumber_r/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

4
ports/espressif/boards/gravitech_cucumber_rs/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

4
ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/board.c
View File

@ -131,10 +131,6 @@ static void display_init(void) {
}
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

13
ports/espressif/boards/lolin_s2_mini/board.c
View File

@ -29,24 +29,11 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
// SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26);
common_hal_never_reset_pin(&pin_GPIO27);
common_hal_never_reset_pin(&pin_GPIO28);
common_hal_never_reset_pin(&pin_GPIO29);
common_hal_never_reset_pin(&pin_GPIO30);
common_hal_never_reset_pin(&pin_GPIO31);
common_hal_never_reset_pin(&pin_GPIO32);
}
bool board_requests_safe_mode(void) {

13
ports/espressif/boards/lolin_s2_pico/board.c
View File

@ -29,24 +29,11 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
// SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26);
common_hal_never_reset_pin(&pin_GPIO27);
common_hal_never_reset_pin(&pin_GPIO28);
common_hal_never_reset_pin(&pin_GPIO29);
common_hal_never_reset_pin(&pin_GPIO30);
common_hal_never_reset_pin(&pin_GPIO31);
common_hal_never_reset_pin(&pin_GPIO32);
}
bool board_requests_safe_mode(void) {

13
ports/espressif/boards/microdev_micro_c3/board.c
View File

@ -28,24 +28,11 @@
#include "supervisor/board.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO18);
common_hal_never_reset_pin(&pin_GPIO19);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO20);
common_hal_never_reset_pin(&pin_GPIO21);
#endif
// SPI Flash
common_hal_never_reset_pin(&pin_GPIO11);
common_hal_never_reset_pin(&pin_GPIO12);
common_hal_never_reset_pin(&pin_GPIO13);
common_hal_never_reset_pin(&pin_GPIO14);
common_hal_never_reset_pin(&pin_GPIO15);
common_hal_never_reset_pin(&pin_GPIO16);
common_hal_never_reset_pin(&pin_GPIO17);
}
bool board_requests_safe_mode(void) {

13
ports/espressif/boards/microdev_micro_s2/board.c
View File

@ -29,24 +29,11 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif
// SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26);
common_hal_never_reset_pin(&pin_GPIO27);
common_hal_never_reset_pin(&pin_GPIO28);
common_hal_never_reset_pin(&pin_GPIO29);
common_hal_never_reset_pin(&pin_GPIO30);
common_hal_never_reset_pin(&pin_GPIO31);
common_hal_never_reset_pin(&pin_GPIO32);
}
bool board_requests_safe_mode(void) {

4
ports/espressif/boards/morpheans_morphesp-240/board.c
View File

@ -139,10 +139,6 @@ uint8_t display_init_sequence[] = {
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO6);

4
ports/espressif/boards/muselab_nanoesp32_s2_wroom/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

4
ports/espressif/boards/muselab_nanoesp32_s2_wrover/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

3
ports/espressif/boards/odt_pixelwing_esp32_s2/board.c
View File

@ -29,9 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
}
bool board_requests_safe_mode(void) {

4
ports/espressif/boards/targett_module_clip_wroom/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

4
ports/espressif/boards/targett_module_clip_wrover/board.c
View File

@ -29,10 +29,6 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);

13
ports/espressif/boards/unexpectedmaker_feathers2/board.c
View File

@ -29,24 +29,11 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
// SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26);
common_hal_never_reset_pin(&pin_GPIO27);
common_hal_never_reset_pin(&pin_GPIO28);
common_hal_never_reset_pin(&pin_GPIO29);
common_hal_never_reset_pin(&pin_GPIO30);
common_hal_never_reset_pin(&pin_GPIO31);
common_hal_never_reset_pin(&pin_GPIO32);
}
bool board_requests_safe_mode(void) {

13
ports/espressif/boards/unexpectedmaker_feathers2_neo/board.c
View File

@ -29,24 +29,11 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
// SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26);
common_hal_never_reset_pin(&pin_GPIO27);
common_hal_never_reset_pin(&pin_GPIO28);
common_hal_never_reset_pin(&pin_GPIO29);
common_hal_never_reset_pin(&pin_GPIO30);
common_hal_never_reset_pin(&pin_GPIO31);
common_hal_never_reset_pin(&pin_GPIO32);
}
bool board_requests_safe_mode(void) {

13
ports/espressif/boards/unexpectedmaker_feathers2_prerelease/board.c
View File

@ -29,24 +29,11 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
// SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26);
common_hal_never_reset_pin(&pin_GPIO27);
common_hal_never_reset_pin(&pin_GPIO28);
common_hal_never_reset_pin(&pin_GPIO29);
common_hal_never_reset_pin(&pin_GPIO30);
common_hal_never_reset_pin(&pin_GPIO31);
common_hal_never_reset_pin(&pin_GPIO32);
}
bool board_requests_safe_mode(void) {

13
ports/espressif/boards/unexpectedmaker_tinys2/board.c
View File

@ -29,24 +29,11 @@
#include "shared-bindings/microcontroller/Pin.h"
void board_init(void) {
// USB
common_hal_never_reset_pin(&pin_GPIO19);
common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
// SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26);
common_hal_never_reset_pin(&pin_GPIO27);
common_hal_never_reset_pin(&pin_GPIO28);
common_hal_never_reset_pin(&pin_GPIO29);
common_hal_never_reset_pin(&pin_GPIO30);
common_hal_never_reset_pin(&pin_GPIO31);
common_hal_never_reset_pin(&pin_GPIO32);
}
bool board_requests_safe_mode(void) {

41
ports/espressif/common-hal/microcontroller/Pin.c
View File

@ -50,6 +50,43 @@ void common_hal_never_reset_pin(const mcu_pin_obj_t *pin) {
never_reset_pin_number(pin->number);
}
STATIC void _reset_pin(gpio_num_t pin_number) {
#if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
// Never ever reset pins used for flash and RAM.
if (26 <= pin_number && pin_number <= 32) {
return;
}
#ifdef CONFIG_SPIRAM_MODE_OCT
// Octal DQ4-DQ7 and DQS/DM
if (33 <= pin_number && pin_number <= 37) {
return;
}
#endif
#if CIRCUITPY_USB
// Never reset USB pins.
if (pin_number == 19 || pin_number == 20) {
return;
}
#endif
#elif defined(CONFIG_IDF_TARGET_ESP32C3)
// Never ever reset pins used for flash and RAM.
if (11 <= pin_number && pin_number <= 17) {
return;
}
#endif
gpio_reset_pin(pin_number);
#ifdef DOUBLE_TAP_PIN
// Pull the double tap pin down so that resets come back to CircuitPython.
if (pin_number == DOUBLE_TAP_PIN->number) {
gpio_pullup_dis(pin_number);
gpio_pulldown_en(pin_number);
}
#endif
}
// Mark pin as free and return it to a quiescent state.
void reset_pin_number(gpio_num_t pin_number) {
if (pin_number == NO_PIN) {
@ -58,7 +95,7 @@ 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);
gpio_reset_pin(pin_number);
_reset_pin(pin_number);
}
void common_hal_mcu_pin_reset_number(uint8_t i) {
@ -79,7 +116,7 @@ void reset_all_pins(void) {
(never_reset_pins[i / 32] & (1 << i % 32)) != 0) {
continue;
}
gpio_reset_pin(i);
_reset_pin(i);
}
in_use[0] = never_reset_pins[0];
in_use[1] = never_reset_pins[1];

8
ports/espressif/esp-idf-config/sdkconfig-debug.defaults
View File

@ -1,17 +1,17 @@
#
# Bootloader config
#
# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE is not set
CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG=y
CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set
# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set
# end of Bootloader config
CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y
# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
#
# Compiler options
#
# CONFIG_COMPILER_OPTIMIZATION_SIZE is not set
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
# CONFIG_COMPILER_OPTIMIZATION_PERF is not set
# CONFIG_COMPILER_OPTIMIZATION_NONE is not set
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y