Skip to content

Commit

Permalink
general settings updates for pkg development
Browse files Browse the repository at this point in the history
  • Loading branch information
Abdul committed May 19, 2021
1 parent 84a1950 commit 7c33a8e
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 142 deletions.
23 changes: 23 additions & 0 deletions catkin_ws/.vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"configurations": [
{
"browse": {
"databaseFilename": "",
"limitSymbolsToIncludedHeaders": true,
"path": [
"${workspaceFolder:catkin_ws}"
]
},
"includePath": [
//"/opt/ros/melodic/include/**",
//"/usr/include/**"
],
"name": "ROS",
"intelliSenseMode": "gcc-x64",
"compilerPath": "/usr/bin/gcc",
"cStandard": "gnu11",
"cppStandard": "gnu++14"
}
],
"version": 4
}
14 changes: 14 additions & 0 deletions catkin_ws/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "ROS: Launch",
"request": "launch",
"target": "${workspaceFolder:catkin_ws}/src/arena_camera/launch/arena_camera_node.launch",
"type": "ros"
}
]
}
4 changes: 4 additions & 0 deletions catkin_ws/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"ros.distro": "melodic",
//"ros.distro": "noetic"
}
2 changes: 1 addition & 1 deletion catkin_ws/src/CMakeLists.txt
15 changes: 0 additions & 15 deletions catkin_ws/src/arena_camera/.vscode/c_cpp_properties.json

This file was deleted.

2 changes: 1 addition & 1 deletion catkin_ws/src/arena_camera/cmake/Findarena_sdk.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if(EXISTS ${_arena_sdk_conf})
)
string(STRIP ${arena_sdk_installation_root} arena_sdk_installation_root)

#message(${_LOG_LVL_FRMT} "arena_sdk_installation_root = ${arena_sdk_installation_root}")
message(${_LOG_LVL_FRMT} "arena_sdk_installation_root = ${arena_sdk_installation_root}")

######### -----------------------------------------------------------------
# INCLUDE
Expand Down
16 changes: 13 additions & 3 deletions ros_and_workspace_setup.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
#
# MAIN VARS TO CHANGE
#
ARENA_INSTALLATION_ROOT="$HOME/ArenaSDK_Linux_x64/"
ARENA_INSTALLATION_ROOT="$HOME/software/OutputDirectory/Linux"
ARENA_ROS_WORDSPACE_TO_SETUP="$HOME/arena_camera_ros/catkin_ws" #change to workspace location
INSTALL_ROS=1



############################################################
# Note:
# ArenaSDK does not need to be installed as long as
Expand All @@ -30,9 +29,17 @@ CURR_OS="$(lsb_release -sc)"

if [ $CURR_OS = "xenial" ]; then
ROS_DIS="kinetic"

if [ $CURR_OS = "bionic" ]; then
ROS_DIS="melodic"
#ROS1_DIS="noetic"

if [ $CURR_OS = "focal" ]; then
ROS_DIS="melodic"
#ROS1_DIS="noetic"
else
echo "$CURR_OS is might not be supported yet! check https://support.thinklucid.com/using-ros-for-linux/"
exit(-1)
exit -1
fi

############################################################
Expand All @@ -49,7 +56,10 @@ if [ $INSTALL_ROS -eq 1 ]; then
# Install ROS Desktop.
sudo apt-get update
sudo apt-get install ros-$ROS_DIS-desktop-full

# Setup system dependencies for ROS.

# NOTE: might need sudo apt-get install python[3]-rosdep
sudo rosdep init
sudo rosdep fix-permissions
rosdep update
Expand Down
126 changes: 4 additions & 122 deletions ros_arenasd.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
{
"name": "REPO_ROOT",
"path": "."
},
{
"name": "SFW_INSTALLED",
"path": "../software_release_chckout"
}
],
"extensions": {
Expand All @@ -29,121 +25,10 @@
"ms-python.vscode-pylance"
]
},
"launch": {
"configurations": [
//---------------------------------------------------------------------
//
// My Args
//
//---------------------------------------------------------------------
{
"name": "arena_camera_node with args",
"type": "cppdbg",
"MIMode": "gdb",
"setupCommands": [
{
"text": "-enable-pretty-printing" // for std::string to show value on houver while steppingg
}
],
"request": "launch",
"program": "${workspaceFolder:WS_ROOT}/devel/lib/arena_camera/arena_camera_node",
"args": [],
"cwd": "${workspaceFolder:WS_ROOT}",
//"stopAtEntry": true,
"stopAtEntry": false,
"preLaunchTask": "catkin_build_debug",
//"preLaunchTask": "catkin_clean_build_debug",
"sourceFileMap": {
//"/home/ubuntu/Jenkins/workspace/ArenaSDK_Master_Lin/": "${workspaceFolder:SFW_INSTALLED}/"
}
},
],
"compounds": []
},
"tasks": {
"version": "2.0.0",
"tasks": [
/*{
"type": "catkin_make",
"problemMatcher": [
"$catkin-gcc"
],
"group": {
"kind": "build",
"isDefault": false
},
"label": "catkin_make: build"
},*/
{
"label": "catkin_clean_build_debug",
"type": "shell",
"problemMatcher": [
"$catkin-gcc"
],
"dependsOn": [
"set_params"
],
"command": [
"cd ${workspaceFolder:REPO_ROOT}/catkin_ws/",
";",
"rm",
"-rf",
"build",
"devel",
"install",
"/src/arena_camera_node/build",
"/src/build",
";",
"catkin_make -DCMAKE_BUILD_TYPE=Debug"
],
"group": {
"kind": "build",
"isDefault": true
},
},
{
"label": "catkin_build_debug",
"type": "shell",
"problemMatcher": [
"$catkin-gcc"
],
"dependsOn": [
"set_params"
],
"command": [
"cd ${workspaceFolder:REPO_ROOT}/catkin_ws/",
";",
"catkin_make -DCMAKE_BUILD_TYPE=Debug"
]
},
{
"label": "set_params",
"type": "shell",
"command": [
";rosparam delete /arena_camera_node/",
";rosparam set /arena_camera_node/frame_rate",
"10.9",
";rosparam set /arena_camera_node/image_encoding",
"mono8",
//";rosparam set /arena_camera_node/device_user_id","",
//";rosparam set /arena_camera_node/binning_x","",
//";rosparam set /arena_camera_node/binning_y","",
//";rosparam set /arena_camera_node/gamma","",
";rosparam set /arena_camera_node/exposure",
"100",
";rosparam set /arena_camera_node/exposure_auto",
"true",
//";rosparam set /arena_camera_node/gain",
//"4",
//";rosparam set /arena_camera_node/gain_auto",""
]
},
]
},
"settings": {
// terminal
//
"terminal.integrated.cwd": "${workspaceFolder:REPO_ROOT}/catkin_ws/",
"terminal.integrated.cwd": "./catkin_ws/",
//
// file
//
Expand All @@ -161,10 +46,6 @@
"C_Cpp.intelliSenseCacheSize": 2000, // Megabytes
"C_Cpp.intelliSenseEngine": "Default",
"C_Cpp.intelliSenseEngineFallback": "Disabled",
"C_Cpp.default.includePath": [
"/opt/ros/kinetic/include/", // ros installation dir
"${env:ARENA_ROOT}/**" // ArenaSDK installation dir. you can replace the env variable with a path
],
"C_Cpp.default.browse.path": [],
"C_Cpp.default.enableConfigurationSquiggles": true,
"C_Cpp.dimInactiveRegions": true,
Expand All @@ -173,7 +54,7 @@
//
// Cmake
//
"cmake.parallelJobs": 88,
"cmake.parallelJobs": 6,
"cmake.saveBeforeBuild": true,
"cmake.parseBuildDiagnostics": true,
// ${workspaceFolder} interpreted PKG_ROOT because it is selected form the status bar
Expand All @@ -186,7 +67,8 @@
//
// ROS
//
"ros.distro": "kinetic",
"ros.distro": "melodic",
//"ros.distro": "noetic",
"cSpell.words": [
"DCMAKE",
"rosparam"
Expand Down

0 comments on commit 7c33a8e

Please sign in to comment.