From 221116b2dab34ee120e8aa9fe202518df96b5a8c Mon Sep 17 00:00:00 2001
From: Peter Albrecht <albrecpe@gmail.com>
Date: Tue, 17 Dec 2024 21:54:40 +0100
Subject: [PATCH 1/4] fix: change include ordering and turn off clang-format
locally
---
.../units/RobotUnit/util/ControlThreadOutputBuffer.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h b/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h
index 29c511539..984cd760c 100644
--- a/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h
+++ b/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h
@@ -24,11 +24,13 @@
#include <vector>
-#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
+// clang-format off
#include <ArmarXCore/core/logging/LoggingUtil.h> // THIS NEEDS TO BE INCLUDED BEFORE EXPRESSION EXCEPTION
#include <ArmarXCore/core/util/PropagateConst.h>
#include <ArmarXCore/core/util/StringHelperTemplates.h>
#include <ArmarXCore/core/util/TripleBuffer.h>
+#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
+// clang-format on
#include "../ControlTargets/ControlTargetBase.h"
#include "../Devices/ControlDevice.h"
--
GitLab
From 54f7c565855229ac54fd7df8a8498dc8bdaf1a2f Mon Sep 17 00:00:00 2001
From: Peter Albrecht <albrecpe@gmail.com>
Date: Tue, 17 Dec 2024 21:55:01 +0100
Subject: [PATCH 2/4] fix: add missing optional include
---
source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h b/source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h
index 15786c619..b2f1336a5 100644
--- a/source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h
+++ b/source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h
@@ -32,6 +32,7 @@
#include <RobotAPI/interface/units/GraspCandidateProviderInterface.h>
#include <RobotAPI/libraries/diffik/SimpleDiffIK.h>
+#include <optional>
namespace armarx
{
--
GitLab
From ae602b7fd25cccddf88e267432663fbf0d902ce1 Mon Sep 17 00:00:00 2001
From: Peter Albrecht <albrecpe@gmail.com>
Date: Thu, 19 Dec 2024 15:10:11 +0100
Subject: [PATCH 3/4] Use comments instead of clang-format off
---
.../units/RobotUnit/util/ControlThreadOutputBuffer.h | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h b/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h
index 984cd760c..0871a9432 100644
--- a/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h
+++ b/source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h
@@ -24,13 +24,16 @@
#include <vector>
-// clang-format off
-#include <ArmarXCore/core/logging/LoggingUtil.h> // THIS NEEDS TO BE INCLUDED BEFORE EXPRESSION EXCEPTION
+// For unknown reasons, this needs to be included before expression exception.
+// TODO: investigate
+#include <ArmarXCore/core/logging/LoggingUtil.h>
+
+// Remaining, normal includes.
#include <ArmarXCore/core/util/PropagateConst.h>
#include <ArmarXCore/core/util/StringHelperTemplates.h>
#include <ArmarXCore/core/util/TripleBuffer.h>
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
-// clang-format on
+
#include "../ControlTargets/ControlTargetBase.h"
#include "../Devices/ControlDevice.h"
--
GitLab
From 0cb0ee382d87c5fc0c094737959363db29eacc16 Mon Sep 17 00:00:00 2001
From: Peter Albrecht <usnlf@student.kit.edu>
Date: Thu, 19 Dec 2024 15:22:36 +0100
Subject: [PATCH 4/4] Rearrange optional include
---
source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h b/source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h
index b2f1336a5..a2aaac406 100644
--- a/source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h
+++ b/source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.h
@@ -25,6 +25,7 @@
#include <map>
#include <memory>
+#include <optional>
#include <Eigen/Core>
@@ -32,7 +33,6 @@
#include <RobotAPI/interface/units/GraspCandidateProviderInterface.h>
#include <RobotAPI/libraries/diffik/SimpleDiffIK.h>
-#include <optional>
namespace armarx
{
--
GitLab