From d9a863370004c5be0b030b199bbbf06fb217f6ac Mon Sep 17 00:00:00 2001 From: cmidgley Date: Fri, 5 Jul 2024 18:57:48 -0400 Subject: [PATCH 1/5] Support env var XSBUG_PORT on xsbug-log.js --- tools/xsbug-log/xsbug-log.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xsbug-log/xsbug-log.js b/tools/xsbug-log/xsbug-log.js index f0679b2cfd..d3c33775af 100644 --- a/tools/xsbug-log/xsbug-log.js +++ b/tools/xsbug-log/xsbug-log.js @@ -70,7 +70,7 @@ class LogMachine extends Machine { } } -const portIn = 5002; +const portIn = process.env.XSBUG_PORT ?? 5002; let connections = 0; let autoexit = false; From 342e623eb0066ecf7ca9b241f5bbf325f318c3aa Mon Sep 17 00:00:00 2001 From: cmidgley Date: Sat, 6 Jul 2024 06:33:18 -0400 Subject: [PATCH 2/5] Set XSBUG_PORT/XSBUG_HOST for simulator on Windows --- tools/mcconfig/nmake.win.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/mcconfig/nmake.win.mk b/tools/mcconfig/nmake.win.mk index eaf9835549..91998313cc 100644 --- a/tools/mcconfig/nmake.win.mk +++ b/tools/mcconfig/nmake.win.mk @@ -33,8 +33,15 @@ START_XSBUG = tasklist /nh /fi "imagename eq xsbug.exe" | find /i "xsbug.exe" > START_XSBUG = !ENDIF +!IFNDEF XSBUG_PORT +XSBUG_PORT = 5002 +!ENDIF +!IFNDEF XSBUG_HOST +XSBUG_HOST = localhost +!ENDIF + !IF "$(XSBUG_LOG)"=="1" -START_COMMAND = cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll +START_COMMAND = cmd /c "set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll" !ELSE START_COMMAND = start $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll !ENDIF From 33816106fce104a82aab091411bfc11ca06502a9 Mon Sep 17 00:00:00 2001 From: cmidgley Date: Sat, 6 Jul 2024 09:14:31 -0400 Subject: [PATCH 3/5] Remove kill serial2xsbug / start xsbug from prepare --- tools/mcconfig/nmake.esp32.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/mcconfig/nmake.esp32.mk b/tools/mcconfig/nmake.esp32.mk index 4207fbba38..a0b0c2d0c5 100644 --- a/tools/mcconfig/nmake.esp32.mk +++ b/tools/mcconfig/nmake.esp32.mk @@ -510,8 +510,6 @@ release: precursor python %IDF_PATH%\tools\idf.py $(IDF_PY_LOG_FLAG) $(PORT_COMMAND) -b $(UPLOAD_SPEED) monitor prepare: - $(KILL_SERIAL2XSBUG) - $(START_XSBUG) if exist $(BLD_DIR)\xs_esp32.elf del $(BLD_DIR)\xs_esp32.elf if not exist $(BLD_DIR) mkdir $(BLD_DIR) copy $(BIN_DIR)\xs_$(ESP32_SUBCLASS).a $(BLD_DIR)\. From 5729d2119a063921e1190a48565db3eb789509b4 Mon Sep 17 00:00:00 2001 From: cmidgley Date: Tue, 24 Sep 2024 18:36:22 -0400 Subject: [PATCH 4/5] Merged localhost launch xsbug logic --- tools/mcconfig/nmake.win.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/mcconfig/nmake.win.mk b/tools/mcconfig/nmake.win.mk index fce0c6349e..a37ea37e43 100644 --- a/tools/mcconfig/nmake.win.mk +++ b/tools/mcconfig/nmake.win.mk @@ -23,11 +23,16 @@ !CMDSWITCHES +S !ENDIF + !IF "$(DEBUG)"=="1" !IF "$(XSBUG_LOG)"=="1" START_XSBUG = !ELSE +!IF "$(XSBUG_HOST)"=="localhost" START_XSBUG = tasklist /nh /fi "imagename eq xsbug.exe" | find /i "xsbug.exe" > nul || (start $(BUILD_DIR)\bin\win\release\xsbug.exe) +!ELSE +START_XSBUG = echo "mcconfig -x" is remote ($(XSBUG_HOST):$(XSBUG_PORT)), not starting xsbug +!ENDIF !ENDIF !ELSE START_XSBUG = @@ -41,9 +46,13 @@ XSBUG_HOST = localhost !ENDIF !IF "$(XSBUG_LOG)"=="1" +!IF "$(XSBUG_HOST)"=="localhost" START_COMMAND = cmd /c "set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll" !ELSE -START_COMMAND = start $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll +START_COMMAND = cmd /c "set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && start $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll" +!ENDIF +!ELSE +START_COMMAND = cmd /c "set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && start $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll" !ENDIF KILL_COMMAND = taskkill /im mcsim.exe /F 2> nul || (call ) From 6453ba72c4381c410f919fccbac7a7c730055f47 Mon Sep 17 00:00:00 2001 From: cmidgley Date: Tue, 6 May 2025 15:30:33 -0400 Subject: [PATCH 5/5] Use XSBUG_LOG_PORT for the xsbug-log listening port --- tools/mcconfig/make.esp.mk | 5 +++-- tools/mcconfig/make.esp32.mk | 3 ++- tools/mcconfig/make.lin.mk | 3 ++- tools/mcconfig/make.mac.mk | 3 ++- tools/mcconfig/make.nrf52.mk | 4 ++-- tools/mcconfig/make.pico.mk | 3 ++- tools/mcconfig/nmake.esp.mk | 2 +- tools/mcconfig/nmake.esp32.mk | 4 ++-- tools/mcconfig/nmake.nrf52.mk | 2 +- tools/mcconfig/nmake.win.mk | 5 ++++- tools/xsbug-log/xsbug-log.js | 2 +- 11 files changed, 22 insertions(+), 14 deletions(-) diff --git a/tools/mcconfig/make.esp.mk b/tools/mcconfig/make.esp.mk index 1681da85dd..259edc109b 100644 --- a/tools/mcconfig/make.esp.mk +++ b/tools/mcconfig/make.esp.mk @@ -79,6 +79,7 @@ DEBUG_IP ?= # xsbug defaults XSBUG_HOST ?= localhost XSBUG_PORT ?= 5002 +XSBUG_LOG_PORT ?= 5002 NEWLIBC_PATH = $(ESPRESSIF_SDK_ROOT)/components/newlib/newlib/lib/libc.a @@ -286,7 +287,7 @@ ifeq ($(DEBUG),1) START_XSBUG = ifeq ($(HOST_OS),Darwin) ifeq ("$(XSBUG_LAUNCH)","log") - CONNECT_XSBUG = export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(LOG_LAUNCH) serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 -elf $(TMP_DIR)/main.elf -bin $(TOOLS_BIN) + CONNECT_XSBUG = export XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(LOG_LAUNCH) serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 -elf $(TMP_DIR)/main.elf -bin $(TOOLS_BIN) else CONNECT_XSBUG = export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 -elf $(TMP_DIR)/main.elf -bin $(TOOLS_BIN) ifeq ("$(XSBUG_LAUNCH)","app") @@ -295,7 +296,7 @@ ifeq ($(DEBUG),1) endif else ifeq ("$(XSBUG_LAUNCH)","log") - CONNECT_XSBUG = export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(LOG_LAUNCH) serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 + CONNECT_XSBUG = export XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(LOG_LAUNCH) serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 else CONNECT_XSBUG = export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 ifeq ("$(XSBUG_LAUNCH)","app") diff --git a/tools/mcconfig/make.esp32.mk b/tools/mcconfig/make.esp32.mk index c12595adfe..03c261ba2c 100644 --- a/tools/mcconfig/make.esp32.mk +++ b/tools/mcconfig/make.esp32.mk @@ -24,6 +24,7 @@ DEBUGGER_SPEED ?= 460800 XSBUG_HOST ?= localhost XSBUG_PORT ?= 5002 +XSBUG_LOG_PORT ?= 5002 USE_USB ?= 0 # USE_USB = 1 - TinyUSB - uses a custom VID/PID @@ -514,7 +515,7 @@ ifeq ($(DEBUG),1) ifeq ("$(XSBUG_LAUNCH)","log") DO_LAUNCH = echo ; echo $(BEFORE_DEBUGGING_MESSAGE); echo ; \ - XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) \ + XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) \ cd $(MODDABLE)/tools/xsbug-log && node xsbug-log \ serial2xsbug `cat $(PORT_NAME_PATH)` $(DEBUGGER_SPEED) 8N1 endif diff --git a/tools/mcconfig/make.lin.mk b/tools/mcconfig/make.lin.mk index fed6302919..7b154d2706 100644 --- a/tools/mcconfig/make.lin.mk +++ b/tools/mcconfig/make.lin.mk @@ -30,7 +30,7 @@ KILL_SIMULATOR = ifeq ($(DEBUG),1) ifeq ("$(XSBUG_LAUNCH)","log") # START_SIMULATOR = export DISPLAY=:0.0 && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)/mc.so - START_SIMULATOR = export DISPLAY=:2.0 && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)/mc.so + START_SIMULATOR = export DISPLAY=:2.0 && export XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)/mc.so else ifeq ("$(XSBUG_LAUNCH)","app") START_XSBUG = $(shell nohup $(BUILD_DIR)/bin/lin/release/xsbug > /dev/null 2>&1 &) @@ -146,6 +146,7 @@ VPATH += $(XS_DIRECTORIES) XSBUG_HOST ?= localhost XSBUG_PORT ?= 5002 +XSBUG_LOG_PORT ?= 5002 .PHONY: all build clean xsbug diff --git a/tools/mcconfig/make.mac.mk b/tools/mcconfig/make.mac.mk index 9775345671..ccf6749ef7 100644 --- a/tools/mcconfig/make.mac.mk +++ b/tools/mcconfig/make.mac.mk @@ -23,7 +23,7 @@ KILL_SIMULATOR = osascript -e 'quit app "mcsim"' ifeq ($(DEBUG),1) START_XSBUG = ifeq ("$(XSBUG_LAUNCH)","log") - START_SIMULATOR = export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log open -a $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)/mc.so + START_SIMULATOR = export XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log open -a $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)/mc.so else ifeq ("$(XSBUG_LAUNCH)","app") START_XSBUG = open -a $(BUILD_DIR)/bin/mac/release/xsbug.app -g endif @@ -129,6 +129,7 @@ VPATH += $(XS_DIRECTORIES) XSBUG_HOST ?= localhost XSBUG_PORT ?= 5002 +XSBUG_LOG_PORT ?= 5002 .PHONY: all build clean xsbug diff --git a/tools/mcconfig/make.nrf52.mk b/tools/mcconfig/make.nrf52.mk index ce6fd4d32c..14db5f0394 100644 --- a/tools/mcconfig/make.nrf52.mk +++ b/tools/mcconfig/make.nrf52.mk @@ -76,7 +76,7 @@ ifeq ($(HOST_OS),Darwin) UF2_VOLUME_PATH = /Volumes/$(UF2_VOLUME_NAME) SET_PROGRAMMING_MODE = $(PLATFORM_DIR)/config/programmingMode $(M4_VID) $(M4_PID) $(UF2_VOLUME_PATH) - START_NODE = cd $(MODDABLE)/tools/xsbug-log && XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) node xsbug-log + START_NODE = cd $(MODDABLE)/tools/xsbug-log && XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) node xsbug-log ifeq ($(USE_USB),1) START_SERIAL2XSBUG = serial2xsbug $(M4_VID):$(M4_PID) 921600 8N1 @@ -129,7 +129,7 @@ else else # not usb ifeq ($(XSBUG_LOG),1) - CONNECT_XSBUG = XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(MODDABLE_TOOLS_DIR)/serial2xsbug $(DEBUGGER_PORT) $(DEBUGGER_SPEED) 8N1 + CONNECT_XSBUG = XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) cd $(MODDABLE)/tools/xsbug-log && node xsbug-log $(MODDABLE_TOOLS_DIR)/serial2xsbug $(DEBUGGER_PORT) $(DEBUGGER_SPEED) 8N1 else CONNECT_XSBUG = XSBUG_PORT=$(XSBUG_PORT) XSBUG_HOST=$(XSBUG_HOST) $(MODDABLE_TOOLS_DIR)/serial2xsbug $(DEBUGGER_PORT) $(DEBUGGER_SPEED) 8N1 endif diff --git a/tools/mcconfig/make.pico.mk b/tools/mcconfig/make.pico.mk index 2cf3c45dcc..e08833d943 100644 --- a/tools/mcconfig/make.pico.mk +++ b/tools/mcconfig/make.pico.mk @@ -39,6 +39,7 @@ DEBUGGER_PORT ?= /dev/cu.SLAB_USBtoUART XSBUG_HOST ?= localhost XSBUG_PORT ?= 5002 +XSBUG_LOG_PORT ?= 5002 UF2_VOLUME_NAME ?= RPI-RP2 PICO_VID ?= 2e8a @@ -79,7 +80,7 @@ ifeq ($(HOST_OS),Darwin) ifeq ($(DEBUG),1) ifeq ("$(XSBUG_LAUNCH)","log") - CONNECT_XSBUG=@echo "Connect to xsbug-log @ $(PICO_VID):$(PICO_PID)." && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log serial2xsbug $(PICO_VID):$(PICO_PID) $(DEBUGGER_SPEED) 8N1 + CONNECT_XSBUG=@echo "Connect to xsbug-log @ $(PICO_VID):$(PICO_PID)." && export XSBUG_LOG_PORT=$(XSBUG_LOG_PORT) && export XSBUG_PORT=$(XSBUG_PORT) && export XSBUG_HOST=$(XSBUG_HOST) && cd $(MODDABLE)/tools/xsbug-log && node xsbug-log serial2xsbug $(PICO_VID):$(PICO_PID) $(DEBUGGER_SPEED) 8N1 else CONNECT_XSBUG=@echo "Connect to xsbug @ $(PICO_VID):$(PICO_PID)." ; export XSBUG_PORT=$(XSBUG_PORT) ; export XSBUG_HOST=$(XSBUG_HOST) ; serial2xsbug $(PICO_VID):$(PICO_PID) $(DEBUGGER_SPEED) 8N1 ifeq ("$(XSBUG_LAUNCH)","app") diff --git a/tools/mcconfig/nmake.esp.mk b/tools/mcconfig/nmake.esp.mk index 31737586da..64ebbf4384 100644 --- a/tools/mcconfig/nmake.esp.mk +++ b/tools/mcconfig/nmake.esp.mk @@ -55,7 +55,7 @@ UPLOAD_VERB = -v !ENDIF !IF "$(XSBUG_LOG)"=="1" -START_SERIAL2XSBUG= echo "Starting serial2xsbug..." && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log $(BUILD_DIR)\bin\win\release\serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 -elf $(TMP_DIR)\main.elf +START_SERIAL2XSBUG= echo "Starting serial2xsbug..." && set "XSBUG_LOG_PORT=$(XSBUG_LOG_PORT)" && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log $(BUILD_DIR)\bin\win\release\serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 -elf $(TMP_DIR)\main.elf START_XSBUG= !ELSE START_SERIAL2XSBUG= echo "Starting serial2xsbug..." && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && $(BUILD_DIR)\bin\win\release\serial2xsbug $(UPLOAD_PORT) $(DEBUGGER_SPEED) 8N1 -elf $(TMP_DIR)\main.elf diff --git a/tools/mcconfig/nmake.esp32.mk b/tools/mcconfig/nmake.esp32.mk index cba5c158fe..df6494acb8 100644 --- a/tools/mcconfig/nmake.esp32.mk +++ b/tools/mcconfig/nmake.esp32.mk @@ -172,9 +172,9 @@ KILL_SERIAL2XSBUG= -tasklist /nh /fi "imagename eq serial2xsbug.exe" | (find /i !IF "$(XSBUG_LOG)"=="1" !IF "$(USE_USB)"=="0" -START_SERIAL2XSBUG = echo Launching app... & set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(BUILD_DIR)\bin\win\release\serial2xsbug $(PORT_TO_USE) $(DEBUGGER_SPEED) 8N1 +START_SERIAL2XSBUG = echo Launching app... && set "XSBUG_LOG_PORT=$(XSBUG_LOG_PORT)" && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(BUILD_DIR)\bin\win\release\serial2xsbug $(PORT_TO_USE) $(DEBUGGER_SPEED) 8N1 !ELSE -START_SERIAL2XSBUG = echo Launching app... && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(BUILD_DIR)\bin\win\release\serial2xsbug $(USB_VENDOR_ID):$(USB_PRODUCT_ID) $(DEBUGGER_SPEED) 8N1 +START_SERIAL2XSBUG = echo Launching app... && set "XSBUG_LOG_PORT=$(XSBUG_LOG_PORT)" && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(BUILD_DIR)\bin\win\release\serial2xsbug $(USB_VENDOR_ID):$(USB_PRODUCT_ID) $(DEBUGGER_SPEED) 8N1 !ENDIF START_XSBUG = !ENDIF diff --git a/tools/mcconfig/nmake.nrf52.mk b/tools/mcconfig/nmake.nrf52.mk index 1eecb8a473..dffc5dc64c 100644 --- a/tools/mcconfig/nmake.nrf52.mk +++ b/tools/mcconfig/nmake.nrf52.mk @@ -108,7 +108,7 @@ WAIT_FOR_NEW_SERIAL = $(PLATFORM_DIR)\config\waitForNewSerialWindows.bat 1 $(UF2 NORESTART = !IF "$(XSBUG_LOG)"=="1" DO_XSBUG = -SERIAL_2_XSBUG = echo Starting serial2xsbug. Type Ctrl-C twice after debugging app. && cd $(MODDABLE)\tools\xsbug-log && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && node xsbug-log start /B $(MODDABLE_TOOLS_DIR)\serial2xsbug $(M4_VID):$(M4_PID) $(DEBUGGER_SPEED) 8N1 +SERIAL_2_XSBUG = echo Starting serial2xsbug. Type Ctrl-C twice after debugging app. && cd $(MODDABLE)\tools\xsbug-log && set "XSBUG_LOG_PORT=$(XSBUG_LOG_PORT)" && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && node xsbug-log start /B $(MODDABLE_TOOLS_DIR)\serial2xsbug $(M4_VID):$(M4_PID) $(DEBUGGER_SPEED) 8N1 !ELSE DO_XSBUG = tasklist /nh /fi "imagename eq xsbug.exe" | find /i "xsbug.exe" > nul || (start $(MODDABLE_TOOLS_DIR)\xsbug.exe) SERIAL_2_XSBUG = echo Starting serial2xsbug. Type Ctrl-C twice after debugging app. && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && $(MODDABLE_TOOLS_DIR)\serial2xsbug $(M4_VID):$(M4_PID) $(DEBUGGER_SPEED) 8N1 -dtr diff --git a/tools/mcconfig/nmake.win.mk b/tools/mcconfig/nmake.win.mk index a37ea37e43..c8fff7691a 100644 --- a/tools/mcconfig/nmake.win.mk +++ b/tools/mcconfig/nmake.win.mk @@ -41,13 +41,16 @@ START_XSBUG = !IFNDEF XSBUG_PORT XSBUG_PORT = 5002 !ENDIF +!IFNDEF XSBUG_LOG_PORT +XSBUG_LOG_PORT = 5002 +!ENDIF !IFNDEF XSBUG_HOST XSBUG_HOST = localhost !ENDIF !IF "$(XSBUG_LOG)"=="1" !IF "$(XSBUG_HOST)"=="localhost" -START_COMMAND = cmd /c "set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll" +START_COMMAND = cmd /c "set "XSBUG_LOG_PORT=$(XSBUG_LOG_PORT)" && set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && cd $(MODDABLE)\tools\xsbug-log && node xsbug-log start /B $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll" !ELSE START_COMMAND = cmd /c "set "XSBUG_PORT=$(XSBUG_PORT)" && set "XSBUG_HOST=$(XSBUG_HOST)" && start $(SIMULATOR) $(SIMULATORS) $(BIN_DIR)\mc.dll" !ENDIF diff --git a/tools/xsbug-log/xsbug-log.js b/tools/xsbug-log/xsbug-log.js index 3382c80f7b..b85baccc37 100644 --- a/tools/xsbug-log/xsbug-log.js +++ b/tools/xsbug-log/xsbug-log.js @@ -39,7 +39,7 @@ catch (e) { process.exit(); } -const portIn = process.env.XSBUG_PORT ?? 5002; +const portIn = process.env.XSBUG_LOG_PORT ?? 5002; let connections = 0; let autoexit = false;