Use physical port if present on WSL2, otherwise via powershell

SmingHub · Jun 5, 2024 · d4c0231 · d4c0231
1 parent 90511f1
commit d4c0231
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/Sming/Components/terminal/component.mk b/Sming/Components/terminal/component.mk
@@ -17,11 +17,6 @@ endif
 CACHE_VARS		+= COM_OPTS KILL_TERM TERMINAL
 COM_OPTS		?= --raw --encoding ascii --rts 0 --dtr 0
 KILL_TERM		?= pkill -9 -f "$(COM_PORT) $(COM_SPEED_SERIAL)" || exit 0
-ifdef WSL_ROOT
-TERMINAL		?= powershell.exe -Command "python -m serial.tools.miniterm $(COM_OPTS) $(COM_PORT) $(COM_SPEED_SERIAL)"
-else
-TERMINAL		?= $(PYTHON) -m serial.tools.miniterm $(COM_OPTS) $(COM_PORT) $(COM_SPEED_SERIAL)
-endif
 
 
 ##@Tools
@@ -33,4 +28,10 @@ kill_term:
 
 .PHONY: terminal
 terminal: kill_term ##Open the serial terminal
+ifdef TERMINAL
 	$(TERMINAL)
+else ifeq ($(WSL_COMPORT_POWERSHELL),1)
+	powershell.exe -Command "python -m serial.tools.miniterm $(COM_OPTS) $(COM_PORT) $(COM_SPEED_SERIAL)"
+else
+	$(PYTHON) -m serial.tools.miniterm $(COM_OPTS) $(COM_PORT) $(COM_SPEED_SERIAL)
+endif
diff --git a/Sming/build.mk b/Sming/build.mk
@@ -94,6 +94,8 @@ else ifeq ($(UNAME), Linux)
  	ifdef WSL_DISTRO_NAME
         DEBUG_VARS += WSL_ROOT
         WSL_ROOT := //wsl$$/$(WSL_DISTRO_NAME)
+		# If serial device is available, use it directly, otherwise via powershell
+		WSL_COMPORT_POWERSHELL = $(if $(wildcard $(COM_PORT)),,1)
  	endif
 else ifeq ($(UNAME), Darwin)
  	#OS X

diff --git a/Sming/component.mk b/Sming/component.mk
@@ -128,9 +128,9 @@ flash: all kill_term ##Write the boot loader and all defined partition images
 	$(Q) $(call CheckPartitionChunks,$(FLASH_PARTITION_CHUNKS))
 	$(call WriteFlash,$(FLASH_BOOT_CHUNKS) $(FLASH_MAP_CHUNK) $(FLASH_PARTITION_CHUNKS))
 ifeq ($(ENABLE_GDB), 1)
-	$(GDB_CMDLINE)
+	$(MAKE) gdb
 else ifneq ($(SMING_ARCH),Host)
-	$(TERMINAL)
+	$(MAKE) terminal
 endif
 
 .PHONY: mergeflash

diff --git a/Sming/project.mk b/Sming/project.mk
@@ -589,7 +589,7 @@ TCP_SERIAL_REDIRECT = $(SMING_HOME)/../Tools/tcp_serial_redirect.py $(COM_PORT)
 .PHONY: tcp-serial-redirect
 tcp-serial-redirect: ##Redirect COM port to TCP port
 	$(info Starting serial redirector)
-ifdef WSL_ROOT
+ifeq ($(WSL_COMPORT_POWERSHELL),1)
 	$(Q) cmd.exe /c start /MIN python3 $(WSL_ROOT)/$(TCP_SERIAL_REDIRECT)
 else
 	$(Q) $(call DetachCommand,$(PYTHON) $(TCP_SERIAL_REDIRECT))