Suggested changes from PR umati#783

mindonwarp · Jun 7, 2022 · 9f21bdd · 9f21bdd
1 parent 41eb9c7
commit 9f21bdd
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 36 deletions.
diff --git a/.clang-format b/.clang-format
@@ -9,5 +9,4 @@ BinPackArguments: false
 AlignAfterOpenBracket: AlwaysBreak
 ContinuationIndentWidth: 2
 ConstructorInitializerIndentWidth: 2
-SortIncludes: false
 ...
diff --git a/GMS/FullGMS.cpp b/GMS/FullGMS.cpp
@@ -2,18 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2022 (c) mindonwarp
+ * Copyright 2022 (c) Alen Galinec
  */
 
-#include "FullGMS.hpp"
-
-#include <string>
 #include <sstream>
+#include <string>
 #include <unordered_map>
 
 #include "../TypeDefinition/GMS/Constants.hpp"
 #include "../TypeDefinition/GMS/GMSType.hpp"
 #include "../TypeDefinition/TypeDefinition.hpp"
+#include "FullGMS.hpp"
 
 namespace {
 static std::unordered_map<std::uint32_t, UmatiServerLib::LocalizedText_t> CLASS_MAP = {

diff --git a/GMS/FullGMS.hpp b/GMS/FullGMS.hpp
@@ -2,13 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2022 (c) mindonwarp
+ * Copyright 2022 (c) Alen Galinec
  */
 
 #pragma once
 
 #include "../TypeDefinition/GMS/GMSType.hpp"
-
 #include "InstantiatedGMS.hpp"
 
 class FullGMS : public InstantiatedGMS {

diff --git a/GMS/InstantiatedGMS.cpp b/GMS/InstantiatedGMS.cpp
@@ -2,13 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2022 (c) mindonwarp
+ * Copyright 2022 (c) Alen Galinec
  */
 
-#include "InstantiatedGMS.hpp"
-
 #include <sstream>
 
+#include "InstantiatedGMS.hpp"
+
 InstantiatedGMS::InstantiatedGMS(UA_Server* pServer) : m_pServer(pServer), NsIndex(m_nsIndex), n(pServer) {}
 
 void InstantiatedGMS::CreateObject() {

diff --git a/GMS/InstantiatedGMS.hpp b/GMS/InstantiatedGMS.hpp
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2022 (c) mindonwarp
+ * Copyright 2022 (c) Alen Galinec
  */
 
 #pragma once
@@ -11,9 +11,9 @@
 #include <Open62541Cpp/UA_NodeId.hpp>
 #include <cstdint>
 
+#include "../MachineTools/SimulatedInstance.hpp"
 #include "../TypeDefinition/GMS/GMSType.hpp"
 #include "../UmatiServerLib/NodesMaster.hpp"
-#include "../MachineTools/SimulatedInstance.hpp"
 
 class InstantiatedGMS : public SimulatedInstance {
  public:

diff --git a/TypeDefinition/GMS/GMSEquipmentType.hpp b/TypeDefinition/GMS/GMSEquipmentType.hpp
@@ -3,7 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * Copyright 2020-2021 (c) Christian von Arnim, ISW University of Stuttgart (for umati and VDW e.V.)
- * Copyright 2022 (c) Sebastian Friedl, ISW University of Stuttgart (for umati and VDMA e.V.)
+ * Copyright 2022 (c) Sebastian Friedl, ISW University of Stuttgart (for umati and VDMA e.V.),
+ * Copyright 2022 (c) Alen Galinec
  */
 
 #pragma once

diff --git a/TypeDefinition/GMS/GMSIdentificationType.hpp b/TypeDefinition/GMS/GMSIdentificationType.hpp
@@ -3,9 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * Copyright 2022 (c) Sebastian Friedl, ISW University of Stuttgart (for VDMA e.V.)
+ * Copyright 2022 (c) Alen Galinec
  */
 
 #pragma once
+#include <string>
+
 #include "../../UmatiServerLib/BindableMemberPlaceholder.hpp"
 #include "../MachineTool/MachineToolIdentification.hpp"
 #include "../Machinery/IMachineTagNameplate.hpp"
@@ -15,8 +18,6 @@
 #include "Constants.hpp"
 #include "WorkspaceType.hpp"
 
-#include <string>
-
 namespace GMS {
 
 struct GMSIdentification_t : public machineTool::MachineToolIdentification_t {

diff --git a/TypeDefinition/GMS/GMSSensor.hpp b/TypeDefinition/GMS/GMSSensor.hpp
@@ -2,16 +2,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2022 (c) mindonwarp
+ * Copyright 2022 (c) Alen Galinec
  */
 
 #pragma once
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include "../TypeDefinition.hpp"
 #include "../MachineTool/Tool.hpp"
+#include "../TypeDefinition.hpp"
 #include "../ns0/MultiStateDiscreteType.hpp"
 #include "Constants.hpp"
 

diff --git a/TypeDefinition/GMS/GMSToolList.hpp b/TypeDefinition/GMS/GMSToolList.hpp
@@ -2,15 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2022 (c) mindonwarp
+ * Copyright 2022 (c) Alen Galinec
  */
 
 #pragma once
 
 #include "../../UmatiServerLib/BindableMemberPlaceholder.hpp"
-#include "../TypeDefinition.hpp"
 #include "../MachineTool/ToolList.hpp"
-
+#include "../TypeDefinition.hpp"
 #include "Constants.hpp"
 #include "GMSSensor.hpp"
 

diff --git a/TypeDefinition/GMS/GMSType.hpp b/TypeDefinition/GMS/GMSType.hpp
@@ -3,18 +3,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * Copyright 2022 (c) Sebastian Friedl, ISW University of Stuttgart (for VDMA e.V.)
+ * Copyright 2022 (c) Alen Galinec
  */
 
 #pragma once
 #include "../MachineTool/MachineTool.hpp"
 #include "../MachineTool/Monitoring.hpp"
 #include "../MachineTool/Production.hpp"
 #include "../TypeDefinition.hpp"
-
 #include "Constants.hpp"
-#include "GMSNotification.hpp"
 #include "GMSEquipmentType.hpp"
 #include "GMSIdentificationType.hpp"
+#include "GMSNotification.hpp"
 #include "GMSResultManagementType.hpp"
 
 namespace GMS {

diff --git a/TypeDefinition/GMS/WorkspaceType.hpp b/TypeDefinition/GMS/WorkspaceType.hpp
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2022 (c) mindonwarp
+ * Copyright 2022 (c) Alen Galinec
  */
 #pragma once
 

diff --git a/TypeDefinition/ns0/DataItem.hpp b/TypeDefinition/ns0/DataItem.hpp
@@ -2,15 +2,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2022 (c) mindonwarp
+ * Copyright 2022 (c) Alen Galinec
  */
 
 #pragma once
+#include <string>
+
 #include "../TypeDefinition.hpp"
 #include "Constants.hpp"
 
-#include <string>
-
 namespace ns0 {
 
 struct DataItem_t {

diff --git a/TypeDefinition/ns0/DiscreteItem.hpp b/TypeDefinition/ns0/DiscreteItem.hpp
@@ -2,15 +2,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2022 (c) mindonwarp
+ * Copyright 2022 (c) Alen Galinec
  */
 
 #pragma once
+#include <string>
+
 #include "../TypeDefinition.hpp"
-#include "DataItem.hpp"
 #include "Constants.hpp"
-
-#include <string>
+#include "DataItem.hpp"
 
 namespace ns0 {
 

diff --git a/TypeDefinition/ns0/MultiStateDiscreteType.hpp b/TypeDefinition/ns0/MultiStateDiscreteType.hpp
@@ -2,13 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * Copyright 2022 (c) mindonwarp
+ * Copyright 2022 (c) Alen Galinec
  */
 
 #pragma once
 #include "../TypeDefinition.hpp"
-#include "DiscreteItem.hpp"
 #include "Constants.hpp"
+#include "DiscreteItem.hpp"
 
 namespace ns0 {
 

diff --git a/UmatiServerLib/BindVariable.hpp b/UmatiServerLib/BindVariable.hpp
@@ -5,6 +5,7 @@
  * Copyright 2020-2021 (c) Christian von Arnim, ISW University of Stuttgart (for umati and VDW e.V.)
  * Copyright 2021 (c) Christoph Ruckstetter, Michael Weinig AG
  * Copyright 2022 (c) Sebastian Friedl, ISW University of Stuttgart (for VDMA e.V.)
+ * Copyright 2022 (c) Alen Galinec
  */
 
 #pragma once
@@ -20,8 +21,8 @@
 #include <list>
 
 #include "../OpcUaTypes/DateTime.hpp"
-#include "../OpcUaTypes/StatusCode.hpp"
 #include "../OpcUaTypes/LocalizedText.hpp"
+#include "../OpcUaTypes/StatusCode.hpp"
 #include "BindableMemberValue.hpp"
 #include "ConvertSimpleValue.hpp"
 #include "ConvertStructValue.hpp"

diff --git a/UmatiServerLib/ConvertSimpleValue.cpp b/UmatiServerLib/ConvertSimpleValue.cpp
@@ -4,15 +4,15 @@
  *
  * Copyright 2019-2021 (c) Christian von Arnim, ISW University of Stuttgart (for umati and VDW e.V.)
  * Copyright 2022 (c) Sebastian Friedl, ISW University of Stuttgart (for VDMA e.V.)
+ * Copyright 2022 (c) Alen Galinec
  */
 
-#include "ConvertSimpleValue.hpp"
-
 #include <open62541/types_generated.h>
 
 #include <Open62541Cpp/UA_String.hpp>
 #include <iostream>
 
+#include "ConvertSimpleValue.hpp"
 #include "NodeValue.hpp"
 #include "UaTypeHelper.hpp"
 

diff --git a/UmatiServerLib/ConvertSimpleValue.hpp b/UmatiServerLib/ConvertSimpleValue.hpp
@@ -4,6 +4,7 @@
  *
  * Copyright 2019-2021 (c) Christian von Arnim, ISW University of Stuttgart (for umati and VDW e.V.)
  * Copyright 2022 (c) Sebastian Friedl, ISW University of Stuttgart (for VDMA e.V.)
+ * Copyright 2022 (c) Alen Galinec
  */
 
 #pragma once
@@ -16,8 +17,8 @@
 #include <variant>
 
 #include "../OpcUaTypes/DateTime.hpp"
-#include "../OpcUaTypes/StatusCode.hpp"
 #include "../OpcUaTypes/LocalizedText.hpp"
+#include "../OpcUaTypes/StatusCode.hpp"
 #include "NodeValue.hpp"
 
 namespace UmatiServerLib {