Skip to content

Devel 4.0 #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Myzhar merged 11 commits into from
Apr 3, 2023
Merged

Devel 4.0 #882

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
896eb1b
Update CMakeLists.txt files
Mar 31, 2023
cfe905f
Update CMakeLists.txt files
Myzhar Mar 31, 2023
8aa953b
SDK v4 compatibility OK
Myzhar Mar 31, 2023
0175e32
Add "REBOOTING" status handling
Myzhar Mar 31, 2023
eb70f60
Camera Rebooting handling
Myzhar Mar 31, 2023
7672aed
Copyright date update
Myzhar Mar 31, 2023
63641b8
Update submodule
Myzhar Mar 31, 2023
bee8459
Add support for ZED X
Myzhar Mar 31, 2023
0d25a2e
Update submodule
Myzhar Apr 3, 2023
175c882
Merge branch 'devel_4.0' of github.com:stereolabs/zed-ros-wrapper int…
Myzhar Apr 3, 2023
0694780
Update Info
Myzhar Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update CMakeLists.txt files
  • Loading branch information
walter authored and walter committed Mar 31, 2023
commit 896eb1ba2e60cee77440cbed254f66ac06a1e7d7
7 changes: 5 additions & 2 deletions zed_nodelets/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.5)

project(zed_nodelets)

## Generate symbols for IDE indexer
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

# if CMAKE_BUILD_TYPE is not specified, take 'Release' as default
IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE Release)
Expand All @@ -19,8 +22,8 @@ function(checkPackage package customMessage)
endif()
endfunction(checkPackage)

find_package(ZED 3)
checkPackage("ZED" "ZED SDK v3.x not found, install it from:\n https://www.stereolabs.com/developers/")
find_package(ZED 4)
checkPackage("ZED" "ZED SDK v4.x not found, install it from:\n https://www.stereolabs.com/developers/")

exec_program(uname ARGS -p OUTPUT_VARIABLE CMAKE_SYSTEM_NAME2)
if ( CMAKE_SYSTEM_NAME2 MATCHES "aarch64" ) # Jetson TX
Expand Down
7 changes: 6 additions & 1 deletion zed_ros/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.5)

project(zed_ros)

## Generate symbols for IDE indexer
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

find_package(catkin REQUIRED)
catkin_metapackage()
3 changes: 3 additions & 0 deletions zed_wrapper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.5)

project(zed_wrapper)

## Generate symbols for IDE indexer
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

# if CMAKE_BUILD_TYPE is not specified, take 'Release' as default
IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE Release)
Expand Down
2 changes: 1 addition & 1 deletion zed_wrapper/params/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ video:
extrinsic_in_camera_frame: true # if `false` extrinsic parameter in `camera_info` will use ROS native frame (X FORWARD, Z UP) instead of the camera frame (Z FORWARD, Y DOWN) [`true` use old behavior as for version < v3.1]

depth:
quality: 1 # '0': NONE, '1': PERFORMANCE, '2': QUALITY, '3': ULTRA, '4': NEURAL
quality: 3 # '0': NONE, '1': PERFORMANCE, '2': QUALITY, '3': ULTRA, '4': NEURAL
sensing_mode: 0 # '0': STANDARD, '1': FILL (not use FILL for robotic applications)
depth_stabilization: 1 # `0`: disabled, `1`: enabled
openni_depth_mode: false # 'false': 32bit float meters, 'true': 16bit uchar millimeters
Expand Down