From e7b654c98c979acc9712dbc9df3de7002846e70c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mirko=20W=C3=A4chter?= <mirko.waechter@kit.edu>
Date: Fri, 3 Feb 2017 23:34:20 +0000
Subject: [PATCH] Update RobotUnit.cpp
---
source/RobotAPI/libraries/Controllers/RobotUnit.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/source/RobotAPI/libraries/Controllers/RobotUnit.cpp b/source/RobotAPI/libraries/Controllers/RobotUnit.cpp
index 8fcc18853..f612bf99b 100644
--- a/source/RobotAPI/libraries/Controllers/RobotUnit.cpp
+++ b/source/RobotAPI/libraries/Controllers/RobotUnit.cpp
@@ -164,8 +164,8 @@ void armarx::RobotUnit::switchSetup(const Ice::StringSeq& controllerRequestedNam
{
if (!hasLVL1Controller(lvl1))
{
- ARMARX_ERROR << "No controler of the name '" << lvl1 << "' is loaded!";
- throw InvalidArgumentException {"No controler of the name '" + lvl1 + "' is loaded!"};
+ ARMARX_ERROR << "No controller of the name '" << lvl1 << "' is loaded!";
+ throw InvalidArgumentException {"No controller of the name '" + lvl1 + "' is loaded!"};
}
}
//check controllers (is there a collision/which controllers need to be deactivated)
@@ -276,7 +276,7 @@ armarx::LVL1ControllerInterfacePrx armarx::RobotUnit::loadController(const std::
ARMARX_ERROR << ss.str();
throw InvalidArgumentException {ss.str()};
}
- //create the controler
+ //create the controller
jointsUsedByLVL1Controler.clear();
LVL1ControllerPtr lvl1 = factory(this, config);
lvl1->jointControlModeMap = jointsUsedByLVL1Controler;
--
GitLab