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

source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp

@@ -785,7 +785,7 @@ void EtherCAT::readErrorCounters()
 
         //not used, only confusing info...
         //uint16_t configAddr = ecx_APRDw(ecx_context.port, ADPh, ECT_REG_STADR, 100000);
-        for (int i = 0; i < 4; i++)
+        for (int i = 0; i < 2; i++)
         {
 
             // Error handling taken from
@@ -809,14 +809,14 @@ void EtherCAT::readErrorCounters()
             }
             else if (ret1 > 0 && ret2 > 0 && ret3 > 0 && ret4 > 0)
             {
-                ARMARX_INFO << "no errors for Slavenumber " << slaveIndex << " port:" << i << "\tname: " << name;
+                ARMARX_DEBUG << "no errors for Slavenumber " << slaveIndex << " port:" << i << "\tname: " << name;
             }
         }
         IceUtil::Time elapsed = (IceUtil::Time::now(IceUtil::Time::Monotonic) - start);
         if (elapsed.toMilliSeconds() > 10)
         {
             updatePDO();
-            ARMARX_INFO << "Updated BUS to prevent timeout, " << elapsed << " has passed since last bus update.";
+            ARMARX_DEBUG << "Updated BUS to prevent timeout, " << elapsed << " has passed since last bus update.";
             start = IceUtil::Time::now(IceUtil::Time::Monotonic);
         }
     }

source/RobotAPI/libraries/aron/core/navigator/data/NavigatorFwd.h

+/**
+ * This file is part of ArmarX.
+ *
+ * ArmarX is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * ArmarX is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author     Fabian Reister ( fabian dot reister at kit dot edu )
+ * @date       2021
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
+ *             GNU General Public License
+ */
+
+#pragma once
+
+#include <memory>
+
+// TODO add forward declarations for those as well
+// #include "complex/NDArray.h"
+// #include "container/List.h"
+// #include "primitive/Bool.h"
+// #include "primitive/Double.h"
+// #include "primitive/Float.h"
+// #include "primitive/Int.h"
+// #include "primitive/Long.h"
+// #include "primitive/String.h"
+
+namespace armarx::aron::datanavigator
+{
+    class DictNavigator;
+    using DictNavigatorPtr = std::shared_ptr<DictNavigator>;
+
+} // namespace armarx::aron::datanavigator

source/RobotAPI/libraries/aron/core/navigator/type/NavigatorFwd.h

+/*
+ * This file is part of ArmarX.
+ *
+ * ArmarX is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * ArmarX is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author     Fabian Reister ( fabian dot reister at kit dot edu )
+ * @date       2021
+ * @copyright  http://www.gnu.org/licenses/gpl-2.0.txt
+ *             GNU General Public License
+ */
+
+#pragma once
+
+#include <memory>
+
+/// implemented
+// #include "container/List.h"
+// #include "container/Object.h"
+
+/// TODO add forward decl for those as well
+// #include "container/Pair.h"
+// #include "container/Tuple.h"
+// #include "enum/IntEnum.h"
+// #include "ndarray/EigenMatrix.h"
+// #include "ndarray/EigenQuaternion.h"
+// #include "ndarray/IVTCByteImage.h"
+// #include "ndarray/NDArray.h"
+// #include "ndarray/OpenCVMat.h"
+// #include "ndarray/Orientation.h"
+// #include "ndarray/PCLPointCloud.h"
+// #include "ndarray/Pose.h"
+// #include "ndarray/Position.h"
+// #include "primitive/Bool.h"
+// #include "primitive/Double.h"
+// #include "primitive/Float.h"
+// #include "primitive/Int.h"
+// #include "primitive/Long.h"
+// #include "primitive/String.h"
+// #include "primitive/Time.h"
+
+namespace armarx::aron::typenavigator
+{
+    class DictNavigator;
+    using DictNavigatorPtr = std::shared_ptr<DictNavigator>;
+
+    class ListNavigator;
+    using ListNavigatorPtr = std::shared_ptr<ListNavigator>;
+
+} // namespace armarx::aron::typenavigator