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

Merge pull request #3817 from BennyE/reserve-pins-only-for-debug 

esp32s2: Reserve UART pins only if DEBUG=1 is set to address issue 3811
This commit is contained in:
Scott Shawcroft 2020-12-14 17:32:17 -08:00 committed by GitHub
parent a1f773d9ed 81c4871fdf
commit d6ee17c6fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/esp32s2/Makefile
View File

@ -118,7 +118,7 @@ CFLAGS += -DSTACK_CANARY_VALUE=0xa5a5a5a5
#Debugging/Optimization #Debugging/Optimization
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
CFLAGS += -ggdb CFLAGS += -DDEBUG -ggdb
OPTIMIZATION_FLAGS ?= -Og OPTIMIZATION_FLAGS ?= -Og
# You may want to enable these flags to make setting breakpoints easier. # You may want to enable these flags to make setting breakpoints easier.
# CFLAGS += -fno-inline -fno-ipa-sra # CFLAGS += -fno-inline -fno-ipa-sra

2
ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/board.c
View File

@ -115,8 +115,10 @@ void board_init(void) {
common_hal_never_reset_pin(&pin_GPIO20); common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART // Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43); common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44); common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
busio_spi_obj_t* spi = &displays[0].fourwire_bus.inline_bus; busio_spi_obj_t* spi = &displays[0].fourwire_bus.inline_bus;
common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL); common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL);

2
ports/esp32s2/boards/electroniccats_bastwifi/board.c
View File

@ -34,8 +34,10 @@ void board_init(void) {
common_hal_never_reset_pin(&pin_GPIO20); common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART // Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43); common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44); common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
} }
bool board_requests_safe_mode(void) { bool board_requests_safe_mode(void) {

2
ports/esp32s2/boards/espressif_kaluga_1/board.c
View File

@ -34,8 +34,10 @@ void board_init(void) {
common_hal_never_reset_pin(&pin_GPIO20); common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART // Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43); common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44); common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
} }
bool board_requests_safe_mode(void) { bool board_requests_safe_mode(void) {

2
ports/esp32s2/boards/espressif_saola_1_wroom/board.c
View File

@ -34,8 +34,10 @@ void board_init(void) {
common_hal_never_reset_pin(&pin_GPIO20); common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART // Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43); common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44); common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
} }
bool board_requests_safe_mode(void) { bool board_requests_safe_mode(void) {

2
ports/esp32s2/boards/espressif_saola_1_wrover/board.c
View File

@ -34,8 +34,10 @@ void board_init(void) {
common_hal_never_reset_pin(&pin_GPIO20); common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART // Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43); common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44); common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
} }
bool board_requests_safe_mode(void) { bool board_requests_safe_mode(void) {

2
ports/esp32s2/boards/microdev_micro_s2/board.c
View File

@ -34,8 +34,10 @@ void board_init(void) {
common_hal_never_reset_pin(&pin_GPIO20); common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART // Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43); common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44); common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
// SPI Flash and RAM // SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26); common_hal_never_reset_pin(&pin_GPIO26);

2
ports/esp32s2/boards/muselab_nanoesp32_s2/board.c
View File

@ -34,8 +34,10 @@ void board_init(void) {
common_hal_never_reset_pin(&pin_GPIO20); common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART // Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43); common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44); common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
} }
bool board_requests_safe_mode(void) { bool board_requests_safe_mode(void) {

2
ports/esp32s2/boards/targett_module_clip_wroom/board.c
View File

@ -34,8 +34,10 @@ void board_init(void) {
common_hal_never_reset_pin(&pin_GPIO20); common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART // Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43); common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44); common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
// Crystal // Crystal
common_hal_never_reset_pin(&pin_GPIO15); common_hal_never_reset_pin(&pin_GPIO15);

2
ports/esp32s2/boards/targett_module_clip_wrover/board.c
View File

@ -34,8 +34,10 @@ void board_init(void) {
common_hal_never_reset_pin(&pin_GPIO20); common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART // Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43); common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44); common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
//Crystal //Crystal
common_hal_never_reset_pin(&pin_GPIO15); common_hal_never_reset_pin(&pin_GPIO15);

2
ports/esp32s2/boards/unexpectedmaker_feathers2/board.c
View File

@ -34,8 +34,10 @@ void board_init(void) {
common_hal_never_reset_pin(&pin_GPIO20); common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART // Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43); common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44); common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
// SPI Flash and RAM // SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26); common_hal_never_reset_pin(&pin_GPIO26);

2
ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/board.c
View File

@ -34,8 +34,10 @@ void board_init(void) {
common_hal_never_reset_pin(&pin_GPIO20); common_hal_never_reset_pin(&pin_GPIO20);
// Debug UART // Debug UART
#ifdef DEBUG
common_hal_never_reset_pin(&pin_GPIO43); common_hal_never_reset_pin(&pin_GPIO43);
common_hal_never_reset_pin(&pin_GPIO44); common_hal_never_reset_pin(&pin_GPIO44);
#endif /* DEBUG */
// SPI Flash and RAM // SPI Flash and RAM
common_hal_never_reset_pin(&pin_GPIO26); common_hal_never_reset_pin(&pin_GPIO26);