dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

VScode: fix tasks.json and launch_sitl.json after ign -> gazebo renaming 

PX4_SIM model need the simulator (gz_) prefix
Fix post debug task
Add x500_depth, rc_cessna, standard_vtol

Signed-off-by: Beniamino Pozzan <beniamino.pozzan@phd.unipd.it>
This commit is contained in:
Beniamino Pozzan 2023-02-19 11:55:41 -08:00 committed by Daniel Agar
parent d45aeae1de
commit 636dfdec6a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.vscode/tasks.json vendored
View File

@ -170,7 +170,7 @@
] ]
}, },
{ {
"label": "ign gazebo", "label": "gazebo",
"type": "shell", "type": "shell",
"options": { "options": {
"cwd": "${workspaceFolder}", "cwd": "${workspaceFolder}",
@ -178,7 +178,7 @@
"IGN_GAZEBO_RESOURCE_PATH": "${workspaceFolder}/Tools/simulation/gz/models", "IGN_GAZEBO_RESOURCE_PATH": "${workspaceFolder}/Tools/simulation/gz/models",
} }
}, },
"command": "ign gazebo -v 4 -r ${workspaceFolder}/Tools/simulation/gz/worlds/${input:gzWorld}.sdf", "command": "gz sim -v 4 -r ${workspaceFolder}/Tools/simulation/gz/worlds/${input:gzWorld}.sdf",
"isBackground": true, "isBackground": true,
"presentation": { "presentation": {
"echo": true, "echo": true,
@ -191,7 +191,7 @@
"close": false "close": false
}, },
"problemMatcher": [], "problemMatcher": [],
"dependsOn":["ign gazebo kill"] "dependsOn":["gazebo kill"]
}, },
{ {
"label": "gazebo-classic kill", "label": "gazebo-classic kill",
@ -211,9 +211,9 @@
"dependsOn":["px4_sitl_cleanup"] "dependsOn":["px4_sitl_cleanup"]
}, },
{ {
"label": "ign gazebo kill", "label": "gazebo kill",
"type": "shell", "type": "shell",
"command": "pkill -9 -f 'ign gazebo' || true", "command": "pkill -9 -f 'gz sim' || true",
"presentation": { "presentation": {
"echo": true, "echo": true,
"reveal": "never", "reveal": "never",

7
platforms/posix/Debug/launch_sitl.json.in
View File

@ -14,11 +14,11 @@
"environment": [ "environment": [
{ {
"name": "PX4_SIM_MODEL", "name": "PX4_SIM_MODEL",
"value": "${input:PX4_GZ_MODEL}" "value": "gz_${input:PX4_GZ_MODEL}"
} }
], ],
"externalConsole": false, "externalConsole": false,
"postDebugTask": "ign gazebo kill", "postDebugTask": "gazebo kill",
"linux": { "linux": {
"MIMode": "gdb", "MIMode": "gdb",
"externalConsole": false, "externalConsole": false,
@ -222,6 +222,9 @@
"description": "GZ vehicle model", "description": "GZ vehicle model",
"options": [ "options": [
"x500", "x500",
"x500_depth",
"rc_cessna",
"standard_vtol",
], ],
"default": "x500" "default": "x500"
} }