From c10f9a5b6ddf6d55fd7d93aad6c3f1abd290c729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20J=C3=A4hne?= <christoph.jaehne@franka.de>
Date: Wed, 22 Jan 2020 10:38:41 +0100
Subject: [PATCH] added arm_id on error print when catchinh control exception

---
 franka_hw/src/franka_combinable_hw.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/franka_hw/src/franka_combinable_hw.cpp b/franka_hw/src/franka_combinable_hw.cpp
index 665df3f..4310390 100644
--- a/franka_hw/src/franka_combinable_hw.cpp
+++ b/franka_hw/src/franka_combinable_hw.cpp
@@ -77,7 +77,7 @@ void FrankaCombinableHW::controlLoop() {
       control();
     } catch (const franka::ControlException& e) {
       // Reflex could be caught and it needs to wait for automatic error recovery
-      ROS_ERROR("%s", e.what());
+      ROS_ERROR("%s: %s", arm_id_.c_str(), e.what());
       has_error_ = true;
       publishErrorState(has_error_);
     }
-- 
GitLab