Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI

Conflicts:
	source/RobotAPI/components/RobotState/RobotStateComponent.cpp

source/RobotAPI/components/RobotState/RobotStateComponent.cpp

@@ -262,7 +262,7 @@ namespace armarx
                     double influencePrev = 1.0f - (double)(time - prevIt->first) / deltaT;
                     //                    ARMARX_INFO_S << "Interpolating: " << time << " prev: " << time - prevIt->first << " next: " << it->first - time << VAROUT(influenceNext) << VAROUT(influencePrev) << " sum: " << (influenceNext + influencePrev);
                     auto jointIt = prevIt->second.jointMap.begin();
-                    for (auto & joint : config.jointMap)
+                    for (auto& joint : config.jointMap)
                     {
                         joint.second = joint.second * influenceNext + jointIt->second * influencePrev;
                         jointIt++;
@@ -288,11 +288,11 @@ namespace armarx
 
     void RobotStateComponent::reportJointAngles(const NameValueMap& jointAngles, Ice::Long timestamp, bool aValueChanged, const Current& c)
     {
-        //        IceUtil::Time start = IceUtil::Time::now();
         if (timestamp <= 0)
         {
             timestamp = IceUtil::Time::now().toMicroSeconds();
         }
+
         if (aValueChanged)
         {
             {
@@ -329,9 +329,6 @@ namespace armarx
         {
             history.erase(history.begin());
         }
-        //        ARMARX_VERBOSE << deactivateSpam(2) << "my duration: " << (IceUtil::Time::now() - start).toMicroSecondsDouble() << " ms";
-
-
     }
 
     std::string RobotStateComponent::getRobotFilename(const Ice::Current&) const
@@ -350,7 +347,7 @@ namespace armarx
         auto packages = armarx::Application::GetProjectDependencies();
         packages.push_back(Application::GetProjectName());
 
-        for (const std::string & projectName : packages)
+        for (const std::string& projectName : packages)
         {
             if (projectName.empty())
             {