Gui: refactor text input module and fix debug on MacOS 12.3 (#1045)

* Gui: refactor text input module
* Gui: simplify TextInput input processing
* Gui: simplify TextInput consume flag processing
* Fix debug with gdb broken by MacOS 12.3

make/rules.mk

@@ -94,7 +94,7 @@ upload: $(OBJ_DIR)/upload
 
 .PHONY: debug
 debug: flash
-	arm-none-eabi-gdb-py \
+	$(GDB) \
 		-ex 'target extended-remote | openocd -c "gdb_port pipe" $(OPENOCD_OPTS)' \
 		-ex "set confirm off" \
 		-ex "source ../debug/FreeRTOS/FreeRTOS.py" \
@@ -105,7 +105,7 @@ debug: flash
 
 .PHONY: debug_other
 debug_other:
-	arm-none-eabi-gdb-py \
+	$(GDB) \
 		-ex 'target extended-remote | openocd -c "gdb_port pipe" $(OPENOCD_OPTS)' \
 		-ex "set confirm off" \
 		-ex "source ../debug/PyCortexMDebug/PyCortexMDebug.py" \
@@ -113,7 +113,7 @@ debug_other:
 
 .PHONY: blackmagic
 blackmagic:
-	arm-none-eabi-gdb-py \
+	$(GDB) \
 		-ex 'target extended-remote $(BLACKMAGIC)' \
 		-ex 'monitor swdp_scan' \
 		-ex 'monitor debug_bmp enable' \

make/toolchain.mk

@@ -1,3 +1,5 @@
+OS := $(shell uname -s)
+
 # Compiller 
 ifeq ($(TOOLCHAIN), arm)
 PREFIX = arm-none-eabi-
@@ -15,6 +17,12 @@ SZ	= $(PREFIX)size
 HEX	= $(CP) -O ihex
 BIN	= $(CP) -O binary -S
 
+ifeq ($(OS), Darwin)
+GDB	= gdb
+else 
+GDB	= $(PREFIX)gdb-py
+endif
+
 DEBUG ?= 1
 COMPACT ?= 0
 ifeq ($(DEBUG), 1)
@@ -27,4 +35,4 @@ endif
 
 CFLAGS		+= -fdata-sections -ffunction-sections -fno-math-errno -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)"
 CPPFLAGS	+= -fno-threadsafe-statics -fno-use-cxa-atexit -fno-exceptions -fno-rtti
-LDFLAGS		+= -Wl,-Map=$(OBJ_DIR)/$(PROJECT).map,--cref -Wl,--gc-sections -Wl,--undefined=uxTopUsedPriority -n
+LDFLAGS		+= -Wl,-Map=$(OBJ_DIR)/$(PROJECT).map,--cref -Wl,--gc-sections -Wl,--undefined=uxTopUsedPriority -n