diff --git a/.vscode/launch.json b/.vscode/launch.json index 80ebdb8ab7..9ad160ec24 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,7 +12,7 @@ // uncomment args below to only debug a particular test //"args": ["--gtest_filter=etb.testTargetTpsIsFloatBug945"], "stopAtEntry": false, - "cwd": "${workspaceFolder}/unit_tests/build/", + "cwd": "${workspaceFolder}/unit_tests/", "environment": [], "externalConsole": false, "MIMode": "gdb", @@ -36,7 +36,7 @@ "name": "Debug F40x", "type": "cortex-debug", "request": "launch", - "cwd": "${workspaceFolder}", + "cwd": "${workspaceFolder}/firmware", "executable": "${workspaceRoot}/firmware/build/rusefi.elf", "device": "STM32F407V", "v1": false, @@ -49,7 +49,7 @@ "name": "Debug F42x", "type": "cortex-debug", "request": "launch", - "cwd": "${workspaceFolder}", + "cwd": "${workspaceFolder}/firmware", "executable": "${workspaceRoot}/firmware/build/rusefi.elf", "device": "STM32F429Z", "v1": false, @@ -62,7 +62,7 @@ "name": "Debug F7x6", "type": "cortex-debug", "request": "launch", - "cwd": "${workspaceFolder}", + "cwd": "${workspaceFolder}/firmware", "executable": "${workspaceRoot}/firmware/build/rusefi.elf", "device": "STM32F767V", "v1": false, @@ -75,7 +75,7 @@ "name": "Debug H743", "type": "cortex-debug", "request": "launch", - "cwd": "${workspaceFolder}", + "cwd": "${workspaceFolder}/firmware", "executable": "${workspaceRoot}/firmware/build/rusefi.elf", "device": "STM32H743V", "v1": false, diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 58c6f3b1ff..b23f2ef20e 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,6 +7,9 @@ "label": "Build Firmware (Frankenso/default)", "type": "shell", "command": "make -j12", + "windows": { + "command": "wsl bash -lc 'make -j12'" + }, "options": { "cwd": "${workspaceRoot}/firmware" }, @@ -20,6 +23,9 @@ "label": "Build Firmware (Proteus F4)", "type": "shell", "command": "make -j12 PROJECT_BOARD=proteus", + "windows": { + "command": "wsl bash -lc 'make -j12 PROJECT_BOARD=proteus'" + }, "options": { "cwd": "${workspaceRoot}/firmware" }, @@ -33,6 +39,9 @@ "label": "Build Firmware (Proteus F7)", "type": "shell", "command": "make -j16 PROJECT_BOARD=proteus PROJECT_CPU=ARCH_STM32F7", + "windows": { + "command": "wsl bash -lc 'make -j12 PROJECT_BOARD=proteus PROJECT_CPU=ARCH_STM32F7'" + }, "options": { "cwd": "${workspaceRoot}/firmware" }, @@ -46,6 +55,9 @@ "label": "Build Firmware (Proteus H7) EXPERIMENTAL", "type": "shell", "command": "make -j16 PROJECT_BOARD=proteus PROJECT_CPU=ARCH_STM32H7", + "windows": { + "command": "wsl bash -lc 'make -j12 PROJECT_BOARD=proteus PROJECT_CPU=ARCH_STM32H7'" + }, "options": { "cwd": "${workspaceRoot}/firmware" }, @@ -59,6 +71,9 @@ "label": "Build Firmware (hellen72)", "type": "shell", "command": "make -j16 PROJECT_BOARD=hellen/hellen72", + "windows": { + "command": "wsl bash -lc 'make -j12 PROJECT_BOARD=hellen/hellen72'" + }, "options": { "cwd": "${workspaceRoot}/firmware" }, @@ -72,6 +87,9 @@ "label": "Build Firmware (microRusEfi F4)", "type": "shell", "command": "make -j12 PROJECT_BOARD=microrusefi", + "windows": { + "command": "wsl bash -lc 'make -j12 PROJECT_BOARD=microrusefi'" + }, "options": { "cwd": "${workspaceRoot}/firmware" }, @@ -85,6 +103,9 @@ "label": "Build Firmware (microRusEfi F7)", "type": "shell", "command": "make -j12 PROJECT_BOARD=microrusefi PROJECT_CPU=ARCH_STM32F7", + "windows": { + "command": "wsl bash -lc 'make -j12 PROJECT_BOARD=microrusefi PROJECT_CPU=ARCH_STM32F7'" + }, "options": { "cwd": "${workspaceRoot}/firmware" }, @@ -98,6 +119,9 @@ "label": "Build Unit Tests", "type": "shell", "command": "make -j12", + "windows": { + "command": "wsl make -j12" + }, "options": { "cwd": "${workspaceRoot}/unit_tests" },