Skip to content

Commit

Permalink
Changing package name to spinnaker_sdk_camera_driver
Browse files Browse the repository at this point in the history
  • Loading branch information
vik748 committed Jul 27, 2018
1 parent d0fb754 commit e8cb78a
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
project(spinnaker_camera_driver)
project(spinnaker_sdk_camera_driver)

## Compile as C++11, supported in ROS Kinetic and newer
# add_compile_options(-std=c++11)
Expand Down Expand Up @@ -195,7 +195,7 @@ add_executable (acquisition_node src/acquisition_node.cpp)
#target_link_libraries (acquisition_mt_node acquilib ${LIBS} ${catkin_LIBRARIES})
#target_link_libraries (conversion_node acquilib ${LIBS} )
target_link_libraries (acquisition_node acquilib ${LIBS} ${catkin_LIBRARIES})
add_dependencies(acquisition_node spinnaker_camera_driver_generate_messages_cpp)
add_dependencies(acquisition_node spinnaker_sdk_camera_driver_generate_messages_cpp)
#add_dependencies(acquisition_mt_node datacollection_neu_generate_messages_cpp)

## Rename C++ executable without prefix
Expand Down
4 changes: 2 additions & 2 deletions include/capture.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <boost/filesystem.hpp>

#include "std_msgs/String.h"
#include "spinnaker_camera_driver/spinnaker_image_names.h"
#include "spinnaker_sdk_camera_driver/spinnaker_image_names.h"

#include <sstream>

Expand Down Expand Up @@ -129,7 +129,7 @@ namespace acquisition {

vector<sensor_msgs::ImagePtr> img_msgs;
vector<sensor_msgs::CameraInfo> cam_info_msgs;
spinnaker_camera_driver::spinnaker_image_names mesg;
spinnaker_sdk_camera_driver::spinnaker_image_names mesg;


boost::mutex queue_mutex_;
Expand Down
6 changes: 3 additions & 3 deletions launch/acquisition.launch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<launch>
<!-- configure console output verbosity mode:debug_console.conf or std_console.conf -->
<env name="ROSCONSOLE_CONFIG_FILE" value="$(find spinnaker_camera_driver)/cfg/std_console.conf"/>
<env name="ROSCONSOLE_CONFIG_FILE" value="$(find spinnaker_sdk_camera_driver)/cfg/std_console.conf"/>

<!-- acquisition.lauynch -->
<arg name="binning" default="2" doc="Binning for cameras, when changing from 2 to 1 cameras need to be unplugged and replugged"/>
Expand All @@ -18,10 +18,10 @@
<arg name="to_ros" default="true" doc="Flag whether images should be published to ROS" />
<arg name="utstamps" default="false" doc="Flag whether each image should have Unique timestamps vs the master cams time stamp for all" />
<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" />
<arg name="config_file" default="$(find spinnaker_camera_driver)/params/test_params.yaml" doc="File specifying the parameters of the camera_array"/>
<arg name="config_file" default="$(find spinnaker_sdk_camera_driver)/params/test_params.yaml" doc="File specifying the parameters of the camera_array"/>

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

<!-- load the acquisition node parameters file. Note any parameters provided in this file will
Expand Down
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<package>
<name>spinnaker_camera_driver</name>
<name>spinnaker_sdk_camera_driver</name>
<version>0.0.0</version>
<description>Point Grey (FLIR) Spinnaker based camera driver (Blackfly S etc.)
</description>
Expand All @@ -13,7 +13,7 @@

<license>MIT</license>

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

<buildtool_depend>catkin</buildtool_depend>
<build_depend>roscpp</build_depend>
Expand Down
2 changes: 1 addition & 1 deletion src/capture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ acquisition::Capture::Capture():nh_(),nh_pvt_ ("~") {
load_cameras();

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

void acquisition::Capture::load_cameras() {
Expand Down

0 comments on commit e8cb78a

Please sign in to comment.