Skip to content

Commit 3fb444a

Browse files
alex-lotzalex-lotz
committed
update generated code using SmartMDSD Toolchain v3.12
1 parent e419a03 commit 3fb444a

File tree

339 files changed

+1529
-1525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

339 files changed

+1529
-1525
lines changed

‎ComponentGMapping/opcua-backend/src-gen/ComponentGMappingOpcUaBackendPortFactory.cc

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
#include <SeRoNetSDK/SeRoNet/OPCUA/Server/QueryServer.hpp>
3030

3131
// include referenced CommunicationObject SeRoNetSDK self description implementations
32-
#include "CommNavigationObjectsOpcUa/CommGridMapOpcUa.hh"
33-
#include "CommBasicObjectsOpcUa/CommMobileLaserScanOpcUa.hh"
3432
#include "CommBasicObjectsOpcUa/CommBasePositionUpdateOpcUa.hh"
33+
#include "CommBasicObjectsOpcUa/CommMobileLaserScanOpcUa.hh"
34+
#include "CommNavigationObjectsOpcUa/CommGridMapOpcUa.hh"
3535

3636
// create a static instance of the OpcUaBackendPortFactory
3737
static ComponentGMappingOpcUaBackendPortFactory OpcUaBackendPortFactory;
@@ -59,14 +59,14 @@ int ComponentGMappingOpcUaBackendPortFactory::onStartup()
5959
return -1;
6060
}
6161

62-
Smart::IPushClientPattern<CommBasicObjects::CommMobileLaserScan> * ComponentGMappingOpcUaBackendPortFactory::createLaserClient()
62+
Smart::ISendClientPattern<CommBasicObjects::CommBasePositionUpdate> * ComponentGMappingOpcUaBackendPortFactory::createBasePositionUpdateClient()
6363
{
64-
return new SeRoNet::OPCUA::Client::PushClient<CommBasicObjects::CommMobileLaserScan>(componentImpl);
64+
return new SeRoNet::OPCUA::Client::SendClient<CommBasicObjects::CommBasePositionUpdate>(componentImpl);
6565
}
6666

67-
Smart::ISendClientPattern<CommBasicObjects::CommBasePositionUpdate> * ComponentGMappingOpcUaBackendPortFactory::createBasePositionUpdateClient()
67+
Smart::IPushClientPattern<CommBasicObjects::CommMobileLaserScan> * ComponentGMappingOpcUaBackendPortFactory::createLaserClient()
6868
{
69-
return new SeRoNet::OPCUA::Client::SendClient<CommBasicObjects::CommBasePositionUpdate>(componentImpl);
69+
return new SeRoNet::OPCUA::Client::PushClient<CommBasicObjects::CommMobileLaserScan>(componentImpl);
7070
}
7171

7272

‎ComponentGMapping/opcua-backend/src-gen/ComponentGMappingOpcUaBackendPortFactory.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public:
4545
virtual void initialize(ComponentGMapping *component, int argc, char* argv[]) override;
4646
virtual int onStartup() override;
4747

48-
virtual Smart::IPushClientPattern<CommBasicObjects::CommMobileLaserScan> * createLaserClient() override;
4948
virtual Smart::ISendClientPattern<CommBasicObjects::CommBasePositionUpdate> * createBasePositionUpdateClient() override;
49+
virtual Smart::IPushClientPattern<CommBasicObjects::CommMobileLaserScan> * createLaserClient() override;
5050

5151
virtual Smart::IPushServerPattern<CommNavigationObjects::CommGridMap> * createNewestMapPushServer(const std::string &serviceName) override;
5252

‎ComponentGMapping/opcua-backend/src-gen/info.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
// running the code generator.
1515
//--------------------------------------------------------------------------
1616

17-
// Generated with SmartMDSD Toolchain Version 3.11.0.201911291144
17+
// Generated with SmartMDSD Toolchain Version 3.12.0.201912041712

‎ComponentGMapping/smartsoft/src-gen/ComponentGMapping.cc

+8-8
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ ComponentGMapping::ComponentGMapping()
7272
connections.gMappingTask.priority = -1;
7373
connections.gMappingTask.cpuAffinity = -1;
7474

75-
// initialize members of OpcUaBackendComponentGeneratorExtension
76-
7775
// initialize members of ComponentGMappingROSExtension
7876

77+
// initialize members of OpcUaBackendComponentGeneratorExtension
78+
7979
// initialize members of PlainOpcUaComponentGMappingExtension
8080

8181
}
@@ -203,10 +203,10 @@ void ComponentGMapping::init(int argc, char *argv[])
203203
// print out the actual parameters which are used to initialize the component
204204
std::cout << " \nComponentDefinition Initial-Parameters:\n" << COMP->getParameters() << std::endl;
205205

206-
// initializations of OpcUaBackendComponentGeneratorExtension
207-
208206
// initializations of ComponentGMappingROSExtension
209207

208+
// initializations of OpcUaBackendComponentGeneratorExtension
209+
210210
// initializations of PlainOpcUaComponentGMappingExtension
211211

212212

@@ -411,10 +411,10 @@ void ComponentGMapping::fini()
411411
portFactory->second->destroy();
412412
}
413413

414-
// destruction of OpcUaBackendComponentGeneratorExtension
415-
416414
// destruction of ComponentGMappingROSExtension
417415

416+
// destruction of OpcUaBackendComponentGeneratorExtension
417+
418418
// destruction of PlainOpcUaComponentGMappingExtension
419419

420420
}
@@ -533,10 +533,10 @@ void ComponentGMapping::loadParameter(int argc, char *argv[])
533533
parameter.getInteger("GMappingTask", "cpuAffinity", connections.gMappingTask.cpuAffinity);
534534
}
535535

536-
// load parameters for OpcUaBackendComponentGeneratorExtension
537-
538536
// load parameters for ComponentGMappingROSExtension
539537

538+
// load parameters for OpcUaBackendComponentGeneratorExtension
539+
540540
// load parameters for PlainOpcUaComponentGMappingExtension
541541

542542

‎ComponentGMapping/smartsoft/src-gen/ComponentGMapping.hh

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
class ComponentGMappingPortFactoryInterface;
3030
class ComponentGMappingExtension;
3131

32-
// includes for OpcUaBackendComponentGeneratorExtension
33-
3432
// includes for ComponentGMappingROSExtension
3533

34+
// includes for OpcUaBackendComponentGeneratorExtension
35+
3636
// includes for PlainOpcUaComponentGMappingExtension
3737
// include plain OPC UA device clients
3838
// include plain OPC UA status servers
@@ -125,10 +125,10 @@ public:
125125

126126
// define request-handlers
127127

128-
// definitions of OpcUaBackendComponentGeneratorExtension
129-
130128
// definitions of ComponentGMappingROSExtension
131129

130+
// definitions of OpcUaBackendComponentGeneratorExtension
131+
132132
// definitions of PlainOpcUaComponentGMappingExtension
133133

134134

@@ -254,10 +254,10 @@ public:
254254
std::string roboticMiddleware;
255255
} laserClient;
256256

257-
// -- parameters for OpcUaBackendComponentGeneratorExtension
258-
259257
// -- parameters for ComponentGMappingROSExtension
260258

259+
// -- parameters for OpcUaBackendComponentGeneratorExtension
260+
261261
// -- parameters for PlainOpcUaComponentGMappingExtension
262262

263263
} connections;

‎ComponentGMapping/smartsoft/src-gen/ComponentGMapping.ini.head

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ interval 1
7676
roboticMiddleware ACE_SmartSoft
7777

7878
##########################
79-
## parameters of OpcUaBackendComponentGeneratorExtension
79+
## parameters of ComponentGMappingROSExtension
8080

8181
##########################
82-
## parameters of ComponentGMappingROSExtension
82+
## parameters of OpcUaBackendComponentGeneratorExtension
8383

8484
##########################
8585
## parameters of PlainOpcUaComponentGMappingExtension

‎ComponentGMapping/smartsoft/src-gen/ComponentGMapping.ini.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ interval 1
7676
roboticMiddleware ACE_SmartSoft
7777

7878
##########################
79-
## parameters of OpcUaBackendComponentGeneratorExtension
79+
## parameters of ComponentGMappingROSExtension
8080

8181
##########################
82-
## parameters of ComponentGMappingROSExtension
82+
## parameters of OpcUaBackendComponentGeneratorExtension
8383

8484
##########################
8585
## parameters of PlainOpcUaComponentGMappingExtension

‎ComponentGMapping/smartsoft/src-gen/MixedPortIncludes.cmake

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
# includes for OpcUaBackendComponentGeneratorExtension
2-
GET_FILENAME_COMPONENT(OPC_UA_BACKEND_DIR "${PROJECT_SOURCE_DIR}/../opcua-backend" REALPATH)
3-
IF(EXISTS ${OPC_UA_BACKEND_DIR})
4-
INCLUDE("${OPC_UA_BACKEND_DIR}/src-gen/OpcUaBackend.cmake")
5-
LIST(APPEND FURTHER_SRCS ${OPC_UA_BACKEND_SRCS})
6-
ENDIF(EXISTS ${OPC_UA_BACKEND_DIR})
7-
81
# includes for ComponentGMappingROSExtension
92
GET_FILENAME_COMPONENT(ROS_DIR "${PROJECT_SOURCE_DIR}/../ROS" REALPATH)
103
IF(EXISTS ${ROS_DIR})
@@ -13,6 +6,13 @@ LIST(APPEND FURTHER_SRCS ${ROS_SRCS})
136
INCLUDE_DIRECTORIES(${ROS_INCLUDES})
147
ENDIF(EXISTS ${ROS_DIR})
158

9+
# includes for OpcUaBackendComponentGeneratorExtension
10+
GET_FILENAME_COMPONENT(OPC_UA_BACKEND_DIR "${PROJECT_SOURCE_DIR}/../opcua-backend" REALPATH)
11+
IF(EXISTS ${OPC_UA_BACKEND_DIR})
12+
INCLUDE("${OPC_UA_BACKEND_DIR}/src-gen/OpcUaBackend.cmake")
13+
LIST(APPEND FURTHER_SRCS ${OPC_UA_BACKEND_SRCS})
14+
ENDIF(EXISTS ${OPC_UA_BACKEND_DIR})
15+
1616
# includes for PlainOpcUaComponentGMappingExtension
1717
GET_FILENAME_COMPONENT(PlainOPCUA_DIR "${PROJECT_SOURCE_DIR}/../plainOpcUa" REALPATH)
1818
IF(EXISTS ${PlainOPCUA_DIR})

‎ComponentGMapping/smartsoft/src-gen/MixedPortTargetConfigs.cmake

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1+
# target configurations for ComponentGMappingROSExtension
2+
IF(EXISTS ${ROS_DIR})
3+
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ROS_LIBS})
4+
ENDIF(EXISTS ${ROS_DIR})
5+
16
# target configurations for OpcUaBackendComponentGeneratorExtension
27
IF(SeRoNetSDK_FOUND)
38
#TARGET_LINK_LIBRARIES(${PROJECT_NAME} SeRoNetSDK::SeRoNetSDK)
49
TARGET_LINK_LIBRARIES(${PROJECT_NAME} CommBasicObjectsOpcUa)
510
TARGET_LINK_LIBRARIES(${PROJECT_NAME} CommNavigationObjectsOpcUa)
611
ENDIF(SeRoNetSDK_FOUND)
712

8-
# target configurations for ComponentGMappingROSExtension
9-
IF(EXISTS ${ROS_DIR})
10-
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ROS_LIBS})
11-
ENDIF(EXISTS ${ROS_DIR})
12-
1313
# target configurations for PlainOpcUaComponentGMappingExtension
1414
IF(Open62541CppWrapper_FOUND)
1515
TARGET_LINK_LIBRARIES(${PROJECT_NAME} Open62541CppWrapper)

‎ComponentGMapping/smartsoft/src-gen/info.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
// running the code generator.
1515
//--------------------------------------------------------------------------
1616

17-
// Generated with SmartMDSD Toolchain Version 3.11.0.201911291144
17+
// Generated with SmartMDSD Toolchain Version 3.12.0.201912041712

‎ComponentKB/opcua-backend/src-gen/ComponentKBOpcUaBackendPortFactory.cc

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
#include <SeRoNetSDK/SeRoNet/OPCUA/Server/QueryServer.hpp>
3030

3131
// include referenced CommunicationObject SeRoNetSDK self description implementations
32-
#include "CommBasicObjectsOpcUa/CommKBEventResultOpcUa.hh"
3332
#include "CommBasicObjectsOpcUa/CommKBEventParamOpcUa.hh"
33+
#include "CommBasicObjectsOpcUa/CommKBEventResultOpcUa.hh"
34+
#include "CommBasicObjectsOpcUa/CommKBRequestOpcUa.hh"
3435
#include "CommBasicObjectsOpcUa/CommKBResponseOpcUa.hh"
3536
#include "CommBasicObjectsOpcUa/CommVoidOpcUa.hh"
36-
#include "CommBasicObjectsOpcUa/CommKBRequestOpcUa.hh"
3737

3838
// create a static instance of the OpcUaBackendPortFactory
3939
static ComponentKBOpcUaBackendPortFactory OpcUaBackendPortFactory;
@@ -67,14 +67,14 @@ Smart::IEventClientPattern<CommBasicObjects::CommKBEventParam, CommBasicObjects:
6767
}
6868

6969

70-
Smart::IQueryServerPattern<CommBasicObjects::CommKBRequest, CommBasicObjects::CommKBResponse> * ComponentKBOpcUaBackendPortFactory::createKbQuery(const std::string &serviceName)
70+
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)
7171
{
72-
return new SeRoNet::OPCUA::Server::QueryServer<CommBasicObjects::CommKBRequest, CommBasicObjects::CommKBResponse>(componentImpl, serviceName);
72+
return new SeRoNet::OPCUA::Server::EventServer<CommBasicObjects::CommKBEventParam, CommBasicObjects::CommKBEventResult, CommBasicObjects::CommVoid>(componentImpl, serviceName, kbEventServerEventTestHandler);
7373
}
7474

75-
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)
75+
Smart::IQueryServerPattern<CommBasicObjects::CommKBRequest, CommBasicObjects::CommKBResponse> * ComponentKBOpcUaBackendPortFactory::createKbQuery(const std::string &serviceName)
7676
{
77-
return new SeRoNet::OPCUA::Server::EventServer<CommBasicObjects::CommKBEventParam, CommBasicObjects::CommKBEventResult, CommBasicObjects::CommVoid>(componentImpl, serviceName, kbEventServerEventTestHandler);
77+
return new SeRoNet::OPCUA::Server::QueryServer<CommBasicObjects::CommKBRequest, CommBasicObjects::CommKBResponse>(componentImpl, serviceName);
7878
}
7979

8080

‎ComponentKB/opcua-backend/src-gen/ComponentKBOpcUaBackendPortFactory.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ public:
4747

4848
virtual Smart::IEventClientPattern<CommBasicObjects::CommKBEventParam, CommBasicObjects::CommKBEventResult> * createKbChainedEntriesEventClient() override;
4949

50-
virtual Smart::IQueryServerPattern<CommBasicObjects::CommKBRequest, CommBasicObjects::CommKBResponse> * createKbQuery(const std::string &serviceName) override;
5150
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;
51+
virtual Smart::IQueryServerPattern<CommBasicObjects::CommKBRequest, CommBasicObjects::CommKBResponse> * createKbQuery(const std::string &serviceName) override;
5252

5353
virtual int onShutdown(const std::chrono::steady_clock::duration &timeoutTime=std::chrono::seconds(2)) override;
5454
virtual void destroy() override;

‎ComponentKB/opcua-backend/src-gen/info.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
// running the code generator.
1515
//--------------------------------------------------------------------------
1616

17-
// Generated with SmartMDSD Toolchain Version 3.11.0.201911291144
17+
// Generated with SmartMDSD Toolchain Version 3.12.0.201912041712

‎ComponentKB/smartsoft/src-gen/ComponentKB.cc

+8-8
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ ComponentKB::ComponentKB()
7474
connections.dummy.cpuAffinity = -1;
7575
connections.kbChainedEntriesEventClientHandler.prescale = 1;
7676

77-
// initialize members of OpcUaBackendComponentGeneratorExtension
78-
7977
// initialize members of ComponentKBROSExtension
8078

79+
// initialize members of OpcUaBackendComponentGeneratorExtension
80+
8181
// initialize members of PlainOpcUaComponentKBExtension
8282

8383
}
@@ -186,10 +186,10 @@ void ComponentKB::init(int argc, char *argv[])
186186
// print out the actual parameters which are used to initialize the component
187187
std::cout << " \nComponentDefinition Initial-Parameters:\n" << COMP->getParameters() << std::endl;
188188

189-
// initializations of OpcUaBackendComponentGeneratorExtension
190-
191189
// initializations of ComponentKBROSExtension
192190

191+
// initializations of OpcUaBackendComponentGeneratorExtension
192+
193193
// initializations of PlainOpcUaComponentKBExtension
194194

195195

@@ -398,10 +398,10 @@ void ComponentKB::fini()
398398
portFactory->second->destroy();
399399
}
400400

401-
// destruction of OpcUaBackendComponentGeneratorExtension
402-
403401
// destruction of ComponentKBROSExtension
404402

403+
// destruction of OpcUaBackendComponentGeneratorExtension
404+
405405
// destruction of PlainOpcUaComponentKBExtension
406406

407407
}
@@ -519,10 +519,10 @@ void ComponentKB::loadParameter(int argc, char *argv[])
519519
parameter.getInteger("kbChainedEntriesEventClientHandler", "prescale", connections.kbChainedEntriesEventClientHandler.prescale);
520520
}
521521

522-
// load parameters for OpcUaBackendComponentGeneratorExtension
523-
524522
// load parameters for ComponentKBROSExtension
525523

524+
// load parameters for OpcUaBackendComponentGeneratorExtension
525+
526526
// load parameters for PlainOpcUaComponentKBExtension
527527

528528

‎ComponentKB/smartsoft/src-gen/ComponentKB.hh

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
class ComponentKBPortFactoryInterface;
3030
class ComponentKBExtension;
3131

32-
// includes for OpcUaBackendComponentGeneratorExtension
33-
3432
// includes for ComponentKBROSExtension
3533

34+
// includes for OpcUaBackendComponentGeneratorExtension
35+
3636
// includes for PlainOpcUaComponentKBExtension
3737
// include plain OPC UA device clients
3838
// include plain OPC UA status servers
@@ -135,10 +135,10 @@ public:
135135
// define request-handlers
136136
KbQueryHandler *kbQueryHandler;
137137

138-
// definitions of OpcUaBackendComponentGeneratorExtension
139-
140138
// definitions of ComponentKBROSExtension
141139

140+
// definitions of OpcUaBackendComponentGeneratorExtension
141+
142142
// definitions of PlainOpcUaComponentKBExtension
143143

144144

@@ -262,10 +262,10 @@ public:
262262
std::string roboticMiddleware;
263263
} kbChainedEntriesEventClient;
264264

265-
// -- parameters for OpcUaBackendComponentGeneratorExtension
266-
267265
// -- parameters for ComponentKBROSExtension
268266

267+
// -- parameters for OpcUaBackendComponentGeneratorExtension
268+
269269
// -- parameters for PlainOpcUaComponentKBExtension
270270

271271
} connections;

‎ComponentKB/smartsoft/src-gen/ComponentKB.ini.head

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ interval 1
7575
roboticMiddleware ACE_SmartSoft
7676

7777
##########################
78-
## parameters of OpcUaBackendComponentGeneratorExtension
78+
## parameters of ComponentKBROSExtension
7979

8080
##########################
81-
## parameters of ComponentKBROSExtension
81+
## parameters of OpcUaBackendComponentGeneratorExtension
8282

8383
##########################
8484
## parameters of PlainOpcUaComponentKBExtension

‎ComponentKB/smartsoft/src-gen/ComponentKB.ini.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ interval 1
7575
roboticMiddleware ACE_SmartSoft
7676

7777
##########################
78-
## parameters of OpcUaBackendComponentGeneratorExtension
78+
## parameters of ComponentKBROSExtension
7979

8080
##########################
81-
## parameters of ComponentKBROSExtension
81+
## parameters of OpcUaBackendComponentGeneratorExtension
8282

8383
##########################
8484
## parameters of PlainOpcUaComponentKBExtension

0 commit comments

Comments
 (0)