flir_camera_driver = spinnaker_camera_driver

flir_camera_driver/CMakeLists.txt → spinnaker_camera_driver/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.3)
 set_directory_properties(PROPERTIES COMPILE_OPTIONS "-std=c++11;-Wall;-Wextra")
 
 
-project(flir_camera_driver)
+project(spinnaker_camera_driver)
 
 find_package(catkin REQUIRED COMPONENTS
   camera_info_manager diagnostic_updater dynamic_reconfigure

flir_camera_driver/README.md → spinnaker_camera_driver/README.md

@@ -1,4 +1,4 @@
-flir_camera_driver
+spinnaker_camera_driver
 =======================
 
 [![Build Status](https://travis-ci.org/clearpathrobotics/flir_camera_driver.png?branch=kinetic-devel)](https://travis-ci.org/clearpathrobotics/flir_camera_driver)

flir_camera_driver/cfg/Flir.cfg → spinnaker_camera_driver/cfg/Flir.cfg

@@ -63,7 +63,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #*  POSSIBILITY OF SUCH DAMAGE.
 #***********************************************************
 
-PACKAGE='flir_camera_driver'
+PACKAGE='spinnaker_camera_driver'
 
 from dynamic_reconfigure.parameter_generator_catkin import *
 
@@ -288,4 +288,4 @@ line_modes = gen.enum([gen.const("Input", str_t, "Input", ""),
 gen.add("line_mode", str_t, SensorLevels.RECONFIGURE_RUNNING, "Line Mode", "Input", edit_method = line_modes)
 
 
-exit(gen.generate(PACKAGE, "flir_camera_driver", "Flir"))
+exit(gen.generate(PACKAGE, "spinnaker_camera_driver", "Flir"))

flir_camera_driver/cmake/download_spinnaker → spinnaker_camera_driver/cmake/download_spinnaker

@@ -99,7 +99,7 @@ if not os.path.exists(os.path.join(os.getcwd(), "usr/lib/")):
     xml_files = os.listdir(xml_path)
 
     try:
-        os.makedirs(destination_folder) #This is set to flir_spinnaker_camera should it be flir_camera_driver?
+        os.makedirs(destination_folder) #This is set to flir_spinnaker_camera should it be spinnaker_camera_driver?
     except:
         logging.info("Error XML folder either exists or can't be created.")
 

flir_camera_driver/config/custom_rosconsole.config → spinnaker_camera_driver/config/custom_rosconsole.config

@@ -1,4 +1,4 @@
 # Set the default ros output to info and higher
 log4j.logger.ros=INFO
 # Override my package to output everything (Change the level to fit your needs)
-log4j.logger.ros.flir_camera_driver=DEBUG
+log4j.logger.ros.spinnaker_camera_driver=DEBUG

flir_camera_driver/include/flir_camera_driver/FlirCamera.h → spinnaker_camera_driver/include/spinnaker_camera_driver/FlirCamera.h

@@ -40,29 +40,29 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    @attention Carnegie Mellon University
 */
 
-#ifndef FLIR_CAMERA_DRIVER_FLIRCAMERA_H
-#define FLIR_CAMERA_DRIVER_FLIRCAMERA_H
+#ifndef SPINNAKER_CAMERA_DRIVER_FLIRCAMERA_H
+#define SPINNAKER_CAMERA_DRIVER_FLIRCAMERA_H
 
 #include <sensor_msgs/Image.h>            // ROS message header for Image
 #include <sensor_msgs/image_encodings.h>  // ROS header for the different supported image encoding types
 #include <sensor_msgs/fill_image.h>
-#include <flir_camera_driver/camera_exceptions.h>
+#include <spinnaker_camera_driver/camera_exceptions.h>
 
 #include <sstream>
 #include <mutex>
 #include <string>
 
 // Header generated by dynamic_reconfigure
-#include <flir_camera_driver/FlirConfig.h>
-#include "flir_camera_driver/camera.h"
-#include "flir_camera_driver/cm3.h"
-#include "flir_camera_driver/set_property.h"
+#include <spinnaker_camera_driver/FlirConfig.h>
+#include "spinnaker_camera_driver/camera.h"
+#include "spinnaker_camera_driver/cm3.h"
+#include "spinnaker_camera_driver/set_property.h"
 
 // Spinnaker SDK
 #include "Spinnaker.h"
 #include "SpinGenApi/SpinnakerGenApi.h"
 
-namespace flir_camera_driver
+namespace spinnaker_camera_driver
 {
 class FlirCamera
 {
@@ -84,7 +84,7 @@ class FlirCamera
   *
   * \return Returns true when the configuration could be applied without modification.
   */
-  void setNewConfiguration(const flir_camera_driver::FlirConfig& config, const uint32_t& level);
+  void setNewConfiguration(const spinnaker_camera_driver::FlirConfig& config, const uint32_t& level);
 
   /** Parameters that need a sensor to be stopped completely when changed. */
   static const uint8_t LEVEL_RECONFIGURE_CLOSE = 3;
@@ -201,5 +201,5 @@ class FlirCamera
   // and each image.
   void ConfigureChunkData(const Spinnaker::GenApi::INodeMap& nodeMap);
 };
-}  // namespace flir_camera_driver
-#endif  // FLIR_CAMERA_DRIVER_FLIRCAMERA_H
+}  // namespace spinnaker_camera_driver
+#endif  // SPINNAKER_CAMERA_DRIVER_FLIRCAMERA_H

flir_camera_driver/include/flir_camera_driver/camera.h → spinnaker_camera_driver/include/spinnaker_camera_driver/camera.h

@@ -22,14 +22,14 @@ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTE
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef FLIR_CAMERA_DRIVER_CAMERA_H
-#define FLIR_CAMERA_DRIVER_CAMERA_H
+#ifndef SPINNAKER_CAMERA_DRIVER_CAMERA_H
+#define SPINNAKER_CAMERA_DRIVER_CAMERA_H
 
 #include <ros/ros.h>
 
 // Header generated by dynamic_reconfigure
-#include <flir_camera_driver/FlirConfig.h>
-#include "flir_camera_driver/set_property.h"
+#include <spinnaker_camera_driver/FlirConfig.h>
+#include "spinnaker_camera_driver/set_property.h"
 
 // Spinnaker SDK
 #include "Spinnaker.h"
@@ -42,14 +42,14 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI
 // this class for any specific differences.
 //*******************************************
 
-namespace flir_camera_driver
+namespace spinnaker_camera_driver
 {
 class Camera
 {
 public:
   explicit Camera(Spinnaker::GenApi::INodeMap* node_map);
   ~Camera();
-  virtual void setNewConfiguration(const flir_camera_driver::FlirConfig& config, const uint32_t& level);
+  virtual void setNewConfiguration(const spinnaker_camera_driver::FlirConfig& config, const uint32_t& level);
 
   /** Parameters that need a sensor to be stopped completely when changed. */
   static const uint8_t LEVEL_RECONFIGURE_CLOSE = 3;
@@ -79,7 +79,7 @@ class Camera
   * \param videoMode string of desired video mode, will be changed if unsupported.
   */
   virtual void setFrameRate(const float frame_rate);
-  virtual void setImageControlFormats(const flir_camera_driver::FlirConfig& config);
+  virtual void setImageControlFormats(const spinnaker_camera_driver::FlirConfig& config);
   /*!
   * \brief Set parameters relative to GigE cameras.
   *
@@ -159,5 +159,5 @@ class Camera
 
   // uint getROIPosition();
 };
-}  // namespace flir_camera_driver
-#endif  // FLIR_CAMERA_DRIVER_CAMERA_H
+}  // namespace spinnaker_camera_driver
+#endif  // SPINNAKER_CAMERA_DRIVER_CAMERA_H

flir_camera_driver/include/flir_camera_driver/camera_exceptions.h → spinnaker_camera_driver/include/spinnaker_camera_driver/camera_exceptions.h

@@ -40,8 +40,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    @attention Carnegie Mellon University
 */
 
-#ifndef FLIR_CAMERA_DRIVER_CAMERA_EXCEPTIONS_H
-#define FLIR_CAMERA_DRIVER_CAMERA_EXCEPTIONS_H
+#ifndef SPINNAKER_CAMERA_DRIVER_CAMERA_EXCEPTIONS_H
+#define SPINNAKER_CAMERA_DRIVER_CAMERA_EXCEPTIONS_H
 
 #include <stdexcept>
 #include <string>
@@ -79,4 +79,4 @@ class CameraImageNotReadyException : public std::runtime_error
   }
 };
 
-#endif  // FLIR_CAMERA_DRIVER_CAMERA_EXCEPTIONS_H
+#endif  // SPINNAKER_CAMERA_DRIVER_CAMERA_EXCEPTIONS_H

flir_camera_driver/include/flir_camera_driver/cm3.h → spinnaker_camera_driver/include/spinnaker_camera_driver/cm3.h

@@ -22,11 +22,11 @@ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTE
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef FLIR_CAMERA_DRIVER_CM3_H
-#define FLIR_CAMERA_DRIVER_CM3_H
-#include "flir_camera_driver/camera.h"
+#ifndef SPINNAKER_CAMERA_DRIVER_CM3_H
+#define SPINNAKER_CAMERA_DRIVER_CM3_H
+#include "spinnaker_camera_driver/camera.h"
 
-namespace flir_camera_driver
+namespace spinnaker_camera_driver
 {
 class Cm3 : public Camera
 {
@@ -37,7 +37,7 @@ class Cm3 : public Camera
   void setNewConfiguration(const FlirConfig& config, const uint32_t& level);
 
 private:
-  void setImageControlFormats(const flir_camera_driver::FlirConfig& config);
+  void setImageControlFormats(const spinnaker_camera_driver::FlirConfig& config);
 };
-}  // namespace flir_camera_driver
-#endif  // FLIR_CAMERA_DRIVER_CM3_H
+}  // namespace spinnaker_camera_driver
+#endif  // SPINNAKER_CAMERA_DRIVER_CM3_H

flir_camera_driver/include/flir_camera_driver/set_property.h → spinnaker_camera_driver/include/spinnaker_camera_driver/set_property.h

@@ -22,16 +22,16 @@ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTE
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#ifndef FLIR_CAMERA_DRIVER_SET_PROPERTY_H
-#define FLIR_CAMERA_DRIVER_SET_PROPERTY_H
+#ifndef SPINNAKER_CAMERA_DRIVER_SET_PROPERTY_H
+#define SPINNAKER_CAMERA_DRIVER_SET_PROPERTY_H
 
 // Spinnaker SDK
 #include "Spinnaker.h"
 #include "SpinGenApi/SpinnakerGenApi.h"
 
 #include <string>
 
-namespace flir_camera_driver
+namespace spinnaker_camera_driver
 {
 inline bool setProperty(Spinnaker::GenApi::INodeMap* node_map, const std::string& property_name,
                         const std::string& entry_name)
@@ -254,5 +254,5 @@ inline bool setMaxInt(Spinnaker::GenApi::INodeMap* node_map, const std::string&
   }
   return false;
 }
-}  // namespace flir_camera_driver
-#endif  // FLIR_CAMERA_DRIVER_SET_PROPERTY_H
+}  // namespace spinnaker_camera_driver
+#endif  // SPINNAKER_CAMERA_DRIVER_SET_PROPERTY_H

flir_camera_driver/launch/camera.launch → spinnaker_camera_driver/launch/camera.launch

@@ -24,7 +24,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCL
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <launch>
-   <!-- Determine this using rosrun flir_camera_driver list_cameras.
+   <!-- Determine this using rosrun spinnaker_camera_driver list_cameras.
        If not specified, defaults to first camera found. -->
   <arg name="camera_name" default="camera" />
   <arg name="camera_serial" default="0" />
@@ -34,7 +34,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI
     <node pkg="nodelet" type="nodelet" name="camera_nodelet_manager" args="manager" cwd="node" output="screen"/>
 
     <node pkg="nodelet" type="nodelet" name="flir_camera_nodelet"
-          args="load flir_camera_driver/FlirCameraNodelet camera_nodelet_manager" >
+          args="load spinnaker_camera_driver/FlirCameraNodelet camera_nodelet_manager" >
 
       <param name="frame_id" value="camera" />
       <param name="serial" value="$(arg camera_serial)" />

flir_camera_driver/launch/stereo.launch → spinnaker_camera_driver/launch/stereo.launch

@@ -40,7 +40,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI
 
       <!-- Both cameras are not loaded into one nodelet manager to avoid the namespacing issue. -->
       <node pkg="nodelet" type="nodelet" name="camera_nodelet"
-            args="load flir_camera_driver/FlirCameraNodelet /camera_nodelet_manager" >
+            args="load spinnaker_camera_driver/FlirCameraNodelet /camera_nodelet_manager" >
         <param name="frame_id" value="camera_left" />
         <param name="serial" value="$(arg left_camera_serial)" />
 
@@ -62,7 +62,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI
     <group ns="right" >
 
       <node pkg="nodelet" type="nodelet" name="camera_nodelet"
-            args="load flir_camera_driver/FlirCameraNodelet /camera_nodelet_manager" >
+            args="load spinnaker_camera_driver/FlirCameraNodelet /camera_nodelet_manager" >
         <param name="frame_id" value="camera_right" />
         <param name="serial" value="$(arg right_camera_serial)" />
 

flir_camera_driver/launch/test_spinnaker.launch → spinnaker_camera_driver/launch/test_spinnaker.launch

@@ -24,5 +24,5 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCL
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <launch>
-  <node name="spinnaker_test_node" pkg="flir_camera_driver" type="spinnaker_test_node" cwd="node"/>
+  <node name="spinnaker_test_node" pkg="spinnaker_camera_driver" type="spinnaker_test_node" cwd="node"/>
 </launch>

flir_camera_driver/nodelet_plugins.xml → spinnaker_camera_driver/nodelet_plugins.xml

@@ -24,7 +24,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCL
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <library path="lib/libFlirCameraNodelet">
-  <class name="flir_camera_driver/FlirCameraNodelet" type="flir_camera_driver::FlirCameraNodelet" base_class_type="nodelet::Nodelet">
+  <class name="spinnaker_camera_driver/FlirCameraNodelet" type="spinnaker_camera_driver::FlirCameraNodelet" base_class_type="nodelet::Nodelet">
     <description>This is the nodelet for the Point Grey Camera Driver.</description>
   </class>
 </library>

flir_camera_driver/package.xml → spinnaker_camera_driver/package.xml

@@ -24,15 +24,15 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCL
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <package format="2">
-  <name>flir_camera_driver</name>
+  <name>spinnaker_camera_driver</name>
   <version>0.0.0</version>
   <description>Flir camera driver based on Spinnaker.</description>
 
   <maintainer email="mhosmar@clearpathrobotics.com">Mike Hosmar</maintainer>
 
   <license>BSD</license>
 
-  <url type="website">http://ros.org/wiki/flir_camera_driver</url>
+  <url type="website">http://ros.org/wiki/spinnaker_camera_driver</url>
 
   <author>Chad Rockey</author>
 

flir_camera_driver/src/FlirCamera.cpp → spinnaker_camera_driver/src/FlirCamera.cpp

@@ -40,7 +40,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    @attention Carnegie Mellon University
 */
 
-#include "flir_camera_driver/FlirCamera.h"
+#include "spinnaker_camera_driver/FlirCamera.h"
 
 #include <iostream>
 #include <sstream>
@@ -49,7 +49,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <ros/ros.h>
 
-namespace flir_camera_driver
+namespace spinnaker_camera_driver
 {
 FlirCamera::FlirCamera()
   : serial_(0)
@@ -69,7 +69,7 @@ FlirCamera::~FlirCamera()
   system_->ReleaseInstance();
 }
 
-void FlirCamera::setNewConfiguration(const flir_camera_driver::FlirConfig& config, const uint32_t& level)
+void FlirCamera::setNewConfiguration(const spinnaker_camera_driver::FlirConfig& config, const uint32_t& level)
 {
   // Check if camera is connected
   if (!pCam_)
@@ -504,4 +504,4 @@ void FlirCamera::ConfigureChunkData(const Spinnaker::GenApi::INodeMap& nodeMap)
     throw std::runtime_error(e.what());
   }
 }
-}  // namespace flir_camera_driver
+}  // namespace spinnaker_camera_driver

flir_camera_driver/src/camera.cpp → spinnaker_camera_driver/src/camera.cpp

@@ -22,11 +22,11 @@ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTE
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "flir_camera_driver/camera.h"
+#include "spinnaker_camera_driver/camera.h"
 
 #include <string>
 
-namespace flir_camera_driver
+namespace spinnaker_camera_driver
 {
 void Camera::init()
 {
@@ -164,7 +164,7 @@ void Camera::setNewConfiguration(const FlirConfig& config, const uint32_t& level
 }
 
 // Image Size and Pixel Format
-void Camera::setImageControlFormats(const flir_camera_driver::FlirConfig& config)
+void Camera::setImageControlFormats(const spinnaker_camera_driver::FlirConfig& config)
 {
   // Set Binning and Decimation
   setProperty(node_map_, "BinningHorizontal", config.image_format_x_binning);
@@ -290,4 +290,4 @@ Camera::Camera(Spinnaker::GenApi::INodeMap* node_map)
   node_map_ = node_map;
   init();
 }
-}  // namespace flir_camera_driver
+}  // namespace spinnaker_camera_driver

flir_camera_driver/src/cm3.cpp → spinnaker_camera_driver/src/cm3.cpp

@@ -22,11 +22,11 @@ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTE
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "flir_camera_driver/cm3.h"
+#include "spinnaker_camera_driver/cm3.h"
 
 #include <string>
 
-namespace flir_camera_driver
+namespace spinnaker_camera_driver
 {
 Cm3::Cm3(Spinnaker::GenApi::INodeMap* node_map) : Camera(node_map)
 {
@@ -158,7 +158,7 @@ void Cm3::setNewConfiguration(const FlirConfig& config, const uint32_t& level)
 }
 
 // Image Size and Pixel Format
-void Cm3::setImageControlFormats(const flir_camera_driver::FlirConfig& config)
+void Cm3::setImageControlFormats(const spinnaker_camera_driver::FlirConfig& config)
 {
   // Set Binning and Decimation
   // setProperty(node_map_, "BinningHorizontal", config.image_format_x_binning);  // Not available on CM3
@@ -204,4 +204,4 @@ void Cm3::setImageControlFormats(const flir_camera_driver::FlirConfig& config)
   // Set Pixel Format
   setProperty(node_map_, "PixelFormat", config.image_format_color_coding);
 }
-}  // namespace flir_camera_driver
+}  // namespace spinnaker_camera_driver

flir_camera_driver/src/node.cpp → spinnaker_camera_driver/src/node.cpp

@@ -53,7 +53,7 @@ int main(int argc, char** argv)
   nodelet::M_string remap(ros::names::getRemappings());
   nodelet::V_string nargv;
   std::string nodelet_name = ros::this_node::getName();
-  nodelet.load(nodelet_name, "flir_camera_driver/FlirCameraNodelet", remap, nargv);
+  nodelet.load(nodelet_name, "spinnaker_camera_driver/FlirCameraNodelet", remap, nargv);
 
   ros::spin();