From 583e4776c0e8ad7e2824606954fb37182bf946ed Mon Sep 17 00:00:00 2001
From: Fernando Herrero Cotarelo <fherrero@iri.upc.edu>
Date: Fri, 22 Apr 2016 10:20:01 +0000
Subject: [PATCH] iri_firewire_camera: flea_6mm.yaml fixed camera name,
 node.cpp fixed camera name

---
 calibration/flea_6mm.yaml           | 4 ++--
 src/firewire_camera_driver_node.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/calibration/flea_6mm.yaml b/calibration/flea_6mm.yaml
index 5833579..0c9dee4 100644
--- a/calibration/flea_6mm.yaml
+++ b/calibration/flea_6mm.yaml
@@ -1,6 +1,6 @@
 image_width: 1024
 image_height: 768
-camera_name: narrow_stereo
+camera_name: firewire_camera
 camera_matrix:
   rows: 3
   cols: 3
@@ -17,4 +17,4 @@ rectification_matrix:
 projection_matrix:
   rows: 3
   cols: 4
-  data: [1241.253662, 0, 692.043757, 0, 0, 1262.634277, 536.985341, 0, 0, 0, 1, 0]
\ No newline at end of file
+  data: [1241.253662, 0, 692.043757, 0, 0, 1262.634277, 536.985341, 0, 0, 0, 1, 0]
diff --git a/src/firewire_camera_driver_node.cpp b/src/firewire_camera_driver_node.cpp
index 9d66d14..d52b3ec 100644
--- a/src/firewire_camera_driver_node.cpp
+++ b/src/firewire_camera_driver_node.cpp
@@ -240,7 +240,7 @@ void FirewireCameraNodelet::onInit()
   this->node=new FirewireCameraDriverNode(getPrivateNodeHandle());
   // initialize the thread
   this->thread_server=CThreadServer::instance();
-  this->spin_thread_id=getName() + "_bumblebee2_nodelet_spin";
+  this->spin_thread_id=getName() + "_firewire_nodelet_spin";
   this->thread_server->create_thread(this->spin_thread_id);
   this->thread_server->attach_thread(this->spin_thread_id,this->spin_thread,this);
   // start the spin thread
-- 
GitLab