From ed0cb248e9a002ce0bdd08243f223e48c0288f96 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 12 Jan 2021 16:04:29 -0600 Subject: [PATCH 1/2] esp32s2: Fix 'make flash' As reported by @jerryneedell, this change was incorrect; the given ESPTOOL_FLAGS caused `write_flash` to be repeated twice, which doesn't work. Closes #3981. --- ports/esp32s2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile index 9827b555c5..aac9347824 100644 --- a/ports/esp32s2/Makefile +++ b/ports/esp32s2/Makefile @@ -299,7 +299,7 @@ ESP_AUTOGEN_LD = $(BUILD)/esp-idf/esp-idf/esp32s2/esp32s2_out.ld $(BUILD)/esp-id FLASH_FLAGS = --flash_mode $(CIRCUITPY_ESP_FLASH_MODE) --flash_freq $(CIRCUITPY_ESP_FLASH_FREQ) --flash_size $(CIRCUITPY_ESP_FLASH_SIZE) -ESPTOOL_FLAGS ?= -b 460800 --before=default_reset --after=no_reset write_flash +ESPTOOL_FLAGS ?= -b 460800 --before=default_reset --after=no_reset all: $(BUILD)/firmware.bin $(BUILD)/firmware.uf2 From f95d10b2a66d69aeaea02ff778fde0d92400fffc Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 12 Jan 2021 16:30:20 -0600 Subject: [PATCH 2/2] make translate --- locale/circuitpython.pot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index e8ac7512aa..82058a6110 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -3455,6 +3455,8 @@ msgstr "" msgid "pow() with 3 arguments requires integers" msgstr "" +#: ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h +#: ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h #: ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h #: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h