update generated code using SmartMDSD Toolchain v3.12

Servicerobotics-Ulm · Dec 5, 2019 · 3fb444a · 3fb444a
1 parent e419a03
commit 3fb444a
Show file tree

Hide file tree

Showing 339 changed files with 1,529 additions and 1,525 deletions.
diff --git a/ComponentGMapping/opcua-backend/src-gen/ComponentGMappingOpcUaBackendPortFactory.cc b/ComponentGMapping/opcua-backend/src-gen/ComponentGMappingOpcUaBackendPortFactory.cc
@@ -29,9 +29,9 @@
 #include <SeRoNetSDK/SeRoNet/OPCUA/Server/QueryServer.hpp>
 
 // include referenced CommunicationObject SeRoNetSDK self description implementations
-#include "CommNavigationObjectsOpcUa/CommGridMapOpcUa.hh"
-#include "CommBasicObjectsOpcUa/CommMobileLaserScanOpcUa.hh"
 #include "CommBasicObjectsOpcUa/CommBasePositionUpdateOpcUa.hh"
+#include "CommBasicObjectsOpcUa/CommMobileLaserScanOpcUa.hh"
+#include "CommNavigationObjectsOpcUa/CommGridMapOpcUa.hh"
 
 // create a static instance of the OpcUaBackendPortFactory
 static ComponentGMappingOpcUaBackendPortFactory OpcUaBackendPortFactory;
@@ -59,14 +59,14 @@ int ComponentGMappingOpcUaBackendPortFactory::onStartup()
 	return -1;
 }
 
-Smart::IPushClientPattern<CommBasicObjects::CommMobileLaserScan> * ComponentGMappingOpcUaBackendPortFactory::createLaserClient()
+Smart::ISendClientPattern<CommBasicObjects::CommBasePositionUpdate> * ComponentGMappingOpcUaBackendPortFactory::createBasePositionUpdateClient()
 {
-	return new SeRoNet::OPCUA::Client::PushClient<CommBasicObjects::CommMobileLaserScan>(componentImpl);
+	return new SeRoNet::OPCUA::Client::SendClient<CommBasicObjects::CommBasePositionUpdate>(componentImpl);
 }
 
-Smart::ISendClientPattern<CommBasicObjects::CommBasePositionUpdate> * ComponentGMappingOpcUaBackendPortFactory::createBasePositionUpdateClient()
+Smart::IPushClientPattern<CommBasicObjects::CommMobileLaserScan> * ComponentGMappingOpcUaBackendPortFactory::createLaserClient()
 {
-	return new SeRoNet::OPCUA::Client::SendClient<CommBasicObjects::CommBasePositionUpdate>(componentImpl);
+	return new SeRoNet::OPCUA::Client::PushClient<CommBasicObjects::CommMobileLaserScan>(componentImpl);
 }
 
 

diff --git a/ComponentGMapping/opcua-backend/src-gen/ComponentGMappingOpcUaBackendPortFactory.hh b/ComponentGMapping/opcua-backend/src-gen/ComponentGMappingOpcUaBackendPortFactory.hh
@@ -45,8 +45,8 @@ public:
 	virtual void initialize(ComponentGMapping *component, int argc, char* argv[]) override;
 	virtual int onStartup() override;
 
-	virtual Smart::IPushClientPattern<CommBasicObjects::CommMobileLaserScan> * createLaserClient() override;
 	virtual Smart::ISendClientPattern<CommBasicObjects::CommBasePositionUpdate> * createBasePositionUpdateClient() override;
+	virtual Smart::IPushClientPattern<CommBasicObjects::CommMobileLaserScan> * createLaserClient() override;
 
 	virtual Smart::IPushServerPattern<CommNavigationObjects::CommGridMap> * createNewestMapPushServer(const std::string &serviceName) override;
 

diff --git a/ComponentGMapping/opcua-backend/src-gen/info.txt b/ComponentGMapping/opcua-backend/src-gen/info.txt
@@ -14,4 +14,4 @@
 // running the code generator.
 //--------------------------------------------------------------------------
 
-// Generated with SmartMDSD Toolchain Version 3.11.0.201911291144
+// Generated with SmartMDSD Toolchain Version 3.12.0.201912041712
diff --git a/ComponentGMapping/smartsoft/src-gen/ComponentGMapping.cc b/ComponentGMapping/smartsoft/src-gen/ComponentGMapping.cc
@@ -72,10 +72,10 @@ ComponentGMapping::ComponentGMapping()
 	connections.gMappingTask.priority = -1;
 	connections.gMappingTask.cpuAffinity = -1;
 
-	// initialize members of OpcUaBackendComponentGeneratorExtension
-
 	// initialize members of ComponentGMappingROSExtension
 
+	// initialize members of OpcUaBackendComponentGeneratorExtension
+
 	// initialize members of PlainOpcUaComponentGMappingExtension
 
 }
@@ -203,10 +203,10 @@ void ComponentGMapping::init(int argc, char *argv[])
 		// print out the actual parameters which are used to initialize the component
 		std::cout << " \nComponentDefinition Initial-Parameters:\n" << COMP->getParameters() << std::endl;
 
-		// initializations of OpcUaBackendComponentGeneratorExtension
-
 		// initializations of ComponentGMappingROSExtension
 
+		// initializations of OpcUaBackendComponentGeneratorExtension
+
 		// initializations of PlainOpcUaComponentGMappingExtension
 
 
@@ -411,10 +411,10 @@ void ComponentGMapping::fini()
 		portFactory->second->destroy();
 	}
 
-	// destruction of OpcUaBackendComponentGeneratorExtension
-
 	// destruction of ComponentGMappingROSExtension
 
+	// destruction of OpcUaBackendComponentGeneratorExtension
+
 	// destruction of PlainOpcUaComponentGMappingExtension
 
 }
@@ -533,10 +533,10 @@ void ComponentGMapping::loadParameter(int argc, char *argv[])
 			parameter.getInteger("GMappingTask", "cpuAffinity", connections.gMappingTask.cpuAffinity);
 		}
 
-		// load parameters for OpcUaBackendComponentGeneratorExtension
-
 		// load parameters for ComponentGMappingROSExtension
 
+		// load parameters for OpcUaBackendComponentGeneratorExtension
+
 		// load parameters for PlainOpcUaComponentGMappingExtension
 
 

diff --git a/ComponentGMapping/smartsoft/src-gen/ComponentGMapping.hh b/ComponentGMapping/smartsoft/src-gen/ComponentGMapping.hh
@@ -29,10 +29,10 @@
 class ComponentGMappingPortFactoryInterface;
 class ComponentGMappingExtension;
 
-// includes for OpcUaBackendComponentGeneratorExtension
-
 // includes for ComponentGMappingROSExtension
 
+// includes for OpcUaBackendComponentGeneratorExtension
+
 // includes for PlainOpcUaComponentGMappingExtension
 // include plain OPC UA device clients
 // include plain OPC UA status servers
@@ -125,10 +125,10 @@ public:
 
 	// define request-handlers
 
-	// definitions of OpcUaBackendComponentGeneratorExtension
-
 	// definitions of ComponentGMappingROSExtension
 
+	// definitions of OpcUaBackendComponentGeneratorExtension
+
 	// definitions of PlainOpcUaComponentGMappingExtension
 
 
@@ -254,10 +254,10 @@ public:
 			std::string roboticMiddleware;
 		} laserClient;
 
-		// -- parameters for OpcUaBackendComponentGeneratorExtension
-
 		// -- parameters for ComponentGMappingROSExtension
 
+		// -- parameters for OpcUaBackendComponentGeneratorExtension
+
 		// -- parameters for PlainOpcUaComponentGMappingExtension
 
 	} connections;

diff --git a/ComponentGMapping/smartsoft/src-gen/ComponentGMapping.ini.head b/ComponentGMapping/smartsoft/src-gen/ComponentGMapping.ini.head
@@ -76,10 +76,10 @@ interval 1
 roboticMiddleware ACE_SmartSoft
 
 ##########################
-## parameters of OpcUaBackendComponentGeneratorExtension
+## parameters of ComponentGMappingROSExtension
 
 ##########################
-## parameters of ComponentGMappingROSExtension
+## parameters of OpcUaBackendComponentGeneratorExtension
 
 ##########################
 ## parameters of PlainOpcUaComponentGMappingExtension

diff --git a/ComponentGMapping/smartsoft/src-gen/ComponentGMapping.ini.template b/ComponentGMapping/smartsoft/src-gen/ComponentGMapping.ini.template
@@ -76,10 +76,10 @@ interval 1
 roboticMiddleware ACE_SmartSoft
 
 ##########################
-## parameters of OpcUaBackendComponentGeneratorExtension
+## parameters of ComponentGMappingROSExtension
 
 ##########################
-## parameters of ComponentGMappingROSExtension
+## parameters of OpcUaBackendComponentGeneratorExtension
 
 ##########################
 ## parameters of PlainOpcUaComponentGMappingExtension

diff --git a/ComponentGMapping/smartsoft/src-gen/MixedPortIncludes.cmake b/ComponentGMapping/smartsoft/src-gen/MixedPortIncludes.cmake
@@ -1,10 +1,3 @@
-# includes for OpcUaBackendComponentGeneratorExtension
-GET_FILENAME_COMPONENT(OPC_UA_BACKEND_DIR "${PROJECT_SOURCE_DIR}/../opcua-backend" REALPATH)
-IF(EXISTS ${OPC_UA_BACKEND_DIR})
-	INCLUDE("${OPC_UA_BACKEND_DIR}/src-gen/OpcUaBackend.cmake")
-	LIST(APPEND FURTHER_SRCS ${OPC_UA_BACKEND_SRCS})
-ENDIF(EXISTS ${OPC_UA_BACKEND_DIR})
-
 # includes for ComponentGMappingROSExtension
 GET_FILENAME_COMPONENT(ROS_DIR "${PROJECT_SOURCE_DIR}/../ROS" REALPATH)
 IF(EXISTS ${ROS_DIR})
@@ -13,6 +6,13 @@ LIST(APPEND FURTHER_SRCS ${ROS_SRCS})
 INCLUDE_DIRECTORIES(${ROS_INCLUDES})
 ENDIF(EXISTS ${ROS_DIR})
 
+# includes for OpcUaBackendComponentGeneratorExtension
+GET_FILENAME_COMPONENT(OPC_UA_BACKEND_DIR "${PROJECT_SOURCE_DIR}/../opcua-backend" REALPATH)
+IF(EXISTS ${OPC_UA_BACKEND_DIR})
+	INCLUDE("${OPC_UA_BACKEND_DIR}/src-gen/OpcUaBackend.cmake")
+	LIST(APPEND FURTHER_SRCS ${OPC_UA_BACKEND_SRCS})
+ENDIF(EXISTS ${OPC_UA_BACKEND_DIR})
+
 # includes for PlainOpcUaComponentGMappingExtension
 GET_FILENAME_COMPONENT(PlainOPCUA_DIR "${PROJECT_SOURCE_DIR}/../plainOpcUa" REALPATH)
 IF(EXISTS ${PlainOPCUA_DIR})

diff --git a/ComponentGMapping/smartsoft/src-gen/MixedPortTargetConfigs.cmake b/ComponentGMapping/smartsoft/src-gen/MixedPortTargetConfigs.cmake
@@ -1,15 +1,15 @@
+# target configurations for ComponentGMappingROSExtension
+IF(EXISTS ${ROS_DIR})
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ROS_LIBS})
+ENDIF(EXISTS ${ROS_DIR})
+
 # target configurations for OpcUaBackendComponentGeneratorExtension
 IF(SeRoNetSDK_FOUND)
 #TARGET_LINK_LIBRARIES(${PROJECT_NAME} SeRoNetSDK::SeRoNetSDK)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} CommBasicObjectsOpcUa)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} CommNavigationObjectsOpcUa)
 ENDIF(SeRoNetSDK_FOUND)
 
-# target configurations for ComponentGMappingROSExtension
-IF(EXISTS ${ROS_DIR})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ROS_LIBS})
-ENDIF(EXISTS ${ROS_DIR})
-
 # target configurations for PlainOpcUaComponentGMappingExtension
 IF(Open62541CppWrapper_FOUND)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} Open62541CppWrapper)

diff --git a/ComponentGMapping/smartsoft/src-gen/info.txt b/ComponentGMapping/smartsoft/src-gen/info.txt
@@ -14,4 +14,4 @@
 // running the code generator.
 //--------------------------------------------------------------------------
 
-// Generated with SmartMDSD Toolchain Version 3.11.0.201911291144
+// Generated with SmartMDSD Toolchain Version 3.12.0.201912041712
diff --git a/ComponentKB/opcua-backend/src-gen/ComponentKBOpcUaBackendPortFactory.cc b/ComponentKB/opcua-backend/src-gen/ComponentKBOpcUaBackendPortFactory.cc
@@ -29,11 +29,11 @@
 #include <SeRoNetSDK/SeRoNet/OPCUA/Server/QueryServer.hpp>
 
 // include referenced CommunicationObject SeRoNetSDK self description implementations
-#include "CommBasicObjectsOpcUa/CommKBEventResultOpcUa.hh"
 #include "CommBasicObjectsOpcUa/CommKBEventParamOpcUa.hh"
+#include "CommBasicObjectsOpcUa/CommKBEventResultOpcUa.hh"
+#include "CommBasicObjectsOpcUa/CommKBRequestOpcUa.hh"
 #include "CommBasicObjectsOpcUa/CommKBResponseOpcUa.hh"
 #include "CommBasicObjectsOpcUa/CommVoidOpcUa.hh"
-#include "CommBasicObjectsOpcUa/CommKBRequestOpcUa.hh"
 
 // create a static instance of the OpcUaBackendPortFactory
 static ComponentKBOpcUaBackendPortFactory OpcUaBackendPortFactory;
@@ -67,14 +67,14 @@ Smart::IEventClientPattern<CommBasicObjects::CommKBEventParam, CommBasicObjects:
 }
 
 
-Smart::IQueryServerPattern<CommBasicObjects::CommKBRequest, CommBasicObjects::CommKBResponse> * ComponentKBOpcUaBackendPortFactory::createKbQuery(const std::string &serviceName)
+Smart::IEventServerPattern<CommBasicObjects::CommKBEventParam, CommBasicObjects::CommKBEventResult, CommBasicObjects::CommVoid> * ComponentKBOpcUaBackendPortFactory::createKbEventServer(const std::string &serviceName, std::shared_ptr<Smart::IEventTestHandler<CommBasicObjects::CommKBEventParam, CommBasicObjects::CommKBEventResult, CommBasicObjects::CommVoid>> kbEventServerEventTestHandler)
 {
-	return new SeRoNet::OPCUA::Server::QueryServer<CommBasicObjects::CommKBRequest, CommBasicObjects::CommKBResponse>(componentImpl, serviceName);
+	return new SeRoNet::OPCUA::Server::EventServer<CommBasicObjects::CommKBEventParam, CommBasicObjects::CommKBEventResult, CommBasicObjects::CommVoid>(componentImpl, serviceName, kbEventServerEventTestHandler);
 }
 
-Smart::IEventServerPattern<CommBasicObjects::CommKBEventParam, CommBasicObjects::CommKBEventResult, CommBasicObjects::CommVoid> * ComponentKBOpcUaBackendPortFactory::createKbEventServer(const std::string &serviceName, std::shared_ptr<Smart::IEventTestHandler<CommBasicObjects::CommKBEventParam, CommBasicObjects::CommKBEventResult, CommBasicObjects::CommVoid>> kbEventServerEventTestHandler)
+Smart::IQueryServerPattern<CommBasicObjects::CommKBRequest, CommBasicObjects::CommKBResponse> * ComponentKBOpcUaBackendPortFactory::createKbQuery(const std::string &serviceName)
 {
-	return new SeRoNet::OPCUA::Server::EventServer<CommBasicObjects::CommKBEventParam, CommBasicObjects::CommKBEventResult, CommBasicObjects::CommVoid>(componentImpl, serviceName, kbEventServerEventTestHandler);
+	return new SeRoNet::OPCUA::Server::QueryServer<CommBasicObjects::CommKBRequest, CommBasicObjects::CommKBResponse>(componentImpl, serviceName);
 }
 
 

diff --git a/ComponentKB/opcua-backend/src-gen/ComponentKBOpcUaBackendPortFactory.hh b/ComponentKB/opcua-backend/src-gen/ComponentKBOpcUaBackendPortFactory.hh
@@ -47,8 +47,8 @@ public:
 
 	virtual Smart::IEventClientPattern<CommBasicObjects::CommKBEventParam, CommBasicObjects::CommKBEventResult> * createKbChainedEntriesEventClient() override;
 
-	virtual Smart::IQueryServerPattern<CommBasicObjects::CommKBRequest, CommBasicObjects::CommKBResponse> * createKbQuery(const std::string &serviceName) override;
 	virtual Smart::IEventServerPattern<CommBasicObjects::CommKBEventParam, CommBasicObjects::CommKBEventResult, CommBasicObjects::CommVoid> * createKbEventServer(const std::string &serviceName, std::shared_ptr<Smart::IEventTestHandler<CommBasicObjects::CommKBEventParam, CommBasicObjects::CommKBEventResult, CommBasicObjects::CommVoid>> kbEventServerEventTestHandler) override;
+	virtual Smart::IQueryServerPattern<CommBasicObjects::CommKBRequest, CommBasicObjects::CommKBResponse> * createKbQuery(const std::string &serviceName) override;
 
 	virtual int onShutdown(const std::chrono::steady_clock::duration &timeoutTime=std::chrono::seconds(2)) override;
 	virtual void destroy() override;

diff --git a/ComponentKB/opcua-backend/src-gen/info.txt b/ComponentKB/opcua-backend/src-gen/info.txt
@@ -14,4 +14,4 @@
 // running the code generator.
 //--------------------------------------------------------------------------
 
-// Generated with SmartMDSD Toolchain Version 3.11.0.201911291144
+// Generated with SmartMDSD Toolchain Version 3.12.0.201912041712
diff --git a/ComponentKB/smartsoft/src-gen/ComponentKB.cc b/ComponentKB/smartsoft/src-gen/ComponentKB.cc
@@ -74,10 +74,10 @@ ComponentKB::ComponentKB()
 	connections.dummy.cpuAffinity = -1;
 	connections.kbChainedEntriesEventClientHandler.prescale = 1;
 
-	// initialize members of OpcUaBackendComponentGeneratorExtension
-
 	// initialize members of ComponentKBROSExtension
 
+	// initialize members of OpcUaBackendComponentGeneratorExtension
+
 	// initialize members of PlainOpcUaComponentKBExtension
 
 }
@@ -186,10 +186,10 @@ void ComponentKB::init(int argc, char *argv[])
 		// print out the actual parameters which are used to initialize the component
 		std::cout << " \nComponentDefinition Initial-Parameters:\n" << COMP->getParameters() << std::endl;
 
-		// initializations of OpcUaBackendComponentGeneratorExtension
-
 		// initializations of ComponentKBROSExtension
 
+		// initializations of OpcUaBackendComponentGeneratorExtension
+
 		// initializations of PlainOpcUaComponentKBExtension
 
 
@@ -398,10 +398,10 @@ void ComponentKB::fini()
 		portFactory->second->destroy();
 	}
 
-	// destruction of OpcUaBackendComponentGeneratorExtension
-
 	// destruction of ComponentKBROSExtension
 
+	// destruction of OpcUaBackendComponentGeneratorExtension
+
 	// destruction of PlainOpcUaComponentKBExtension
 
 }
@@ -519,10 +519,10 @@ void ComponentKB::loadParameter(int argc, char *argv[])
 			parameter.getInteger("kbChainedEntriesEventClientHandler", "prescale", connections.kbChainedEntriesEventClientHandler.prescale);
 		}
 
-		// load parameters for OpcUaBackendComponentGeneratorExtension
-
 		// load parameters for ComponentKBROSExtension
 
+		// load parameters for OpcUaBackendComponentGeneratorExtension
+
 		// load parameters for PlainOpcUaComponentKBExtension
 
 

diff --git a/ComponentKB/smartsoft/src-gen/ComponentKB.hh b/ComponentKB/smartsoft/src-gen/ComponentKB.hh
@@ -29,10 +29,10 @@
 class ComponentKBPortFactoryInterface;
 class ComponentKBExtension;
 
-// includes for OpcUaBackendComponentGeneratorExtension
-
 // includes for ComponentKBROSExtension
 
+// includes for OpcUaBackendComponentGeneratorExtension
+
 // includes for PlainOpcUaComponentKBExtension
 // include plain OPC UA device clients
 // include plain OPC UA status servers
@@ -135,10 +135,10 @@ public:
 	// define request-handlers
 	KbQueryHandler *kbQueryHandler;
 
-	// definitions of OpcUaBackendComponentGeneratorExtension
-
 	// definitions of ComponentKBROSExtension
 
+	// definitions of OpcUaBackendComponentGeneratorExtension
+
 	// definitions of PlainOpcUaComponentKBExtension
 
 
@@ -262,10 +262,10 @@ public:
 			std::string roboticMiddleware;
 		} kbChainedEntriesEventClient;
 
-		// -- parameters for OpcUaBackendComponentGeneratorExtension
-
 		// -- parameters for ComponentKBROSExtension
 
+		// -- parameters for OpcUaBackendComponentGeneratorExtension
+
 		// -- parameters for PlainOpcUaComponentKBExtension
 
 	} connections;

diff --git a/ComponentKB/smartsoft/src-gen/ComponentKB.ini.head b/ComponentKB/smartsoft/src-gen/ComponentKB.ini.head
@@ -75,10 +75,10 @@ interval 1
 roboticMiddleware ACE_SmartSoft
 
 ##########################
-## parameters of OpcUaBackendComponentGeneratorExtension
+## parameters of ComponentKBROSExtension
 
 ##########################
-## parameters of ComponentKBROSExtension
+## parameters of OpcUaBackendComponentGeneratorExtension
 
 ##########################
 ## parameters of PlainOpcUaComponentKBExtension

diff --git a/ComponentKB/smartsoft/src-gen/ComponentKB.ini.template b/ComponentKB/smartsoft/src-gen/ComponentKB.ini.template
@@ -75,10 +75,10 @@ interval 1
 roboticMiddleware ACE_SmartSoft
 
 ##########################
-## parameters of OpcUaBackendComponentGeneratorExtension
+## parameters of ComponentKBROSExtension
 
 ##########################
-## parameters of ComponentKBROSExtension
+## parameters of OpcUaBackendComponentGeneratorExtension
 
 ##########################
 ## parameters of PlainOpcUaComponentKBExtension