diff --git a/.gitignore b/.gitignore index 165a8e361c4b..71f5e7bfc61b 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,4 @@ src/systemcmds/topic_listener/listener_generated.cpp # colcon log/ +.vscode diff --git a/.vscode/.gitignore b/.vscode/.gitignore deleted file mode 100644 index 54fa58b6971d..000000000000 --- a/.vscode/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -.cortex-debug.peripherals.state.json -.cortex-debug.registers.state.json -compile_commands.json - -# generated by cmake -launch.json -c_cpp_properties.json - -# C/C++ extension does some local caching in this folder -ipch/ - -browse.vc.db* - -*.log diff --git a/.vscode/cmake-kits.json b/.vscode/cmake-kits.json deleted file mode 100644 index a7d7e14b60ae..000000000000 --- a/.vscode/cmake-kits.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - { - "name": "PX4 detect" - } -] \ No newline at end of file diff --git a/.vscode/cmake-variants.yaml b/.vscode/cmake-variants.yaml deleted file mode 100644 index ef05fbdbae15..000000000000 --- a/.vscode/cmake-variants.yaml +++ /dev/null @@ -1,338 +0,0 @@ -CONFIG: - default: px4_sitl_default - choices: - px4_sitl_default: - short: px4_sitl_default - buildType: RelWithDebInfo - settings: - CONFIG: px4_sitl_default - px4_sitl_nolockstep: - short: px4_sitl_nolockstep - buildType: RelWithDebInfo - settings: - CONFIG: px4_sitl_nolockstep - px4_sitl_asan: - short: px4_sitl (AddressSanitizer) - buildType: AddressSanitizer - settings: - CONFIG: px4_sitl_default - px4_sitl_ubsan: - short: px4_sitl (UndefinedBehaviorSanitizer) - buildType: UndefinedBehaviorSanitizer - settings: - CONFIG: px4_sitl_default - px4_sitl_replay: - short: px4_sitl_replay - buildType: RelWithDebInfo - settings: - CONFIG: px4_sitl_replay - px4_sitl_test: - short: px4_sitl_test - buildType: RelWithDebInfo - settings: - CONFIG: px4_sitl_test - px4_io-v2_default: - short: px4_io-v2 - buildType: MinSizeRel - settings: - CONFIG: px4_io-v2_default - px4_fmu-v2_default: - short: px4_fmu-v2 - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v2_default - px4_fmu-v3_default: - short: px4_fmu-v3 - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v3_default - px4_fmu-v4_default: - short: px4_fmu-v4 - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v4_default - px4_fmu-v4pro_default: - short: px4_fmu-v4pro - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v4pro_default - px4_fmu-v5_default: - short: px4_fmu-v5 - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v5_default - px4_fmu-v5_debug: - short: px4_fmu-v5_debug - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v5_debug - px4_fmu-v5x_default: - short: px4_fmu-v5x - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v5x_default - px4_fmu-v6c_default: - short: px4_fmu-v6c - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v6c_default - px4_fmu-v6c_bootloader: - short: px4_fmu-v6c_bootloader - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v6c_bootloader - px4_fmu-v6u_default: - short: px4_fmu-v6u - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v6u_default - px4_fmu-v6u_bootloader: - short: px4_fmu-v6u_bootloader - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v6u_bootloader - px4_fmu-v6x_default: - short: px4_fmu-v6x - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v6x_default - px4_fmu-v6x_bootloader: - short: px4_fmu-v6x_bootloader - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v6x_bootloader - px4_fmu-v6xrt_default: - short: px4_fmu-v6xrt - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v6xrt_default - px4_fmu-v6xrt_bootloader: - short: px4_fmu-v6xrt_bootloader - buildType: MinSizeRel - settings: - CONFIG: px4_fmu-v6xrt_bootloader - airmind_mindpx-v2_default: - short: airmind_mindpx-v2 - buildType: MinSizeRel - settings: - CONFIG: airmind_mindpx-v2_default - ark_can-flow_default: - short: ark_can-flow_default - buildType: MinSizeRel - settings: - CONFIG: ark_can-flow_default - ark_can-flow_canbootloader: - short: ark_can-flow_canbootloader - buildType: MinSizeRel - settings: - CONFIG: ark_can-flow_canbootloader - ark_can-gps_default: - short: ark_can-gps_default - buildType: MinSizeRel - settings: - CONFIG: ark_can-gps_default - ark_can-gps_canbootloader: - short: ark_can-gps_canbootloader - buildType: MinSizeRel - settings: - CONFIG: ark_can-gps_canbootloader - ark_can-rtk-gps_default: - short: ark_can-rtk-gps_default - buildType: MinSizeRel - settings: - CONFIG: ark_can-rtk-gps_default - ark_can-rtk-gps_debug: - short: ark_can-rtk-gps_debug - buildType: MinSizeRel - settings: - CONFIG: ark_can-rtk-gps_debug - ark_can-rtk-gps_canbootloader: - short: ark_can-rtk-gps_canbootloader - buildType: MinSizeRel - settings: - CONFIG: ark_can-rtk-gps_canbootloader - ark_septentrio_gps_default: - short: ark_septentrio_gps_default - buildType: MinSizeRel - settings: - CONFIG: ark_septentrio_gps_default - ark_septentrio_gps_canbootloader: - short: ark_septentrio_gps_canbootloader - buildType: MinSizeRel - settings: - CONFIG: ark_septentrio_gps_canbootloader - ark_cannode_default: - short: ark_cannode_default - buildType: MinSizeRel - settings: - CONFIG: ark_cannode_default - ark_cannode_canbootloader: - short: ark_cannode_canbootloader - buildType: MinSizeRel - settings: - CONFIG: ark_cannode_canbootloader - ark_fmu-v6x_bootloader: - short: ark_fmu-v6x_bootloader - buildType: MinSizeRel - settings: - CONFIG: ark_fmu-v6x_bootloader - ark_fmu-v6x_default: - short: ark_fmu-v6x_default - buildType: MinSizeRel - settings: - CONFIG: ark_fmu-v6x_default - ark_pi6x_bootloader: - short: ark_pi6x_bootloader - buildType: MinSizeRel - settings: - CONFIG: ark_pi6x_bootloader - ark_pi6x_default: - short: ark_pi6x_default - buildType: MinSizeRel - settings: - CONFIG: ark_pi6x_default - atl_mantis-edu_default: - short: atl_mantis-edu - buildType: MinSizeRel - settings: - CONFIG: atl_mantis-edu_default - av_x-v1_default: - short: av_x-v1 - buildType: MinSizeRel - settings: - CONFIG: av_x-v1_default - bitcraze_crazyflie_default: - short: bitcraze_crazyflie - buildType: MinSizeRel - settings: - CONFIG: bitcraze_crazyflie_default - cuav_can-gps-v1_default: - short: cuav_can-gps-v1_default - buildType: MinSizeRel - settings: - CONFIG: cuav_can-gps-v1_default - cuav_can-gps-v1_canbootloader: - short: cuav_can-gps-v1_canbootloader - buildType: MinSizeRel - settings: - CONFIG: cuav_can-gps-v1_canbootloader - cuav_nora_default: - short: cuav_nora - buildType: MinSizeRel - settings: - CONFIG: cuav_nora_default - cuav_x7pro_default: - short: cuav_x7pro - buildType: MinSizeRel - settings: - CONFIG: cuav_x7pro_default - cubepilot_cubeorange_test: - short: cubepilot_cubeorange - buildType: MinSizeRel - settings: - CONFIG: cubepilot_cubeorange_test - cubepilot_cubeorangeplus_test: - short: cubepilot_cubeorangeplus - buildType: MinSizeRel - settings: - CONFIG: cubepilot_cubeorangeplus_test - emlid_navio2_default: - short: emlid_navio2 - buildType: MinSizeRel - settings: - CONFIG: emlid_navio2_default - freefly_can-rtk-gps_default: - short: freefly_can-rtk-gps_default - buildType: MinSizeRel - settings: - CONFIG: freefly_can-rtk-gps_default - freefly_can-rtk-gps_canbootloader: - short: freefly_can-rtk-gps_canbootloader - buildType: MinSizeRel - settings: - CONFIG: freefly_can-rtk-gps_canbootloader - holybro_can-gps-v1_canbootloader: - short: holybro_can-gps-v1_canbootloader - buildType: MinSizeRel - settings: - CONFIG: holybro_can-gps-v1_canbootloader - holybro_can-gps-v1_default: - short: holybro_can-gps-v1_default - buildType: MinSizeRel - settings: - CONFIG: holybro_can-gps-v1_default - holybro_durandal-v1_default: - short: holybro_durandal-v1 - buildType: MinSizeRel - settings: - CONFIG: holybro_durandal-v1_default - matek_h743-slim_default: - short: matek_h743-slim - buildType: MinSizeRel - settings: - CONFIG: matek_h743-slim_default - matek_gnss-m9n-f4_canbootloader: - short: matek_gnss-m9n-f4_canbootloader - buildType: MiniSizeRel - settings: - CONFIG: matek_m9nf4can_canbootloader - matek_gnss-m9n-f4_default: - short: matek_gnss-m9n-f4_default - buildType: MiniSizeRel - settings: - CONFIG: matek_gnss-m9n-f4_default - modalai_fc-v1_default: - short: modalai_fc-v1 - buildType: MinSizeRel - settings: - CONFIG: modalai_fc-v1_default - modalai_fc-v2_default: - short: modalai_fc-v2 - buildType: MinSizeRel - settings: - CONFIG: modalai_fc-v2_default - modalai_voxl2-io_default: - short: modalai_voxl2-io - buildType: MinSizeRel - settings: - CONFIG: modalai_voxl2-io_default - mro_ctrl-zero-f7_default: - short: mro_ctrl-zero-f7 - buildType: MinSizeRel - settings: - CONFIG: mro_ctrl-zero-f7_default - mro_pixracerpro_bootloader: - short: mro_pixracerpro_bootloader - buildType: MinSizeRel - settings: - CONFIG: mro_pixracerpro_bootloader - mro_pixracerpro_default: - short: mro_pixracerpro_default - buildType: MinSizeRel - settings: - CONFIG: mro_pixracerpro_default - mro_x21-777_default: - short: mro_x2.1-777 - buildType: MinSizeRel - settings: - CONFIG: mro_x21-777_default - nxp_fmuk66-v3_default: - short: nxp_fmuk66-v3 - buildType: MinSizeRel - settings: - CONFIG: nxp_fmuk66-v3_default - nxp_mr-canhubk3_default: - short: nxp_mr-canhubk3_default - buildType: MinSizeRel - settings: - CONFIG: nxp_mr-canhubk3_default - nxp_mr-canhubk3_fmu: - short: nxp_mr-canhubk3_fmu - buildType: MinSizeRel - settings: - CONFIG: nxp_mr-canhubk3_fmu - raspberrypi_pico_default: - short: raspberrypi_pico - buildType: MinSizeRel - settings: - CONFIG: raspberrypi_pico_default diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 3da9f2675427..000000000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - // See http://go.microsoft.com/fwlink/?LinkId=827846 - // for the documentation about the extensions.json format - "recommendations": [ - "chiehyu.vscode-astyle", - "dan-c-underwood.arm", - "editorconfig.editorconfig", - "fredericbonnet.cmake-test-adapter", - "github.vscode-pull-request-github", - "marus25.cortex-debug", - "ms-azuretools.vscode-docker", - "ms-iot.vscode-ros", - "ms-python.python", - "ms-vscode.cmake-tools", - "ms-vscode.cpptools", - "ms-vscode.cpptools-extension-pack", - "redhat.vscode-yaml", - "streetsidesoftware.code-spell-checker", - "twxs.cmake", - "uavcan.dsdl", - "wholroyd.jinja", - "zixuanwang.linkerscript", - "ms-vscode.makefile-tools" - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json index 67016f098380..1752cee1bf50 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,132 +1,16 @@ { - "astyle.astylerc": "${workspaceFolder}/Tools/astyle/astylerc", - "astyle.c.enable": true, - "astyle.cpp.enable": true, - "C_Cpp.autoAddFileAssociations": false, - "C_Cpp.clang_format_fallbackStyle": "none", - "C_Cpp.default.browse.limitSymbolsToIncludedHeaders": true, - "C_Cpp.default.cppStandard": "c++14", - "C_Cpp.default.cStandard": "c11", - "C_Cpp.formatting": "Disabled", - "C_Cpp.intelliSenseEngine": "Default", - "C_Cpp.vcpkg.enabled": false, - "C_Cpp.workspaceParsingPriority": "low", - "cmake.buildBeforeRun": true, - "cmake.buildDirectory": "${workspaceFolder}/build/${variant:CONFIG}", - "cmake.configureOnOpen": true, - "cmake.ctest.parallelJobs": 1, - "cmake.skipConfigureIfCachePresent": true, - "cmakeExplorer.buildDir": "${workspaceFolder}/build/px4_sitl_test", - "cmakeExplorer.parallelJobs": 1, - "cmakeExplorer.suiteDelimiter": "-", - "cSpell.allowCompoundWords": true, - "cSpell.diagnosticLevel": "Hint", - "cSpell.showStatus": false, - "cSpell.words": [ - "acro", - "nuttx", - "esc" - ], - "debug.toolBarLocation": "docked", - "editor.defaultFormatter": "chiehyu.vscode-astyle", - "editor.insertSpaces": false, - "editor.minimap.maxColumn": 120, - "editor.minimap.renderCharacters": false, - "editor.minimap.showSlider": "always", - "editor.suggest.localityBonus": true, - "editor.tabSize": 8, - "editor.wordWrapColumn": 120, - "explorer.openEditors.visible": 0, - "files.insertFinalNewline": true, - "files.trimTrailingWhitespace": true, - "files.watcherExclude": { - "**/build/**": true - }, - "git.detectSubmodulesLimit": 20, - "git.ignoreLimitWarning": true, - "githubPullRequests.defaultMergeMethod": "squash", - "githubPullRequests.telemetry.enabled": false, - "files.associations": { - "*.jinja": "jinja", - "algorithm": "cpp", - "array": "cpp", - "atomic": "cpp", - "bitset": "cpp", - "cctype": "cpp", - "cfenv": "cpp", - "chrono": "cpp", - "cinttypes": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "codecvt": "cpp", - "complex": "cpp", - "condition_variable": "cpp", - "csignal": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cstring": "cpp", - "ctime": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "deque": "cpp", - "exception": "cpp", - "forward_list": "cpp", - "fstream": "cpp", - "functional": "cpp", - "future": "cpp", - "hash_map": "cpp", - "hash_set": "cpp", - "initializer_list": "cpp", - "iomanip": "cpp", - "iosfwd": "cpp", - "iostream": "cpp", - "istream": "cpp", - "iterator": "cpp", - "limits": "cpp", - "list": "cpp", - "map": "cpp", - "memory": "cpp", - "memory_resource": "cpp", - "mutex": "cpp", - "new": "cpp", - "numeric": "cpp", - "optional": "cpp", - "ostream": "cpp", - "random": "cpp", - "ratio": "cpp", - "regex": "cpp", - "set": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "streambuf": "cpp", - "string": "cpp", - "string_view": "cpp", - "strstream": "cpp", - "system_error": "cpp", - "thread": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "typeindex": "cpp", - "typeinfo": "cpp", - "unordered_map": "cpp", - "unordered_set": "cpp", - "utility": "cpp", - "valarray": "cpp", - "variant": "cpp", - "vector": "cpp", - "Jenkinsfile*": "groovy", - "*.sdf": "xml" - }, - "search.exclude": { - "${workspaceFolder}/build": true - }, - "search.showLineNumbers": true, - "terminal.integrated.scrollback": 15000, - "yaml.schemas": { - "${workspaceFolder}/validation/module_schema.yaml": "${workspaceFolder}/src/modules/*/module.yaml" - }, - "ros.distro": "humble" + "python.autoComplete.extraPaths": [ + "/home/omer/WORKSPACE-ROVERCOPTER/install/px4_msgs/local/lib/python3.10/dist-packages", + "/home/omer/ros_gz/install/ros_ign_interfaces/local/lib/python3.10/dist-packages", + "/home/omer/ros_gz/install/ros_gz_interfaces/local/lib/python3.10/dist-packages", + "/opt/ros/humble/lib/python3.10/site-packages", + "/opt/ros/humble/local/lib/python3.10/dist-packages" + ], + "python.analysis.extraPaths": [ + "/home/omer/WORKSPACE-ROVERCOPTER/install/px4_msgs/local/lib/python3.10/dist-packages", + "/home/omer/ros_gz/install/ros_ign_interfaces/local/lib/python3.10/dist-packages", + "/home/omer/ros_gz/install/ros_gz_interfaces/local/lib/python3.10/dist-packages", + "/opt/ros/humble/lib/python3.10/site-packages", + "/opt/ros/humble/local/lib/python3.10/dist-packages" + ] } diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index 80490d515f5e..000000000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,310 +0,0 @@ -{ - // See https://go.microsoft.com/fwlink/?LinkId=733558 - // for the documentation about the tasks.json format - "version": "2.0.0", - "tasks": [ - { - "label": "build", - "type": "shell", - "command": "/bin/bash", - "args": [ - "-c", - "${command:cmake.tasksBuildCommand}" - ], - "options": { - "cwd": "${command:cmake.buildDirectory}" - }, - "group": { - "kind": "build", - "isDefault": true, - }, - "problemMatcher": { - "base": "$gcc", - "fileLocation": ["relative", "${command:cmake.buildDirectory}"] - }, - "presentation":{ - "echo": false, - "showReuseMessage": false, - "clear": true, - "panel": "shared", - "group": "build" - } - }, - { - "label": "test", - "type": "shell", - "command": "make tests", - "options": { - "cwd": "${workspaceFolder}" - }, - "group": { - "kind": "test", - "isDefault": true, - }, - "presentation":{ - "echo": true, - "showReuseMessage": false, - "clear": false, - "panel": "shared", - "group": "test" - } - }, - { - "label": "jmavsim kill", - "type": "shell", - "command": "kill $(ps aux | grep jmavsim | grep -v 'grep' | awk '{print $2}') || true", - "presentation": { - "echo": true, - "reveal": "never", - "revealProblems": "onProblem", - "focus": false, - "panel": "dedicated", - "showReuseMessage": false, - "clear": false, - "close": true - }, - "problemMatcher": [], - "dependsOn":["px4_sitl_cleanup"] - }, - { - "label": "gazebo-classic build", - "type": "shell", - "command": "make px4_sitl_default sitl_gazebo-classic", - "options": { - "cwd": "${workspaceFolder}" - }, - "presentation": { - "echo": true, - "reveal": "never", - "revealProblems": "onProblem", - "focus": false, - "panel": "dedicated", - "showReuseMessage": false, - "clear": false, - "close": true - }, - "problemMatcher": [], - }, - { - "label": "gazebo-classic start", - "type": "shell", - "dependsOn": "gazebo-classic build", - "options": { - "cwd": "${workspaceFolder}", - "env": { - "GAZEBO_PLUGIN_PATH": "${workspaceFolder}/build/px4_sitl_default/build_gazebo-classic", - "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/simulation/gazebo-classic/sitl_gazebo-classic/models", - "PX4_SIM_SPEED_FACTOR": "1" - } - }, - "command": "gzserver --verbose ${workspaceFolder}/Tools/simulation/gazebo-classic/sitl_gazebo-classic/worlds/empty.world", - "isBackground": true, - "presentation": { - "echo": true, - "reveal": "never", - "revealProblems": "onProblem", - "focus": false, - "panel": "dedicated", - "showReuseMessage": false, - "clear": false, - "close": true - }, - "problemMatcher": [ - { - "pattern": [ - { - "regexp": ".", - "file": 1, - "location": 2, - "message": 3 - } - ], - "background": { - "activeOnStart": true, - "beginsPattern": ".", - "endsPattern": ".", - } - } - ] - }, - { - "label": "gazebo-classic", - "type": "shell", - "dependsOn": "gazebo-classic start", - "options": { - "cwd": "${workspaceFolder}", - "env": { - "GAZEBO_PLUGIN_PATH": "${workspaceFolder}/build/px4_sitl_default/build_gazebo-classic", - "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/simulation/gazebo-classic/sitl_gazebo-classic/models", - "PX4_SIM_SPEED_FACTOR": "1" - } - }, - "command": "gz model --verbose --spawn-file=${workspaceFolder}/Tools/simulation/gazebo-classic/sitl_gazebo-classic/models/iris/iris.sdf --model-name=iris -x 1.01 -y 0.98 -z 0.83", - "isBackground": false, - "presentation": { - "echo": true, - "reveal": "never", - "revealProblems": "onProblem", - "focus": false, - "panel": "dedicated", - "showReuseMessage": false, - "clear": false, - "close": true - }, - "problemMatcher": [ - { - "pattern": [ - { - "regexp": ".", - "file": 1, - "location": 2, - "message": 3 - } - ], - "background": { - "activeOnStart": true, - "beginsPattern": ".", - "endsPattern": ".", - } - } - ] - }, - { - "label": "gazebo", - "type": "shell", - "options": { - "cwd": "${workspaceFolder}", - "env": { - "IGN_GAZEBO_RESOURCE_PATH": "${workspaceFolder}/Tools/simulation/gz/models", - } - }, - "command": "gz sim -v 4 -r ${workspaceFolder}/Tools/simulation/gz/worlds/${input:gzWorld}.sdf", - "isBackground": true, - "presentation": { - "echo": true, - "reveal": "always", - "revealProblems": "onProblem", - "focus": true, - "panel": "dedicated", - "showReuseMessage": false, - "clear": false, - "close": false - }, - "problemMatcher": [], - "dependsOn":["gazebo kill"] - }, - { - "label": "gazebo-classic kill", - "type": "shell", - "command": "pkill -9 -f gzserver || true", - "presentation": { - "echo": true, - "reveal": "never", - "revealProblems": "onProblem", - "focus": false, - "panel": "dedicated", - "showReuseMessage": false, - "clear": false, - "close": true - }, - "problemMatcher": [], - "dependsOn":["px4_sitl_cleanup"] - }, - { - "label": "gazebo kill", - "type": "shell", - "command": "pkill -9 -f 'gz sim' || true", - "presentation": { - "echo": true, - "reveal": "never", - "revealProblems": "onProblem", - "focus": false, - "panel": "dedicated", - "showReuseMessage": false, - "clear": false, - "close": true - }, - "problemMatcher": [], - "dependsOn":["px4_sitl_cleanup"] - }, - - { - "label": "px4_sitl_cleanup", - "type": "shell", - "command": "rm -rfv /tmp/px4* || true", - "presentation": { - "echo": true, - "reveal": "never", - "revealProblems": "onProblem", - "focus": false, - "panel": "dedicated", - "showReuseMessage": false, - "clear": false, - "close": true - }, - "problemMatcher": [], - "dependsOn":["px4_kill"] - }, - { - "label": "px4_kill", - "type": "shell", - "command": "pkill -9 px4 || true", - "presentation": { - "echo": true, - "reveal": "never", - "revealProblems": "onProblem", - "focus": false, - "panel": "dedicated", - "showReuseMessage": false, - "clear": false, - "close": true - }, - "problemMatcher": [] - }, - { - "label": "mavlink shell", - "type": "shell", - "command": "./Tools/mavlink_shell.py", - "options": { - "cwd": "${workspaceFolder}" - }, - "presentation": { - "echo": true, - "reveal": "always", - "focus": true, - "panel": "new", - "showReuseMessage": false, - "clear": false - }, - "problemMatcher": [] - }, - { - "label": "miniterm.py", - "type": "shell", - "command": "miniterm.py --raw - 57600", - "options": { - "cwd": "${workspaceFolder}" - }, - "presentation": { - "echo": true, - "reveal": "always", - "focus": true, - "panel": "new", - "showReuseMessage": false, - "clear": false - }, - "problemMatcher": [] - } - ], - "inputs": [ - { - "type": "pickString", - "id": "gzWorld", - "description": "gz world", - "options": [ - "default" - ], - "default": "default" - } - ] -} diff --git a/platforms/nuttx/NuttX/nuttx b/platforms/nuttx/NuttX/nuttx index 0f401a606265..4be592dd2114 160000 --- a/platforms/nuttx/NuttX/nuttx +++ b/platforms/nuttx/NuttX/nuttx @@ -1 +1 @@ -Subproject commit 0f401a6062653795b6355c420ea8b0e72578c204 +Subproject commit 4be592dd2114d2c07505b143493a3cfa6dc9c239 diff --git a/src/modules/simulation/gz_bridge/CMakeLists.txt b/src/modules/simulation/gz_bridge/CMakeLists.txt index 003a712282f9..e041838e2704 100644 --- a/src/modules/simulation/gz_bridge/CMakeLists.txt +++ b/src/modules/simulation/gz_bridge/CMakeLists.txt @@ -93,6 +93,7 @@ if(gz-transport_FOUND) windy baylands lawn + ubp ) # find corresponding airframes