From ea3dfa444ac7bf7b687065e609988c96dc376bae Mon Sep 17 00:00:00 2001 From: lady ada Date: Fri, 8 Apr 2022 16:39:47 -0400 Subject: [PATCH 1/8] msys at least breaks elsewhere now --- py/makeversionhdr.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py index da6f7c9f59..84bba402d9 100644 --- a/py/makeversionhdr.py +++ b/py/makeversionhdr.py @@ -22,13 +22,14 @@ def get_version_info_from_git(): [tools_describe], stderr=subprocess.STDOUT, universal_newlines=True, + shell=True ).strip() except subprocess.CalledProcessError as er: if er.returncode == 128: # git exit code of 128 means no repository found return None git_tag = "" - except OSError: + except OSError as e: return None try: git_hash = subprocess.check_output( From 1f3dadcbb9a135c4d4348cc85da8af140ac79d43 Mon Sep 17 00:00:00 2001 From: lady ada Date: Fri, 8 Apr 2022 16:43:15 -0400 Subject: [PATCH 2/8] ok other waythen --- py/makeversionhdr.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py index 84bba402d9..e4ddf9fa1e 100644 --- a/py/makeversionhdr.py +++ b/py/makeversionhdr.py @@ -19,10 +19,7 @@ def get_version_info_from_git(): # Note: git describe doesn't work if no tag is available try: git_tag = subprocess.check_output( - [tools_describe], - stderr=subprocess.STDOUT, - universal_newlines=True, - shell=True + [tools_describe], stderr=subprocess.STDOUT, universal_newlines=True, shell=True ).strip() except subprocess.CalledProcessError as er: if er.returncode == 128: From d3a989f27479bf148eae17221254c0557d090fb6 Mon Sep 17 00:00:00 2001 From: lady ada Date: Fri, 8 Apr 2022 16:55:49 -0400 Subject: [PATCH 3/8] not sure why this changed...but it changed in mingw64? --- mpy-cross/mpy-cross.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpy-cross/mpy-cross.mk b/mpy-cross/mpy-cross.mk index 642fe9b5aa..a975f8253b 100644 --- a/mpy-cross/mpy-cross.mk +++ b/mpy-cross/mpy-cross.mk @@ -8,7 +8,7 @@ include ../py/mkenv.mk ifeq ($(OS),Windows_NT) # Detect a MINGW32 build, and change the name of the final executable. -PROG ?= mpy-cross.exe +PROG ?= mpy-cross else PROG ?= mpy-cross endif From f7b3247deb4196f809f3d8f9a7cdaf214074bb0f Mon Sep 17 00:00:00 2001 From: lady ada Date: Fri, 8 Apr 2022 17:44:28 -0400 Subject: [PATCH 4/8] fix paths with ('s or spaces --- ports/espressif/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index 96360d06bd..214b9251e7 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -310,7 +310,7 @@ $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -DESP32 SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_MOD) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) # IDF build commands -IDF_PATH = $(realpath ./esp-idf) +IDF_PATH = "$(realpath ./esp-idf)" # create the directory $(BUILD)/esp-idf: $(Q)$(MKDIR) -p $@ From 3c70aa8845707cca98112d70f36c18f42ced8ceb Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 9 Apr 2022 08:49:26 -0500 Subject: [PATCH 5/8] Revert "fix paths with ('s or spaces" This reverts commit f7b3247deb4196f809f3d8f9a7cdaf214074bb0f. --- ports/espressif/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index 214b9251e7..96360d06bd 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -310,7 +310,7 @@ $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -DESP32 SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_MOD) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED) # IDF build commands -IDF_PATH = "$(realpath ./esp-idf)" +IDF_PATH = $(realpath ./esp-idf) # create the directory $(BUILD)/esp-idf: $(Q)$(MKDIR) -p $@ From b5ab73b111ab790c7c7382317a881c0c9cbb1bd7 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 9 Apr 2022 09:55:10 -0500 Subject: [PATCH 6/8] whole conditional block no longer needed --- mpy-cross/mpy-cross.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mpy-cross/mpy-cross.mk b/mpy-cross/mpy-cross.mk index a975f8253b..825566efec 100644 --- a/mpy-cross/mpy-cross.mk +++ b/mpy-cross/mpy-cross.mk @@ -6,12 +6,7 @@ include ../py/mkenv.mk # define main target -ifeq ($(OS),Windows_NT) -# Detect a MINGW32 build, and change the name of the final executable. PROG ?= mpy-cross -else -PROG ?= mpy-cross -endif # qstr definitions (must come before including py.mk) QSTR_DEFS = qstrdefsport.h From a9713b773f9d832dce918a3107aa7a5deee39715 Mon Sep 17 00:00:00 2001 From: lady ada Date: Sat, 9 Apr 2022 11:34:04 -0400 Subject: [PATCH 7/8] try reducing freq --- ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c index 74187899ef..d4debd6287 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c @@ -81,7 +81,7 @@ void board_init(void) { &pin_GPIO39, // DC &pin_GPIO7, // CS &pin_GPIO40, // RST - 40000000, // baudrate + 10000000, // baudrate 0, // polarity 0 // phase ); From e5a613ba136e3cee198ac22d916c659d51daa395 Mon Sep 17 00:00:00 2001 From: lady ada Date: Sat, 9 Apr 2022 11:39:09 -0400 Subject: [PATCH 8/8] Revert "try reducing freq" This reverts commit a9713b773f9d832dce918a3107aa7a5deee39715. --- ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c index d4debd6287..74187899ef 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c @@ -81,7 +81,7 @@ void board_init(void) { &pin_GPIO39, // DC &pin_GPIO7, // CS &pin_GPIO40, // RST - 10000000, // baudrate + 40000000, // baudrate 0, // polarity 0 // phase );