rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make things happy (#2662)

This commit is contained in:
Matthew Kennedy 2021-05-09 06:17:44 -07:00 committed by GitHub
parent 642e95d04c
commit 1f0983c2ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.vscode/launch.json vendored
View File

@ -12,7 +12,7 @@
// uncomment args below to only debug a particular test // uncomment args below to only debug a particular test
//"args": ["--gtest_filter=etb.testTargetTpsIsFloatBug945"], //"args": ["--gtest_filter=etb.testTargetTpsIsFloatBug945"],
"stopAtEntry": false, "stopAtEntry": false,
"cwd": "${workspaceFolder}/unit_tests/build/", "cwd": "${workspaceFolder}/unit_tests/",
"environment": [], "environment": [],
"externalConsole": false, "externalConsole": false,
"MIMode": "gdb", "MIMode": "gdb",
@ -36,7 +36,7 @@
"name": "Debug F40x", "name": "Debug F40x",
"type": "cortex-debug", "type": "cortex-debug",
"request": "launch", "request": "launch",
"cwd": "${workspaceFolder}", "cwd": "${workspaceFolder}/firmware",
"executable": "${workspaceRoot}/firmware/build/rusefi.elf", "executable": "${workspaceRoot}/firmware/build/rusefi.elf",
"device": "STM32F407V", "device": "STM32F407V",
"v1": false, "v1": false,
@ -49,7 +49,7 @@
"name": "Debug F42x", "name": "Debug F42x",
"type": "cortex-debug", "type": "cortex-debug",
"request": "launch", "request": "launch",
"cwd": "${workspaceFolder}", "cwd": "${workspaceFolder}/firmware",
"executable": "${workspaceRoot}/firmware/build/rusefi.elf", "executable": "${workspaceRoot}/firmware/build/rusefi.elf",
"device": "STM32F429Z", "device": "STM32F429Z",
"v1": false, "v1": false,
@ -62,7 +62,7 @@
"name": "Debug F7x6", "name": "Debug F7x6",
"type": "cortex-debug", "type": "cortex-debug",
"request": "launch", "request": "launch",
"cwd": "${workspaceFolder}", "cwd": "${workspaceFolder}/firmware",
"executable": "${workspaceRoot}/firmware/build/rusefi.elf", "executable": "${workspaceRoot}/firmware/build/rusefi.elf",
"device": "STM32F767V", "device": "STM32F767V",
"v1": false, "v1": false,
@ -75,7 +75,7 @@
"name": "Debug H743", "name": "Debug H743",
"type": "cortex-debug", "type": "cortex-debug",
"request": "launch", "request": "launch",
"cwd": "${workspaceFolder}", "cwd": "${workspaceFolder}/firmware",
"executable": "${workspaceRoot}/firmware/build/rusefi.elf", "executable": "${workspaceRoot}/firmware/build/rusefi.elf",
"device": "STM32H743V", "device": "STM32H743V",
"v1": false, "v1": false,

24
.vscode/tasks.json vendored
View File

@ -7,6 +7,9 @@
"label": "Build Firmware (Frankenso/default)", "label": "Build Firmware (Frankenso/default)",
"type": "shell", "type": "shell",
"command": "make -j12", "command": "make -j12",
"windows": {
"command": "wsl bash -lc 'make -j12'"
},
"options": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
@ -20,6 +23,9 @@
"label": "Build Firmware (Proteus F4)", "label": "Build Firmware (Proteus F4)",
"type": "shell", "type": "shell",
"command": "make -j12 PROJECT_BOARD=proteus", "command": "make -j12 PROJECT_BOARD=proteus",
"windows": {
"command": "wsl bash -lc 'make -j12 PROJECT_BOARD=proteus'"
},
"options": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
@ -33,6 +39,9 @@
"label": "Build Firmware (Proteus F7)", "label": "Build Firmware (Proteus F7)",
"type": "shell", "type": "shell",
"command": "make -j16 PROJECT_BOARD=proteus PROJECT_CPU=ARCH_STM32F7", "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": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
@ -46,6 +55,9 @@
"label": "Build Firmware (Proteus H7) EXPERIMENTAL", "label": "Build Firmware (Proteus H7) EXPERIMENTAL",
"type": "shell", "type": "shell",
"command": "make -j16 PROJECT_BOARD=proteus PROJECT_CPU=ARCH_STM32H7", "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": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
@ -59,6 +71,9 @@
"label": "Build Firmware (hellen72)", "label": "Build Firmware (hellen72)",
"type": "shell", "type": "shell",
"command": "make -j16 PROJECT_BOARD=hellen/hellen72", "command": "make -j16 PROJECT_BOARD=hellen/hellen72",
"windows": {
"command": "wsl bash -lc 'make -j12 PROJECT_BOARD=hellen/hellen72'"
},
"options": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
@ -72,6 +87,9 @@
"label": "Build Firmware (microRusEfi F4)", "label": "Build Firmware (microRusEfi F4)",
"type": "shell", "type": "shell",
"command": "make -j12 PROJECT_BOARD=microrusefi", "command": "make -j12 PROJECT_BOARD=microrusefi",
"windows": {
"command": "wsl bash -lc 'make -j12 PROJECT_BOARD=microrusefi'"
},
"options": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
@ -85,6 +103,9 @@
"label": "Build Firmware (microRusEfi F7)", "label": "Build Firmware (microRusEfi F7)",
"type": "shell", "type": "shell",
"command": "make -j12 PROJECT_BOARD=microrusefi PROJECT_CPU=ARCH_STM32F7", "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": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
@ -98,6 +119,9 @@
"label": "Build Unit Tests", "label": "Build Unit Tests",
"type": "shell", "type": "shell",
"command": "make -j12", "command": "make -j12",
"windows": {
"command": "wsl make -j12"
},
"options": { "options": {
"cwd": "${workspaceRoot}/unit_tests" "cwd": "${workspaceRoot}/unit_tests"
}, },