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

simulator usability (#2794) 

* simulator

* simulator is debuggable

* s

* format
This commit is contained in:
Matthew Kennedy 2021-06-03 22:34:49 -07:00 committed by GitHub
parent 7cef936a6d
commit f3ff40724a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 173 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
.vscode/launch.json vendored
View File

@ -24,6 +24,24 @@
} }
] ]
}, },
{
"name": "Debug simulator (gdb)",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/simulator/build/rusefi_simulator",
"stopAtEntry": false,
"cwd": "${workspaceFolder}/simulator/",
"environment": [],
"externalConsole": false,
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
}
]
},
{ {
"name": "Debug Unit Tests (lldb)", "name": "Debug Unit Tests (lldb)",
"type": "lldb", "type": "lldb",
@ -33,56 +51,56 @@
"cwd": "${workspaceFolder}/unit_tests/build/", "cwd": "${workspaceFolder}/unit_tests/build/",
}, },
{ {
"name": "Debug F40x", "name": "Debug F40x",
"type": "cortex-debug", "type": "cortex-debug",
"request": "launch", "request": "launch",
"cwd": "${workspaceFolder}/firmware", "cwd": "${workspaceFolder}/firmware",
"executable": "${workspaceRoot}/firmware/build/rusefi.elf", "executable": "${workspaceRoot}/firmware/build/rusefi.elf",
"device": "STM32F407V", "device": "STM32F407V",
"v1": false, "v1": false,
"svdFile": "${workspaceRoot}/firmware/ext/cmsis-svd/data/STMicro/STM32F405.svd", "svdFile": "${workspaceRoot}/firmware/ext/cmsis-svd/data/STMicro/STM32F405.svd",
"servertype": "openocd", "servertype": "openocd",
"configFiles": ["interface/stlink.cfg", "target/stm32f4x.cfg"], "configFiles": ["interface/stlink.cfg", "target/stm32f4x.cfg"],
"runToMain": true "runToMain": true
}, },
{ {
"name": "Debug F42x", "name": "Debug F42x",
"type": "cortex-debug", "type": "cortex-debug",
"request": "launch", "request": "launch",
"cwd": "${workspaceFolder}/firmware", "cwd": "${workspaceFolder}/firmware",
"executable": "${workspaceRoot}/firmware/build/rusefi.elf", "executable": "${workspaceRoot}/firmware/build/rusefi.elf",
"device": "STM32F429Z", "device": "STM32F429Z",
"v1": false, "v1": false,
"svdFile": "${workspaceRoot}/firmware/ext/cmsis-svd/data/STMicro/STM32F427.svd", "svdFile": "${workspaceRoot}/firmware/ext/cmsis-svd/data/STMicro/STM32F427.svd",
"servertype": "openocd", "servertype": "openocd",
"configFiles": ["interface/stlink.cfg", "target/stm32f4x.cfg"], "configFiles": ["interface/stlink.cfg", "target/stm32f4x.cfg"],
"runToMain": true "runToMain": true
}, },
{ {
"name": "Debug F7x6", "name": "Debug F7x6",
"type": "cortex-debug", "type": "cortex-debug",
"request": "launch", "request": "launch",
"cwd": "${workspaceFolder}/firmware", "cwd": "${workspaceFolder}/firmware",
"executable": "${workspaceRoot}/firmware/build/rusefi.elf", "executable": "${workspaceRoot}/firmware/build/rusefi.elf",
"device": "STM32F767V", "device": "STM32F767V",
"v1": false, "v1": false,
"svdFile": "${workspaceRoot}/firmware/ext/cmsis-svd/data/STMicro/STM32F7x7.svd", "svdFile": "${workspaceRoot}/firmware/ext/cmsis-svd/data/STMicro/STM32F7x7.svd",
"servertype": "openocd", "servertype": "openocd",
"configFiles": ["interface/stlink.cfg", "target/stm32f7x.cfg"], "configFiles": ["interface/stlink.cfg", "target/stm32f7x.cfg"],
"runToMain": true "runToMain": true
}, },
{ {
"name": "Debug H743", "name": "Debug H743",
"type": "cortex-debug", "type": "cortex-debug",
"request": "launch", "request": "launch",
"cwd": "${workspaceFolder}/firmware", "cwd": "${workspaceFolder}/firmware",
"executable": "${workspaceRoot}/firmware/build/rusefi.elf", "executable": "${workspaceRoot}/firmware/build/rusefi.elf",
"device": "STM32H743V", "device": "STM32H743V",
"v1": false, "v1": false,
"svdFile": "${workspaceRoot}/firmware/ext/cmsis-svd/data/STMicro/STM32H743x.svd", "svdFile": "${workspaceRoot}/firmware/ext/cmsis-svd/data/STMicro/STM32H743x.svd",
"servertype": "openocd", "servertype": "openocd",
"configFiles": ["interface/stlink.cfg", "target/stm32h7x.cfg"], "configFiles": ["interface/stlink.cfg", "target/stm32h7x.cfg"],
"runToMain": true "runToMain": true
} }
] ]
} }

198
.vscode/tasks.json vendored
View File

@ -3,133 +3,149 @@
// for the documentation about the tasks.json format // for the documentation about the tasks.json format
"version": "2.0.0", "version": "2.0.0",
"tasks": [ "tasks": [
{ {
"label": "Build Firmware (Frankenso/default)", "label": "Build Firmware (Frankenso/default)",
"type": "shell", "type": "shell",
"command": "make -j12", "command": "make -j12",
"windows": { "windows": {
"command": "wsl bash -lc 'make -j12'" "command": "wsl bash -lc 'make -j12'"
}, },
"options": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
"problemMatcher": [], "problemMatcher": [],
"group": { "group": {
"kind": "build", "kind": "build",
"isDefault": true "isDefault": true
} }
}, },
{ {
"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": { "windows": {
"command": "wsl bash -lc 'make -j12 PROJECT_BOARD=proteus'" "command": "wsl bash -lc 'make -j12 PROJECT_BOARD=proteus'"
}, },
"options": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
"problemMatcher": [], "problemMatcher": [],
"group": { "group": {
"kind": "build", "kind": "build",
"isDefault": true "isDefault": true
} }
}, },
{ {
"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": { "windows": {
"command": "wsl bash -lc 'make -j12 PROJECT_BOARD=proteus PROJECT_CPU=ARCH_STM32F7'" "command": "wsl bash -lc 'make -j12 PROJECT_BOARD=proteus PROJECT_CPU=ARCH_STM32F7'"
}, },
"options": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
"problemMatcher": [], "problemMatcher": [],
"group": { "group": {
"kind": "build", "kind": "build",
"isDefault": true "isDefault": true
} }
}, },
{ {
"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": { "windows": {
"command": "wsl bash -lc 'make -j12 PROJECT_BOARD=proteus PROJECT_CPU=ARCH_STM32H7'" "command": "wsl bash -lc 'make -j12 PROJECT_BOARD=proteus PROJECT_CPU=ARCH_STM32H7'"
}, },
"options": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
"problemMatcher": [], "problemMatcher": [],
"group": { "group": {
"kind": "build", "kind": "build",
"isDefault": true "isDefault": true
} }
}, },
{ {
"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": { "windows": {
"command": "wsl bash -lc 'make -j12 PROJECT_BOARD=hellen/hellen72'" "command": "wsl bash -lc 'make -j12 PROJECT_BOARD=hellen/hellen72'"
}, },
"options": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
"problemMatcher": [], "problemMatcher": [],
"group": { "group": {
"kind": "build", "kind": "build",
"isDefault": true "isDefault": true
} }
}, },
{ {
"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": { "windows": {
"command": "wsl bash -lc 'make -j12 PROJECT_BOARD=microrusefi'" "command": "wsl bash -lc 'make -j12 PROJECT_BOARD=microrusefi'"
}, },
"options": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
"problemMatcher": [], "problemMatcher": [],
"group": { "group": {
"kind": "build", "kind": "build",
"isDefault": true "isDefault": true
} }
}, },
{ {
"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": { "windows": {
"command": "wsl bash -lc 'make -j12 PROJECT_BOARD=microrusefi PROJECT_CPU=ARCH_STM32F7'" "command": "wsl bash -lc 'make -j12 PROJECT_BOARD=microrusefi PROJECT_CPU=ARCH_STM32F7'"
}, },
"options": { "options": {
"cwd": "${workspaceRoot}/firmware" "cwd": "${workspaceRoot}/firmware"
}, },
"problemMatcher": [], "problemMatcher": [],
"group": { "group": {
"kind": "build", "kind": "build",
"isDefault": true "isDefault": true
} }
}, },
{ {
"label": "Build Unit Tests", "label": "Build Unit Tests",
"type": "shell", "type": "shell",
"command": "make -j12", "command": "make -j12",
"windows": { "windows": {
"command": "wsl make -j12" "command": "wsl make -j12"
}, },
"options": { "options": {
"cwd": "${workspaceRoot}/unit_tests" "cwd": "${workspaceRoot}/unit_tests"
}, },
"problemMatcher": [], "problemMatcher": [],
"group": { "group": {
"kind": "build", "kind": "build",
"isDefault": true "isDefault": true
} }
} },
{
"label": "Build Simulator",
"type": "shell",
"command": "make -j12",
"windows": {
"command": "wsl make -j12"
},
"options": {
"cwd": "${workspaceRoot}/simulator"
},
"problemMatcher": [],
"group": {
"kind": "build",
"isDefault": true
}
}
] ]
} }

2
simulator/Makefile
View File

@ -34,7 +34,7 @@ ifeq ($(USE_OPT),)
# this config producec a smaller binary file # this config producec a smaller binary file
# 7.3 compiler would want -Wno-error=implicit-fallthrough while 6.4 does not know about it # 7.3 compiler would want -Wno-error=implicit-fallthrough while 6.4 does not know about it
# see https://github.com/rusefi/rusefi/issues/517 # see https://github.com/rusefi/rusefi/issues/517
USE_OPT = -Wall -O2 -Wno-error=implicit-fallthrough -Wno-error=write-strings -Wno-error=strict-aliasing USE_OPT = -Wall -Og -g -Wno-error=implicit-fallthrough -Wno-error=write-strings -Wno-error=strict-aliasing
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
else else