Skip to content

Commit e8cb78a

Browse files
committed
Changing package name to spinnaker_sdk_camera_driver
1 parent d0fb754 commit e8cb78a

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 2.8.3)
2-
project(spinnaker_camera_driver)
2+
project(spinnaker_sdk_camera_driver)
33

44
## Compile as C++11, supported in ROS Kinetic and newer
55
# add_compile_options(-std=c++11)
@@ -195,7 +195,7 @@ add_executable (acquisition_node src/acquisition_node.cpp)
195195
#target_link_libraries (acquisition_mt_node acquilib ${LIBS} ${catkin_LIBRARIES})
196196
#target_link_libraries (conversion_node acquilib ${LIBS} )
197197
target_link_libraries (acquisition_node acquilib ${LIBS} ${catkin_LIBRARIES})
198-
add_dependencies(acquisition_node spinnaker_camera_driver_generate_messages_cpp)
198+
add_dependencies(acquisition_node spinnaker_sdk_camera_driver_generate_messages_cpp)
199199
#add_dependencies(acquisition_mt_node datacollection_neu_generate_messages_cpp)
200200

201201
## Rename C++ executable without prefix

include/capture.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <boost/filesystem.hpp>
1010

1111
#include "std_msgs/String.h"
12-
#include "spinnaker_camera_driver/spinnaker_image_names.h"
12+
#include "spinnaker_sdk_camera_driver/spinnaker_image_names.h"
1313

1414
#include <sstream>
1515

@@ -129,7 +129,7 @@ namespace acquisition {
129129

130130
vector<sensor_msgs::ImagePtr> img_msgs;
131131
vector<sensor_msgs::CameraInfo> cam_info_msgs;
132-
spinnaker_camera_driver::spinnaker_image_names mesg;
132+
spinnaker_sdk_camera_driver::spinnaker_image_names mesg;
133133

134134

135135
boost::mutex queue_mutex_;

launch/acquisition.launch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<launch>
22
<!-- configure console output verbosity mode:debug_console.conf or std_console.conf -->
3-
<env name="ROSCONSOLE_CONFIG_FILE" value="$(find spinnaker_camera_driver)/cfg/std_console.conf"/>
3+
<env name="ROSCONSOLE_CONFIG_FILE" value="$(find spinnaker_sdk_camera_driver)/cfg/std_console.conf"/>
44

55
<!-- acquisition.lauynch -->
66
<arg name="binning" default="2" doc="Binning for cameras, when changing from 2 to 1 cameras need to be unplugged and replugged"/>
@@ -18,10 +18,10 @@
1818
<arg name="to_ros" default="true" doc="Flag whether images should be published to ROS" />
1919
<arg name="utstamps" default="false" doc="Flag whether each image should have Unique timestamps vs the master cams time stamp for all" />
2020
<arg name="max_rate_save" default="false" doc="Flag for max rate mode which is when the master triggerst the slaves and saves images at maximum rate possible" />
21-
<arg name="config_file" default="$(find spinnaker_camera_driver)/params/test_params.yaml" doc="File specifying the parameters of the camera_array"/>
21+
<arg name="config_file" default="$(find spinnaker_sdk_camera_driver)/params/test_params.yaml" doc="File specifying the parameters of the camera_array"/>
2222

2323
<!-- load the acquisition node -->
24-
<node pkg="spinnaker_camera_driver" type="acquisition_node" name="acquisition_node" output="$(arg output)"
24+
<node pkg="spinnaker_sdk_camera_driver" type="acquisition_node" name="acquisition_node" output="$(arg output)"
2525
args="">
2626

2727
<!-- load the acquisition node parameters file. Note any parameters provided in this file will

package.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<package>
3-
<name>spinnaker_camera_driver</name>
3+
<name>spinnaker_sdk_camera_driver</name>
44
<version>0.0.0</version>
55
<description>Point Grey (FLIR) Spinnaker based camera driver (Blackfly S etc.)
66
</description>
@@ -13,7 +13,7 @@
1313

1414
<license>MIT</license>
1515

16-
<url type="website">http://wiki.ros.org/spinnaker_camera_driver</url>
16+
<url type="website">http://wiki.ros.org/spinnaker_sdk_camera_driver</url>
1717

1818
<buildtool_depend>catkin</buildtool_depend>
1919
<build_depend>roscpp</build_depend>

src/capture.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ acquisition::Capture::Capture():nh_(),nh_pvt_ ("~") {
112112
load_cameras();
113113

114114
//initializing the ros publisher
115-
acquisition_pub = nh_.advertise<spinnaker_camera_driver::spinnaker_image_names>("camera", 1000);
115+
acquisition_pub = nh_.advertise<spinnaker_sdk_camera_driver::spinnaker_image_names>("camera", 1000);
116116
}
117117

118118
void acquisition::Capture::load_cameras() {

0 commit comments

Comments
 (0)