From 052df8057935a8a20fea874ddc8e5843005d8793 Mon Sep 17 00:00:00 2001 From: jan-ati Date: Tue, 10 Sep 2024 15:53:47 +0000 Subject: [PATCH 01/18] Added build directories to the .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 4ad5360..4f7b515 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ /cmake-* /build +build/ +examples/build/ .idea docs/build/ docs/source/doxyoutput/ From 194da53e114086e91fa281aa7127564f5ae91aee Mon Sep 17 00:00:00 2001 From: jan-ati Date: Tue, 10 Sep 2024 15:54:01 +0000 Subject: [PATCH 02/18] Began updating library include paths to use the root directory --- CMakeLists.txt | 6 +++--- EIPScanner.pc.in | 2 +- examples/CMakeLists.txt | 5 ++++- examples/ExplicitMessagingExample.cpp | 12 ++++++------ .../mp3300iec/Yaskawa_AssemblyObjectExample.cpp | 3 ++- src/cip/GeneralStatusCodes.h | 2 +- src/cip/MessageRouterRequest.cpp | 5 +++-- src/cip/MessageRouterRequest.h | 4 ++-- src/cip/MessageRouterResponse.cpp | 8 +++++--- src/cip/MessageRouterResponse.h | 7 ++++--- src/cip/Services.h | 2 +- 11 files changed, 32 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dda3c8..9ea0b7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ if (TEST_ENABLED) endif() -configure_file(EIPScanner.pc.in EIPScanner.pc @ONLY) +# configure_file(EIPScanner.pc.in EIPScanner.pc @ONLY) -install(FILES ${CMAKE_BINARY_DIR}/EIPScanner.pc - DESTINATION lib/pkgconfig) +# install(FILES ${CMAKE_BINARY_DIR}/EIPScanner.pc +# DESTINATION lib/pkgconfig) diff --git a/EIPScanner.pc.in b/EIPScanner.pc.in index 87f917d..308ea85 100644 --- a/EIPScanner.pc.in +++ b/EIPScanner.pc.in @@ -7,5 +7,5 @@ Name: @CMAKE_PROJECT_NAME@ Description: @CMAKE_PROJECT_DESCRIPTION@ URL: @CMAKE_PROJECT_HOMEPAGE_URL@ Version: @EIPSCANNER_FULL_VERSION@ -Cflags: -I"${includedir}" -I"${includedir}/@CMAKE_PROJECT_NAME@" +Cflags: -I"${includedir}" Libs: -L"${libdir}" -l@CMAKE_PROJECT_NAME@ diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 3142b74..76391a0 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,4 +1,7 @@ -include_directories("${PROJECT_SOURCE_DIR}/src") +# include_directories("${PROJECT_SOURCE_DIR}/src") + +include_directories(/usr/local/include/EIPScanner) +link_directories(/code/build/src) add_executable(explicit_messaging ExplicitMessagingExample.cpp) target_link_libraries(explicit_messaging EIPScanner) diff --git a/examples/ExplicitMessagingExample.cpp b/examples/ExplicitMessagingExample.cpp index 6ae711f..4491563 100644 --- a/examples/ExplicitMessagingExample.cpp +++ b/examples/ExplicitMessagingExample.cpp @@ -9,12 +9,12 @@ #include #include -#include -#include "SessionInfo.h" -#include "MessageRouter.h" -#include "ConnectionManager.h" -#include "utils/Logger.h" -#include "utils/Buffer.h" +#include +#include +#include +#include +#include +#include using namespace eipScanner::cip; using eipScanner::SessionInfo; diff --git a/examples/vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp b/examples/vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp index 8cebde6..bb3099e 100644 --- a/examples/vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp +++ b/examples/vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp @@ -3,13 +3,14 @@ #define OS_Windows (1) #endif -#include "cip/Types.h" #include #include #include #include #include "ConnectionManager.h" #include + +#include #include "FileObject.h" #include "fileObject/FileObjectState.h" #include "IdentityObject.h" diff --git a/src/cip/GeneralStatusCodes.h b/src/cip/GeneralStatusCodes.h index 810f6e3..ac0b152 100644 --- a/src/cip/GeneralStatusCodes.h +++ b/src/cip/GeneralStatusCodes.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_GENERALSTATUSCODES_H #define EIPSCANNER_CIP_GENERALSTATUSCODES_H -#include "Types.h" +#include "src/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterRequest.cpp b/src/cip/MessageRouterRequest.cpp index 43e5ab7..e673b6f 100644 --- a/src/cip/MessageRouterRequest.cpp +++ b/src/cip/MessageRouterRequest.cpp @@ -3,8 +3,9 @@ // #include -#include "MessageRouterRequest.h" -#include "EPath.h" + +#include "src/MessageRouterRequest.h" +#include "src/EPath.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterRequest.h b/src/cip/MessageRouterRequest.h index 09777b7..00a885a 100644 --- a/src/cip/MessageRouterRequest.h +++ b/src/cip/MessageRouterRequest.h @@ -8,8 +8,8 @@ #include #include -#include "Services.h" -#include "EPath.h" +#include "src/Services.h" +#include "src/EPath.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterResponse.cpp b/src/cip/MessageRouterResponse.cpp index 5b56cc8..e8e6bb5 100644 --- a/src/cip/MessageRouterResponse.cpp +++ b/src/cip/MessageRouterResponse.cpp @@ -2,9 +2,11 @@ // Created by Aleksey Timin on 11/16/19. // #include -#include "MessageRouterResponse.h" -#include "utils/Buffer.h" -#include "utils/Logger.h" + +#include "src/cip/MessageRouterResponse.h" + +#include "src/utils/Buffer.h" +#include "src/utils/Logger.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterResponse.h b/src/cip/MessageRouterResponse.h index b2c7d67..cd59284 100644 --- a/src/cip/MessageRouterResponse.h +++ b/src/cip/MessageRouterResponse.h @@ -8,9 +8,10 @@ #include #include -#include "GeneralStatusCodes.h" -#include "Services.h" -#include "eip/CommonPacketItem.h" +#include "src/cip/GeneralStatusCodes.h" + +#include "src/Services.h" +#include "src/eip/CommonPacketItem.h" namespace eipScanner { namespace cip { diff --git a/src/cip/Services.h b/src/cip/Services.h index a2c91ca..1a0fdbe 100644 --- a/src/cip/Services.h +++ b/src/cip/Services.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_SERVICES_H #define EIPSCANNER_CIP_SERVICES_H -#include "Types.h" +#include "src/cip/Types.h" namespace eipScanner { namespace cip { From 3d15fe9d11772c234b957b13ccb180d064824199 Mon Sep 17 00:00:00 2001 From: jan-ati Date: Wed, 11 Sep 2024 14:57:29 +0000 Subject: [PATCH 03/18] Changed header paths to be the full path from the base directory --- src/BaseObject.cpp | 2 +- src/BaseObject.h | 2 +- src/ConnectionManager.cpp | 20 +++++++++---------- src/ConnectionManager.h | 12 +++++------ src/DiscoveryManager.cpp | 12 +++++------ src/DiscoveryManager.h | 4 ++-- src/FileObject.cpp | 10 +++++----- src/FileObject.h | 8 ++++---- src/IOConnection.cpp | 12 +++++------ src/IOConnection.h | 4 ++-- src/IdentityObject.cpp | 4 ++-- src/IdentityObject.h | 12 +++++------ src/MessageRouter.cpp | 18 ++++++++--------- src/MessageRouter.h | 10 +++++----- src/ParameterObject.cpp | 6 +++--- src/ParameterObject.h | 6 +++--- src/SessionInfo.cpp | 8 ++++---- src/SessionInfo.h | 4 ++-- src/SessionInfoIf.h | 4 ++-- src/cip/CipRevision.cpp | 3 ++- src/cip/CipRevision.h | 2 +- src/cip/CipString.cpp | 3 ++- src/cip/CipString.h | 2 +- src/cip/EPath.cpp | 4 ++-- src/cip/EPath.h | 2 +- .../connectionManager/ConnectionParameters.h | 2 +- .../connectionManager/ForwardCloseRequest.cpp | 4 ++-- .../connectionManager/ForwardCloseRequest.h | 2 +- .../connectionManager/ForwardOpenRequest.cpp | 4 ++-- .../connectionManager/ForwardOpenRequest.h | 2 +- .../connectionManager/ForwardOpenResponse.cpp | 4 ++-- .../connectionManager/ForwardOpenResponse.h | 2 +- .../LargeForwardOpenRequest.cpp | 2 +- .../LargeForwardOpenRequest.h | 2 +- .../NetworkConnectionParametersBuilder.cpp | 2 +- .../NetworkConnectionParametersBuilder.h | 2 +- .../NetworkConnectionParams.h | 2 +- src/eip/CommonPacket.cpp | 6 +++--- src/eip/CommonPacket.h | 2 +- src/eip/CommonPacketItem.cpp | 4 ++-- src/eip/CommonPacketItem.h | 2 +- src/eip/CommonPacketItemFactory.cpp | 4 ++-- src/eip/CommonPacketItemFactory.h | 4 ++-- src/eip/EncapsPacket.cpp | 4 ++-- src/eip/EncapsPacket.h | 3 +-- src/eip/EncapsPacketFactory.cpp | 4 ++-- src/eip/EncapsPacketFactory.h | 4 ++-- src/fileObject/FileObjectEmptyState.cpp | 2 +- src/fileObject/FileObjectEmptyState.h | 2 +- src/fileObject/FileObjectLoadedState.cpp | 6 +++--- src/fileObject/FileObjectLoadedState.h | 2 +- src/fileObject/FileObjectNonExistentState.cpp | 2 +- src/fileObject/FileObjectNonExistentState.h | 2 +- src/fileObject/FileObjectState.cpp | 12 +++++------ src/fileObject/FileObjectState.h | 10 +++++----- .../FileObjectUploadInProgressState.cpp | 4 ++-- .../FileObjectUploadInProgressState.h | 4 ++-- src/sockets/BaseSocket.cpp | 4 ++-- src/sockets/BaseSocket.h | 2 +- src/sockets/EndPoint.cpp | 6 +++--- src/sockets/Platform.cpp | 2 +- src/sockets/TCPSocket.cpp | 6 +++--- src/sockets/TCPSocket.h | 2 +- src/sockets/UDPBoundSocket.cpp | 4 ++-- src/sockets/UDPBoundSocket.h | 2 +- src/sockets/UDPSocket.cpp | 6 +++--- src/sockets/UDPSocket.h | 2 +- src/utils/Buffer.cpp | 2 +- src/utils/Buffer.h | 6 +++--- src/utils/Logger.cpp | 2 +- 70 files changed, 167 insertions(+), 166 deletions(-) diff --git a/src/BaseObject.cpp b/src/BaseObject.cpp index 1fa3e48..5a0fd37 100644 --- a/src/BaseObject.cpp +++ b/src/BaseObject.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 12/9/19. // -#include "BaseObject.h" +#include "src/BaseObject.h" namespace eipScanner { diff --git a/src/BaseObject.h b/src/BaseObject.h index b374860..d44a143 100644 --- a/src/BaseObject.h +++ b/src/BaseObject.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_BASEOBJECT_H #define EIPSCANNER_BASEOBJECT_H -#include "cip/Types.h" +#include "src/cip/Types.h" namespace eipScanner { /** diff --git a/src/ConnectionManager.cpp b/src/ConnectionManager.cpp index a4c76a2..e7264c5 100644 --- a/src/ConnectionManager.cpp +++ b/src/ConnectionManager.cpp @@ -6,16 +6,16 @@ #include #include -#include "ConnectionManager.h" -#include "eip/CommonPacket.h" -#include "cip/connectionManager/ForwardOpenRequest.h" -#include "cip/connectionManager/ForwardCloseRequest.h" -#include "cip/connectionManager/LargeForwardOpenRequest.h" -#include "cip/connectionManager/ForwardOpenResponse.h" -#include "cip/connectionManager/NetworkConnectionParams.h" -#include "cip/connectionManager/NetworkConnectionParametersBuilder.h" -#include "utils/Logger.h" -#include "utils/Buffer.h" +#include "src/ConnectionManager.h" +#include "src/eip/CommonPacket.h" +#include "src/cip/connectionManager/ForwardOpenRequest.h" +#include "src/cip/connectionManager/ForwardCloseRequest.h" +#include "src/cip/connectionManager/LargeForwardOpenRequest.h" +#include "src/cip/connectionManager/ForwardOpenResponse.h" +#include "src/cip/connectionManager/NetworkConnectionParams.h" +#include "src/cip/connectionManager/NetworkConnectionParametersBuilder.h" +#include "src/utils/Logger.h" +#include "src/utils/Buffer.h" namespace eipScanner { using namespace cip::connectionManager; diff --git a/src/ConnectionManager.h b/src/ConnectionManager.h index a317067..419cbda 100644 --- a/src/ConnectionManager.h +++ b/src/ConnectionManager.h @@ -6,12 +6,12 @@ #define EIPSCANNER_CONNECTIONMANAGER_H #include -#include "MessageRouter.h" -#include "IOConnection.h" -#include "cip/connectionManager/ConnectionParameters.h" -#include "cip/Services.h" -#include "cip/Types.h" -#include "sockets/UDPBoundSocket.h" +#include "src/MessageRouter.h" +#include "src/IOConnection.h" +#include "src/cip/connectionManager/ConnectionParameters.h" +#include "src/cip/Services.h" +#include "src/cip/Types.h" +#include "src/sockets/UDPBoundSocket.h" namespace eipScanner { /** diff --git a/src/DiscoveryManager.cpp b/src/DiscoveryManager.cpp index f8a118a..1e2bb5d 100644 --- a/src/DiscoveryManager.cpp +++ b/src/DiscoveryManager.cpp @@ -3,13 +3,13 @@ // #include -#include "eip/EncapsPacketFactory.h" -#include "eip/CommonPacket.h" -#include "sockets/UDPSocket.h" -#include "utils/Logger.h" -#include "utils/Buffer.h" +#include "src/eip/EncapsPacketFactory.h" +#include "src/eip/CommonPacket.h" +#include "src/sockets/UDPSocket.h" +#include "src/utils/Logger.h" +#include "src/utils/Buffer.h" -#include "DiscoveryManager.h" +#include "src/DiscoveryManager.h" namespace eipScanner { using namespace cip; diff --git a/src/DiscoveryManager.h b/src/DiscoveryManager.h index ebfedb9..a1570d1 100644 --- a/src/DiscoveryManager.h +++ b/src/DiscoveryManager.h @@ -5,8 +5,8 @@ #ifndef EIPSCANNER_DISCOVERYMANAGER_H #define EIPSCANNER_DISCOVERYMANAGER_H -#include "IdentityObject.h" -#include "sockets/Platform.h" +#include "src/IdentityObject.h" +#include "src/sockets/Platform.h" #if defined (__unix__) || defined(__APPLE__) #define DISCOVERY_SOCKET_RECEIVE_END_ERROR_CODE (EIPSCANNER_SOCKET_ERROR(EAGAIN)) diff --git a/src/FileObject.cpp b/src/FileObject.cpp index 5a451a3..140be41 100644 --- a/src/FileObject.cpp +++ b/src/FileObject.cpp @@ -2,11 +2,11 @@ // Created by Aleksey Timin on 11/21/19. // #include -#include "FileObject.h" -#include "fileObject/FileObjectState.h" -#include "utils/Buffer.h" -#include "utils/Logger.h" -#include "cip/Services.h" +#include "src/FileObject.h" +#include "src/fileObject/FileObjectState.h" +#include "src/utils/Buffer.h" +#include "src/utils/Logger.h" +#include "src/cip/Services.h" namespace eipScanner { using utils::Buffer; diff --git a/src/FileObject.h b/src/FileObject.h index c48a4c0..957a971 100644 --- a/src/FileObject.h +++ b/src/FileObject.h @@ -7,10 +7,10 @@ #include -#include "cip/Types.h" -#include "cip/GeneralStatusCodes.h" -#include "MessageRouter.h" -#include "BaseObject.h" +#include "src/cip/Types.h" +#include "src/cip/GeneralStatusCodes.h" +#include "src/MessageRouter.h" +#include "src/BaseObject.h" namespace eipScanner { namespace fileObject { diff --git a/src/IOConnection.cpp b/src/IOConnection.cpp index 5571496..500d2f1 100644 --- a/src/IOConnection.cpp +++ b/src/IOConnection.cpp @@ -2,12 +2,12 @@ // Created by Aleksey Timin on 11/18/19. // -#include "IOConnection.h" -#include "eip/CommonPacketItemFactory.h" -#include "eip/CommonPacket.h" -#include "cip/connectionManager/NetworkConnectionParams.h" -#include "utils/Buffer.h" -#include "utils/Logger.h" +#include "src/IOConnection.h" +#include "src/eip/CommonPacketItemFactory.h" +#include "src/eip/CommonPacket.h" +#include "src/cip/connectionManager/NetworkConnectionParams.h" +#include "src/utils/Buffer.h" +#include "src/utils/Logger.h" namespace eipScanner { using utils::Logger; diff --git a/src/IOConnection.h b/src/IOConnection.h index 9058d89..666887e 100644 --- a/src/IOConnection.h +++ b/src/IOConnection.h @@ -8,8 +8,8 @@ #include #include #include -#include "cip/Types.h" -#include "sockets/UDPSocket.h" +#include "src/cip/Types.h" +#include "src/sockets/UDPSocket.h" namespace eipScanner { class ConnectionManager; diff --git a/src/IdentityObject.cpp b/src/IdentityObject.cpp index 0e771c9..a6ca66f 100644 --- a/src/IdentityObject.cpp +++ b/src/IdentityObject.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 12/8/19. // -#include "IdentityObject.h" -#include "utils/Buffer.h" +#include "src/IdentityObject.h" +#include "src/utils/Buffer.h" namespace eipScanner { using namespace cip; diff --git a/src/IdentityObject.h b/src/IdentityObject.h index cd4cc0b..4227324 100644 --- a/src/IdentityObject.h +++ b/src/IdentityObject.h @@ -5,12 +5,12 @@ #ifndef EIPSCANNER_IDENTITYOBJECT_H #define EIPSCANNER_IDENTITYOBJECT_H -#include "cip/CipString.h" -#include "cip/CipRevision.h" -#include "cip/Types.h" -#include "SessionInfo.h" -#include "MessageRouter.h" -#include "BaseObject.h" +#include "src/cip/CipString.h" +#include "src/cip/CipRevision.h" +#include "src/cip/Types.h" +#include "src/SessionInfo.h" +#include "src/MessageRouter.h" +#include "src/BaseObject.h" namespace eipScanner { /** diff --git a/src/MessageRouter.cpp b/src/MessageRouter.cpp index 16f2232..df36c7a 100644 --- a/src/MessageRouter.cpp +++ b/src/MessageRouter.cpp @@ -3,15 +3,15 @@ // #include -#include "eip/EncapsPacketFactory.h" -#include "utils/Buffer.h" -#include "MessageRouter.h" -#include "cip/MessageRouterRequest.h" -#include "cip/MessageRouterResponse.h" -#include "eip/CommonPacketItemFactory.h" -#include "eip/CommonPacket.h" -#include "utils/Buffer.h" -#include "utils/Logger.h" +#include "src/eip/EncapsPacketFactory.h" +#include "src/utils/Buffer.h" +#include "src/MessageRouter.h" +#include "src/cip/MessageRouterRequest.h" +#include "src/cip/MessageRouterResponse.h" +#include "src/eip/CommonPacketItemFactory.h" +#include "src/eip/CommonPacket.h" +#include "src/utils/Buffer.h" +#include "src/utils/Logger.h" namespace eipScanner { using namespace cip; diff --git a/src/MessageRouter.h b/src/MessageRouter.h index c4a0bda..cb2a43a 100644 --- a/src/MessageRouter.h +++ b/src/MessageRouter.h @@ -6,11 +6,11 @@ #define EIPSCANNER_MESSAGEROUTER_H #include -#include "cip/EPath.h" -#include "cip/Services.h" -#include "cip/MessageRouterResponse.h" -#include "eip/CommonPacketItem.h" -#include "SessionInfo.h" +#include "src/cip/EPath.h" +#include "src/cip/Services.h" +#include "src/cip/MessageRouterResponse.h" +#include "src/eip/CommonPacketItem.h" +#include "src/SessionInfo.h" namespace eipScanner { /** diff --git a/src/ParameterObject.cpp b/src/ParameterObject.cpp index adc702b..a5fc08c 100644 --- a/src/ParameterObject.cpp +++ b/src/ParameterObject.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 12/4/19. // -#include "ParameterObject.h" -#include "utils/Buffer.h" -#include "utils/Logger.h" +#include "src/ParameterObject.h" +#include "src/utils/Buffer.h" +#include "src/utils/Logger.h" namespace eipScanner { using utils::Buffer; diff --git a/src/ParameterObject.h b/src/ParameterObject.h index c338f24..ea41d55 100644 --- a/src/ParameterObject.h +++ b/src/ParameterObject.h @@ -7,9 +7,9 @@ #include #include -#include "MessageRouter.h" -#include "utils/Buffer.h" -#include "BaseObject.h" +#include "src/MessageRouter.h" +#include "src/utils/Buffer.h" +#include "src/BaseObject.h" namespace eipScanner { diff --git a/src/SessionInfo.cpp b/src/SessionInfo.cpp index cbfb179..5898e85 100644 --- a/src/SessionInfo.cpp +++ b/src/SessionInfo.cpp @@ -4,10 +4,10 @@ -#include "SessionInfo.h" -#include "utils/Logger.h" -#include "eip/EncapsPacket.h" -#include "eip/EncapsPacketFactory.h" +#include "src/SessionInfo.h" +#include "src/utils/Logger.h" +#include "src/eip/EncapsPacket.h" +#include "src/eip/EncapsPacketFactory.h" namespace eipScanner { diff --git a/src/SessionInfo.h b/src/SessionInfo.h index 313abe6..51c5087 100644 --- a/src/SessionInfo.h +++ b/src/SessionInfo.h @@ -10,8 +10,8 @@ #include #include -#include "SessionInfoIf.h" -#include "sockets/TCPSocket.h" +#include "src/SessionInfoIf.h" +#include "src/sockets/TCPSocket.h" namespace eipScanner { /** diff --git a/src/SessionInfoIf.h b/src/SessionInfoIf.h index 974a7e5..fc50e67 100644 --- a/src/SessionInfoIf.h +++ b/src/SessionInfoIf.h @@ -6,8 +6,8 @@ #define EIPSCANNER_SESSIONINFOIF_H #include -#include "eip/EncapsPacket.h" -#include "sockets/EndPoint.h" +#include "src/eip/EncapsPacket.h" +#include "src/sockets/EndPoint.h" namespace eipScanner { /** diff --git a/src/cip/CipRevision.cpp b/src/cip/CipRevision.cpp index 466940a..9be4815 100644 --- a/src/cip/CipRevision.cpp +++ b/src/cip/CipRevision.cpp @@ -2,7 +2,8 @@ // Created by Aleksey Timin on 12/8/19. // -#include "CipRevision.h" +#include "src/CipRevision.h" + namespace eipScanner { namespace cip { diff --git a/src/cip/CipRevision.h b/src/cip/CipRevision.h index da1f1d3..164de58 100644 --- a/src/cip/CipRevision.h +++ b/src/cip/CipRevision.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CIPREVISION_H #include -#include "Types.h" +#include "src/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/CipString.cpp b/src/cip/CipString.cpp index f734716..08f3515 100644 --- a/src/cip/CipString.cpp +++ b/src/cip/CipString.cpp @@ -2,7 +2,8 @@ // Created by Aleksey Timin on 12/4/19. // -#include "CipString.h" +#include "src/CipString.h" + namespace eipScanner { namespace cip { diff --git a/src/cip/CipString.h b/src/cip/CipString.h index 1cdc713..d9777eb 100644 --- a/src/cip/CipString.h +++ b/src/cip/CipString.h @@ -9,7 +9,7 @@ #include #include #include -#include "Types.h" +#include "src/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/EPath.cpp b/src/cip/EPath.cpp index 447ef30..4b450d8 100644 --- a/src/cip/EPath.cpp +++ b/src/cip/EPath.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // #include -#include "utils/Buffer.h" -#include "EPath.h" +#include "src/utils/Buffer.h" +#include "src/EPath.h" namespace eipScanner { namespace cip { diff --git a/src/cip/EPath.h b/src/cip/EPath.h index d2270b6..332dc9a 100644 --- a/src/cip/EPath.h +++ b/src/cip/EPath.h @@ -9,7 +9,7 @@ #include #include -#include "Types.h" +#include "src/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ConnectionParameters.h b/src/cip/connectionManager/ConnectionParameters.h index c1ba86d..ee64d78 100644 --- a/src/cip/connectionManager/ConnectionParameters.h +++ b/src/cip/connectionManager/ConnectionParameters.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_CONNECTIONPARAMETERS_H #define EIPSCANNER_CIP_CONNECTIONPARAMETERS_H -#include "cip/Types.h" +#include "src/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardCloseRequest.cpp b/src/cip/connectionManager/ForwardCloseRequest.cpp index 4134f80..87a6add 100644 --- a/src/cip/connectionManager/ForwardCloseRequest.cpp +++ b/src/cip/connectionManager/ForwardCloseRequest.cpp @@ -1,8 +1,8 @@ // // Created by Aleksey Timin on 11/19/19. // -#include "ForwardCloseRequest.h" -#include "utils/Buffer.h" +#include "src/ForwardCloseRequest.h" +#include "src/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardCloseRequest.h b/src/cip/connectionManager/ForwardCloseRequest.h index bbbd872..beb76e7 100644 --- a/src/cip/connectionManager/ForwardCloseRequest.h +++ b/src/cip/connectionManager/ForwardCloseRequest.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_FORWARDCLOSEREQUEST_H #include -#include "ConnectionParameters.h" +#include "src/ConnectionParameters.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenRequest.cpp b/src/cip/connectionManager/ForwardOpenRequest.cpp index a48d9cc..17eaa7d 100644 --- a/src/cip/connectionManager/ForwardOpenRequest.cpp +++ b/src/cip/connectionManager/ForwardOpenRequest.cpp @@ -2,11 +2,11 @@ // Created by Aleksey Timin on 11/18/19. // -#include "ForwardOpenRequest.h" +#include "src/ForwardOpenRequest.h" #include #include -#include "utils/Buffer.h" +#include "src/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenRequest.h b/src/cip/connectionManager/ForwardOpenRequest.h index e999a0d..94dc529 100644 --- a/src/cip/connectionManager/ForwardOpenRequest.h +++ b/src/cip/connectionManager/ForwardOpenRequest.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_FORWARDOPENREQUEST_H #include -#include "ConnectionParameters.h" +#include "src/ConnectionParameters.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenResponse.cpp b/src/cip/connectionManager/ForwardOpenResponse.cpp index 622c1d1..a8d9467 100644 --- a/src/cip/connectionManager/ForwardOpenResponse.cpp +++ b/src/cip/connectionManager/ForwardOpenResponse.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/18/19. // -#include "ForwardOpenResponse.h" -#include "utils/Buffer.h" +#include "src/ForwardOpenResponse.h" +#include "src/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenResponse.h b/src/cip/connectionManager/ForwardOpenResponse.h index d70d334..cf96e97 100644 --- a/src/cip/connectionManager/ForwardOpenResponse.h +++ b/src/cip/connectionManager/ForwardOpenResponse.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_FORWARDOPENRESPONSE_H #include -#include "cip/Types.h" +#include "src/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/LargeForwardOpenRequest.cpp b/src/cip/connectionManager/LargeForwardOpenRequest.cpp index 45da36a..0426ee0 100644 --- a/src/cip/connectionManager/LargeForwardOpenRequest.cpp +++ b/src/cip/connectionManager/LargeForwardOpenRequest.cpp @@ -6,7 +6,7 @@ #include #include -#include "utils/Buffer.h" +#include "src/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/LargeForwardOpenRequest.h b/src/cip/connectionManager/LargeForwardOpenRequest.h index c1f0a87..bc3962b 100644 --- a/src/cip/connectionManager/LargeForwardOpenRequest.h +++ b/src/cip/connectionManager/LargeForwardOpenRequest.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_LARGEFORWARDOPENREQUEST_H #include -#include "ConnectionParameters.h" +#include "src/ConnectionParameters.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp b/src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp index 219a191..90740a1 100644 --- a/src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp +++ b/src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp @@ -6,7 +6,7 @@ #include #include -#include "utils/Buffer.h" +#include "src/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/NetworkConnectionParametersBuilder.h b/src/cip/connectionManager/NetworkConnectionParametersBuilder.h index ba091fa..7934fe4 100644 --- a/src/cip/connectionManager/NetworkConnectionParametersBuilder.h +++ b/src/cip/connectionManager/NetworkConnectionParametersBuilder.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_CONNECTIONMANAGER_NETWORKCONNECTIONPARAMETERSBUILDER_H #define EIPSCANNER_CIP_CONNECTIONMANAGER_NETWORKCONNECTIONPARAMETERSBUILDER_H -#include "cip/Types.h" +#include "src/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/NetworkConnectionParams.h b/src/cip/connectionManager/NetworkConnectionParams.h index e6cb8b9..dd7bbe1 100644 --- a/src/cip/connectionManager/NetworkConnectionParams.h +++ b/src/cip/connectionManager/NetworkConnectionParams.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_CONNECTIONMANAGER_NETWORKCONNECTIONPARAMS_H #define EIPSCANNER_CIP_CONNECTIONMANAGER_NETWORKCONNECTIONPARAMS_H -#include "cip/Types.h" +#include "src/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/eip/CommonPacket.cpp b/src/eip/CommonPacket.cpp index c51a176..2ea1bfd 100644 --- a/src/eip/CommonPacket.cpp +++ b/src/eip/CommonPacket.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 11/16/19. // #include -#include "CommonPacket.h" -#include "utils/Buffer.h" -#include "cip/Types.h" +#include "src/CommonPacket.h" +#include "src/utils/Buffer.h" +#include "src/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacket.h b/src/eip/CommonPacket.h index a4ed814..8e2f8b4 100644 --- a/src/eip/CommonPacket.h +++ b/src/eip/CommonPacket.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_EIP_COMMONPACKET_H #define EIPSCANNER_EIP_COMMONPACKET_H -#include "CommonPacketItem.h" +#include "src/CommonPacketItem.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItem.cpp b/src/eip/CommonPacketItem.cpp index b716caf..bf89d83 100644 --- a/src/eip/CommonPacketItem.cpp +++ b/src/eip/CommonPacketItem.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // -#include "utils/Buffer.h" -#include "CommonPacketItem.h" +#include "src/utils/Buffer.h" +#include "src/CommonPacketItem.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItem.h b/src/eip/CommonPacketItem.h index 000bba6..acd9317 100644 --- a/src/eip/CommonPacketItem.h +++ b/src/eip/CommonPacketItem.h @@ -8,7 +8,7 @@ #include #include -#include "cip/Types.h" +#include "src/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItemFactory.cpp b/src/eip/CommonPacketItemFactory.cpp index 40f0d8a..1dd79b3 100644 --- a/src/eip/CommonPacketItemFactory.cpp +++ b/src/eip/CommonPacketItemFactory.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // -#include "CommonPacketItemFactory.h" -#include "utils/Buffer.h" +#include "src/CommonPacketItemFactory.h" +#include "src/utils/Buffer.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItemFactory.h b/src/eip/CommonPacketItemFactory.h index 98a5b63..58a2647 100644 --- a/src/eip/CommonPacketItemFactory.h +++ b/src/eip/CommonPacketItemFactory.h @@ -6,8 +6,8 @@ #define EIPSCANNER_EIP_COMMONPACKETITEMFACTORY_H #include -#include "CommonPacketItem.h" -#include "cip/Types.h" +#include "src/CommonPacketItem.h" +#include "src/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/eip/EncapsPacket.cpp b/src/eip/EncapsPacket.cpp index 64d2ed3..c61d37e 100644 --- a/src/eip/EncapsPacket.cpp +++ b/src/eip/EncapsPacket.cpp @@ -4,8 +4,8 @@ #include #include -#include "EncapsPacket.h" -#include "utils/Buffer.h" +#include "src/EncapsPacket.h" +#include "src/utils/Buffer.h" using eipScanner::utils::Buffer; diff --git a/src/eip/EncapsPacket.h b/src/eip/EncapsPacket.h index 1d39ba1..a700818 100644 --- a/src/eip/EncapsPacket.h +++ b/src/eip/EncapsPacket.h @@ -9,8 +9,7 @@ #include #include -#include "cip/Types.h" -#include +#include "src/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/eip/EncapsPacketFactory.cpp b/src/eip/EncapsPacketFactory.cpp index 56d7027..4bb361b 100644 --- a/src/eip/EncapsPacketFactory.cpp +++ b/src/eip/EncapsPacketFactory.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // -#include -#include "EncapsPacketFactory.h" +#include "src/utils/Buffer.h" +#include "src/EncapsPacketFactory.h" namespace eipScanner { namespace eip { diff --git a/src/eip/EncapsPacketFactory.h b/src/eip/EncapsPacketFactory.h index 163077e..1b68917 100644 --- a/src/eip/EncapsPacketFactory.h +++ b/src/eip/EncapsPacketFactory.h @@ -5,8 +5,8 @@ #ifndef EIPSCANNER_EIP_ENCAPSPACKETFACTORY_H #define EIPSCANNER_EIP_ENCAPSPACKETFACTORY_H -#include "EncapsPacket.h" -#include "cip/Types.h" +#include "src/EncapsPacket.h" +#include "src/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/fileObject/FileObjectEmptyState.cpp b/src/fileObject/FileObjectEmptyState.cpp index a234485..6413c32 100644 --- a/src/fileObject/FileObjectEmptyState.cpp +++ b/src/fileObject/FileObjectEmptyState.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 11/23/19. // -#include "FileObjectEmptyState.h" +#include "src/FileObjectEmptyState.h" namespace eipScanner { namespace fileObject { using utils::LogLevel; diff --git a/src/fileObject/FileObjectEmptyState.h b/src/fileObject/FileObjectEmptyState.h index 284657c..7a60061 100644 --- a/src/fileObject/FileObjectEmptyState.h +++ b/src/fileObject/FileObjectEmptyState.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_FILEOBJECT_FILEOBJECTEMPTYSTATE_H #define EIPSCANNER_FILEOBJECT_FILEOBJECTEMPTYSTATE_H -#include "FileObjectState.h" +#include "src/FileObjectState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectLoadedState.cpp b/src/fileObject/FileObjectLoadedState.cpp index f078943..0a0305f 100644 --- a/src/fileObject/FileObjectLoadedState.cpp +++ b/src/fileObject/FileObjectLoadedState.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 11/23/19. // -#include "FileObjectLoadedState.h" -#include "FileObjectUploadInProgressState.h" -#include "utils/Buffer.h" +#include "src/FileObjectLoadedState.h" +#include "src/FileObjectUploadInProgressState.h" +#include "src/utils/Buffer.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectLoadedState.h b/src/fileObject/FileObjectLoadedState.h index 26086e8..cd703f0 100644 --- a/src/fileObject/FileObjectLoadedState.h +++ b/src/fileObject/FileObjectLoadedState.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_FILEOBJECT_FILEOBJECTLOADEDSTATE_H #define EIPSCANNER_FILEOBJECT_FILEOBJECTLOADEDSTATE_H -#include "FileObjectState.h" +#include "src/FileObjectState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectNonExistentState.cpp b/src/fileObject/FileObjectNonExistentState.cpp index 6215269..0e7e39b 100644 --- a/src/fileObject/FileObjectNonExistentState.cpp +++ b/src/fileObject/FileObjectNonExistentState.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 11/23/19. // -#include "FileObjectNonExistentState.h" +#include "src/FileObjectNonExistentState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectNonExistentState.h b/src/fileObject/FileObjectNonExistentState.h index 6d63b09..a5b4d5d 100644 --- a/src/fileObject/FileObjectNonExistentState.h +++ b/src/fileObject/FileObjectNonExistentState.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_FILEOBJECT_FILEOBJECTNONEXISTENTSTATE_H #define EIPSCANNER_FILEOBJECT_FILEOBJECTNONEXISTENTSTATE_H -#include "FileObjectState.h" +#include "src/FileObjectState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectState.cpp b/src/fileObject/FileObjectState.cpp index 84d4bc2..8bd1843 100644 --- a/src/fileObject/FileObjectState.cpp +++ b/src/fileObject/FileObjectState.cpp @@ -3,12 +3,12 @@ // #include -#include "FileObjectState.h" -#include "utils/Buffer.h" -#include "FileObjectNonExistentState.h" -#include "FileObjectEmptyState.h" -#include "FileObjectLoadedState.h" -#include "FileObjectUploadInProgressState.h" +#include "src/FileObjectState.h" +#include "src/utils/Buffer.h" +#include "src/FileObjectNonExistentState.h" +#include "src/FileObjectEmptyState.h" +#include "src/FileObjectLoadedState.h" +#include "src/FileObjectUploadInProgressState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectState.h b/src/fileObject/FileObjectState.h index c762705..ca0243f 100644 --- a/src/fileObject/FileObjectState.h +++ b/src/fileObject/FileObjectState.h @@ -6,11 +6,11 @@ #define EIPSCANNER_FILEOBJECT_FILEOBJECTSTATE_H #include -#include "SessionInfo.h" -#include "MessageRouter.h" -#include "FileObject.h" -#include "cip/GeneralStatusCodes.h" -#include "utils/Logger.h" +#include "src/SessionInfo.h" +#include "src/MessageRouter.h" +#include "src/FileObject.h" +#include "src/cip/GeneralStatusCodes.h" +#include "src/utils/Logger.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectUploadInProgressState.cpp b/src/fileObject/FileObjectUploadInProgressState.cpp index 0054a26..8926424 100644 --- a/src/fileObject/FileObjectUploadInProgressState.cpp +++ b/src/fileObject/FileObjectUploadInProgressState.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/23/19. // -#include "FileObjectUploadInProgressState.h" -#include "utils/Buffer.h" +#include "src/FileObjectUploadInProgressState.h" +#include "src/utils/Buffer.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectUploadInProgressState.h b/src/fileObject/FileObjectUploadInProgressState.h index 8a8b25f..dda0329 100644 --- a/src/fileObject/FileObjectUploadInProgressState.h +++ b/src/fileObject/FileObjectUploadInProgressState.h @@ -7,8 +7,8 @@ #include -#include "FileObjectState.h" -#include "cip/Types.h" +#include "src/FileObjectState.h" +#include "src/cip/Types.h" namespace eipScanner { namespace fileObject { diff --git a/src/sockets/BaseSocket.cpp b/src/sockets/BaseSocket.cpp index efb71db..db6a00f 100644 --- a/src/sockets/BaseSocket.cpp +++ b/src/sockets/BaseSocket.cpp @@ -14,8 +14,8 @@ #include #include -#include "BaseSocket.h" -#include "Platform.h" +#include "src/BaseSocket.h" +#include "src/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/BaseSocket.h b/src/sockets/BaseSocket.h index 1019fab..7db8164 100644 --- a/src/sockets/BaseSocket.h +++ b/src/sockets/BaseSocket.h @@ -13,7 +13,7 @@ #include #include -#include "EndPoint.h" +#include "src/EndPoint.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/EndPoint.cpp b/src/sockets/EndPoint.cpp index b6de7ad..2e04f5a 100644 --- a/src/sockets/EndPoint.cpp +++ b/src/sockets/EndPoint.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 12/10/19. // -#include "EndPoint.h" -#include "BaseSocket.h" -#include "Platform.h" +#include "src/EndPoint.h" +#include "src/BaseSocket.h" +#include "src/Platform.h" #if defined(__unix__) || defined(__APPLE__) #include diff --git a/src/sockets/Platform.cpp b/src/sockets/Platform.cpp index 175343f..da1d106 100644 --- a/src/sockets/Platform.cpp +++ b/src/sockets/Platform.cpp @@ -2,7 +2,7 @@ // Created by Stefan Broekman on 02/04/21. // -#include "Platform.h" +#include "src/Platform.h" #if defined(_WIN32) || defined(WIN32) || defined(_WIN64) #include diff --git a/src/sockets/TCPSocket.cpp b/src/sockets/TCPSocket.cpp index bbceaac..876b3b4 100644 --- a/src/sockets/TCPSocket.cpp +++ b/src/sockets/TCPSocket.cpp @@ -15,9 +15,9 @@ #include -#include "utils/Logger.h" -#include "TCPSocket.h" -#include "Platform.h" +#include "src/utils/Logger.h" +#include "src/TCPSocket.h" +#include "src/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/TCPSocket.h b/src/sockets/TCPSocket.h index f5c2882..0a89dc4 100644 --- a/src/sockets/TCPSocket.h +++ b/src/sockets/TCPSocket.h @@ -7,7 +7,7 @@ #include #include -#include "BaseSocket.h" +#include "src/BaseSocket.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPBoundSocket.cpp b/src/sockets/UDPBoundSocket.cpp index 8b03fc9..8f51179 100644 --- a/src/sockets/UDPBoundSocket.cpp +++ b/src/sockets/UDPBoundSocket.cpp @@ -6,8 +6,8 @@ //#include //#include -#include "UDPBoundSocket.h" -#include "Platform.h" +#include "src/UDPBoundSocket.h" +#include "src/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPBoundSocket.h b/src/sockets/UDPBoundSocket.h index 3d9c3f9..85e67c7 100644 --- a/src/sockets/UDPBoundSocket.h +++ b/src/sockets/UDPBoundSocket.h @@ -9,7 +9,7 @@ #include #include //#include -#include "UDPSocket.h" +#include "src/UDPSocket.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPSocket.cpp b/src/sockets/UDPSocket.cpp index 04f1ddb..7084022 100644 --- a/src/sockets/UDPSocket.cpp +++ b/src/sockets/UDPSocket.cpp @@ -12,9 +12,9 @@ #include #endif -#include "utils/Logger.h" -#include "UDPSocket.h" -#include "Platform.h" +#include "src/utils/Logger.h" +#include "src/UDPSocket.h" +#include "src/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPSocket.h b/src/sockets/UDPSocket.h index 285cc0a..1e18402 100644 --- a/src/sockets/UDPSocket.h +++ b/src/sockets/UDPSocket.h @@ -8,7 +8,7 @@ #include #include #include -#include "BaseSocket.h" +#include "src/BaseSocket.h" namespace eipScanner { namespace sockets { diff --git a/src/utils/Buffer.cpp b/src/utils/Buffer.cpp index 0e3ed2a..2edbb80 100644 --- a/src/utils/Buffer.cpp +++ b/src/utils/Buffer.cpp @@ -2,7 +2,7 @@ // Created by flipback on 11/16/19. // -#include "Buffer.h" +#include "src/Buffer.h" namespace eipScanner { namespace utils { diff --git a/src/utils/Buffer.h b/src/utils/Buffer.h index 32c1409..d5fec26 100644 --- a/src/utils/Buffer.h +++ b/src/utils/Buffer.h @@ -8,9 +8,9 @@ #include #include #include -#include "cip/CipString.h" -#include "cip/CipRevision.h" -#include "sockets/EndPoint.h" +#include "src/cip/CipString.h" +#include "src/cip/CipRevision.h" +#include "src/sockets/EndPoint.h" namespace eipScanner { namespace utils { diff --git a/src/utils/Logger.cpp b/src/utils/Logger.cpp index 495bc84..6e9633c 100644 --- a/src/utils/Logger.cpp +++ b/src/utils/Logger.cpp @@ -4,7 +4,7 @@ #include #include -#include "Logger.h" +#include "src/Logger.h" namespace eipScanner { namespace utils { From 044f63fda31c34bebddafa95842654848b27231a Mon Sep 17 00:00:00 2001 From: jan-ati Date: Wed, 11 Sep 2024 18:06:26 +0000 Subject: [PATCH 04/18] Updates all include paths to be the full paths to the source of the EIPScanner project --- src/BaseObject.cpp | 2 +- src/cip/CMakeLists.txt | 14 ++++++++++++++ src/cip/CipRevision.cpp | 2 +- src/cip/CipRevision.h | 2 +- src/cip/CipString.cpp | 2 +- src/cip/CipString.h | 2 +- src/cip/EPath.cpp | 2 +- src/cip/EPath.h | 2 +- src/cip/MessageRouterRequest.cpp | 6 +++--- src/cip/MessageRouterRequest.h | 4 ++-- src/cip/MessageRouterResponse.h | 2 +- src/cip/connectionManager/ForwardCloseRequest.cpp | 2 +- src/cip/connectionManager/ForwardCloseRequest.h | 2 +- src/cip/connectionManager/ForwardOpenRequest.cpp | 2 +- src/cip/connectionManager/ForwardOpenRequest.h | 2 +- src/cip/connectionManager/ForwardOpenResponse.cpp | 2 +- .../connectionManager/LargeForwardOpenRequest.cpp | 2 +- .../connectionManager/LargeForwardOpenRequest.h | 2 +- .../NetworkConnectionParametersBuilder.cpp | 2 +- src/eip/CommonPacket.cpp | 2 +- src/eip/CommonPacket.h | 2 +- src/eip/CommonPacketItem.cpp | 2 +- src/eip/CommonPacketItemFactory.cpp | 2 +- src/eip/CommonPacketItemFactory.h | 2 +- src/eip/EncapsPacket.cpp | 2 +- src/eip/EncapsPacketFactory.cpp | 2 +- src/eip/EncapsPacketFactory.h | 2 +- src/fileObject/FileObjectEmptyState.cpp | 2 +- src/fileObject/FileObjectEmptyState.h | 2 +- src/fileObject/FileObjectLoadedState.cpp | 4 ++-- src/fileObject/FileObjectLoadedState.h | 2 +- src/fileObject/FileObjectNonExistentState.cpp | 2 +- src/fileObject/FileObjectNonExistentState.h | 2 +- src/fileObject/FileObjectState.cpp | 10 +++++----- src/fileObject/FileObjectUploadInProgressState.cpp | 2 +- src/fileObject/FileObjectUploadInProgressState.h | 2 +- src/sockets/BaseSocket.cpp | 4 ++-- src/sockets/BaseSocket.h | 2 +- src/sockets/EndPoint.cpp | 6 +++--- src/sockets/Platform.cpp | 2 +- src/sockets/TCPSocket.cpp | 4 ++-- src/sockets/TCPSocket.h | 2 +- src/sockets/UDPBoundSocket.cpp | 4 ++-- src/sockets/UDPBoundSocket.h | 2 +- src/sockets/UDPSocket.cpp | 4 ++-- src/sockets/UDPSocket.h | 2 +- src/utils/Buffer.cpp | 2 +- src/utils/Logger.cpp | 2 +- 48 files changed, 75 insertions(+), 61 deletions(-) create mode 100644 src/cip/CMakeLists.txt diff --git a/src/BaseObject.cpp b/src/BaseObject.cpp index 5a0fd37..1fa3e48 100644 --- a/src/BaseObject.cpp +++ b/src/BaseObject.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 12/9/19. // -#include "src/BaseObject.h" +#include "BaseObject.h" namespace eipScanner { diff --git a/src/cip/CMakeLists.txt b/src/cip/CMakeLists.txt new file mode 100644 index 0000000..a170fb1 --- /dev/null +++ b/src/cip/CMakeLists.txt @@ -0,0 +1,14 @@ +set(SOURCE_FILES + CipRevision.cpp + EPath.cpp + MessageRouterRequest.cpp + MessageRouterResponse.cpp + CipString.cpp) + +add_subdirectory(connectionManager) + +add_library(EIPScannerCip SHARED ${SOURCE_FILES}) +add_library(EIPScannerCipS STATIC ${SOURCE_FILES}) + +target_link_libraries(EIPScannerCip EIPScanner) +target_link_libraries(EIPScannerCipS EIPScannerS) \ No newline at end of file diff --git a/src/cip/CipRevision.cpp b/src/cip/CipRevision.cpp index 9be4815..0dd25f7 100644 --- a/src/cip/CipRevision.cpp +++ b/src/cip/CipRevision.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 12/8/19. // -#include "src/CipRevision.h" +#include "src/cip/CipRevision.h" namespace eipScanner { namespace cip { diff --git a/src/cip/CipRevision.h b/src/cip/CipRevision.h index 164de58..b3aa5ca 100644 --- a/src/cip/CipRevision.h +++ b/src/cip/CipRevision.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CIPREVISION_H #include -#include "src/Types.h" +#include "src/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/CipString.cpp b/src/cip/CipString.cpp index 08f3515..f90b8ce 100644 --- a/src/cip/CipString.cpp +++ b/src/cip/CipString.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 12/4/19. // -#include "src/CipString.h" +#include "src/cip/CipString.h" namespace eipScanner { namespace cip { diff --git a/src/cip/CipString.h b/src/cip/CipString.h index d9777eb..cb2c583 100644 --- a/src/cip/CipString.h +++ b/src/cip/CipString.h @@ -9,7 +9,7 @@ #include #include #include -#include "src/Types.h" +#include "src/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/EPath.cpp b/src/cip/EPath.cpp index 4b450d8..a0a37bf 100644 --- a/src/cip/EPath.cpp +++ b/src/cip/EPath.cpp @@ -3,7 +3,7 @@ // #include #include "src/utils/Buffer.h" -#include "src/EPath.h" +#include "src/cip/EPath.h" namespace eipScanner { namespace cip { diff --git a/src/cip/EPath.h b/src/cip/EPath.h index 332dc9a..b663c9e 100644 --- a/src/cip/EPath.h +++ b/src/cip/EPath.h @@ -9,7 +9,7 @@ #include #include -#include "src/Types.h" +#include "src/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterRequest.cpp b/src/cip/MessageRouterRequest.cpp index e673b6f..0d4a73c 100644 --- a/src/cip/MessageRouterRequest.cpp +++ b/src/cip/MessageRouterRequest.cpp @@ -2,10 +2,10 @@ // Created by Aleksey Timin on 11/16/19. // -#include +#include "src/utils/Buffer.h" -#include "src/MessageRouterRequest.h" -#include "src/EPath.h" +#include "src/cip/MessageRouterRequest.h" +#include "src/cip/EPath.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterRequest.h b/src/cip/MessageRouterRequest.h index 00a885a..a564bcf 100644 --- a/src/cip/MessageRouterRequest.h +++ b/src/cip/MessageRouterRequest.h @@ -8,8 +8,8 @@ #include #include -#include "src/Services.h" -#include "src/EPath.h" +#include "src/cip/Services.h" +#include "src/cip/EPath.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterResponse.h b/src/cip/MessageRouterResponse.h index cd59284..f279f6f 100644 --- a/src/cip/MessageRouterResponse.h +++ b/src/cip/MessageRouterResponse.h @@ -10,7 +10,7 @@ #include "src/cip/GeneralStatusCodes.h" -#include "src/Services.h" +#include "src/cip/Services.h" #include "src/eip/CommonPacketItem.h" namespace eipScanner { diff --git a/src/cip/connectionManager/ForwardCloseRequest.cpp b/src/cip/connectionManager/ForwardCloseRequest.cpp index 87a6add..690170b 100644 --- a/src/cip/connectionManager/ForwardCloseRequest.cpp +++ b/src/cip/connectionManager/ForwardCloseRequest.cpp @@ -1,7 +1,7 @@ // // Created by Aleksey Timin on 11/19/19. // -#include "src/ForwardCloseRequest.h" +#include "src/cip/connectionManager/ForwardCloseRequest.h" #include "src/utils/Buffer.h" namespace eipScanner { diff --git a/src/cip/connectionManager/ForwardCloseRequest.h b/src/cip/connectionManager/ForwardCloseRequest.h index beb76e7..38a3d86 100644 --- a/src/cip/connectionManager/ForwardCloseRequest.h +++ b/src/cip/connectionManager/ForwardCloseRequest.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_FORWARDCLOSEREQUEST_H #include -#include "src/ConnectionParameters.h" +#include "src/cip/connectionManager/ConnectionParameters.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenRequest.cpp b/src/cip/connectionManager/ForwardOpenRequest.cpp index 17eaa7d..1098938 100644 --- a/src/cip/connectionManager/ForwardOpenRequest.cpp +++ b/src/cip/connectionManager/ForwardOpenRequest.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 11/18/19. // -#include "src/ForwardOpenRequest.h" +#include "src/cip/connectionManager/ForwardOpenRequest.h" #include #include diff --git a/src/cip/connectionManager/ForwardOpenRequest.h b/src/cip/connectionManager/ForwardOpenRequest.h index 94dc529..bf6bc53 100644 --- a/src/cip/connectionManager/ForwardOpenRequest.h +++ b/src/cip/connectionManager/ForwardOpenRequest.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_FORWARDOPENREQUEST_H #include -#include "src/ConnectionParameters.h" +#include "src/cip/connectionManager/ConnectionParameters.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenResponse.cpp b/src/cip/connectionManager/ForwardOpenResponse.cpp index a8d9467..49485d5 100644 --- a/src/cip/connectionManager/ForwardOpenResponse.cpp +++ b/src/cip/connectionManager/ForwardOpenResponse.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 11/18/19. // -#include "src/ForwardOpenResponse.h" +#include "src/cip/connectionManager/ForwardOpenResponse.h" #include "src/utils/Buffer.h" namespace eipScanner { diff --git a/src/cip/connectionManager/LargeForwardOpenRequest.cpp b/src/cip/connectionManager/LargeForwardOpenRequest.cpp index 0426ee0..4a5717c 100644 --- a/src/cip/connectionManager/LargeForwardOpenRequest.cpp +++ b/src/cip/connectionManager/LargeForwardOpenRequest.cpp @@ -2,7 +2,7 @@ // Created by Vincent Prince on 05/22/20. // -#include "LargeForwardOpenRequest.h" +#include "src/cip/connectionManager/LargeForwardOpenRequest.h" #include #include diff --git a/src/cip/connectionManager/LargeForwardOpenRequest.h b/src/cip/connectionManager/LargeForwardOpenRequest.h index bc3962b..7206ece 100644 --- a/src/cip/connectionManager/LargeForwardOpenRequest.h +++ b/src/cip/connectionManager/LargeForwardOpenRequest.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_LARGEFORWARDOPENREQUEST_H #include -#include "src/ConnectionParameters.h" +#include "src/cip/connectionManager/ConnectionParameters.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp b/src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp index 90740a1..5e26e1c 100644 --- a/src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp +++ b/src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp @@ -2,7 +2,7 @@ // Created by Vincent Prince on 05/22/20. // -#include "NetworkConnectionParametersBuilder.h" +#include "src/cip/connectionManager/NetworkConnectionParametersBuilder.h" #include #include diff --git a/src/eip/CommonPacket.cpp b/src/eip/CommonPacket.cpp index 2ea1bfd..da9cccd 100644 --- a/src/eip/CommonPacket.cpp +++ b/src/eip/CommonPacket.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 11/16/19. // #include -#include "src/CommonPacket.h" +#include "src/eip/CommonPacket.h" #include "src/utils/Buffer.h" #include "src/cip/Types.h" diff --git a/src/eip/CommonPacket.h b/src/eip/CommonPacket.h index 8e2f8b4..5aac91c 100644 --- a/src/eip/CommonPacket.h +++ b/src/eip/CommonPacket.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_EIP_COMMONPACKET_H #define EIPSCANNER_EIP_COMMONPACKET_H -#include "src/CommonPacketItem.h" +#include "src/eip/CommonPacketItem.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItem.cpp b/src/eip/CommonPacketItem.cpp index bf89d83..d5db455 100644 --- a/src/eip/CommonPacketItem.cpp +++ b/src/eip/CommonPacketItem.cpp @@ -3,7 +3,7 @@ // #include "src/utils/Buffer.h" -#include "src/CommonPacketItem.h" +#include "src/eip/CommonPacketItem.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItemFactory.cpp b/src/eip/CommonPacketItemFactory.cpp index 1dd79b3..cc0170f 100644 --- a/src/eip/CommonPacketItemFactory.cpp +++ b/src/eip/CommonPacketItemFactory.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 11/16/19. // -#include "src/CommonPacketItemFactory.h" +#include "src/eip/CommonPacketItemFactory.h" #include "src/utils/Buffer.h" namespace eipScanner { diff --git a/src/eip/CommonPacketItemFactory.h b/src/eip/CommonPacketItemFactory.h index 58a2647..4d97564 100644 --- a/src/eip/CommonPacketItemFactory.h +++ b/src/eip/CommonPacketItemFactory.h @@ -6,7 +6,7 @@ #define EIPSCANNER_EIP_COMMONPACKETITEMFACTORY_H #include -#include "src/CommonPacketItem.h" +#include "src/eip/CommonPacketItem.h" #include "src/cip/Types.h" namespace eipScanner { diff --git a/src/eip/EncapsPacket.cpp b/src/eip/EncapsPacket.cpp index c61d37e..9d37a7b 100644 --- a/src/eip/EncapsPacket.cpp +++ b/src/eip/EncapsPacket.cpp @@ -4,7 +4,7 @@ #include #include -#include "src/EncapsPacket.h" +#include "src/eip/EncapsPacket.h" #include "src/utils/Buffer.h" using eipScanner::utils::Buffer; diff --git a/src/eip/EncapsPacketFactory.cpp b/src/eip/EncapsPacketFactory.cpp index 4bb361b..be7d3e4 100644 --- a/src/eip/EncapsPacketFactory.cpp +++ b/src/eip/EncapsPacketFactory.cpp @@ -3,7 +3,7 @@ // #include "src/utils/Buffer.h" -#include "src/EncapsPacketFactory.h" +#include "src/eip/EncapsPacketFactory.h" namespace eipScanner { namespace eip { diff --git a/src/eip/EncapsPacketFactory.h b/src/eip/EncapsPacketFactory.h index 1b68917..ce147e1 100644 --- a/src/eip/EncapsPacketFactory.h +++ b/src/eip/EncapsPacketFactory.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_EIP_ENCAPSPACKETFACTORY_H #define EIPSCANNER_EIP_ENCAPSPACKETFACTORY_H -#include "src/EncapsPacket.h" +#include "src/eip/EncapsPacket.h" #include "src/cip/Types.h" namespace eipScanner { diff --git a/src/fileObject/FileObjectEmptyState.cpp b/src/fileObject/FileObjectEmptyState.cpp index 6413c32..3b8fc51 100644 --- a/src/fileObject/FileObjectEmptyState.cpp +++ b/src/fileObject/FileObjectEmptyState.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 11/23/19. // -#include "src/FileObjectEmptyState.h" +#include "src/fileObject/FileObjectEmptyState.h" namespace eipScanner { namespace fileObject { using utils::LogLevel; diff --git a/src/fileObject/FileObjectEmptyState.h b/src/fileObject/FileObjectEmptyState.h index 7a60061..59eef79 100644 --- a/src/fileObject/FileObjectEmptyState.h +++ b/src/fileObject/FileObjectEmptyState.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_FILEOBJECT_FILEOBJECTEMPTYSTATE_H #define EIPSCANNER_FILEOBJECT_FILEOBJECTEMPTYSTATE_H -#include "src/FileObjectState.h" +#include "src/fileObject/FileObjectState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectLoadedState.cpp b/src/fileObject/FileObjectLoadedState.cpp index 0a0305f..eda2244 100644 --- a/src/fileObject/FileObjectLoadedState.cpp +++ b/src/fileObject/FileObjectLoadedState.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/23/19. // -#include "src/FileObjectLoadedState.h" -#include "src/FileObjectUploadInProgressState.h" +#include "src/fileObject/FileObjectLoadedState.h" +#include "src/fileObject/FileObjectUploadInProgressState.h" #include "src/utils/Buffer.h" namespace eipScanner { diff --git a/src/fileObject/FileObjectLoadedState.h b/src/fileObject/FileObjectLoadedState.h index cd703f0..bde67ed 100644 --- a/src/fileObject/FileObjectLoadedState.h +++ b/src/fileObject/FileObjectLoadedState.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_FILEOBJECT_FILEOBJECTLOADEDSTATE_H #define EIPSCANNER_FILEOBJECT_FILEOBJECTLOADEDSTATE_H -#include "src/FileObjectState.h" +#include "src/fileObject/FileObjectState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectNonExistentState.cpp b/src/fileObject/FileObjectNonExistentState.cpp index 0e7e39b..1719164 100644 --- a/src/fileObject/FileObjectNonExistentState.cpp +++ b/src/fileObject/FileObjectNonExistentState.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 11/23/19. // -#include "src/FileObjectNonExistentState.h" +#include "src/fileObject/FileObjectNonExistentState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectNonExistentState.h b/src/fileObject/FileObjectNonExistentState.h index a5b4d5d..998ad2f 100644 --- a/src/fileObject/FileObjectNonExistentState.h +++ b/src/fileObject/FileObjectNonExistentState.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_FILEOBJECT_FILEOBJECTNONEXISTENTSTATE_H #define EIPSCANNER_FILEOBJECT_FILEOBJECTNONEXISTENTSTATE_H -#include "src/FileObjectState.h" +#include "src/fileObject/FileObjectState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectState.cpp b/src/fileObject/FileObjectState.cpp index 8bd1843..d6f7575 100644 --- a/src/fileObject/FileObjectState.cpp +++ b/src/fileObject/FileObjectState.cpp @@ -3,12 +3,12 @@ // #include -#include "src/FileObjectState.h" +#include "src/fileObject/FileObjectState.h" #include "src/utils/Buffer.h" -#include "src/FileObjectNonExistentState.h" -#include "src/FileObjectEmptyState.h" -#include "src/FileObjectLoadedState.h" -#include "src/FileObjectUploadInProgressState.h" +#include "src/fileObject/FileObjectNonExistentState.h" +#include "src/fileObject/FileObjectEmptyState.h" +#include "src/fileObject/FileObjectLoadedState.h" +#include "src/fileObject/FileObjectUploadInProgressState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectUploadInProgressState.cpp b/src/fileObject/FileObjectUploadInProgressState.cpp index 8926424..3c6232f 100644 --- a/src/fileObject/FileObjectUploadInProgressState.cpp +++ b/src/fileObject/FileObjectUploadInProgressState.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 11/23/19. // -#include "src/FileObjectUploadInProgressState.h" +#include "src/fileObject/FileObjectUploadInProgressState.h" #include "src/utils/Buffer.h" namespace eipScanner { diff --git a/src/fileObject/FileObjectUploadInProgressState.h b/src/fileObject/FileObjectUploadInProgressState.h index dda0329..00e5e8a 100644 --- a/src/fileObject/FileObjectUploadInProgressState.h +++ b/src/fileObject/FileObjectUploadInProgressState.h @@ -7,7 +7,7 @@ #include -#include "src/FileObjectState.h" +#include "src/fileObject/FileObjectState.h" #include "src/cip/Types.h" namespace eipScanner { diff --git a/src/sockets/BaseSocket.cpp b/src/sockets/BaseSocket.cpp index db6a00f..8ec4835 100644 --- a/src/sockets/BaseSocket.cpp +++ b/src/sockets/BaseSocket.cpp @@ -14,8 +14,8 @@ #include #include -#include "src/BaseSocket.h" -#include "src/Platform.h" +#include "src/sockets/BaseSocket.h" +#include "src/sockets/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/BaseSocket.h b/src/sockets/BaseSocket.h index 7db8164..62ca736 100644 --- a/src/sockets/BaseSocket.h +++ b/src/sockets/BaseSocket.h @@ -13,7 +13,7 @@ #include #include -#include "src/EndPoint.h" +#include "src/sockets/EndPoint.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/EndPoint.cpp b/src/sockets/EndPoint.cpp index 2e04f5a..04f0e80 100644 --- a/src/sockets/EndPoint.cpp +++ b/src/sockets/EndPoint.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 12/10/19. // -#include "src/EndPoint.h" -#include "src/BaseSocket.h" -#include "src/Platform.h" +#include "src/sockets/EndPoint.h" +#include "src/sockets/BaseSocket.h" +#include "src/sockets/Platform.h" #if defined(__unix__) || defined(__APPLE__) #include diff --git a/src/sockets/Platform.cpp b/src/sockets/Platform.cpp index da1d106..5c97184 100644 --- a/src/sockets/Platform.cpp +++ b/src/sockets/Platform.cpp @@ -2,7 +2,7 @@ // Created by Stefan Broekman on 02/04/21. // -#include "src/Platform.h" +#include "src/sockets/Platform.h" #if defined(_WIN32) || defined(WIN32) || defined(_WIN64) #include diff --git a/src/sockets/TCPSocket.cpp b/src/sockets/TCPSocket.cpp index 876b3b4..eac161c 100644 --- a/src/sockets/TCPSocket.cpp +++ b/src/sockets/TCPSocket.cpp @@ -16,8 +16,8 @@ #include #include "src/utils/Logger.h" -#include "src/TCPSocket.h" -#include "src/Platform.h" +#include "src/sockets/TCPSocket.h" +#include "src/sockets/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/TCPSocket.h b/src/sockets/TCPSocket.h index 0a89dc4..63c9321 100644 --- a/src/sockets/TCPSocket.h +++ b/src/sockets/TCPSocket.h @@ -7,7 +7,7 @@ #include #include -#include "src/BaseSocket.h" +#include "src/sockets/BaseSocket.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPBoundSocket.cpp b/src/sockets/UDPBoundSocket.cpp index 8f51179..1eea323 100644 --- a/src/sockets/UDPBoundSocket.cpp +++ b/src/sockets/UDPBoundSocket.cpp @@ -6,8 +6,8 @@ //#include //#include -#include "src/UDPBoundSocket.h" -#include "src/Platform.h" +#include "src/sockets/UDPBoundSocket.h" +#include "src/sockets/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPBoundSocket.h b/src/sockets/UDPBoundSocket.h index 85e67c7..d5553bc 100644 --- a/src/sockets/UDPBoundSocket.h +++ b/src/sockets/UDPBoundSocket.h @@ -9,7 +9,7 @@ #include #include //#include -#include "src/UDPSocket.h" +#include "src/sockets/UDPSocket.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPSocket.cpp b/src/sockets/UDPSocket.cpp index 7084022..0c87475 100644 --- a/src/sockets/UDPSocket.cpp +++ b/src/sockets/UDPSocket.cpp @@ -13,8 +13,8 @@ #endif #include "src/utils/Logger.h" -#include "src/UDPSocket.h" -#include "src/Platform.h" +#include "src/sockets/UDPSocket.h" +#include "src/sockets/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPSocket.h b/src/sockets/UDPSocket.h index 1e18402..55a0999 100644 --- a/src/sockets/UDPSocket.h +++ b/src/sockets/UDPSocket.h @@ -8,7 +8,7 @@ #include #include #include -#include "src/BaseSocket.h" +#include "src/sockets/BaseSocket.h" namespace eipScanner { namespace sockets { diff --git a/src/utils/Buffer.cpp b/src/utils/Buffer.cpp index 2edbb80..990590c 100644 --- a/src/utils/Buffer.cpp +++ b/src/utils/Buffer.cpp @@ -2,7 +2,7 @@ // Created by flipback on 11/16/19. // -#include "src/Buffer.h" +#include "src/utils/Buffer.h" namespace eipScanner { namespace utils { diff --git a/src/utils/Logger.cpp b/src/utils/Logger.cpp index 6e9633c..8003eeb 100644 --- a/src/utils/Logger.cpp +++ b/src/utils/Logger.cpp @@ -4,7 +4,7 @@ #include #include -#include "src/Logger.h" +#include "src/utils/Logger.h" namespace eipScanner { namespace utils { From f24f0f1e06ef8b1178f2fefb55a4df856c4ec0d4 Mon Sep 17 00:00:00 2001 From: jan-ati Date: Wed, 11 Sep 2024 18:06:57 +0000 Subject: [PATCH 05/18] Created libraries for all of the submodules and linked them to the parent EIPScanner --- CMakeLists.txt | 8 ++- src/CMakeLists.txt | 76 +++++------------------- src/cip/connectionManager/CMakeLists.txt | 12 ++++ src/eip/CMakeLists.txt | 12 ++++ src/fileObject/CMakeLists.txt | 12 ++++ src/sockets/CMakeLists.txt | 13 ++++ src/utils/CMakeLists.txt | 9 +++ 7 files changed, 77 insertions(+), 65 deletions(-) create mode 100644 src/cip/connectionManager/CMakeLists.txt create mode 100644 src/eip/CMakeLists.txt create mode 100644 src/fileObject/CMakeLists.txt create mode 100644 src/sockets/CMakeLists.txt create mode 100644 src/utils/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ea0b7a..82a8690 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,10 @@ if (WIN32) endif() endif() +# TODO: Change the file structure so that every folder isn't included in the include directories +include_directories(${PROJECT_SOURCE_DIR}) add_subdirectory(src) + if (EXAMPLE_ENABLED) add_subdirectory(examples) endif() @@ -36,7 +39,6 @@ if (TEST_ENABLED) endif() -# configure_file(EIPScanner.pc.in EIPScanner.pc @ONLY) +configure_file(EIPScanner.pc.in EIPScanner.pc @ONLY) -# install(FILES ${CMAKE_BINARY_DIR}/EIPScanner.pc -# DESTINATION lib/pkgconfig) +install(FILES ${CMAKE_BINARY_DIR}/EIPScanner.pc DESTINATION lib/pkgconfig) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6a58194..9f2ae2e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,40 +1,5 @@ -include_directories(${CMAKE_CURRENT_LIST_DIR}) - -set(SOURCE_FILES - cip/connectionManager/ForwardCloseRequest.cpp - cip/connectionManager/ForwardOpenRequest.cpp - cip/connectionManager/LargeForwardOpenRequest.cpp - cip/connectionManager/ForwardOpenResponse.cpp - cip/connectionManager/NetworkConnectionParametersBuilder.cpp - - cip/CipRevision.cpp - cip/EPath.cpp - cip/MessageRouterRequest.cpp - cip/MessageRouterResponse.cpp - cip/CipString.cpp - - eip/CommonPacket.cpp - eip/CommonPacketItem.cpp - eip/CommonPacketItemFactory.cpp - eip/EncapsPacket.cpp - eip/EncapsPacketFactory.cpp - - fileObject/FileObjectEmptyState.cpp - fileObject/FileObjectLoadedState.cpp - fileObject/FileObjectNonExistentState.cpp - fileObject/FileObjectState.cpp - fileObject/FileObjectUploadInProgressState.cpp - - sockets/BaseSocket.cpp - sockets/EndPoint.cpp - sockets/TCPSocket.cpp - sockets/UDPBoundSocket.cpp - sockets/UDPSocket.cpp - sockets/Platform.cpp - - utils/Logger.cpp - utils/Buffer.cpp - +# Add library target for common source files +set(SOURCE_FILES BaseObject.cpp ConnectionManager.cpp DiscoveryManager.cpp @@ -44,32 +9,19 @@ set(SOURCE_FILES MessageRouter.cpp ParameterObject.cpp SessionInfo.cpp) + +add_library(EIPScanner SHARED ${SOURCE_FILES}) +add_library(EIPScannerS STATIC ${SOURCE_FILES}) -# if vendor scripts are enabled -if(ENABLE_VENDOR_SRC) - add_subdirectory(vendor) -endif() - -add_library(EIPScanner SHARED ${SOURCE_FILES} ${VENDOR_FILES}) -add_library(EIPScannerS STATIC ${SOURCE_FILES} ${VENDOR_FILES}) - -if(WIN32) - target_link_libraries(EIPScanner ws2_32) - target_link_libraries(EIPScannerS ws2_32) -endif() -set_target_properties( - EIPScanner - PROPERTIES - VERSION ${EIPSCANNER_FULL_VERSION} - SOVERSION ${EIPSCANNER_MAJOR_VERSION}) +add_subdirectory(cip) +add_subdirectory(eip) +add_subdirectory(fileObject) +add_subdirectory(sockets) +add_subdirectory(utils) -install(TARGETS EIPScanner EIPScannerS - LIBRARY - DESTINATION lib - ARCHIVE - DESTINATION lib) -install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ - DESTINATION include/EIPScanner - FILES_MATCHING PATTERN "*.h*") +# if vendor scripts are enabled +if(ENABLE_VENDOR_SRC) + add_subdirectory(vendor) +endif() diff --git a/src/cip/connectionManager/CMakeLists.txt b/src/cip/connectionManager/CMakeLists.txt new file mode 100644 index 0000000..d9ff1e6 --- /dev/null +++ b/src/cip/connectionManager/CMakeLists.txt @@ -0,0 +1,12 @@ +set(SOURCE_FILES + ForwardCloseRequest.cpp + ForwardOpenRequest.cpp + LargeForwardOpenRequest.cpp + ForwardOpenResponse.cpp + NetworkConnectionParametersBuilder.cpp) + +add_library(EIPScannerCipConnectionManager SHARED ${SOURCE_FILES}) +add_library(EIPScannerCipConnectionManagerS STATIC ${SOURCE_FILES}) + +target_link_libraries(EIPScannerCipConnectionManager EIPScanner) +target_link_libraries(EIPScannerCipConnectionManagerS EIPScannerS) \ No newline at end of file diff --git a/src/eip/CMakeLists.txt b/src/eip/CMakeLists.txt new file mode 100644 index 0000000..74cde76 --- /dev/null +++ b/src/eip/CMakeLists.txt @@ -0,0 +1,12 @@ +set(SOURCE_FILES + CommonPacket.cpp + CommonPacketItem.cpp + CommonPacketItemFactory.cpp + EncapsPacket.cpp + EncapsPacketFactory.cpp) + +add_library(EIPScannerEip SHARED ${SOURCE_FILES}) +add_library(EIPScannerEipS STATIC ${SOURCE_FILES}) + +target_link_libraries(EIPScannerEip EIPScanner) +target_link_libraries(EIPScannerEipS EIPScannerS) \ No newline at end of file diff --git a/src/fileObject/CMakeLists.txt b/src/fileObject/CMakeLists.txt new file mode 100644 index 0000000..ee6bf91 --- /dev/null +++ b/src/fileObject/CMakeLists.txt @@ -0,0 +1,12 @@ +set(SOURCE_FILES + FileObjectEmptyState.cpp + FileObjectLoadedState.cpp + FileObjectNonExistentState.cpp + FileObjectState.cpp + FileObjectUploadInProgressState.cpp) + +add_library(EIPScannerFileObject SHARED ${SOURCE_FILES}) +add_library(EIPScannerFileObjectS STATIC ${SOURCE_FILES}) + +target_link_libraries(EIPScannerFileObject EIPScanner) +target_link_libraries(EIPScannerFileObjectS EIPScannerS) \ No newline at end of file diff --git a/src/sockets/CMakeLists.txt b/src/sockets/CMakeLists.txt new file mode 100644 index 0000000..8549881 --- /dev/null +++ b/src/sockets/CMakeLists.txt @@ -0,0 +1,13 @@ +set(SOURCE_FILES + BaseSocket.cpp + EndPoint.cpp + TCPSocket.cpp + UDPBoundSocket.cpp + UDPSocket.cpp + Platform.cpp) + +add_library(EIPScannerSocket SHARED ${SOURCE_FILES}) +add_library(EIPScannerSocketS STATIC ${SOURCE_FILES}) + +target_link_libraries(EIPScannerSocket EIPScanner) +target_link_libraries(EIPScannerSocketS EIPScannerS) \ No newline at end of file diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt new file mode 100644 index 0000000..174b927 --- /dev/null +++ b/src/utils/CMakeLists.txt @@ -0,0 +1,9 @@ +set(SOURCE_FILES + Logger.cpp + Buffer.cpp) + +add_library(EIPScannerUtil SHARED ${SOURCE_FILES}) +add_library(EIPScannerUtilS STATIC ${SOURCE_FILES}) + +target_link_libraries(EIPScannerUtil EIPScanner) +target_link_libraries(EIPScannerUtilS EIPScannerS) \ No newline at end of file From 7a437fc1cee7b26f9bbc241ec1cb21a97c5e96ab Mon Sep 17 00:00:00 2001 From: jan-ati Date: Wed, 11 Sep 2024 18:26:36 +0000 Subject: [PATCH 06/18] Moved the EIPScanner files to a root EIPScanner directory so that all of the project paths start at the root --- CMakeLists.txt | 8 +- src/{ => EIPScanner}/BaseObject.cpp | 0 src/{ => EIPScanner}/BaseObject.h | 2 +- src/{ => EIPScanner}/CMakeLists.txt | 0 src/{ => EIPScanner}/ConnectionManager.cpp | 20 ++--- src/{ => EIPScanner}/ConnectionManager.h | 12 +-- src/{ => EIPScanner}/DiscoveryManager.cpp | 12 +-- src/{ => EIPScanner}/DiscoveryManager.h | 4 +- src/{ => EIPScanner}/FileObject.cpp | 10 +-- src/{ => EIPScanner}/FileObject.h | 8 +- src/{ => EIPScanner}/IOConnection.cpp | 12 +-- src/{ => EIPScanner}/IOConnection.h | 4 +- src/{ => EIPScanner}/IdentityObject.cpp | 4 +- src/{ => EIPScanner}/IdentityObject.h | 12 +-- src/{ => EIPScanner}/MessageRouter.cpp | 18 ++--- src/{ => EIPScanner}/MessageRouter.h | 10 +-- src/EIPScanner/OLD_CMakeLists.txt | 75 +++++++++++++++++++ src/{ => EIPScanner}/ParameterObject.cpp | 6 +- src/{ => EIPScanner}/ParameterObject.h | 6 +- src/{ => EIPScanner}/SessionInfo.cpp | 8 +- src/{ => EIPScanner}/SessionInfo.h | 4 +- src/{ => EIPScanner}/SessionInfoIf.h | 4 +- src/{ => EIPScanner}/cip/CMakeLists.txt | 0 src/{ => EIPScanner}/cip/CipRevision.cpp | 2 +- src/{ => EIPScanner}/cip/CipRevision.h | 2 +- src/{ => EIPScanner}/cip/CipString.cpp | 2 +- src/{ => EIPScanner}/cip/CipString.h | 2 +- src/{ => EIPScanner}/cip/EPath.cpp | 4 +- src/{ => EIPScanner}/cip/EPath.h | 2 +- src/{ => EIPScanner}/cip/GeneralStatusCodes.h | 2 +- .../cip/MessageRouterRequest.cpp | 6 +- .../cip/MessageRouterRequest.h | 4 +- .../cip/MessageRouterResponse.cpp | 6 +- .../cip/MessageRouterResponse.h | 6 +- src/{ => EIPScanner}/cip/Services.h | 2 +- src/{ => EIPScanner}/cip/Types.h | 0 .../cip/connectionManager/CMakeLists.txt | 0 .../connectionManager/ConnectionParameters.h | 2 +- .../connectionManager/ForwardCloseRequest.cpp | 4 +- .../connectionManager/ForwardCloseRequest.h | 2 +- .../connectionManager/ForwardOpenRequest.cpp | 4 +- .../connectionManager/ForwardOpenRequest.h | 2 +- .../connectionManager/ForwardOpenResponse.cpp | 4 +- .../connectionManager/ForwardOpenResponse.h | 2 +- .../LargeForwardOpenRequest.cpp | 4 +- .../LargeForwardOpenRequest.h | 2 +- .../NetworkConnectionParametersBuilder.cpp | 4 +- .../NetworkConnectionParametersBuilder.h | 2 +- .../NetworkConnectionParams.h | 2 +- src/{ => EIPScanner}/eip/CMakeLists.txt | 0 src/{ => EIPScanner}/eip/CommonPacket.cpp | 6 +- src/{ => EIPScanner}/eip/CommonPacket.h | 2 +- src/{ => EIPScanner}/eip/CommonPacketItem.cpp | 4 +- src/{ => EIPScanner}/eip/CommonPacketItem.h | 2 +- .../eip/CommonPacketItemFactory.cpp | 4 +- .../eip/CommonPacketItemFactory.h | 4 +- src/{ => EIPScanner}/eip/EncapsPacket.cpp | 4 +- src/{ => EIPScanner}/eip/EncapsPacket.h | 2 +- .../eip/EncapsPacketFactory.cpp | 4 +- .../eip/EncapsPacketFactory.h | 4 +- .../fileObject/CMakeLists.txt | 0 .../fileObject/FileObjectEmptyState.cpp | 2 +- .../fileObject/FileObjectEmptyState.h | 2 +- .../fileObject/FileObjectLoadedState.cpp | 6 +- .../fileObject/FileObjectLoadedState.h | 2 +- .../fileObject/FileObjectNonExistentState.cpp | 2 +- .../fileObject/FileObjectNonExistentState.h | 2 +- .../fileObject/FileObjectState.cpp | 12 +-- .../fileObject/FileObjectState.h | 10 +-- .../FileObjectUploadInProgressState.cpp | 4 +- .../FileObjectUploadInProgressState.h | 4 +- src/{ => EIPScanner}/sockets/BaseSocket.cpp | 4 +- src/{ => EIPScanner}/sockets/BaseSocket.h | 2 +- src/{ => EIPScanner}/sockets/CMakeLists.txt | 0 src/{ => EIPScanner}/sockets/EndPoint.cpp | 6 +- src/{ => EIPScanner}/sockets/EndPoint.h | 0 src/{ => EIPScanner}/sockets/Platform.cpp | 2 +- src/{ => EIPScanner}/sockets/Platform.h | 0 src/{ => EIPScanner}/sockets/TCPSocket.cpp | 6 +- src/{ => EIPScanner}/sockets/TCPSocket.h | 2 +- .../sockets/UDPBoundSocket.cpp | 4 +- src/{ => EIPScanner}/sockets/UDPBoundSocket.h | 2 +- src/{ => EIPScanner}/sockets/UDPSocket.cpp | 6 +- src/{ => EIPScanner}/sockets/UDPSocket.h | 2 +- src/{ => EIPScanner}/utils/Buffer.cpp | 2 +- src/{ => EIPScanner}/utils/Buffer.h | 6 +- src/{ => EIPScanner}/utils/CMakeLists.txt | 0 src/{ => EIPScanner}/utils/Logger.cpp | 2 +- src/{ => EIPScanner}/utils/Logger.h | 0 src/{ => EIPScanner}/vendor/CMakeLists.txt | 0 .../vendor/ra/powerFlex525/DPIFaultCode.cpp | 0 .../vendor/ra/powerFlex525/DPIFaultCode.h | 0 .../ra/powerFlex525/DPIFaultManager.cpp | 0 .../vendor/ra/powerFlex525/DPIFaultManager.h | 0 .../vendor/ra/powerFlex525/DPIFaultObject.cpp | 0 .../vendor/ra/powerFlex525/DPIFaultObject.h | 0 .../ra/powerFlex525/DPIFaultParameter.cpp | 0 .../ra/powerFlex525/DPIFaultParameter.h | 0 .../yaskawa/mp3300iec/Yaskawa_EPath.cpp | 0 .../vendor/yaskawa/mp3300iec/Yaskawa_EPath.h | 0 .../mp3300iec/Yaskawa_MessageRouter.cpp | 0 .../yaskawa/mp3300iec/Yaskawa_MessageRouter.h | 0 .../Yaskawa_MessageRouterRequest.cpp | 0 .../mp3300iec/Yaskawa_MessageRouterRequest.h | 0 104 files changed, 259 insertions(+), 182 deletions(-) rename src/{ => EIPScanner}/BaseObject.cpp (100%) rename src/{ => EIPScanner}/BaseObject.h (95%) rename src/{ => EIPScanner}/CMakeLists.txt (100%) rename src/{ => EIPScanner}/ConnectionManager.cpp (94%) rename src/{ => EIPScanner}/ConnectionManager.h (90%) rename src/{ => EIPScanner}/DiscoveryManager.cpp (91%) rename src/{ => EIPScanner}/DiscoveryManager.h (95%) rename src/{ => EIPScanner}/FileObject.cpp (83%) rename src/{ => EIPScanner}/FileObject.h (93%) rename src/{ => EIPScanner}/IOConnection.cpp (93%) rename src/{ => EIPScanner}/IOConnection.h (97%) rename src/{ => EIPScanner}/IdentityObject.cpp (97%) rename src/{ => EIPScanner}/IdentityObject.h (93%) rename src/{ => EIPScanner}/MessageRouter.cpp (86%) rename src/{ => EIPScanner}/MessageRouter.h (93%) create mode 100644 src/EIPScanner/OLD_CMakeLists.txt rename src/{ => EIPScanner}/ParameterObject.cpp (98%) rename src/{ => EIPScanner}/ParameterObject.h (98%) rename src/{ => EIPScanner}/SessionInfo.cpp (92%) rename src/{ => EIPScanner}/SessionInfo.h (95%) rename src/{ => EIPScanner}/SessionInfoIf.h (91%) rename src/{ => EIPScanner}/cip/CMakeLists.txt (100%) rename src/{ => EIPScanner}/cip/CipRevision.cpp (95%) rename src/{ => EIPScanner}/cip/CipRevision.h (94%) rename src/{ => EIPScanner}/cip/CipString.cpp (70%) rename src/{ => EIPScanner}/cip/CipString.h (96%) rename src/{ => EIPScanner}/cip/EPath.cpp (98%) rename src/{ => EIPScanner}/cip/EPath.h (96%) rename src/{ => EIPScanner}/cip/GeneralStatusCodes.h (99%) rename src/{ => EIPScanner}/cip/MessageRouterRequest.cpp (85%) rename src/{ => EIPScanner}/cip/MessageRouterRequest.h (89%) rename src/{ => EIPScanner}/cip/MessageRouterResponse.cpp (95%) rename src/{ => EIPScanner}/cip/MessageRouterResponse.h (90%) rename src/{ => EIPScanner}/cip/Services.h (96%) rename src/{ => EIPScanner}/cip/Types.h (100%) rename src/{ => EIPScanner}/cip/connectionManager/CMakeLists.txt (100%) rename src/{ => EIPScanner}/cip/connectionManager/ConnectionParameters.h (96%) rename src/{ => EIPScanner}/cip/connectionManager/ForwardCloseRequest.cpp (93%) rename src/{ => EIPScanner}/cip/connectionManager/ForwardCloseRequest.h (92%) rename src/{ => EIPScanner}/cip/connectionManager/ForwardOpenRequest.cpp (93%) rename src/{ => EIPScanner}/cip/connectionManager/ForwardOpenRequest.h (89%) rename src/{ => EIPScanner}/cip/connectionManager/ForwardOpenResponse.cpp (94%) rename src/{ => EIPScanner}/cip/connectionManager/ForwardOpenResponse.h (97%) rename src/{ => EIPScanner}/cip/connectionManager/LargeForwardOpenRequest.cpp (92%) rename src/{ => EIPScanner}/cip/connectionManager/LargeForwardOpenRequest.h (89%) rename src/{ => EIPScanner}/cip/connectionManager/NetworkConnectionParametersBuilder.cpp (96%) rename src/{ => EIPScanner}/cip/connectionManager/NetworkConnectionParametersBuilder.h (97%) rename src/{ => EIPScanner}/cip/connectionManager/NetworkConnectionParams.h (96%) rename src/{ => EIPScanner}/eip/CMakeLists.txt (100%) rename src/{ => EIPScanner}/eip/CommonPacket.cpp (91%) rename src/{ => EIPScanner}/eip/CommonPacket.h (92%) rename src/{ => EIPScanner}/eip/CommonPacketItem.cpp (93%) rename src/{ => EIPScanner}/eip/CommonPacketItem.h (97%) rename src/{ => EIPScanner}/eip/CommonPacketItemFactory.cpp (90%) rename src/{ => EIPScanner}/eip/CommonPacketItemFactory.h (88%) rename src/{ => EIPScanner}/eip/EncapsPacket.cpp (97%) rename src/{ => EIPScanner}/eip/EncapsPacket.h (98%) rename src/{ => EIPScanner}/eip/EncapsPacketFactory.cpp (94%) rename src/{ => EIPScanner}/eip/EncapsPacketFactory.h (88%) rename src/{ => EIPScanner}/fileObject/CMakeLists.txt (100%) rename src/{ => EIPScanner}/fileObject/FileObjectEmptyState.cpp (92%) rename src/{ => EIPScanner}/fileObject/FileObjectEmptyState.h (91%) rename src/{ => EIPScanner}/fileObject/FileObjectLoadedState.cpp (88%) rename src/{ => EIPScanner}/fileObject/FileObjectLoadedState.h (91%) rename src/{ => EIPScanner}/fileObject/FileObjectNonExistentState.cpp (92%) rename src/{ => EIPScanner}/fileObject/FileObjectNonExistentState.h (91%) rename src/{ => EIPScanner}/fileObject/FileObjectState.cpp (91%) rename src/{ => EIPScanner}/fileObject/FileObjectState.h (89%) rename src/{ => EIPScanner}/fileObject/FileObjectUploadInProgressState.cpp (96%) rename src/{ => EIPScanner}/fileObject/FileObjectUploadInProgressState.h (91%) rename src/{ => EIPScanner}/sockets/BaseSocket.cpp (98%) rename src/{ => EIPScanner}/sockets/BaseSocket.h (97%) rename src/{ => EIPScanner}/sockets/CMakeLists.txt (100%) rename src/{ => EIPScanner}/sockets/EndPoint.cpp (93%) rename src/{ => EIPScanner}/sockets/EndPoint.h (100%) rename src/{ => EIPScanner}/sockets/Platform.cpp (91%) rename src/{ => EIPScanner}/sockets/Platform.h (100%) rename src/{ => EIPScanner}/sockets/TCPSocket.cpp (97%) rename src/{ => EIPScanner}/sockets/TCPSocket.h (93%) rename src/{ => EIPScanner}/sockets/UDPBoundSocket.cpp (90%) rename src/{ => EIPScanner}/sockets/UDPBoundSocket.h (93%) rename src/{ => EIPScanner}/sockets/UDPSocket.cpp (95%) rename src/{ => EIPScanner}/sockets/UDPSocket.h (94%) rename src/{ => EIPScanner}/utils/Buffer.cpp (99%) rename src/{ => EIPScanner}/utils/Buffer.h (96%) rename src/{ => EIPScanner}/utils/CMakeLists.txt (100%) rename src/{ => EIPScanner}/utils/Logger.cpp (96%) rename src/{ => EIPScanner}/utils/Logger.h (100%) rename src/{ => EIPScanner}/vendor/CMakeLists.txt (100%) rename src/{ => EIPScanner}/vendor/ra/powerFlex525/DPIFaultCode.cpp (100%) rename src/{ => EIPScanner}/vendor/ra/powerFlex525/DPIFaultCode.h (100%) rename src/{ => EIPScanner}/vendor/ra/powerFlex525/DPIFaultManager.cpp (100%) rename src/{ => EIPScanner}/vendor/ra/powerFlex525/DPIFaultManager.h (100%) rename src/{ => EIPScanner}/vendor/ra/powerFlex525/DPIFaultObject.cpp (100%) rename src/{ => EIPScanner}/vendor/ra/powerFlex525/DPIFaultObject.h (100%) rename src/{ => EIPScanner}/vendor/ra/powerFlex525/DPIFaultParameter.cpp (100%) rename src/{ => EIPScanner}/vendor/ra/powerFlex525/DPIFaultParameter.h (100%) rename src/{ => EIPScanner}/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp (100%) rename src/{ => EIPScanner}/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h (100%) rename src/{ => EIPScanner}/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp (100%) rename src/{ => EIPScanner}/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h (100%) rename src/{ => EIPScanner}/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp (100%) rename src/{ => EIPScanner}/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 82a8690..3374ad7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,9 +26,11 @@ if (WIN32) endif() endif() -# TODO: Change the file structure so that every folder isn't included in the include directories -include_directories(${PROJECT_SOURCE_DIR}) -add_subdirectory(src) +# Setup the include structure so that every file is based off of the root of the project +include_directories(src) + +# Actually add the source files for the project +add_subdirectory(src/${CMAKE_PROJECT_NAME}) if (EXAMPLE_ENABLED) add_subdirectory(examples) diff --git a/src/BaseObject.cpp b/src/EIPScanner/BaseObject.cpp similarity index 100% rename from src/BaseObject.cpp rename to src/EIPScanner/BaseObject.cpp diff --git a/src/BaseObject.h b/src/EIPScanner/BaseObject.h similarity index 95% rename from src/BaseObject.h rename to src/EIPScanner/BaseObject.h index d44a143..f94f42d 100644 --- a/src/BaseObject.h +++ b/src/EIPScanner/BaseObject.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_BASEOBJECT_H #define EIPSCANNER_BASEOBJECT_H -#include "src/cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { /** diff --git a/src/CMakeLists.txt b/src/EIPScanner/CMakeLists.txt similarity index 100% rename from src/CMakeLists.txt rename to src/EIPScanner/CMakeLists.txt diff --git a/src/ConnectionManager.cpp b/src/EIPScanner/ConnectionManager.cpp similarity index 94% rename from src/ConnectionManager.cpp rename to src/EIPScanner/ConnectionManager.cpp index e7264c5..ee65c60 100644 --- a/src/ConnectionManager.cpp +++ b/src/EIPScanner/ConnectionManager.cpp @@ -6,16 +6,16 @@ #include #include -#include "src/ConnectionManager.h" -#include "src/eip/CommonPacket.h" -#include "src/cip/connectionManager/ForwardOpenRequest.h" -#include "src/cip/connectionManager/ForwardCloseRequest.h" -#include "src/cip/connectionManager/LargeForwardOpenRequest.h" -#include "src/cip/connectionManager/ForwardOpenResponse.h" -#include "src/cip/connectionManager/NetworkConnectionParams.h" -#include "src/cip/connectionManager/NetworkConnectionParametersBuilder.h" -#include "src/utils/Logger.h" -#include "src/utils/Buffer.h" +#include "EIPScanner/ConnectionManager.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/cip/connectionManager/ForwardOpenRequest.h" +#include "EIPScanner/cip/connectionManager/ForwardCloseRequest.h" +#include "EIPScanner/cip/connectionManager/LargeForwardOpenRequest.h" +#include "EIPScanner/cip/connectionManager/ForwardOpenResponse.h" +#include "EIPScanner/cip/connectionManager/NetworkConnectionParams.h" +#include "EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { using namespace cip::connectionManager; diff --git a/src/ConnectionManager.h b/src/EIPScanner/ConnectionManager.h similarity index 90% rename from src/ConnectionManager.h rename to src/EIPScanner/ConnectionManager.h index 419cbda..e822a26 100644 --- a/src/ConnectionManager.h +++ b/src/EIPScanner/ConnectionManager.h @@ -6,12 +6,12 @@ #define EIPSCANNER_CONNECTIONMANAGER_H #include -#include "src/MessageRouter.h" -#include "src/IOConnection.h" -#include "src/cip/connectionManager/ConnectionParameters.h" -#include "src/cip/Services.h" -#include "src/cip/Types.h" -#include "src/sockets/UDPBoundSocket.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/IOConnection.h" +#include "EIPScanner/cip/connectionManager/ConnectionParameters.h" +#include "EIPScanner/cip/Services.h" +#include "EIPScanner/cip/Types.h" +#include "EIPScanner/sockets/UDPBoundSocket.h" namespace eipScanner { /** diff --git a/src/DiscoveryManager.cpp b/src/EIPScanner/DiscoveryManager.cpp similarity index 91% rename from src/DiscoveryManager.cpp rename to src/EIPScanner/DiscoveryManager.cpp index 1e2bb5d..4b06f5d 100644 --- a/src/DiscoveryManager.cpp +++ b/src/EIPScanner/DiscoveryManager.cpp @@ -3,13 +3,13 @@ // #include -#include "src/eip/EncapsPacketFactory.h" -#include "src/eip/CommonPacket.h" -#include "src/sockets/UDPSocket.h" -#include "src/utils/Logger.h" -#include "src/utils/Buffer.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/sockets/UDPSocket.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/utils/Buffer.h" -#include "src/DiscoveryManager.h" +#include "EIPScanner/DiscoveryManager.h" namespace eipScanner { using namespace cip; diff --git a/src/DiscoveryManager.h b/src/EIPScanner/DiscoveryManager.h similarity index 95% rename from src/DiscoveryManager.h rename to src/EIPScanner/DiscoveryManager.h index a1570d1..bea587e 100644 --- a/src/DiscoveryManager.h +++ b/src/EIPScanner/DiscoveryManager.h @@ -5,8 +5,8 @@ #ifndef EIPSCANNER_DISCOVERYMANAGER_H #define EIPSCANNER_DISCOVERYMANAGER_H -#include "src/IdentityObject.h" -#include "src/sockets/Platform.h" +#include "EIPScanner/IdentityObject.h" +#include "EIPScanner/sockets/Platform.h" #if defined (__unix__) || defined(__APPLE__) #define DISCOVERY_SOCKET_RECEIVE_END_ERROR_CODE (EIPSCANNER_SOCKET_ERROR(EAGAIN)) diff --git a/src/FileObject.cpp b/src/EIPScanner/FileObject.cpp similarity index 83% rename from src/FileObject.cpp rename to src/EIPScanner/FileObject.cpp index 140be41..d884917 100644 --- a/src/FileObject.cpp +++ b/src/EIPScanner/FileObject.cpp @@ -2,11 +2,11 @@ // Created by Aleksey Timin on 11/21/19. // #include -#include "src/FileObject.h" -#include "src/fileObject/FileObjectState.h" -#include "src/utils/Buffer.h" -#include "src/utils/Logger.h" -#include "src/cip/Services.h" +#include "EIPScanner/FileObject.h" +#include "EIPScanner/fileObject/FileObjectState.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/cip/Services.h" namespace eipScanner { using utils::Buffer; diff --git a/src/FileObject.h b/src/EIPScanner/FileObject.h similarity index 93% rename from src/FileObject.h rename to src/EIPScanner/FileObject.h index 957a971..e815852 100644 --- a/src/FileObject.h +++ b/src/EIPScanner/FileObject.h @@ -7,10 +7,10 @@ #include -#include "src/cip/Types.h" -#include "src/cip/GeneralStatusCodes.h" -#include "src/MessageRouter.h" -#include "src/BaseObject.h" +#include "EIPScanner/cip/Types.h" +#include "EIPScanner/cip/GeneralStatusCodes.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/BaseObject.h" namespace eipScanner { namespace fileObject { diff --git a/src/IOConnection.cpp b/src/EIPScanner/IOConnection.cpp similarity index 93% rename from src/IOConnection.cpp rename to src/EIPScanner/IOConnection.cpp index 500d2f1..77182c8 100644 --- a/src/IOConnection.cpp +++ b/src/EIPScanner/IOConnection.cpp @@ -2,12 +2,12 @@ // Created by Aleksey Timin on 11/18/19. // -#include "src/IOConnection.h" -#include "src/eip/CommonPacketItemFactory.h" -#include "src/eip/CommonPacket.h" -#include "src/cip/connectionManager/NetworkConnectionParams.h" -#include "src/utils/Buffer.h" -#include "src/utils/Logger.h" +#include "EIPScanner/IOConnection.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/cip/connectionManager/NetworkConnectionParams.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { using utils::Logger; diff --git a/src/IOConnection.h b/src/EIPScanner/IOConnection.h similarity index 97% rename from src/IOConnection.h rename to src/EIPScanner/IOConnection.h index 666887e..8b9d574 100644 --- a/src/IOConnection.h +++ b/src/EIPScanner/IOConnection.h @@ -8,8 +8,8 @@ #include #include #include -#include "src/cip/Types.h" -#include "src/sockets/UDPSocket.h" +#include "EIPScanner/cip/Types.h" +#include "EIPScanner/sockets/UDPSocket.h" namespace eipScanner { class ConnectionManager; diff --git a/src/IdentityObject.cpp b/src/EIPScanner/IdentityObject.cpp similarity index 97% rename from src/IdentityObject.cpp rename to src/EIPScanner/IdentityObject.cpp index a6ca66f..54b05f0 100644 --- a/src/IdentityObject.cpp +++ b/src/EIPScanner/IdentityObject.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 12/8/19. // -#include "src/IdentityObject.h" -#include "src/utils/Buffer.h" +#include "EIPScanner/IdentityObject.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { using namespace cip; diff --git a/src/IdentityObject.h b/src/EIPScanner/IdentityObject.h similarity index 93% rename from src/IdentityObject.h rename to src/EIPScanner/IdentityObject.h index 4227324..f945e5f 100644 --- a/src/IdentityObject.h +++ b/src/EIPScanner/IdentityObject.h @@ -5,12 +5,12 @@ #ifndef EIPSCANNER_IDENTITYOBJECT_H #define EIPSCANNER_IDENTITYOBJECT_H -#include "src/cip/CipString.h" -#include "src/cip/CipRevision.h" -#include "src/cip/Types.h" -#include "src/SessionInfo.h" -#include "src/MessageRouter.h" -#include "src/BaseObject.h" +#include "EIPScanner/cip/CipString.h" +#include "EIPScanner/cip/CipRevision.h" +#include "EIPScanner/cip/Types.h" +#include "EIPScanner/SessionInfo.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/BaseObject.h" namespace eipScanner { /** diff --git a/src/MessageRouter.cpp b/src/EIPScanner/MessageRouter.cpp similarity index 86% rename from src/MessageRouter.cpp rename to src/EIPScanner/MessageRouter.cpp index df36c7a..c985dab 100644 --- a/src/MessageRouter.cpp +++ b/src/EIPScanner/MessageRouter.cpp @@ -3,15 +3,15 @@ // #include -#include "src/eip/EncapsPacketFactory.h" -#include "src/utils/Buffer.h" -#include "src/MessageRouter.h" -#include "src/cip/MessageRouterRequest.h" -#include "src/cip/MessageRouterResponse.h" -#include "src/eip/CommonPacketItemFactory.h" -#include "src/eip/CommonPacket.h" -#include "src/utils/Buffer.h" -#include "src/utils/Logger.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/cip/MessageRouterRequest.h" +#include "EIPScanner/cip/MessageRouterResponse.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { using namespace cip; diff --git a/src/MessageRouter.h b/src/EIPScanner/MessageRouter.h similarity index 93% rename from src/MessageRouter.h rename to src/EIPScanner/MessageRouter.h index cb2a43a..a5cecb8 100644 --- a/src/MessageRouter.h +++ b/src/EIPScanner/MessageRouter.h @@ -6,11 +6,11 @@ #define EIPSCANNER_MESSAGEROUTER_H #include -#include "src/cip/EPath.h" -#include "src/cip/Services.h" -#include "src/cip/MessageRouterResponse.h" -#include "src/eip/CommonPacketItem.h" -#include "src/SessionInfo.h" +#include "EIPScanner/cip/EPath.h" +#include "EIPScanner/cip/Services.h" +#include "EIPScanner/cip/MessageRouterResponse.h" +#include "EIPScanner/eip/CommonPacketItem.h" +#include "EIPScanner/SessionInfo.h" namespace eipScanner { /** diff --git a/src/EIPScanner/OLD_CMakeLists.txt b/src/EIPScanner/OLD_CMakeLists.txt new file mode 100644 index 0000000..6a58194 --- /dev/null +++ b/src/EIPScanner/OLD_CMakeLists.txt @@ -0,0 +1,75 @@ +include_directories(${CMAKE_CURRENT_LIST_DIR}) + +set(SOURCE_FILES + cip/connectionManager/ForwardCloseRequest.cpp + cip/connectionManager/ForwardOpenRequest.cpp + cip/connectionManager/LargeForwardOpenRequest.cpp + cip/connectionManager/ForwardOpenResponse.cpp + cip/connectionManager/NetworkConnectionParametersBuilder.cpp + + cip/CipRevision.cpp + cip/EPath.cpp + cip/MessageRouterRequest.cpp + cip/MessageRouterResponse.cpp + cip/CipString.cpp + + eip/CommonPacket.cpp + eip/CommonPacketItem.cpp + eip/CommonPacketItemFactory.cpp + eip/EncapsPacket.cpp + eip/EncapsPacketFactory.cpp + + fileObject/FileObjectEmptyState.cpp + fileObject/FileObjectLoadedState.cpp + fileObject/FileObjectNonExistentState.cpp + fileObject/FileObjectState.cpp + fileObject/FileObjectUploadInProgressState.cpp + + sockets/BaseSocket.cpp + sockets/EndPoint.cpp + sockets/TCPSocket.cpp + sockets/UDPBoundSocket.cpp + sockets/UDPSocket.cpp + sockets/Platform.cpp + + utils/Logger.cpp + utils/Buffer.cpp + + BaseObject.cpp + ConnectionManager.cpp + DiscoveryManager.cpp + FileObject.cpp + IdentityObject.cpp + IOConnection.cpp + MessageRouter.cpp + ParameterObject.cpp + SessionInfo.cpp) + +# if vendor scripts are enabled +if(ENABLE_VENDOR_SRC) + add_subdirectory(vendor) +endif() + +add_library(EIPScanner SHARED ${SOURCE_FILES} ${VENDOR_FILES}) +add_library(EIPScannerS STATIC ${SOURCE_FILES} ${VENDOR_FILES}) + +if(WIN32) + target_link_libraries(EIPScanner ws2_32) + target_link_libraries(EIPScannerS ws2_32) +endif() + +set_target_properties( + EIPScanner + PROPERTIES + VERSION ${EIPSCANNER_FULL_VERSION} + SOVERSION ${EIPSCANNER_MAJOR_VERSION}) + +install(TARGETS EIPScanner EIPScannerS + LIBRARY + DESTINATION lib + ARCHIVE + DESTINATION lib) + +install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ + DESTINATION include/EIPScanner + FILES_MATCHING PATTERN "*.h*") diff --git a/src/ParameterObject.cpp b/src/EIPScanner/ParameterObject.cpp similarity index 98% rename from src/ParameterObject.cpp rename to src/EIPScanner/ParameterObject.cpp index a5fc08c..bce429e 100644 --- a/src/ParameterObject.cpp +++ b/src/EIPScanner/ParameterObject.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 12/4/19. // -#include "src/ParameterObject.h" -#include "src/utils/Buffer.h" -#include "src/utils/Logger.h" +#include "EIPScanner/ParameterObject.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { using utils::Buffer; diff --git a/src/ParameterObject.h b/src/EIPScanner/ParameterObject.h similarity index 98% rename from src/ParameterObject.h rename to src/EIPScanner/ParameterObject.h index ea41d55..66f4252 100644 --- a/src/ParameterObject.h +++ b/src/EIPScanner/ParameterObject.h @@ -7,9 +7,9 @@ #include #include -#include "src/MessageRouter.h" -#include "src/utils/Buffer.h" -#include "src/BaseObject.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/BaseObject.h" namespace eipScanner { diff --git a/src/SessionInfo.cpp b/src/EIPScanner/SessionInfo.cpp similarity index 92% rename from src/SessionInfo.cpp rename to src/EIPScanner/SessionInfo.cpp index 5898e85..de8710d 100644 --- a/src/SessionInfo.cpp +++ b/src/EIPScanner/SessionInfo.cpp @@ -4,10 +4,10 @@ -#include "src/SessionInfo.h" -#include "src/utils/Logger.h" -#include "src/eip/EncapsPacket.h" -#include "src/eip/EncapsPacketFactory.h" +#include "EIPScanner/SessionInfo.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/eip/EncapsPacket.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" namespace eipScanner { diff --git a/src/SessionInfo.h b/src/EIPScanner/SessionInfo.h similarity index 95% rename from src/SessionInfo.h rename to src/EIPScanner/SessionInfo.h index 51c5087..dfd9285 100644 --- a/src/SessionInfo.h +++ b/src/EIPScanner/SessionInfo.h @@ -10,8 +10,8 @@ #include #include -#include "src/SessionInfoIf.h" -#include "src/sockets/TCPSocket.h" +#include "EIPScanner/SessionInfoIf.h" +#include "EIPScanner/sockets/TCPSocket.h" namespace eipScanner { /** diff --git a/src/SessionInfoIf.h b/src/EIPScanner/SessionInfoIf.h similarity index 91% rename from src/SessionInfoIf.h rename to src/EIPScanner/SessionInfoIf.h index fc50e67..eba4efb 100644 --- a/src/SessionInfoIf.h +++ b/src/EIPScanner/SessionInfoIf.h @@ -6,8 +6,8 @@ #define EIPSCANNER_SESSIONINFOIF_H #include -#include "src/eip/EncapsPacket.h" -#include "src/sockets/EndPoint.h" +#include "EIPScanner/eip/EncapsPacket.h" +#include "EIPScanner/sockets/EndPoint.h" namespace eipScanner { /** diff --git a/src/cip/CMakeLists.txt b/src/EIPScanner/cip/CMakeLists.txt similarity index 100% rename from src/cip/CMakeLists.txt rename to src/EIPScanner/cip/CMakeLists.txt diff --git a/src/cip/CipRevision.cpp b/src/EIPScanner/cip/CipRevision.cpp similarity index 95% rename from src/cip/CipRevision.cpp rename to src/EIPScanner/cip/CipRevision.cpp index 0dd25f7..5894ad5 100644 --- a/src/cip/CipRevision.cpp +++ b/src/EIPScanner/cip/CipRevision.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 12/8/19. // -#include "src/cip/CipRevision.h" +#include "EIPScanner/cip/CipRevision.h" namespace eipScanner { namespace cip { diff --git a/src/cip/CipRevision.h b/src/EIPScanner/cip/CipRevision.h similarity index 94% rename from src/cip/CipRevision.h rename to src/EIPScanner/cip/CipRevision.h index b3aa5ca..17bcdc9 100644 --- a/src/cip/CipRevision.h +++ b/src/EIPScanner/cip/CipRevision.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CIPREVISION_H #include -#include "src/cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/CipString.cpp b/src/EIPScanner/cip/CipString.cpp similarity index 70% rename from src/cip/CipString.cpp rename to src/EIPScanner/cip/CipString.cpp index f90b8ce..2567d0b 100644 --- a/src/cip/CipString.cpp +++ b/src/EIPScanner/cip/CipString.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 12/4/19. // -#include "src/cip/CipString.h" +#include "EIPScanner/cip/CipString.h" namespace eipScanner { namespace cip { diff --git a/src/cip/CipString.h b/src/EIPScanner/cip/CipString.h similarity index 96% rename from src/cip/CipString.h rename to src/EIPScanner/cip/CipString.h index cb2c583..0f8f8b5 100644 --- a/src/cip/CipString.h +++ b/src/EIPScanner/cip/CipString.h @@ -9,7 +9,7 @@ #include #include #include -#include "src/cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/EPath.cpp b/src/EIPScanner/cip/EPath.cpp similarity index 98% rename from src/cip/EPath.cpp rename to src/EIPScanner/cip/EPath.cpp index a0a37bf..b868adb 100644 --- a/src/cip/EPath.cpp +++ b/src/EIPScanner/cip/EPath.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // #include -#include "src/utils/Buffer.h" -#include "src/cip/EPath.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/cip/EPath.h" namespace eipScanner { namespace cip { diff --git a/src/cip/EPath.h b/src/EIPScanner/cip/EPath.h similarity index 96% rename from src/cip/EPath.h rename to src/EIPScanner/cip/EPath.h index b663c9e..b75eb93 100644 --- a/src/cip/EPath.h +++ b/src/EIPScanner/cip/EPath.h @@ -9,7 +9,7 @@ #include #include -#include "src/cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/GeneralStatusCodes.h b/src/EIPScanner/cip/GeneralStatusCodes.h similarity index 99% rename from src/cip/GeneralStatusCodes.h rename to src/EIPScanner/cip/GeneralStatusCodes.h index ac0b152..1c7a665 100644 --- a/src/cip/GeneralStatusCodes.h +++ b/src/EIPScanner/cip/GeneralStatusCodes.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_GENERALSTATUSCODES_H #define EIPSCANNER_CIP_GENERALSTATUSCODES_H -#include "src/cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterRequest.cpp b/src/EIPScanner/cip/MessageRouterRequest.cpp similarity index 85% rename from src/cip/MessageRouterRequest.cpp rename to src/EIPScanner/cip/MessageRouterRequest.cpp index 0d4a73c..592257e 100644 --- a/src/cip/MessageRouterRequest.cpp +++ b/src/EIPScanner/cip/MessageRouterRequest.cpp @@ -2,10 +2,10 @@ // Created by Aleksey Timin on 11/16/19. // -#include "src/utils/Buffer.h" +#include "EIPScanner/utils/Buffer.h" -#include "src/cip/MessageRouterRequest.h" -#include "src/cip/EPath.h" +#include "EIPScanner/cip/MessageRouterRequest.h" +#include "EIPScanner/cip/EPath.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterRequest.h b/src/EIPScanner/cip/MessageRouterRequest.h similarity index 89% rename from src/cip/MessageRouterRequest.h rename to src/EIPScanner/cip/MessageRouterRequest.h index a564bcf..0531ca6 100644 --- a/src/cip/MessageRouterRequest.h +++ b/src/EIPScanner/cip/MessageRouterRequest.h @@ -8,8 +8,8 @@ #include #include -#include "src/cip/Services.h" -#include "src/cip/EPath.h" +#include "EIPScanner/cip/Services.h" +#include "EIPScanner/cip/EPath.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterResponse.cpp b/src/EIPScanner/cip/MessageRouterResponse.cpp similarity index 95% rename from src/cip/MessageRouterResponse.cpp rename to src/EIPScanner/cip/MessageRouterResponse.cpp index e8e6bb5..5af3717 100644 --- a/src/cip/MessageRouterResponse.cpp +++ b/src/EIPScanner/cip/MessageRouterResponse.cpp @@ -3,10 +3,10 @@ // #include -#include "src/cip/MessageRouterResponse.h" +#include "EIPScanner/cip/MessageRouterResponse.h" -#include "src/utils/Buffer.h" -#include "src/utils/Logger.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterResponse.h b/src/EIPScanner/cip/MessageRouterResponse.h similarity index 90% rename from src/cip/MessageRouterResponse.h rename to src/EIPScanner/cip/MessageRouterResponse.h index f279f6f..9311f49 100644 --- a/src/cip/MessageRouterResponse.h +++ b/src/EIPScanner/cip/MessageRouterResponse.h @@ -8,10 +8,10 @@ #include #include -#include "src/cip/GeneralStatusCodes.h" +#include "EIPScanner/cip/GeneralStatusCodes.h" -#include "src/cip/Services.h" -#include "src/eip/CommonPacketItem.h" +#include "EIPScanner/cip/Services.h" +#include "EIPScanner/eip/CommonPacketItem.h" namespace eipScanner { namespace cip { diff --git a/src/cip/Services.h b/src/EIPScanner/cip/Services.h similarity index 96% rename from src/cip/Services.h rename to src/EIPScanner/cip/Services.h index 1a0fdbe..32032db 100644 --- a/src/cip/Services.h +++ b/src/EIPScanner/cip/Services.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_SERVICES_H #define EIPSCANNER_CIP_SERVICES_H -#include "src/cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/Types.h b/src/EIPScanner/cip/Types.h similarity index 100% rename from src/cip/Types.h rename to src/EIPScanner/cip/Types.h diff --git a/src/cip/connectionManager/CMakeLists.txt b/src/EIPScanner/cip/connectionManager/CMakeLists.txt similarity index 100% rename from src/cip/connectionManager/CMakeLists.txt rename to src/EIPScanner/cip/connectionManager/CMakeLists.txt diff --git a/src/cip/connectionManager/ConnectionParameters.h b/src/EIPScanner/cip/connectionManager/ConnectionParameters.h similarity index 96% rename from src/cip/connectionManager/ConnectionParameters.h rename to src/EIPScanner/cip/connectionManager/ConnectionParameters.h index ee64d78..83db80f 100644 --- a/src/cip/connectionManager/ConnectionParameters.h +++ b/src/EIPScanner/cip/connectionManager/ConnectionParameters.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_CONNECTIONPARAMETERS_H #define EIPSCANNER_CIP_CONNECTIONPARAMETERS_H -#include "src/cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardCloseRequest.cpp b/src/EIPScanner/cip/connectionManager/ForwardCloseRequest.cpp similarity index 93% rename from src/cip/connectionManager/ForwardCloseRequest.cpp rename to src/EIPScanner/cip/connectionManager/ForwardCloseRequest.cpp index 690170b..534ca5b 100644 --- a/src/cip/connectionManager/ForwardCloseRequest.cpp +++ b/src/EIPScanner/cip/connectionManager/ForwardCloseRequest.cpp @@ -1,8 +1,8 @@ // // Created by Aleksey Timin on 11/19/19. // -#include "src/cip/connectionManager/ForwardCloseRequest.h" -#include "src/utils/Buffer.h" +#include "EIPScanner/cip/connectionManager/ForwardCloseRequest.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardCloseRequest.h b/src/EIPScanner/cip/connectionManager/ForwardCloseRequest.h similarity index 92% rename from src/cip/connectionManager/ForwardCloseRequest.h rename to src/EIPScanner/cip/connectionManager/ForwardCloseRequest.h index 38a3d86..7dea89c 100644 --- a/src/cip/connectionManager/ForwardCloseRequest.h +++ b/src/EIPScanner/cip/connectionManager/ForwardCloseRequest.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_FORWARDCLOSEREQUEST_H #include -#include "src/cip/connectionManager/ConnectionParameters.h" +#include "EIPScanner/cip/connectionManager/ConnectionParameters.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenRequest.cpp b/src/EIPScanner/cip/connectionManager/ForwardOpenRequest.cpp similarity index 93% rename from src/cip/connectionManager/ForwardOpenRequest.cpp rename to src/EIPScanner/cip/connectionManager/ForwardOpenRequest.cpp index 1098938..c01dd17 100644 --- a/src/cip/connectionManager/ForwardOpenRequest.cpp +++ b/src/EIPScanner/cip/connectionManager/ForwardOpenRequest.cpp @@ -2,11 +2,11 @@ // Created by Aleksey Timin on 11/18/19. // -#include "src/cip/connectionManager/ForwardOpenRequest.h" +#include "EIPScanner/cip/connectionManager/ForwardOpenRequest.h" #include #include -#include "src/utils/Buffer.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenRequest.h b/src/EIPScanner/cip/connectionManager/ForwardOpenRequest.h similarity index 89% rename from src/cip/connectionManager/ForwardOpenRequest.h rename to src/EIPScanner/cip/connectionManager/ForwardOpenRequest.h index bf6bc53..32f0f8d 100644 --- a/src/cip/connectionManager/ForwardOpenRequest.h +++ b/src/EIPScanner/cip/connectionManager/ForwardOpenRequest.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_FORWARDOPENREQUEST_H #include -#include "src/cip/connectionManager/ConnectionParameters.h" +#include "EIPScanner/cip/connectionManager/ConnectionParameters.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenResponse.cpp b/src/EIPScanner/cip/connectionManager/ForwardOpenResponse.cpp similarity index 94% rename from src/cip/connectionManager/ForwardOpenResponse.cpp rename to src/EIPScanner/cip/connectionManager/ForwardOpenResponse.cpp index 49485d5..5f431a9 100644 --- a/src/cip/connectionManager/ForwardOpenResponse.cpp +++ b/src/EIPScanner/cip/connectionManager/ForwardOpenResponse.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/18/19. // -#include "src/cip/connectionManager/ForwardOpenResponse.h" -#include "src/utils/Buffer.h" +#include "EIPScanner/cip/connectionManager/ForwardOpenResponse.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenResponse.h b/src/EIPScanner/cip/connectionManager/ForwardOpenResponse.h similarity index 97% rename from src/cip/connectionManager/ForwardOpenResponse.h rename to src/EIPScanner/cip/connectionManager/ForwardOpenResponse.h index cf96e97..0de20fc 100644 --- a/src/cip/connectionManager/ForwardOpenResponse.h +++ b/src/EIPScanner/cip/connectionManager/ForwardOpenResponse.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_FORWARDOPENRESPONSE_H #include -#include "src/cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/LargeForwardOpenRequest.cpp b/src/EIPScanner/cip/connectionManager/LargeForwardOpenRequest.cpp similarity index 92% rename from src/cip/connectionManager/LargeForwardOpenRequest.cpp rename to src/EIPScanner/cip/connectionManager/LargeForwardOpenRequest.cpp index 4a5717c..37e02da 100644 --- a/src/cip/connectionManager/LargeForwardOpenRequest.cpp +++ b/src/EIPScanner/cip/connectionManager/LargeForwardOpenRequest.cpp @@ -2,11 +2,11 @@ // Created by Vincent Prince on 05/22/20. // -#include "src/cip/connectionManager/LargeForwardOpenRequest.h" +#include "EIPScanner/cip/connectionManager/LargeForwardOpenRequest.h" #include #include -#include "src/utils/Buffer.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/LargeForwardOpenRequest.h b/src/EIPScanner/cip/connectionManager/LargeForwardOpenRequest.h similarity index 89% rename from src/cip/connectionManager/LargeForwardOpenRequest.h rename to src/EIPScanner/cip/connectionManager/LargeForwardOpenRequest.h index 7206ece..9e0274b 100644 --- a/src/cip/connectionManager/LargeForwardOpenRequest.h +++ b/src/EIPScanner/cip/connectionManager/LargeForwardOpenRequest.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_LARGEFORWARDOPENREQUEST_H #include -#include "src/cip/connectionManager/ConnectionParameters.h" +#include "EIPScanner/cip/connectionManager/ConnectionParameters.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp b/src/EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.cpp similarity index 96% rename from src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp rename to src/EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.cpp index 5e26e1c..b0bc2da 100644 --- a/src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp +++ b/src/EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.cpp @@ -2,11 +2,11 @@ // Created by Vincent Prince on 05/22/20. // -#include "src/cip/connectionManager/NetworkConnectionParametersBuilder.h" +#include "EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.h" #include #include -#include "src/utils/Buffer.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/NetworkConnectionParametersBuilder.h b/src/EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.h similarity index 97% rename from src/cip/connectionManager/NetworkConnectionParametersBuilder.h rename to src/EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.h index 7934fe4..09a1ecd 100644 --- a/src/cip/connectionManager/NetworkConnectionParametersBuilder.h +++ b/src/EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_CONNECTIONMANAGER_NETWORKCONNECTIONPARAMETERSBUILDER_H #define EIPSCANNER_CIP_CONNECTIONMANAGER_NETWORKCONNECTIONPARAMETERSBUILDER_H -#include "src/cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/NetworkConnectionParams.h b/src/EIPScanner/cip/connectionManager/NetworkConnectionParams.h similarity index 96% rename from src/cip/connectionManager/NetworkConnectionParams.h rename to src/EIPScanner/cip/connectionManager/NetworkConnectionParams.h index dd7bbe1..7e3e407 100644 --- a/src/cip/connectionManager/NetworkConnectionParams.h +++ b/src/EIPScanner/cip/connectionManager/NetworkConnectionParams.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_CONNECTIONMANAGER_NETWORKCONNECTIONPARAMS_H #define EIPSCANNER_CIP_CONNECTIONMANAGER_NETWORKCONNECTIONPARAMS_H -#include "src/cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/eip/CMakeLists.txt b/src/EIPScanner/eip/CMakeLists.txt similarity index 100% rename from src/eip/CMakeLists.txt rename to src/EIPScanner/eip/CMakeLists.txt diff --git a/src/eip/CommonPacket.cpp b/src/EIPScanner/eip/CommonPacket.cpp similarity index 91% rename from src/eip/CommonPacket.cpp rename to src/EIPScanner/eip/CommonPacket.cpp index da9cccd..b4626fd 100644 --- a/src/eip/CommonPacket.cpp +++ b/src/EIPScanner/eip/CommonPacket.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 11/16/19. // #include -#include "src/eip/CommonPacket.h" -#include "src/utils/Buffer.h" -#include "src/cip/Types.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacket.h b/src/EIPScanner/eip/CommonPacket.h similarity index 92% rename from src/eip/CommonPacket.h rename to src/EIPScanner/eip/CommonPacket.h index 5aac91c..f6ac377 100644 --- a/src/eip/CommonPacket.h +++ b/src/EIPScanner/eip/CommonPacket.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_EIP_COMMONPACKET_H #define EIPSCANNER_EIP_COMMONPACKET_H -#include "src/eip/CommonPacketItem.h" +#include "EIPScanner/eip/CommonPacketItem.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItem.cpp b/src/EIPScanner/eip/CommonPacketItem.cpp similarity index 93% rename from src/eip/CommonPacketItem.cpp rename to src/EIPScanner/eip/CommonPacketItem.cpp index d5db455..fd86c78 100644 --- a/src/eip/CommonPacketItem.cpp +++ b/src/EIPScanner/eip/CommonPacketItem.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // -#include "src/utils/Buffer.h" -#include "src/eip/CommonPacketItem.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/eip/CommonPacketItem.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItem.h b/src/EIPScanner/eip/CommonPacketItem.h similarity index 97% rename from src/eip/CommonPacketItem.h rename to src/EIPScanner/eip/CommonPacketItem.h index acd9317..9413d65 100644 --- a/src/eip/CommonPacketItem.h +++ b/src/EIPScanner/eip/CommonPacketItem.h @@ -8,7 +8,7 @@ #include #include -#include "src/cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItemFactory.cpp b/src/EIPScanner/eip/CommonPacketItemFactory.cpp similarity index 90% rename from src/eip/CommonPacketItemFactory.cpp rename to src/EIPScanner/eip/CommonPacketItemFactory.cpp index cc0170f..3022155 100644 --- a/src/eip/CommonPacketItemFactory.cpp +++ b/src/EIPScanner/eip/CommonPacketItemFactory.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // -#include "src/eip/CommonPacketItemFactory.h" -#include "src/utils/Buffer.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItemFactory.h b/src/EIPScanner/eip/CommonPacketItemFactory.h similarity index 88% rename from src/eip/CommonPacketItemFactory.h rename to src/EIPScanner/eip/CommonPacketItemFactory.h index 4d97564..2289c57 100644 --- a/src/eip/CommonPacketItemFactory.h +++ b/src/EIPScanner/eip/CommonPacketItemFactory.h @@ -6,8 +6,8 @@ #define EIPSCANNER_EIP_COMMONPACKETITEMFACTORY_H #include -#include "src/eip/CommonPacketItem.h" -#include "src/cip/Types.h" +#include "EIPScanner/eip/CommonPacketItem.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/eip/EncapsPacket.cpp b/src/EIPScanner/eip/EncapsPacket.cpp similarity index 97% rename from src/eip/EncapsPacket.cpp rename to src/EIPScanner/eip/EncapsPacket.cpp index 9d37a7b..091517b 100644 --- a/src/eip/EncapsPacket.cpp +++ b/src/EIPScanner/eip/EncapsPacket.cpp @@ -4,8 +4,8 @@ #include #include -#include "src/eip/EncapsPacket.h" -#include "src/utils/Buffer.h" +#include "EIPScanner/eip/EncapsPacket.h" +#include "EIPScanner/utils/Buffer.h" using eipScanner::utils::Buffer; diff --git a/src/eip/EncapsPacket.h b/src/EIPScanner/eip/EncapsPacket.h similarity index 98% rename from src/eip/EncapsPacket.h rename to src/EIPScanner/eip/EncapsPacket.h index a700818..e1db917 100644 --- a/src/eip/EncapsPacket.h +++ b/src/EIPScanner/eip/EncapsPacket.h @@ -9,7 +9,7 @@ #include #include -#include "src/cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/eip/EncapsPacketFactory.cpp b/src/EIPScanner/eip/EncapsPacketFactory.cpp similarity index 94% rename from src/eip/EncapsPacketFactory.cpp rename to src/EIPScanner/eip/EncapsPacketFactory.cpp index be7d3e4..392c675 100644 --- a/src/eip/EncapsPacketFactory.cpp +++ b/src/EIPScanner/eip/EncapsPacketFactory.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // -#include "src/utils/Buffer.h" -#include "src/eip/EncapsPacketFactory.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" namespace eipScanner { namespace eip { diff --git a/src/eip/EncapsPacketFactory.h b/src/EIPScanner/eip/EncapsPacketFactory.h similarity index 88% rename from src/eip/EncapsPacketFactory.h rename to src/EIPScanner/eip/EncapsPacketFactory.h index ce147e1..1e10e86 100644 --- a/src/eip/EncapsPacketFactory.h +++ b/src/EIPScanner/eip/EncapsPacketFactory.h @@ -5,8 +5,8 @@ #ifndef EIPSCANNER_EIP_ENCAPSPACKETFACTORY_H #define EIPSCANNER_EIP_ENCAPSPACKETFACTORY_H -#include "src/eip/EncapsPacket.h" -#include "src/cip/Types.h" +#include "EIPScanner/eip/EncapsPacket.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/fileObject/CMakeLists.txt b/src/EIPScanner/fileObject/CMakeLists.txt similarity index 100% rename from src/fileObject/CMakeLists.txt rename to src/EIPScanner/fileObject/CMakeLists.txt diff --git a/src/fileObject/FileObjectEmptyState.cpp b/src/EIPScanner/fileObject/FileObjectEmptyState.cpp similarity index 92% rename from src/fileObject/FileObjectEmptyState.cpp rename to src/EIPScanner/fileObject/FileObjectEmptyState.cpp index 3b8fc51..2820e9b 100644 --- a/src/fileObject/FileObjectEmptyState.cpp +++ b/src/EIPScanner/fileObject/FileObjectEmptyState.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 11/23/19. // -#include "src/fileObject/FileObjectEmptyState.h" +#include "EIPScanner/fileObject/FileObjectEmptyState.h" namespace eipScanner { namespace fileObject { using utils::LogLevel; diff --git a/src/fileObject/FileObjectEmptyState.h b/src/EIPScanner/fileObject/FileObjectEmptyState.h similarity index 91% rename from src/fileObject/FileObjectEmptyState.h rename to src/EIPScanner/fileObject/FileObjectEmptyState.h index 59eef79..f1f9508 100644 --- a/src/fileObject/FileObjectEmptyState.h +++ b/src/EIPScanner/fileObject/FileObjectEmptyState.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_FILEOBJECT_FILEOBJECTEMPTYSTATE_H #define EIPSCANNER_FILEOBJECT_FILEOBJECTEMPTYSTATE_H -#include "src/fileObject/FileObjectState.h" +#include "EIPScanner/fileObject/FileObjectState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectLoadedState.cpp b/src/EIPScanner/fileObject/FileObjectLoadedState.cpp similarity index 88% rename from src/fileObject/FileObjectLoadedState.cpp rename to src/EIPScanner/fileObject/FileObjectLoadedState.cpp index eda2244..ea3ce3b 100644 --- a/src/fileObject/FileObjectLoadedState.cpp +++ b/src/EIPScanner/fileObject/FileObjectLoadedState.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 11/23/19. // -#include "src/fileObject/FileObjectLoadedState.h" -#include "src/fileObject/FileObjectUploadInProgressState.h" -#include "src/utils/Buffer.h" +#include "EIPScanner/fileObject/FileObjectLoadedState.h" +#include "EIPScanner/fileObject/FileObjectUploadInProgressState.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectLoadedState.h b/src/EIPScanner/fileObject/FileObjectLoadedState.h similarity index 91% rename from src/fileObject/FileObjectLoadedState.h rename to src/EIPScanner/fileObject/FileObjectLoadedState.h index bde67ed..58153e1 100644 --- a/src/fileObject/FileObjectLoadedState.h +++ b/src/EIPScanner/fileObject/FileObjectLoadedState.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_FILEOBJECT_FILEOBJECTLOADEDSTATE_H #define EIPSCANNER_FILEOBJECT_FILEOBJECTLOADEDSTATE_H -#include "src/fileObject/FileObjectState.h" +#include "EIPScanner/fileObject/FileObjectState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectNonExistentState.cpp b/src/EIPScanner/fileObject/FileObjectNonExistentState.cpp similarity index 92% rename from src/fileObject/FileObjectNonExistentState.cpp rename to src/EIPScanner/fileObject/FileObjectNonExistentState.cpp index 1719164..9f4fad8 100644 --- a/src/fileObject/FileObjectNonExistentState.cpp +++ b/src/EIPScanner/fileObject/FileObjectNonExistentState.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 11/23/19. // -#include "src/fileObject/FileObjectNonExistentState.h" +#include "EIPScanner/fileObject/FileObjectNonExistentState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectNonExistentState.h b/src/EIPScanner/fileObject/FileObjectNonExistentState.h similarity index 91% rename from src/fileObject/FileObjectNonExistentState.h rename to src/EIPScanner/fileObject/FileObjectNonExistentState.h index 998ad2f..69e22de 100644 --- a/src/fileObject/FileObjectNonExistentState.h +++ b/src/EIPScanner/fileObject/FileObjectNonExistentState.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_FILEOBJECT_FILEOBJECTNONEXISTENTSTATE_H #define EIPSCANNER_FILEOBJECT_FILEOBJECTNONEXISTENTSTATE_H -#include "src/fileObject/FileObjectState.h" +#include "EIPScanner/fileObject/FileObjectState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectState.cpp b/src/EIPScanner/fileObject/FileObjectState.cpp similarity index 91% rename from src/fileObject/FileObjectState.cpp rename to src/EIPScanner/fileObject/FileObjectState.cpp index d6f7575..a22c610 100644 --- a/src/fileObject/FileObjectState.cpp +++ b/src/EIPScanner/fileObject/FileObjectState.cpp @@ -3,12 +3,12 @@ // #include -#include "src/fileObject/FileObjectState.h" -#include "src/utils/Buffer.h" -#include "src/fileObject/FileObjectNonExistentState.h" -#include "src/fileObject/FileObjectEmptyState.h" -#include "src/fileObject/FileObjectLoadedState.h" -#include "src/fileObject/FileObjectUploadInProgressState.h" +#include "EIPScanner/fileObject/FileObjectState.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/fileObject/FileObjectNonExistentState.h" +#include "EIPScanner/fileObject/FileObjectEmptyState.h" +#include "EIPScanner/fileObject/FileObjectLoadedState.h" +#include "EIPScanner/fileObject/FileObjectUploadInProgressState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectState.h b/src/EIPScanner/fileObject/FileObjectState.h similarity index 89% rename from src/fileObject/FileObjectState.h rename to src/EIPScanner/fileObject/FileObjectState.h index ca0243f..de3f258 100644 --- a/src/fileObject/FileObjectState.h +++ b/src/EIPScanner/fileObject/FileObjectState.h @@ -6,11 +6,11 @@ #define EIPSCANNER_FILEOBJECT_FILEOBJECTSTATE_H #include -#include "src/SessionInfo.h" -#include "src/MessageRouter.h" -#include "src/FileObject.h" -#include "src/cip/GeneralStatusCodes.h" -#include "src/utils/Logger.h" +#include "EIPScanner/SessionInfo.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/FileObject.h" +#include "EIPScanner/cip/GeneralStatusCodes.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectUploadInProgressState.cpp b/src/EIPScanner/fileObject/FileObjectUploadInProgressState.cpp similarity index 96% rename from src/fileObject/FileObjectUploadInProgressState.cpp rename to src/EIPScanner/fileObject/FileObjectUploadInProgressState.cpp index 3c6232f..78d0420 100644 --- a/src/fileObject/FileObjectUploadInProgressState.cpp +++ b/src/EIPScanner/fileObject/FileObjectUploadInProgressState.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/23/19. // -#include "src/fileObject/FileObjectUploadInProgressState.h" -#include "src/utils/Buffer.h" +#include "EIPScanner/fileObject/FileObjectUploadInProgressState.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectUploadInProgressState.h b/src/EIPScanner/fileObject/FileObjectUploadInProgressState.h similarity index 91% rename from src/fileObject/FileObjectUploadInProgressState.h rename to src/EIPScanner/fileObject/FileObjectUploadInProgressState.h index 00e5e8a..8556feb 100644 --- a/src/fileObject/FileObjectUploadInProgressState.h +++ b/src/EIPScanner/fileObject/FileObjectUploadInProgressState.h @@ -7,8 +7,8 @@ #include -#include "src/fileObject/FileObjectState.h" -#include "src/cip/Types.h" +#include "EIPScanner/fileObject/FileObjectState.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace fileObject { diff --git a/src/sockets/BaseSocket.cpp b/src/EIPScanner/sockets/BaseSocket.cpp similarity index 98% rename from src/sockets/BaseSocket.cpp rename to src/EIPScanner/sockets/BaseSocket.cpp index 8ec4835..a044acf 100644 --- a/src/sockets/BaseSocket.cpp +++ b/src/EIPScanner/sockets/BaseSocket.cpp @@ -14,8 +14,8 @@ #include #include -#include "src/sockets/BaseSocket.h" -#include "src/sockets/Platform.h" +#include "EIPScanner/sockets/BaseSocket.h" +#include "EIPScanner/sockets/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/BaseSocket.h b/src/EIPScanner/sockets/BaseSocket.h similarity index 97% rename from src/sockets/BaseSocket.h rename to src/EIPScanner/sockets/BaseSocket.h index 62ca736..429bb6d 100644 --- a/src/sockets/BaseSocket.h +++ b/src/EIPScanner/sockets/BaseSocket.h @@ -13,7 +13,7 @@ #include #include -#include "src/sockets/EndPoint.h" +#include "EIPScanner/sockets/EndPoint.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/CMakeLists.txt b/src/EIPScanner/sockets/CMakeLists.txt similarity index 100% rename from src/sockets/CMakeLists.txt rename to src/EIPScanner/sockets/CMakeLists.txt diff --git a/src/sockets/EndPoint.cpp b/src/EIPScanner/sockets/EndPoint.cpp similarity index 93% rename from src/sockets/EndPoint.cpp rename to src/EIPScanner/sockets/EndPoint.cpp index 04f0e80..3d72eaa 100644 --- a/src/sockets/EndPoint.cpp +++ b/src/EIPScanner/sockets/EndPoint.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 12/10/19. // -#include "src/sockets/EndPoint.h" -#include "src/sockets/BaseSocket.h" -#include "src/sockets/Platform.h" +#include "EIPScanner/sockets/EndPoint.h" +#include "EIPScanner/sockets/BaseSocket.h" +#include "EIPScanner/sockets/Platform.h" #if defined(__unix__) || defined(__APPLE__) #include diff --git a/src/sockets/EndPoint.h b/src/EIPScanner/sockets/EndPoint.h similarity index 100% rename from src/sockets/EndPoint.h rename to src/EIPScanner/sockets/EndPoint.h diff --git a/src/sockets/Platform.cpp b/src/EIPScanner/sockets/Platform.cpp similarity index 91% rename from src/sockets/Platform.cpp rename to src/EIPScanner/sockets/Platform.cpp index 5c97184..1c19961 100644 --- a/src/sockets/Platform.cpp +++ b/src/EIPScanner/sockets/Platform.cpp @@ -2,7 +2,7 @@ // Created by Stefan Broekman on 02/04/21. // -#include "src/sockets/Platform.h" +#include "EIPScanner/sockets/Platform.h" #if defined(_WIN32) || defined(WIN32) || defined(_WIN64) #include diff --git a/src/sockets/Platform.h b/src/EIPScanner/sockets/Platform.h similarity index 100% rename from src/sockets/Platform.h rename to src/EIPScanner/sockets/Platform.h diff --git a/src/sockets/TCPSocket.cpp b/src/EIPScanner/sockets/TCPSocket.cpp similarity index 97% rename from src/sockets/TCPSocket.cpp rename to src/EIPScanner/sockets/TCPSocket.cpp index eac161c..922579c 100644 --- a/src/sockets/TCPSocket.cpp +++ b/src/EIPScanner/sockets/TCPSocket.cpp @@ -15,9 +15,9 @@ #include -#include "src/utils/Logger.h" -#include "src/sockets/TCPSocket.h" -#include "src/sockets/Platform.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/sockets/TCPSocket.h" +#include "EIPScanner/sockets/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/TCPSocket.h b/src/EIPScanner/sockets/TCPSocket.h similarity index 93% rename from src/sockets/TCPSocket.h rename to src/EIPScanner/sockets/TCPSocket.h index 63c9321..3c63085 100644 --- a/src/sockets/TCPSocket.h +++ b/src/EIPScanner/sockets/TCPSocket.h @@ -7,7 +7,7 @@ #include #include -#include "src/sockets/BaseSocket.h" +#include "EIPScanner/sockets/BaseSocket.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPBoundSocket.cpp b/src/EIPScanner/sockets/UDPBoundSocket.cpp similarity index 90% rename from src/sockets/UDPBoundSocket.cpp rename to src/EIPScanner/sockets/UDPBoundSocket.cpp index 1eea323..83966c2 100644 --- a/src/sockets/UDPBoundSocket.cpp +++ b/src/EIPScanner/sockets/UDPBoundSocket.cpp @@ -6,8 +6,8 @@ //#include //#include -#include "src/sockets/UDPBoundSocket.h" -#include "src/sockets/Platform.h" +#include "EIPScanner/sockets/UDPBoundSocket.h" +#include "EIPScanner/sockets/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPBoundSocket.h b/src/EIPScanner/sockets/UDPBoundSocket.h similarity index 93% rename from src/sockets/UDPBoundSocket.h rename to src/EIPScanner/sockets/UDPBoundSocket.h index d5553bc..8207082 100644 --- a/src/sockets/UDPBoundSocket.h +++ b/src/EIPScanner/sockets/UDPBoundSocket.h @@ -9,7 +9,7 @@ #include #include //#include -#include "src/sockets/UDPSocket.h" +#include "EIPScanner/sockets/UDPSocket.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPSocket.cpp b/src/EIPScanner/sockets/UDPSocket.cpp similarity index 95% rename from src/sockets/UDPSocket.cpp rename to src/EIPScanner/sockets/UDPSocket.cpp index 0c87475..f2758ca 100644 --- a/src/sockets/UDPSocket.cpp +++ b/src/EIPScanner/sockets/UDPSocket.cpp @@ -12,9 +12,9 @@ #include #endif -#include "src/utils/Logger.h" -#include "src/sockets/UDPSocket.h" -#include "src/sockets/Platform.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/sockets/UDPSocket.h" +#include "EIPScanner/sockets/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPSocket.h b/src/EIPScanner/sockets/UDPSocket.h similarity index 94% rename from src/sockets/UDPSocket.h rename to src/EIPScanner/sockets/UDPSocket.h index 55a0999..ed63f72 100644 --- a/src/sockets/UDPSocket.h +++ b/src/EIPScanner/sockets/UDPSocket.h @@ -8,7 +8,7 @@ #include #include #include -#include "src/sockets/BaseSocket.h" +#include "EIPScanner/sockets/BaseSocket.h" namespace eipScanner { namespace sockets { diff --git a/src/utils/Buffer.cpp b/src/EIPScanner/utils/Buffer.cpp similarity index 99% rename from src/utils/Buffer.cpp rename to src/EIPScanner/utils/Buffer.cpp index 990590c..b77359c 100644 --- a/src/utils/Buffer.cpp +++ b/src/EIPScanner/utils/Buffer.cpp @@ -2,7 +2,7 @@ // Created by flipback on 11/16/19. // -#include "src/utils/Buffer.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace utils { diff --git a/src/utils/Buffer.h b/src/EIPScanner/utils/Buffer.h similarity index 96% rename from src/utils/Buffer.h rename to src/EIPScanner/utils/Buffer.h index d5fec26..d3efb4d 100644 --- a/src/utils/Buffer.h +++ b/src/EIPScanner/utils/Buffer.h @@ -8,9 +8,9 @@ #include #include #include -#include "src/cip/CipString.h" -#include "src/cip/CipRevision.h" -#include "src/sockets/EndPoint.h" +#include "EIPScanner/cip/CipString.h" +#include "EIPScanner/cip/CipRevision.h" +#include "EIPScanner/sockets/EndPoint.h" namespace eipScanner { namespace utils { diff --git a/src/utils/CMakeLists.txt b/src/EIPScanner/utils/CMakeLists.txt similarity index 100% rename from src/utils/CMakeLists.txt rename to src/EIPScanner/utils/CMakeLists.txt diff --git a/src/utils/Logger.cpp b/src/EIPScanner/utils/Logger.cpp similarity index 96% rename from src/utils/Logger.cpp rename to src/EIPScanner/utils/Logger.cpp index 8003eeb..27cf44b 100644 --- a/src/utils/Logger.cpp +++ b/src/EIPScanner/utils/Logger.cpp @@ -4,7 +4,7 @@ #include #include -#include "src/utils/Logger.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { namespace utils { diff --git a/src/utils/Logger.h b/src/EIPScanner/utils/Logger.h similarity index 100% rename from src/utils/Logger.h rename to src/EIPScanner/utils/Logger.h diff --git a/src/vendor/CMakeLists.txt b/src/EIPScanner/vendor/CMakeLists.txt similarity index 100% rename from src/vendor/CMakeLists.txt rename to src/EIPScanner/vendor/CMakeLists.txt diff --git a/src/vendor/ra/powerFlex525/DPIFaultCode.cpp b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.cpp similarity index 100% rename from src/vendor/ra/powerFlex525/DPIFaultCode.cpp rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.cpp diff --git a/src/vendor/ra/powerFlex525/DPIFaultCode.h b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.h similarity index 100% rename from src/vendor/ra/powerFlex525/DPIFaultCode.h rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.h diff --git a/src/vendor/ra/powerFlex525/DPIFaultManager.cpp b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.cpp similarity index 100% rename from src/vendor/ra/powerFlex525/DPIFaultManager.cpp rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.cpp diff --git a/src/vendor/ra/powerFlex525/DPIFaultManager.h b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.h similarity index 100% rename from src/vendor/ra/powerFlex525/DPIFaultManager.h rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.h diff --git a/src/vendor/ra/powerFlex525/DPIFaultObject.cpp b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.cpp similarity index 100% rename from src/vendor/ra/powerFlex525/DPIFaultObject.cpp rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.cpp diff --git a/src/vendor/ra/powerFlex525/DPIFaultObject.h b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h similarity index 100% rename from src/vendor/ra/powerFlex525/DPIFaultObject.h rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h diff --git a/src/vendor/ra/powerFlex525/DPIFaultParameter.cpp b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.cpp similarity index 100% rename from src/vendor/ra/powerFlex525/DPIFaultParameter.cpp rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.cpp diff --git a/src/vendor/ra/powerFlex525/DPIFaultParameter.h b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h similarity index 100% rename from src/vendor/ra/powerFlex525/DPIFaultParameter.h rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h diff --git a/src/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp similarity index 100% rename from src/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp rename to src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp diff --git a/src/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h similarity index 100% rename from src/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h rename to src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h diff --git a/src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp similarity index 100% rename from src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp rename to src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp diff --git a/src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h similarity index 100% rename from src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h rename to src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h diff --git a/src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp similarity index 100% rename from src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp rename to src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp diff --git a/src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h similarity index 100% rename from src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h rename to src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h From 1d29b6997f4281be4f896c86bd05db02b55a7c20 Mon Sep 17 00:00:00 2001 From: jan-ati Date: Wed, 11 Sep 2024 18:49:23 +0000 Subject: [PATCH 07/18] Updated the examples projects to use the full project path --- examples/CMakeLists.txt | 21 ++++++------- examples/DiscoveryManagerExample.cpp | 4 +-- examples/FileObjectExample.cpp | 6 ++-- examples/IdentityObjectExample.cpp | 4 +-- examples/ImplicitMessagingExample.cpp | 10 +++---- examples/ParameterObjectExample.cpp | 6 ++-- .../Yaskawa_AssemblyObjectExample.cpp | 30 +++++++++---------- .../vendor/ra/powerFlex525/DPIFaultCode.cpp | 2 +- .../ra/powerFlex525/DPIFaultManager.cpp | 6 ++-- .../vendor/ra/powerFlex525/DPIFaultManager.h | 6 ++-- .../vendor/ra/powerFlex525/DPIFaultObject.cpp | 4 +-- .../ra/powerFlex525/DPIFaultParameter.cpp | 4 +-- .../ra/powerFlex525/DPIFaultParameter.h | 12 ++++---- .../yaskawa/mp3300iec/Yaskawa_EPath.cpp | 4 +-- .../vendor/yaskawa/mp3300iec/Yaskawa_EPath.h | 2 +- .../mp3300iec/Yaskawa_MessageRouter.cpp | 18 +++++------ .../yaskawa/mp3300iec/Yaskawa_MessageRouter.h | 10 +++---- .../Yaskawa_MessageRouterRequest.cpp | 6 ++-- .../mp3300iec/Yaskawa_MessageRouterRequest.h | 4 +-- 19 files changed, 80 insertions(+), 79 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 76391a0..0a1e996 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,28 +1,29 @@ -# include_directories("${PROJECT_SOURCE_DIR}/src") +cmake_minimum_required(VERSION 3.5) -include_directories(/usr/local/include/EIPScanner) -link_directories(/code/build/src) +# Remember to update the LIBRARY_PATH and LD_LIBRARY_PATH environment variables +# to the /usr/local/include/ +# and /usr/local/lib add_executable(explicit_messaging ExplicitMessagingExample.cpp) -target_link_libraries(explicit_messaging EIPScanner) +target_link_libraries(explicit_messaging PUBLIC EIPScanner) add_executable(file_object_example FileObjectExample.cpp) -target_link_libraries(file_object_example EIPScanner) +target_link_libraries(file_object_example PUBLIC EIPScanner) add_executable(identity_object_example IdentityObjectExample.cpp) -target_link_libraries(identity_object_example EIPScanner) +target_link_libraries(identity_object_example PUBLIC EIPScanner) add_executable(implicit_messaging ImplicitMessagingExample.cpp) -target_link_libraries(implicit_messaging EIPScanner) +target_link_libraries(implicit_messaging PUBLIC EIPScanner) add_executable(parameter_object_example ParameterObjectExample.cpp) -target_link_libraries(parameter_object_example EIPScanner) +target_link_libraries(parameter_object_example PUBLIC EIPScanner) add_executable(discovery_example DiscoveryManagerExample.cpp) -target_link_libraries(discovery_example EIPScanner) +target_link_libraries(discovery_example PUBLIC EIPScanner) add_executable(yaskawa_assembly_object_example vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp) -target_link_libraries(yaskawa_assembly_object_example EIPScanner) +target_link_libraries(yaskawa_assembly_object_example PUBLIC EIPScanner) if(WIN32) target_link_libraries(explicit_messaging ws2_32) diff --git a/examples/DiscoveryManagerExample.cpp b/examples/DiscoveryManagerExample.cpp index 915e00e..d8af238 100644 --- a/examples/DiscoveryManagerExample.cpp +++ b/examples/DiscoveryManagerExample.cpp @@ -7,8 +7,8 @@ #define OS_Windows (1) #endif -#include -#include +#include +#include using eipScanner::DiscoveryManager; using eipScanner::utils::Logger; diff --git a/examples/FileObjectExample.cpp b/examples/FileObjectExample.cpp index 27a40c7..220e7d5 100644 --- a/examples/FileObjectExample.cpp +++ b/examples/FileObjectExample.cpp @@ -8,9 +8,9 @@ #endif #include -#include "FileObject.h" -#include "utils/Logger.h" -#include "fileObject/FileObjectState.h" +#include +#include +#include using namespace eipScanner::cip; using eipScanner::SessionInfo; diff --git a/examples/IdentityObjectExample.cpp b/examples/IdentityObjectExample.cpp index e29c8e9..755313c 100644 --- a/examples/IdentityObjectExample.cpp +++ b/examples/IdentityObjectExample.cpp @@ -7,8 +7,8 @@ #define OS_Windows (1) #endif -#include "IdentityObject.h" -#include "utils/Logger.h" +#include +#include using eipScanner::IdentityObject; using eipScanner::SessionInfo; diff --git a/examples/ImplicitMessagingExample.cpp b/examples/ImplicitMessagingExample.cpp index a8b4d90..fc24b54 100644 --- a/examples/ImplicitMessagingExample.cpp +++ b/examples/ImplicitMessagingExample.cpp @@ -8,11 +8,11 @@ #endif #include -#include -#include "SessionInfo.h" -#include "ConnectionManager.h" -#include "utils/Logger.h" -#include "utils/Buffer.h" +#include +#include +#include +#include +#include using namespace eipScanner::cip; using eipScanner::SessionInfo; diff --git a/examples/ParameterObjectExample.cpp b/examples/ParameterObjectExample.cpp index 537b43c..35177e9 100644 --- a/examples/ParameterObjectExample.cpp +++ b/examples/ParameterObjectExample.cpp @@ -7,9 +7,9 @@ #define OS_Windows (1) #endif -#include "ParameterObject.h" -#include "utils/Logger.h" -#include "utils/Buffer.h" +#include +#include +#include using namespace eipScanner::cip; using eipScanner::SessionInfo; diff --git a/examples/vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp b/examples/vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp index bb3099e..51deebe 100644 --- a/examples/vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp +++ b/examples/vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp @@ -6,23 +6,23 @@ #include #include #include -#include -#include "ConnectionManager.h" -#include +#include +#include +#include #include -#include "FileObject.h" -#include "fileObject/FileObjectState.h" -#include "IdentityObject.h" -#include "IOConnection.h" -#include "ParameterObject.h" -#include "SessionInfo.h" -#include "utils/Logger.h" -#include "utils/Buffer.h" - -#include "vendor/yaskawa/mp3300iec/Yaskawa_EPath.h" -#include "vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h" -#include "vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h" +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include using namespace eipScanner::cip; using eipScanner::ConnectionManager; diff --git a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.cpp b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.cpp index bba3dbb..e6f347e 100644 --- a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.cpp +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.cpp @@ -2,7 +2,7 @@ // Created by James Roth on 12/18/19. // -#include "DPIFaultCode.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.h" namespace eipScanner { diff --git a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.cpp b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.cpp index 00f2334..5f2f8e4 100644 --- a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.cpp +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 12/11/19. // -#include "utils/Buffer.h" -#include "utils/Logger.h" -#include "DPIFaultManager.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.h" namespace eipScanner { namespace vendor { diff --git a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.h b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.h index d56af02..917f118 100644 --- a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.h +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.h @@ -7,9 +7,9 @@ #include #include -#include "DPIFaultObject.h" -#include "SessionInfoIf.h" -#include "DPIFaultParameter.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h" +#include "EIPScanner/SessionInfoIf.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h" namespace eipScanner { namespace vendor { diff --git a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.cpp b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.cpp index e3f99cb..3dbc605 100644 --- a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.cpp +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.cpp @@ -3,8 +3,8 @@ // -#include "DPIFaultObject.h" -#include "utils/Buffer.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { diff --git a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.cpp b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.cpp index db43afb..6c8c9db 100644 --- a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.cpp +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.cpp @@ -2,12 +2,12 @@ // Created by James Roth on 12/19/19. // -#include "DPIFaultParameter.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h" #include -#include "utils/Buffer.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace vendor { diff --git a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h index 32c1288..f455474 100644 --- a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h @@ -5,12 +5,12 @@ #ifndef EIPSCANNER_DPIFAULTPARAMETER_HPP #define EIPSCANNER_DPIFAULTPARAMETER_HPP -#include "cip/CipString.h" -#include "BaseObject.h" -#include "SessionInfoIf.h" -#include "MessageRouter.h" -#include "ParameterObject.h" -#include "DPIFaultCode.h" +#include "EIPScanner/cip/CipString.h" +#include "EIPScanner/BaseObject.h" +#include "EIPScanner/SessionInfoIf.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/ParameterObject.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.h" namespace eipScanner { namespace vendor { diff --git a/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp index db26946..ee546c7 100644 --- a/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp +++ b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp @@ -1,6 +1,6 @@ #include -#include "utils/Buffer.h" -#include "Yaskawa_EPath.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h" namespace eipScanner { namespace cip { diff --git a/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h index 6fbf035..a258b40 100644 --- a/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h +++ b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h @@ -5,7 +5,7 @@ #include #include -#include "cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { diff --git a/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp index f966901..ba47cd1 100644 --- a/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp +++ b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp @@ -1,14 +1,14 @@ #include -#include "eip/EncapsPacketFactory.h" -#include "utils/Buffer.h" -#include "Yaskawa_MessageRouter.h" -#include "Yaskawa_MessageRouterRequest.h" -#include "cip/MessageRouterResponse.h" -#include "eip/CommonPacketItemFactory.h" -#include "eip/CommonPacket.h" -#include "utils/Buffer.h" -#include "utils/Logger.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h" +#include "EIPScanner/cip/MessageRouterResponse.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { using namespace cip; diff --git a/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h index 40faa66..190661b 100644 --- a/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h +++ b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h @@ -2,11 +2,11 @@ #define EIPSCANNER_YASKAWA_MESSAGEROUTER_H #include -#include "Yaskawa_EPath.h" -#include "cip/Services.h" -#include "cip/MessageRouterResponse.h" -#include "eip/CommonPacketItem.h" -#include "SessionInfo.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h" +#include "EIPScanner/cip/Services.h" +#include "EIPScanner/cip/MessageRouterResponse.h" +#include "EIPScanner/eip/CommonPacketItem.h" +#include "EIPScanner/SessionInfo.h" namespace eipScanner { /** diff --git a/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp index 8ac06b1..3c355aa 100644 --- a/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp +++ b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp @@ -1,6 +1,6 @@ -#include -#include "Yaskawa_MessageRouterRequest.h" -#include "Yaskawa_EPath.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h" namespace eipScanner { namespace cip { diff --git a/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h index 2f2c640..55c76ec 100644 --- a/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h +++ b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h @@ -4,8 +4,8 @@ #include #include -#include "cip/Services.h" -#include "Yaskawa_EPath.h" +#include "EIPScanner/cip/Services.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h" namespace eipScanner { namespace cip { From c7a5f77a5e755435f54638c344ff11a4d058c8f7 Mon Sep 17 00:00:00 2001 From: jan-ati Date: Wed, 11 Sep 2024 18:59:37 +0000 Subject: [PATCH 08/18] Updated the paths for the testing files to use the root directory of the EIPScanner library --- examples/README.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 examples/README.md diff --git a/examples/README.md b/examples/README.md new file mode 100644 index 0000000..c112314 --- /dev/null +++ b/examples/README.md @@ -0,0 +1,6 @@ +# Examples + +These examples use the installed library. + +Therefore the paths are `` rather than `"EIPScanner/..."` +* * The source files are linked in the `/usr/local/lib` shared object file \ No newline at end of file From 10aa69e115388b577038e2080f0c1df5a7613633 Mon Sep 17 00:00:00 2001 From: jan-ati Date: Wed, 11 Sep 2024 19:00:22 +0000 Subject: [PATCH 09/18] Updated the paths in the testing files to use the full paths of EIPScanner files relative to the root of the EIPScanner library --- test/CMakeLists.txt | 2 ++ test/Mocks.h | 2 +- test/README.md | 6 ++++++ test/TestDiscoveryManager.cpp | 2 +- test/TestIdentityObject.cpp | 2 +- test/TestMessageRouter.cpp | 14 +++++++------- test/TestParameterObject.cpp | 2 +- test/cip/TestCipRevision.cpp | 2 +- test/cip/TestCipString.cpp | 4 ++-- test/cip/TestEPath.cpp | 2 +- test/cip/TestMessageRouterResponse.cpp | 2 +- test/eip/TestCommonPacket.cpp | 6 +++--- test/eip/TestCommonPacketItem.cpp | 4 ++-- test/eip/TestCommonPacketItemFactory.cpp | 2 +- test/eip/TestEncapsPacket.cpp | 2 +- test/eip/TestEncapsPacketFactory.cpp | 4 ++-- test/fileObject/{Mocks.h => FileObjectMocks.h} | 0 test/fileObject/TestFileObjectLoadedState.cpp | 8 ++++---- .../TestFileObjectUploadInProgressState.cpp | 8 ++++---- test/sockets/TestEndPoint.cpp | 2 +- test/test.cpp | 2 +- test/utils/TestBuffer.cpp | 2 +- .../vendor/ra/powerFlex525/TestDPIFaultManager.cpp | 2 +- test/vendor/ra/powerFlex525/TestDPIFaultObject.cpp | 2 +- .../ra/powerFlex525/TestDPIFaultParameter.cpp | 4 ++-- 25 files changed, 48 insertions(+), 40 deletions(-) create mode 100644 test/README.md rename test/fileObject/{Mocks.h => FileObjectMocks.h} (100%) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1ac842f..a827e5e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 3.5) + enable_testing() include_directories("${PROJECT_SOURCE_DIR}/src") include_directories("${PROJECT_SOURCE_DIR}/test") diff --git a/test/Mocks.h b/test/Mocks.h index bec4d4a..b50dc8c 100644 --- a/test/Mocks.h +++ b/test/Mocks.h @@ -6,7 +6,7 @@ #define EIPSCANNER_MOCKS_H #include -#include "MessageRouter.h" +#include "EIPScanner/MessageRouter.h" class TMockMessageRouter : public eipScanner::MessageRouter { public: diff --git a/test/README.md b/test/README.md new file mode 100644 index 0000000..b0c46ca --- /dev/null +++ b/test/README.md @@ -0,0 +1,6 @@ +# Examples + +These tests use the source code of this repo. + +Therefore the paths are `"EIPScanner/..."` rather than `` +* The source files are being linked directly rather than through the EIPScanner `/usr/local/lib` shared object file \ No newline at end of file diff --git a/test/TestDiscoveryManager.cpp b/test/TestDiscoveryManager.cpp index 0a02785..0677e24 100644 --- a/test/TestDiscoveryManager.cpp +++ b/test/TestDiscoveryManager.cpp @@ -6,7 +6,7 @@ #include #include "Mocks.h" -#include "DiscoveryManager.h" +#include "EIPScanner/DiscoveryManager.h" using namespace eipScanner; diff --git a/test/TestIdentityObject.cpp b/test/TestIdentityObject.cpp index c5bba93..99bc8c4 100644 --- a/test/TestIdentityObject.cpp +++ b/test/TestIdentityObject.cpp @@ -4,7 +4,7 @@ #include #include "Mocks.h" -#include "IdentityObject.h" +#include "EIPScanner/IdentityObject.h" using namespace eipScanner; diff --git a/test/TestMessageRouter.cpp b/test/TestMessageRouter.cpp index c9306c3..9e19c56 100644 --- a/test/TestMessageRouter.cpp +++ b/test/TestMessageRouter.cpp @@ -4,13 +4,13 @@ #include #include "Mocks.h" -#include "MessageRouter.h" -#include "eip/CommonPacket.h" -#include "eip/CommonPacketItem.h" -#include "eip/CommonPacketItemFactory.h" -#include "eip/EncapsPacketFactory.h" -#include "cip/MessageRouterRequest.h" -#include "cip/MessageRouterResponse.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/eip/CommonPacketItem.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" +#include "EIPScanner/cip/MessageRouterRequest.h" +#include "EIPScanner/cip/MessageRouterResponse.h" using namespace eipScanner; diff --git a/test/TestParameterObject.cpp b/test/TestParameterObject.cpp index 0f16b4b..efd110b 100644 --- a/test/TestParameterObject.cpp +++ b/test/TestParameterObject.cpp @@ -4,7 +4,7 @@ #include #include "Mocks.h" -#include "ParameterObject.h" +#include "EIPScanner/ParameterObject.h" using namespace eipScanner; using ::testing::Return; diff --git a/test/cip/TestCipRevision.cpp b/test/cip/TestCipRevision.cpp index ae8f600..92731c4 100644 --- a/test/cip/TestCipRevision.cpp +++ b/test/cip/TestCipRevision.cpp @@ -3,7 +3,7 @@ // #include -#include "cip/CipRevision.h" +#include "EIPScanner/cip/CipRevision.h" using eipScanner::cip::CipRevision; diff --git a/test/cip/TestCipString.cpp b/test/cip/TestCipString.cpp index f23240b..dac1744 100644 --- a/test/cip/TestCipString.cpp +++ b/test/cip/TestCipString.cpp @@ -4,8 +4,8 @@ // #include -#include "cip/CipString.h" -#include "utils/Buffer.h" +#include "EIPScanner/cip/CipString.h" +#include "EIPScanner/utils/Buffer.h" using eipScanner::cip::CipBaseString; using eipScanner::utils::Buffer; diff --git a/test/cip/TestEPath.cpp b/test/cip/TestEPath.cpp index e499372..86a2d3d 100644 --- a/test/cip/TestEPath.cpp +++ b/test/cip/TestEPath.cpp @@ -3,7 +3,7 @@ // #include -#include "cip/EPath.h" +#include "EIPScanner/cip/EPath.h" using eipScanner::cip::EPath; diff --git a/test/cip/TestMessageRouterResponse.cpp b/test/cip/TestMessageRouterResponse.cpp index 828f30a..80d86a1 100644 --- a/test/cip/TestMessageRouterResponse.cpp +++ b/test/cip/TestMessageRouterResponse.cpp @@ -3,7 +3,7 @@ // #include -#include "cip/MessageRouterResponse.h" +#include "EIPScanner/cip/MessageRouterResponse.h" using eipScanner::cip::MessageRouterResponse; diff --git a/test/eip/TestCommonPacket.cpp b/test/eip/TestCommonPacket.cpp index 7f90e50..e41e27b 100644 --- a/test/eip/TestCommonPacket.cpp +++ b/test/eip/TestCommonPacket.cpp @@ -3,9 +3,9 @@ // #include -#include "eip/CommonPacketItem.h" -#include "eip/CommonPacketItemFactory.h" -#include "eip/CommonPacket.h" +#include "EIPScanner/eip/CommonPacketItem.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/CommonPacket.h" using eipScanner::eip::CommonPacket; using eipScanner::eip::CommonPacketItem; diff --git a/test/eip/TestCommonPacketItem.cpp b/test/eip/TestCommonPacketItem.cpp index b43fc1e..5e7e78e 100644 --- a/test/eip/TestCommonPacketItem.cpp +++ b/test/eip/TestCommonPacketItem.cpp @@ -3,8 +3,8 @@ // #include -#include "eip/CommonPacketItem.h" -#include "eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/CommonPacketItem.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" using eipScanner::eip::CommonPacketItem; using eipScanner::eip::CommonPacketItemFactory; diff --git a/test/eip/TestCommonPacketItemFactory.cpp b/test/eip/TestCommonPacketItemFactory.cpp index 56e657f..690c7c4 100644 --- a/test/eip/TestCommonPacketItemFactory.cpp +++ b/test/eip/TestCommonPacketItemFactory.cpp @@ -3,7 +3,7 @@ // #include -#include "eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" using eipScanner::eip::CommonPacketItemFactory; using eipScanner::eip::CommonPacketItemIds; diff --git a/test/eip/TestEncapsPacket.cpp b/test/eip/TestEncapsPacket.cpp index 922e292..6e8a3a7 100644 --- a/test/eip/TestEncapsPacket.cpp +++ b/test/eip/TestEncapsPacket.cpp @@ -3,7 +3,7 @@ // #include -#include "eip/EncapsPacket.h" +#include "EIPScanner/eip/EncapsPacket.h" using eipScanner::eip::EncapsPacket; using eipScanner::eip::EncapsCommands; diff --git a/test/eip/TestEncapsPacketFactory.cpp b/test/eip/TestEncapsPacketFactory.cpp index ea26b03..de55246 100644 --- a/test/eip/TestEncapsPacketFactory.cpp +++ b/test/eip/TestEncapsPacketFactory.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // #include -#include "eip/EncapsPacketFactory.h" -#include "eip/EncapsPacket.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" +#include "EIPScanner/eip/EncapsPacket.h" using eipScanner::eip::EncapsPacket; using eipScanner::eip::EncapsPacketFactory; diff --git a/test/fileObject/Mocks.h b/test/fileObject/FileObjectMocks.h similarity index 100% rename from test/fileObject/Mocks.h rename to test/fileObject/FileObjectMocks.h diff --git a/test/fileObject/TestFileObjectLoadedState.cpp b/test/fileObject/TestFileObjectLoadedState.cpp index 2e0a409..dc2ad9c 100644 --- a/test/fileObject/TestFileObjectLoadedState.cpp +++ b/test/fileObject/TestFileObjectLoadedState.cpp @@ -4,10 +4,10 @@ #include #include -#include "./Mocks.h" -#include "FileObject.h" -#include "fileObject/FileObjectLoadedState.h" -#include "utils/Buffer.h" +#include "FileObjectMocks.h" +#include "EIPScanner/FileObject.h" +#include "EIPScanner/fileObject/FileObjectLoadedState.h" +#include "EIPScanner/utils/Buffer.h" using namespace eipScanner; using eipScanner::fileObject::FileObjectLoadedState; diff --git a/test/fileObject/TestFileObjectUploadInProgressState.cpp b/test/fileObject/TestFileObjectUploadInProgressState.cpp index 8da1df3..e09e556 100644 --- a/test/fileObject/TestFileObjectUploadInProgressState.cpp +++ b/test/fileObject/TestFileObjectUploadInProgressState.cpp @@ -4,10 +4,10 @@ #include #include -#include "Mocks.h" -#include "FileObject.h" -#include "fileObject/FileObjectUploadInProgressState.h" -#include "utils/Buffer.h" +#include "FileObjectMocks.h" +#include "EIPScanner/FileObject.h" +#include "EIPScanner/fileObject/FileObjectUploadInProgressState.h" +#include "EIPScanner/utils/Buffer.h" using namespace eipScanner; using eipScanner::fileObject::FileObjectUploadInProgressState; diff --git a/test/sockets/TestEndPoint.cpp b/test/sockets/TestEndPoint.cpp index 2a7e96c..d080d68 100644 --- a/test/sockets/TestEndPoint.cpp +++ b/test/sockets/TestEndPoint.cpp @@ -3,7 +3,7 @@ // #include -#include "sockets/EndPoint.h" +#include "EIPScanner/sockets/EndPoint.h" using eipScanner::sockets::EndPoint; diff --git a/test/test.cpp b/test/test.cpp index 00b3b13..59b68a4 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -3,7 +3,7 @@ // #include -#include "utils/Logger.h" +#include "EIPScanner/utils/Logger.h" int main(int argc, char **argv) { eipScanner::utils::Logger::setLogLevel(eipScanner::utils::LogLevel::DEBUG); diff --git a/test/utils/TestBuffer.cpp b/test/utils/TestBuffer.cpp index 2adb401..13a730b 100644 --- a/test/utils/TestBuffer.cpp +++ b/test/utils/TestBuffer.cpp @@ -1,6 +1,6 @@ #include -#include "utils/Buffer.h" +#include "EIPScanner/utils/Buffer.h" using namespace eipScanner; using eipScanner::utils::Buffer; diff --git a/test/vendor/ra/powerFlex525/TestDPIFaultManager.cpp b/test/vendor/ra/powerFlex525/TestDPIFaultManager.cpp index e940468..69a7e63 100644 --- a/test/vendor/ra/powerFlex525/TestDPIFaultManager.cpp +++ b/test/vendor/ra/powerFlex525/TestDPIFaultManager.cpp @@ -4,7 +4,7 @@ #include #include "Mocks.h" -#include "vendor/ra/powerFlex525/DPIFaultManager.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.h" using namespace eipScanner; using namespace eipScanner::vendor::ra::powerFlex525; diff --git a/test/vendor/ra/powerFlex525/TestDPIFaultObject.cpp b/test/vendor/ra/powerFlex525/TestDPIFaultObject.cpp index 77a12c2..8e8b409 100644 --- a/test/vendor/ra/powerFlex525/TestDPIFaultObject.cpp +++ b/test/vendor/ra/powerFlex525/TestDPIFaultObject.cpp @@ -5,7 +5,7 @@ #include #include "Mocks.h" -#include "vendor/ra/powerFlex525/DPIFaultObject.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h" using namespace eipScanner; using namespace eipScanner::vendor::ra::powerFlex525; diff --git a/test/vendor/ra/powerFlex525/TestDPIFaultParameter.cpp b/test/vendor/ra/powerFlex525/TestDPIFaultParameter.cpp index 7f275c1..c7945d2 100644 --- a/test/vendor/ra/powerFlex525/TestDPIFaultParameter.cpp +++ b/test/vendor/ra/powerFlex525/TestDPIFaultParameter.cpp @@ -5,8 +5,8 @@ #include #include "Mocks.h" -#include "vendor/ra/powerFlex525/DPIFaultObject.h" -#include "vendor/ra/powerFlex525/DPIFaultParameter.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h" using namespace eipScanner; using namespace eipScanner::vendor::ra::powerFlex525; From f7bb13e99546899cc9b7297640aa32fa11742051 Mon Sep 17 00:00:00 2001 From: jan-ati Date: Tue, 24 Sep 2024 21:15:50 +0000 Subject: [PATCH 10/18] Build the examples targets when the option is set --- CMakeLists.txt | 13 +++++++++++-- examples/CMakeLists.txt | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3374ad7..a009ce2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ project(EIPScanner set(CMAKE_CXX_STANDARD 20) option(ENABLE_VENDOR_SRC "Enable vendor source" ON) option(TEST_ENABLED "Enable unit test" OFF) -option(EXAMPLE_ENABLED "Build examples" OFF) +option(EXAMPLE_ENABLED "Build examples" ON) if (WIN32) # Needed on MinGW with GCC 10 or lower @@ -33,7 +33,16 @@ include_directories(src) add_subdirectory(src/${CMAKE_PROJECT_NAME}) if (EXAMPLE_ENABLED) - add_subdirectory(examples) + set(EXAMPLES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/examples) + + # Create the build directory if it doesn't exist + file(MAKE_DIRECTORY ${EXAMPLES_DIR}/build) + + # Run the other CMakeLists.txt file without any dependencies on this file + execute_process(COMMAND ${CMAKE_COMMAND} ${EXAMPLES_DIR} WORKING_DIRECTORY ${EXAMPLES_DIR}/build) + + # Execute code during a `cmake --build` command + add_custom_target(EXAMPLES_TARGETS ALL COMMAND ${CMAKE_COMMAND} --build ${EXAMPLES_DIR}/build WORKING_DIRECTORY ${EXAMPLES_DIR}/build COMMENT "Building the examples sub-project") endif() if (TEST_ENABLED) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 0a1e996..3a0148f 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.5) # Remember to update the LIBRARY_PATH and LD_LIBRARY_PATH environment variables -# to the /usr/local/include/ -# and /usr/local/lib +# * export LIBRARY_PATH=/usr/local/include/ +# * export LD_LIBRARY_PATH=/usr/local/lib/ add_executable(explicit_messaging ExplicitMessagingExample.cpp) target_link_libraries(explicit_messaging PUBLIC EIPScanner) From 0dbd37709a020642dac3613404bc317e8928839e Mon Sep 17 00:00:00 2001 From: jan-ati Date: Wed, 25 Sep 2024 14:14:02 +0000 Subject: [PATCH 11/18] Updated lingering include paths for the EIPScanner/vendor files --- src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h | 8 ++++---- test/README.md | 9 +++++++-- test/fileObject/FileObjectMocks.h | 8 ++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h index 5c11679..e93e03d 100644 --- a/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h @@ -7,10 +7,10 @@ #include -#include "cip/CipString.h" -#include "BaseObject.h" -#include "SessionInfoIf.h" -#include "MessageRouter.h" +#include "EIPScanner/cip/CipString.h" +#include "EIPScanner/BaseObject.h" +#include "EIPScanner/SessionInfoIf.h" +#include "EIPScanner/MessageRouter.h" namespace eipScanner { namespace vendor { diff --git a/test/README.md b/test/README.md index b0c46ca..7e5ec49 100644 --- a/test/README.md +++ b/test/README.md @@ -1,6 +1,11 @@ -# Examples +# Tests These tests use the source code of this repo. Therefore the paths are `"EIPScanner/..."` rather than `` -* The source files are being linked directly rather than through the EIPScanner `/usr/local/lib` shared object file \ No newline at end of file +* The source files are being linked directly rather than through the EIPScanner `/usr/local/lib` shared object file + + +## Requirements + +The GMock Library: `sudo apt install libgmock-dev` \ No newline at end of file diff --git a/test/fileObject/FileObjectMocks.h b/test/fileObject/FileObjectMocks.h index c775a75..62e6da3 100644 --- a/test/fileObject/FileObjectMocks.h +++ b/test/fileObject/FileObjectMocks.h @@ -6,10 +6,10 @@ #define EIPSCANNER_TEST_FILEOBJECT_MOCKS_H #include "../Mocks.h" -#include "MessageRouter.h" -#include "FileObject.h" -#include "fileObject/FileObjectState.h" -#include "utils/Buffer.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/FileObject.h" +#include "EIPScanner/fileObject/FileObjectState.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace fileObject { From 32bb5daed23432f1190c95826d0203393b802e2f Mon Sep 17 00:00:00 2001 From: jan-ati Date: Thu, 26 Sep 2024 15:53:16 -0400 Subject: [PATCH 12/18] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a009ce2..9be81b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ project(EIPScanner set(CMAKE_CXX_STANDARD 20) option(ENABLE_VENDOR_SRC "Enable vendor source" ON) option(TEST_ENABLED "Enable unit test" OFF) -option(EXAMPLE_ENABLED "Build examples" ON) +option(EXAMPLE_ENABLED "Build examples" OFF) if (WIN32) # Needed on MinGW with GCC 10 or lower From bc88252002974b625f5b731bab7644e9c792282c Mon Sep 17 00:00:00 2001 From: Jan Ritzenhoff Date: Thu, 26 Sep 2024 16:06:37 -0400 Subject: [PATCH 13/18] Added back CMakeLists lines that actually installed the shared libraries and headers to the correct source --- src/EIPScanner/CMakeLists.txt | 23 ++++++++++ src/EIPScanner/OLD_CMakeLists.txt | 75 ------------------------------- 2 files changed, 23 insertions(+), 75 deletions(-) delete mode 100644 src/EIPScanner/OLD_CMakeLists.txt diff --git a/src/EIPScanner/CMakeLists.txt b/src/EIPScanner/CMakeLists.txt index 9f2ae2e..890849b 100644 --- a/src/EIPScanner/CMakeLists.txt +++ b/src/EIPScanner/CMakeLists.txt @@ -25,3 +25,26 @@ add_subdirectory(utils) if(ENABLE_VENDOR_SRC) add_subdirectory(vendor) endif() + + +if(WIN32) + target_link_libraries(EIPScanner ws2_32) + target_link_libraries(EIPScannerS ws2_32) +endif() + + +set_target_properties( + EIPScanner + PROPERTIES + VERSION ${EIPSCANNER_FULL_VERSION} + SOVERSION ${EIPSCANNER_MAJOR_VERSION}) + +install(TARGETS EIPScanner EIPScannerS + LIBRARY + DESTINATION lib + ARCHIVE + DESTINATION lib) + +install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ + DESTINATION include/EIPScanner + FILES_MATCHING PATTERN "*.h*") \ No newline at end of file diff --git a/src/EIPScanner/OLD_CMakeLists.txt b/src/EIPScanner/OLD_CMakeLists.txt deleted file mode 100644 index 6a58194..0000000 --- a/src/EIPScanner/OLD_CMakeLists.txt +++ /dev/null @@ -1,75 +0,0 @@ -include_directories(${CMAKE_CURRENT_LIST_DIR}) - -set(SOURCE_FILES - cip/connectionManager/ForwardCloseRequest.cpp - cip/connectionManager/ForwardOpenRequest.cpp - cip/connectionManager/LargeForwardOpenRequest.cpp - cip/connectionManager/ForwardOpenResponse.cpp - cip/connectionManager/NetworkConnectionParametersBuilder.cpp - - cip/CipRevision.cpp - cip/EPath.cpp - cip/MessageRouterRequest.cpp - cip/MessageRouterResponse.cpp - cip/CipString.cpp - - eip/CommonPacket.cpp - eip/CommonPacketItem.cpp - eip/CommonPacketItemFactory.cpp - eip/EncapsPacket.cpp - eip/EncapsPacketFactory.cpp - - fileObject/FileObjectEmptyState.cpp - fileObject/FileObjectLoadedState.cpp - fileObject/FileObjectNonExistentState.cpp - fileObject/FileObjectState.cpp - fileObject/FileObjectUploadInProgressState.cpp - - sockets/BaseSocket.cpp - sockets/EndPoint.cpp - sockets/TCPSocket.cpp - sockets/UDPBoundSocket.cpp - sockets/UDPSocket.cpp - sockets/Platform.cpp - - utils/Logger.cpp - utils/Buffer.cpp - - BaseObject.cpp - ConnectionManager.cpp - DiscoveryManager.cpp - FileObject.cpp - IdentityObject.cpp - IOConnection.cpp - MessageRouter.cpp - ParameterObject.cpp - SessionInfo.cpp) - -# if vendor scripts are enabled -if(ENABLE_VENDOR_SRC) - add_subdirectory(vendor) -endif() - -add_library(EIPScanner SHARED ${SOURCE_FILES} ${VENDOR_FILES}) -add_library(EIPScannerS STATIC ${SOURCE_FILES} ${VENDOR_FILES}) - -if(WIN32) - target_link_libraries(EIPScanner ws2_32) - target_link_libraries(EIPScannerS ws2_32) -endif() - -set_target_properties( - EIPScanner - PROPERTIES - VERSION ${EIPSCANNER_FULL_VERSION} - SOVERSION ${EIPSCANNER_MAJOR_VERSION}) - -install(TARGETS EIPScanner EIPScannerS - LIBRARY - DESTINATION lib - ARCHIVE - DESTINATION lib) - -install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ - DESTINATION include/EIPScanner - FILES_MATCHING PATTERN "*.h*") From 2a5cc4d71025651c274a4cea8b206d6da2d162af Mon Sep 17 00:00:00 2001 From: root Date: Thu, 26 Sep 2024 16:26:40 -0400 Subject: [PATCH 14/18] Changed the default installation for the header files to only be the /include rather than /include/EIPScanner --- src/EIPScanner/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EIPScanner/CMakeLists.txt b/src/EIPScanner/CMakeLists.txt index 890849b..ceeb454 100644 --- a/src/EIPScanner/CMakeLists.txt +++ b/src/EIPScanner/CMakeLists.txt @@ -46,5 +46,5 @@ install(TARGETS EIPScanner EIPScannerS DESTINATION lib) install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ - DESTINATION include/EIPScanner + DESTINATION include/ FILES_MATCHING PATTERN "*.h*") \ No newline at end of file From 450758ef6854be892761e1d84a5b36b61658a7e4 Mon Sep 17 00:00:00 2001 From: Jan Ritzenhoff Date: Thu, 26 Sep 2024 17:04:48 -0400 Subject: [PATCH 15/18] Modified the CMakeLists.txt files to include the sources of every sub-directory without needing to create sub-libraries and link them --- src/EIPScanner/CMakeLists.txt | 5 +++-- src/EIPScanner/cip/CMakeLists.txt | 18 ++++++++--------- .../cip/connectionManager/CMakeLists.txt | 17 +++++++--------- src/EIPScanner/eip/CMakeLists.txt | 17 +++++++--------- src/EIPScanner/fileObject/CMakeLists.txt | 19 ++++++++---------- src/EIPScanner/sockets/CMakeLists.txt | 20 +++++++++---------- src/EIPScanner/utils/CMakeLists.txt | 12 +++++------ src/EIPScanner/vendor/CMakeLists.txt | 17 ---------------- src/EIPScanner/vendor/ra/CMakeLists.txt | 8 ++++++++ src/EIPScanner/vendor/yaskawa/CMakeLists.txt | 7 +++++++ 10 files changed, 62 insertions(+), 78 deletions(-) delete mode 100644 src/EIPScanner/vendor/CMakeLists.txt create mode 100644 src/EIPScanner/vendor/ra/CMakeLists.txt create mode 100644 src/EIPScanner/vendor/yaskawa/CMakeLists.txt diff --git a/src/EIPScanner/CMakeLists.txt b/src/EIPScanner/CMakeLists.txt index ceeb454..637d35f 100644 --- a/src/EIPScanner/CMakeLists.txt +++ b/src/EIPScanner/CMakeLists.txt @@ -23,7 +23,8 @@ add_subdirectory(utils) # if vendor scripts are enabled if(ENABLE_VENDOR_SRC) - add_subdirectory(vendor) + add_subdirectory(vendor/ra) + add_subdirectory(vendor/yaskawa) endif() @@ -46,5 +47,5 @@ install(TARGETS EIPScanner EIPScannerS DESTINATION lib) install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ - DESTINATION include/ + DESTINATION include FILES_MATCHING PATTERN "*.h*") \ No newline at end of file diff --git a/src/EIPScanner/cip/CMakeLists.txt b/src/EIPScanner/cip/CMakeLists.txt index a170fb1..7c616ce 100644 --- a/src/EIPScanner/cip/CMakeLists.txt +++ b/src/EIPScanner/cip/CMakeLists.txt @@ -1,14 +1,12 @@ set(SOURCE_FILES - CipRevision.cpp - EPath.cpp - MessageRouterRequest.cpp - MessageRouterResponse.cpp - CipString.cpp) + ${CMAKE_CURRENT_LIST_DIR}/CipRevision.cpp + ${CMAKE_CURRENT_LIST_DIR}/EPath.cpp + ${CMAKE_CURRENT_LIST_DIR}/MessageRouterRequest.cpp + ${CMAKE_CURRENT_LIST_DIR}/MessageRouterResponse.cpp + ${CMAKE_CURRENT_LIST_DIR}/CipString.cpp) -add_subdirectory(connectionManager) -add_library(EIPScannerCip SHARED ${SOURCE_FILES}) -add_library(EIPScannerCipS STATIC ${SOURCE_FILES}) +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScannerS PUBLIC ${SOURCE_FILES}) -target_link_libraries(EIPScannerCip EIPScanner) -target_link_libraries(EIPScannerCipS EIPScannerS) \ No newline at end of file +add_subdirectory(connectionManager) \ No newline at end of file diff --git a/src/EIPScanner/cip/connectionManager/CMakeLists.txt b/src/EIPScanner/cip/connectionManager/CMakeLists.txt index d9ff1e6..190ac53 100644 --- a/src/EIPScanner/cip/connectionManager/CMakeLists.txt +++ b/src/EIPScanner/cip/connectionManager/CMakeLists.txt @@ -1,12 +1,9 @@ set(SOURCE_FILES - ForwardCloseRequest.cpp - ForwardOpenRequest.cpp - LargeForwardOpenRequest.cpp - ForwardOpenResponse.cpp - NetworkConnectionParametersBuilder.cpp) + ${CMAKE_CURRENT_LIST_DIR}/ForwardCloseRequest.cpp + ${CMAKE_CURRENT_LIST_DIR}/ForwardOpenRequest.cpp + ${CMAKE_CURRENT_LIST_DIR}/LargeForwardOpenRequest.cpp + ${CMAKE_CURRENT_LIST_DIR}/ForwardOpenResponse.cpp + ${CMAKE_CURRENT_LIST_DIR}/NetworkConnectionParametersBuilder.cpp) -add_library(EIPScannerCipConnectionManager SHARED ${SOURCE_FILES}) -add_library(EIPScannerCipConnectionManagerS STATIC ${SOURCE_FILES}) - -target_link_libraries(EIPScannerCipConnectionManager EIPScanner) -target_link_libraries(EIPScannerCipConnectionManagerS EIPScannerS) \ No newline at end of file +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScannerS PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/EIPScanner/eip/CMakeLists.txt b/src/EIPScanner/eip/CMakeLists.txt index 74cde76..115b554 100644 --- a/src/EIPScanner/eip/CMakeLists.txt +++ b/src/EIPScanner/eip/CMakeLists.txt @@ -1,12 +1,9 @@ set(SOURCE_FILES - CommonPacket.cpp - CommonPacketItem.cpp - CommonPacketItemFactory.cpp - EncapsPacket.cpp - EncapsPacketFactory.cpp) + ${CMAKE_CURRENT_LIST_DIR}/CommonPacket.cpp + ${CMAKE_CURRENT_LIST_DIR}/CommonPacketItem.cpp + ${CMAKE_CURRENT_LIST_DIR}/CommonPacketItemFactory.cpp + ${CMAKE_CURRENT_LIST_DIR}/EncapsPacket.cpp + ${CMAKE_CURRENT_LIST_DIR}/EncapsPacketFactory.cpp) -add_library(EIPScannerEip SHARED ${SOURCE_FILES}) -add_library(EIPScannerEipS STATIC ${SOURCE_FILES}) - -target_link_libraries(EIPScannerEip EIPScanner) -target_link_libraries(EIPScannerEipS EIPScannerS) \ No newline at end of file +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScannerS PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/EIPScanner/fileObject/CMakeLists.txt b/src/EIPScanner/fileObject/CMakeLists.txt index ee6bf91..24cc0ea 100644 --- a/src/EIPScanner/fileObject/CMakeLists.txt +++ b/src/EIPScanner/fileObject/CMakeLists.txt @@ -1,12 +1,9 @@ set(SOURCE_FILES - FileObjectEmptyState.cpp - FileObjectLoadedState.cpp - FileObjectNonExistentState.cpp - FileObjectState.cpp - FileObjectUploadInProgressState.cpp) - -add_library(EIPScannerFileObject SHARED ${SOURCE_FILES}) -add_library(EIPScannerFileObjectS STATIC ${SOURCE_FILES}) - -target_link_libraries(EIPScannerFileObject EIPScanner) -target_link_libraries(EIPScannerFileObjectS EIPScannerS) \ No newline at end of file + ${CMAKE_CURRENT_LIST_DIR}/FileObjectEmptyState.cpp + ${CMAKE_CURRENT_LIST_DIR}/FileObjectLoadedState.cpp + ${CMAKE_CURRENT_LIST_DIR}/FileObjectNonExistentState.cpp + ${CMAKE_CURRENT_LIST_DIR}/FileObjectState.cpp + ${CMAKE_CURRENT_LIST_DIR}/FileObjectUploadInProgressState.cpp) + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScannerS PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/EIPScanner/sockets/CMakeLists.txt b/src/EIPScanner/sockets/CMakeLists.txt index 8549881..ba8b5f5 100644 --- a/src/EIPScanner/sockets/CMakeLists.txt +++ b/src/EIPScanner/sockets/CMakeLists.txt @@ -1,13 +1,11 @@ set(SOURCE_FILES - BaseSocket.cpp - EndPoint.cpp - TCPSocket.cpp - UDPBoundSocket.cpp - UDPSocket.cpp - Platform.cpp) + ${CMAKE_CURRENT_LIST_DIR}/BaseSocket.cpp + ${CMAKE_CURRENT_LIST_DIR}/EndPoint.cpp + ${CMAKE_CURRENT_LIST_DIR}/TCPSocket.cpp + ${CMAKE_CURRENT_LIST_DIR}/UDPBoundSocket.cpp + ${CMAKE_CURRENT_LIST_DIR}/UDPSocket.cpp + ${CMAKE_CURRENT_LIST_DIR}/Platform.cpp) -add_library(EIPScannerSocket SHARED ${SOURCE_FILES}) -add_library(EIPScannerSocketS STATIC ${SOURCE_FILES}) - -target_link_libraries(EIPScannerSocket EIPScanner) -target_link_libraries(EIPScannerSocketS EIPScannerS) \ No newline at end of file + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/EIPScanner/utils/CMakeLists.txt b/src/EIPScanner/utils/CMakeLists.txt index 174b927..6bb0041 100644 --- a/src/EIPScanner/utils/CMakeLists.txt +++ b/src/EIPScanner/utils/CMakeLists.txt @@ -1,9 +1,7 @@ set(SOURCE_FILES - Logger.cpp - Buffer.cpp) + ${CMAKE_CURRENT_LIST_DIR}/Logger.cpp + ${CMAKE_CURRENT_LIST_DIR}/Buffer.cpp) -add_library(EIPScannerUtil SHARED ${SOURCE_FILES}) -add_library(EIPScannerUtilS STATIC ${SOURCE_FILES}) - -target_link_libraries(EIPScannerUtil EIPScanner) -target_link_libraries(EIPScannerUtilS EIPScannerS) \ No newline at end of file + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/EIPScanner/vendor/CMakeLists.txt b/src/EIPScanner/vendor/CMakeLists.txt deleted file mode 100644 index 99ac1d1..0000000 --- a/src/EIPScanner/vendor/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -include_directories(ra/powerFlex525) -include_directories(yaskawa/mp3300iec) - -set( VENDOR_FILES - # ra - vendor/ra/powerFlex525/DPIFaultManager.cpp - vendor/ra/powerFlex525/DPIFaultObject.cpp - vendor/ra/powerFlex525/DPIFaultCode.cpp - vendor/ra/powerFlex525/DPIFaultParameter.cpp - - # yaskawa - vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp - vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp - vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp - - PARENT_SCOPE -) \ No newline at end of file diff --git a/src/EIPScanner/vendor/ra/CMakeLists.txt b/src/EIPScanner/vendor/ra/CMakeLists.txt new file mode 100644 index 0000000..f7b5a94 --- /dev/null +++ b/src/EIPScanner/vendor/ra/CMakeLists.txt @@ -0,0 +1,8 @@ +set(SOURCE_FILES + ${CMAKE_CURRENT_LIST_DIR}/powerFlex525/DPIFaultManager.cpp + ${CMAKE_CURRENT_LIST_DIR}/powerFlex525/DPIFaultObject.cpp + ${CMAKE_CURRENT_LIST_DIR}/powerFlex525/DPIFaultCode.cpp + ${CMAKE_CURRENT_LIST_DIR}/powerFlex525/DPIFaultParameter.cpp) + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/EIPScanner/vendor/yaskawa/CMakeLists.txt b/src/EIPScanner/vendor/yaskawa/CMakeLists.txt new file mode 100644 index 0000000..ecf55c4 --- /dev/null +++ b/src/EIPScanner/vendor/yaskawa/CMakeLists.txt @@ -0,0 +1,7 @@ +set(SOURCE_FILES + ${CMAKE_CURRENT_LIST_DIR}/mp3300iec/Yaskawa_EPath.cpp + ${CMAKE_CURRENT_LIST_DIR}/mp3300iec/Yaskawa_MessageRouter.cpp + ${CMAKE_CURRENT_LIST_DIR}/mp3300iec/Yaskawa_MessageRouterRequest.cpp) + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) \ No newline at end of file From d2a0c50461cc6c41e348c19b4955b77c97c69b6d Mon Sep 17 00:00:00 2001 From: Jan Ritzenhoff Date: Fri, 27 Sep 2024 11:35:29 -0400 Subject: [PATCH 16/18] Added the teknic vendor sources --- src/EIPScanner/CMakeLists.txt | 1 + src/EIPScanner/vendor/teknic/CMakeLists.txt | 8 + .../teknic/clearlink/AttributeBaseObject.cpp | 83 ++++++ .../teknic/clearlink/AttributeBaseObject.h | 82 ++++++ .../teknic/clearlink/SDMotorConfigObject.cpp | 81 ++++++ .../teknic/clearlink/SDMotorConfigObject.h | 258 ++++++++++++++++++ .../teknic/clearlink/SDMotorInputObject.cpp | 62 +++++ .../teknic/clearlink/SDMotorInputObject.h | 215 +++++++++++++++ .../teknic/clearlink/SDMotorOutputObject.cpp | 69 +++++ .../teknic/clearlink/SDMotorOutputObject.h | 197 +++++++++++++ 10 files changed, 1056 insertions(+) create mode 100644 src/EIPScanner/vendor/teknic/CMakeLists.txt create mode 100644 src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.cpp create mode 100644 src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h create mode 100644 src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.cpp create mode 100644 src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.h create mode 100644 src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.cpp create mode 100644 src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.h create mode 100644 src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.cpp create mode 100644 src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.h diff --git a/src/EIPScanner/CMakeLists.txt b/src/EIPScanner/CMakeLists.txt index 637d35f..b13e48e 100644 --- a/src/EIPScanner/CMakeLists.txt +++ b/src/EIPScanner/CMakeLists.txt @@ -25,6 +25,7 @@ add_subdirectory(utils) if(ENABLE_VENDOR_SRC) add_subdirectory(vendor/ra) add_subdirectory(vendor/yaskawa) + add_subdirectory(vendor/teknic) endif() diff --git a/src/EIPScanner/vendor/teknic/CMakeLists.txt b/src/EIPScanner/vendor/teknic/CMakeLists.txt new file mode 100644 index 0000000..c6d5b1b --- /dev/null +++ b/src/EIPScanner/vendor/teknic/CMakeLists.txt @@ -0,0 +1,8 @@ +set(SOURCE_FILES + ${CMAKE_CURRENT_LIST_DIR}/clearlink/AttributeBaseObject.cpp + ${CMAKE_CURRENT_LIST_DIR}/clearlink/SDMotorConfigObject.cpp + ${CMAKE_CURRENT_LIST_DIR}/clearlink/SDMotorInputObject.cpp + ${CMAKE_CURRENT_LIST_DIR}/clearlink/SDMotorOutputObject.cpp) + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.cpp b/src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.cpp new file mode 100644 index 0000000..c59bd87 --- /dev/null +++ b/src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.cpp @@ -0,0 +1,83 @@ +// +// Created by Jan Ritzenhoff on 8/29/2024. +// + +#include "EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h" + +#include + +namespace eipScanner +{ +namespace vendor +{ +namespace teknic +{ +namespace clearlink +{ + AttributeBaseObject::AttributeBaseObject(eipScanner::cip::CipUint classId, eipScanner::cip::CipUint instanceId, + const eipScanner::SessionInfoIf::SPtr sessionInfo, const eipScanner::MessageRouter::SPtr messageRouter) + : BaseObject(classId, instanceId), _sessionInfo(sessionInfo), _messageRouter(messageRouter) {} + + void AttributeBaseObject::_getAllAttributesIndividually() + { + std::vector classAttributes = _getAttributeReferences(); + + for (uint8_t fieldIndex = 0; fieldIndex < classAttributes.size(); ++fieldIndex) + { + + // actually send the explicit message + auto getAttributeResponse = _messageRouter->sendRequest(_sessionInfo, eipScanner::cip::ServiceCodes::GET_ATTRIBUTE_SINGLE, + eipScanner::cip::EPath(getClassId(), getInstanceId(), fieldIndex + 1)); + + // check the getAttributeResponse code + if (getAttributeResponse.getGeneralStatusCode() != eipScanner::cip::GeneralStatusCodes::SUCCESS) + { + logGeneralAndAdditionalStatus(getAttributeResponse); + // throw std::runtime_error("Failed to read attribute with status code: " + std::to_string(getAttributeResponse.getGeneralStatusCode())); + continue; + } + + eipScanner::utils::Buffer getBuffer(getAttributeResponse.getData()); + + auto fieldReference = classAttributes[fieldIndex]; + // pass a reference of the getBuffer to the lambda function and the first argument of the lambda function is the actual field reference + std::visit([&getBuffer](auto &fieldRef) + { getBuffer >> fieldRef; }, + fieldReference); + } + } + + void AttributeBaseObject::_setAllAttributesIndividually() + { + std::vector classAttributes = _getAttributeReferences(); + + for (uint8_t fieldIndex = 0; fieldIndex < classAttributes.size(); ++fieldIndex) + { + + auto fieldReference = classAttributes[fieldIndex]; + + eipScanner::utils::Buffer setBuffer; + + // pass a reference of the buffer to the lambda function + std::visit([&setBuffer](auto &fieldRef) + { setBuffer << fieldRef; }, + fieldReference); + + // actually send the explicit message + auto setAttributeResponse = _messageRouter->sendRequest(_sessionInfo, eipScanner::cip::ServiceCodes::SET_ATTRIBUTE_SINGLE, + eipScanner::cip::EPath(getClassId(), getInstanceId(), fieldIndex + 1), + setBuffer.data()); + + // check the setAttributeResponse code + if (setAttributeResponse.getGeneralStatusCode() != eipScanner::cip::GeneralStatusCodes::SUCCESS) + { + logGeneralAndAdditionalStatus(setAttributeResponse); + throw std::runtime_error("Failed to read attribute with status code: " + std::to_string(setAttributeResponse.getGeneralStatusCode())); + } + } + } + +} +} +} +} \ No newline at end of file diff --git a/src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h b/src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h new file mode 100644 index 0000000..529ff06 --- /dev/null +++ b/src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h @@ -0,0 +1,82 @@ +// +// Created by Jan Ritzenhoff on 8/29/2024. +// + +#ifndef EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_ATTRIBUTEBASEOBJECT_H +#define EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_ATTRIBUTEBASEOBJECT_H + +#include +#include +#include + +#include "EIPScanner/cip/Types.h" +#include "EIPScanner/BaseObject.h" +#include "EIPScanner/SessionInfo.h" +#include "EIPScanner/MessageRouter.h" + +#include "EIPScanner/utils/Buffer.h" + +namespace eipScanner +{ +namespace vendor +{ +namespace teknic +{ +namespace clearlink +{ + + /** + * @class AttributeBaseObject + * + * @brief Base class for all the CIP Objects that access all attributes independently using explicit messaging + */ + class AttributeBaseObject : public eipScanner::BaseObject + { + public: + /** + * @brief Creates an CIP instance + * @param classId the class ID of the the new instance + * @param instanceId the instance ID of the the new instanc + */ + AttributeBaseObject(eipScanner::cip::CipUint classId, eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr sessionInfo, const eipScanner::MessageRouter::SPtr messageRouter); + + protected: + using ReflexiveFieldReference = std::variant, + std::reference_wrapper, + std::reference_wrapper, + std::reference_wrapper, + std::reference_wrapper, + std::reference_wrapper, + std::reference_wrapper, + std::reference_wrapper, + std::reference_wrapper, + std::reference_wrapper, + std::reference_wrapper, + std::reference_wrapper, + std::reference_wrapper, + std::reference_wrapper, + std::reference_wrapper>; + // std::reference_wrapper, (this is typedeffed' to the same thing as the DWord. Including both in the variant confuses the compiler) + + virtual std::vector _getAttributeReferences() = 0; + + /** + * @brief Gets the whole assembly to the device as individual get_attribute_single messages + */ + void _getAllAttributesIndividually(); + + /** + * @brief Sets the whole assembly to the device as individual set_attribute_single messages + */ + void _setAllAttributesIndividually(); + + private: + const eipScanner::SessionInfoIf::SPtr _sessionInfo; + const eipScanner::MessageRouter::SPtr _messageRouter; + }; +} +} +} +} + +#endif // EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_ATTRIBUTEBASEOBJECT_H diff --git a/src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.cpp b/src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.cpp new file mode 100644 index 0000000..2c28a1d --- /dev/null +++ b/src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.cpp @@ -0,0 +1,81 @@ +// +// Created by Jan Ritzenhoff on 8/28/2024 +// +#include "EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.h" + +#include "EIPScanner/utils/Buffer.h" + +#include + +namespace eipScanner +{ +namespace vendor +{ +namespace teknic +{ +namespace clearlink +{ + using eipScanner::utils::Buffer; + + SDMotorConfigObject::SDMotorConfigObject(eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr si, const eipScanner::MessageRouter::SPtr messageRouter) + : AttributeBaseObject(CLASS_ID, instanceId, si, messageRouter), _configRegister(0), _softLimitPosition1(0), _softLimitPosition2(0), _positiveLimitConnector(0), _negativeLimitConnector(0), _homeSensorConnector(0), _brakeOutputConnector(0), _triggerPositionCaptureConnector(0), _maxDecelerationRate(0), _stopSensorConnector(0), _followEncoderMode(0), _followDivisor(0), _followMultiplier(0) + { + + _getAllAttributesIndividually(); + } + + void SDMotorConfigObject::setAllAttributesIndividually() + { + _setAllAttributesIndividually(); + } + + std::vector SDMotorConfigObject::_getAttributeReferences() + { + return {std::ref(_configRegister), std::ref(_softLimitPosition1), std::ref(_softLimitPosition2), + std::ref(_positiveLimitConnector), std::ref(_negativeLimitConnector), std::ref(_homeSensorConnector), + std::ref(_brakeOutputConnector), std::ref(_triggerPositionCaptureConnector), std::ref(_maxDecelerationRate), + std::ref(_stopSensorConnector), std::ref(_followEncoderMode), std::ref(_followDivisor), std::ref(_followMultiplier)}; + } + + eipScanner::cip::CipDword SDMotorConfigObject::getConfigRegister() const { return _configRegister; } + void SDMotorConfigObject::setConfigRegister(eipScanner::cip::CipDword configRegister) { _configRegister = configRegister; } + + eipScanner::cip::CipDint SDMotorConfigObject::getSoftLimitPosition1() const { return _softLimitPosition1; } + void SDMotorConfigObject::setSoftLimitPosition1(eipScanner::cip::CipDint softLimitPosition1) { _softLimitPosition1 = softLimitPosition1; } + + eipScanner::cip::CipDint SDMotorConfigObject::getSoftLimitPosition2() const { return _softLimitPosition2; } + void SDMotorConfigObject::setSoftLimitPosition2(eipScanner::cip::CipDint softLimitPosition2) { _softLimitPosition2 = softLimitPosition2; } + + eipScanner::cip::CipSint SDMotorConfigObject::getPositiveLimitConnector() const { return _positiveLimitConnector; } + void SDMotorConfigObject::setPositiveLimitConnector(eipScanner::cip::CipSint positiveLimitConnector) { _positiveLimitConnector = positiveLimitConnector; } + + eipScanner::cip::CipSint SDMotorConfigObject::getNegativeLimitConnector() const { return _negativeLimitConnector; } + void SDMotorConfigObject::setNegativeLimitConnector(eipScanner::cip::CipSint negativeLimitConnector) { _negativeLimitConnector = negativeLimitConnector; } + + eipScanner::cip::CipSint SDMotorConfigObject::getHomeSensorConnector() const { return _homeSensorConnector; } + void SDMotorConfigObject::setHomeSensorConnector(eipScanner::cip::CipSint homeSensorConnector) { _homeSensorConnector = homeSensorConnector; } + + eipScanner::cip::CipSint SDMotorConfigObject::getBrakeOutputConnector() const { return _brakeOutputConnector; } + void SDMotorConfigObject::setBrakeOutputConnector(eipScanner::cip::CipSint brakeOutputConnector) { _brakeOutputConnector = brakeOutputConnector; } + + eipScanner::cip::CipSint SDMotorConfigObject::getTriggerPositionCaptureConnector() const { return _triggerPositionCaptureConnector; } + void SDMotorConfigObject::setTriggerPositionCaptureConnector(eipScanner::cip::CipSint triggerPositionCaptureConnector) { _triggerPositionCaptureConnector = triggerPositionCaptureConnector; } + + eipScanner::cip::CipDint SDMotorConfigObject::getMaxDecelerationRate() const { return _maxDecelerationRate; } + void SDMotorConfigObject::setMaxDecelerationRate(eipScanner::cip::CipDint maxDecelerationRate) { _maxDecelerationRate = maxDecelerationRate; } + + eipScanner::cip::CipSint SDMotorConfigObject::getStopSensorConnector() const { return _stopSensorConnector; } + void SDMotorConfigObject::setStopSensorConnector(eipScanner::cip::CipSint stopSensorConnector) { _stopSensorConnector = stopSensorConnector; } + + eipScanner::cip::CipSint SDMotorConfigObject::getFollowEncoderMode() const { return _followEncoderMode; } + void SDMotorConfigObject::setFollowEncoderMode(eipScanner::cip::CipSint followEncoderMode) { _followEncoderMode = followEncoderMode; } + + eipScanner::cip::CipDint SDMotorConfigObject::getFollowDivisor() const { return _followDivisor; } + void SDMotorConfigObject::setFollowDivisor(eipScanner::cip::CipDint followDivisor) { _followDivisor = followDivisor; } + + eipScanner::cip::CipDint SDMotorConfigObject::getFollowMultiplier() const { return _followMultiplier; } + void SDMotorConfigObject::setFollowMultiplier(eipScanner::cip::CipDint followMultiplier) { _followMultiplier = followMultiplier; } +} +} +} +} diff --git a/src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.h b/src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.h new file mode 100644 index 0000000..ea0e954 --- /dev/null +++ b/src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.h @@ -0,0 +1,258 @@ +// +// Created by Jan Ritzenhoff on 8/28/2024 +// + +// Based on: +// Step and Direction Motor Configuration Object (64hex - 4 instances) +// * https://www.teknic.com/files/downloads/clearlink_ethernet-ip_object_reference.pdf#page=37 + +#ifndef EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTORCONFIGOBJECT_H +#define EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTORCONFIGOBJECT_H + +#include "EIPScanner/cip/CipRevision.h" +#include "EIPScanner/cip/CipString.h" + +#include "EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h" + + +namespace eipScanner +{ +namespace vendor +{ +namespace teknic +{ +namespace clearlink +{ + /** + * @class SDMotorConfigObject + * + * @brief Implements interface to Identity Object (0x64). + * + * It reads all data from the CIP instance in the constructor + */ + class SDMotorConfigObject : public AttributeBaseObject + { + public: + static const eipScanner::cip::CipUint CLASS_ID = 0x64; + + /** + * @brief Creates an instance and reads all its data via EIP + * @note Used for testing + * @param instanceId + * @param si + * @param messageRouter + */ + SDMotorConfigObject(eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr si, const eipScanner::MessageRouter::SPtr messageRouter); + + /** + * @brief Gets Config Register [AttrID=1] + * @return + */ + eipScanner::cip::CipDword getConfigRegister() const; + + /** + * @brief Gets SoftLimitPosition1 [AttrID=2] + * @return + */ + eipScanner::cip::CipDint getSoftLimitPosition1() const; + + /** + * @brief Gets SoftLimitPosition2 [AttrID=3] + * @return + */ + eipScanner::cip::CipDint getSoftLimitPosition2() const; + + /** + * @brief Gets PositiveLimitConnector [AttrID=4] + * @return + */ + eipScanner::cip::CipSint getPositiveLimitConnector() const; + + /** + * @brief Gets NegativeLimitConnector [AttrID=5] + * @return + */ + eipScanner::cip::CipSint getNegativeLimitConnector() const; + + /** + * @brief Gets HomeSensorConnector [AttrID=6] + * @return + */ + eipScanner::cip::CipSint getHomeSensorConnector() const; + + /** + * @brief Gets BrakeOutputConnector [AttrID=7] + * @return + */ + eipScanner::cip::CipSint getBrakeOutputConnector() const; + + /** + * @brief Gets TriggerPositionCaptureConnector [AttrID=8] + * @return + */ + eipScanner::cip::CipSint getTriggerPositionCaptureConnector() const; + + /** + * @brief Gets MaxDecelerationRate [AttrID=9] + * @return + */ + eipScanner::cip::CipDint getMaxDecelerationRate() const; + + /** + * @brief Gets StopSensorConnector [AttrID=10] + * @return + */ + eipScanner::cip::CipSint getStopSensorConnector() const; + + /** + * @brief Gets FollowEncoderMode [AttrID=11] + * @return + */ + eipScanner::cip::CipSint getFollowEncoderMode() const; + + /** + * @brief Gets FollowDivisor [AttrID=12] + * @return + */ + eipScanner::cip::CipDint getFollowDivisor() const; + + /** + * @brief Gets FollowMultiplier [AttrID=13] + * @return + */ + eipScanner::cip::CipDint getFollowMultiplier() const; + + // ------------------------------------------------------------- + + void setAllAttributesIndividually(); + + // ------------------------------------------------------------- + + /** + * @brief Sets Config Register [AttrID=1] + * @return + */ + void setConfigRegister(eipScanner::cip::CipDword configRegister); + + /** + * @brief Sets SoftLimitPosition1 [AttrID=2] + * @return + */ + void setSoftLimitPosition1(eipScanner::cip::CipDint softLimitPosition1); + + /** + * @brief Sets SoftLimitPosition2 [AttrID=3] + * @return + */ + void setSoftLimitPosition2(eipScanner::cip::CipDint softLimitPosition2); + + /** + * @brief Sets PositiveLimitConnector [AttrID=4] + * @return + */ + void setPositiveLimitConnector(eipScanner::cip::CipSint positiveLimitConnector); + + /** + * @brief Sets NegativeLimitConnector [AttrID=5] + * @return + */ + void setNegativeLimitConnector(eipScanner::cip::CipSint negativeLimitConnector); + + /** + * @brief Sets HomeSensorConnector [AttrID=6] + * @return + */ + void setHomeSensorConnector(eipScanner::cip::CipSint homeSensorConnector); + + /** + * @brief Sets BrakeOutputConnector [AttrID=7] + * @return + */ + void setBrakeOutputConnector(eipScanner::cip::CipSint brakeOutputConnector); + + /** + * @brief Sets TriggerPositionCaptureConnector [AttrID=8] + * @return + */ + void setTriggerPositionCaptureConnector(eipScanner::cip::CipSint triggerPositionCaptureConnector); + + /** + * @brief Sets MaxDecelerationRate [AttrID=9] + * @return + */ + void setMaxDecelerationRate(eipScanner::cip::CipDint maxDecelerationRate); + + /** + * @brief Sets StopSensorConnector [AttrID=10] + * @return + */ + void setStopSensorConnector(eipScanner::cip::CipSint stopSensorConnector); + + /** + * @brief Sets FollowEncoderMode [AttrID=11] + * @return + */ + void setFollowEncoderMode(eipScanner::cip::CipSint followEncoderMode); + + /** + * @brief Sets FollowDivisor [AttrID=12] + * @return + */ + void setFollowDivisor(eipScanner::cip::CipDint followDivisor); + + /** + * @brief Sets FollowMultiplier [AttrID=13] + * @return + */ + void setFollowMultiplier(eipScanner::cip::CipDint followMultiplier); + + enum ConfigFlag + { + HomingEnable = 0, + HomeSensorActiveLevel = 1, + EnableInversion = 2, + HLFBInversion = 3, // NOTE: The default if HIGH + PositionCaptureActiveLevel = 4, + SoftwareLimitEnable = 5 + // 6 - 31 are reserved + }; + + /** + * @brief Sets a motor config flag + */ + void setConfigFlag(ConfigFlag flag, bool value) + { + if (value) + { + _configRegister |= (1 << flag); + } + else + { + _configRegister &= ~(1 << flag); + } + } + + private: + virtual std::vector _getAttributeReferences(); + + eipScanner::cip::CipDword _configRegister; + eipScanner::cip::CipDint _softLimitPosition1; + eipScanner::cip::CipDint _softLimitPosition2; + eipScanner::cip::CipSint _positiveLimitConnector; + eipScanner::cip::CipSint _negativeLimitConnector; + eipScanner::cip::CipSint _homeSensorConnector; + eipScanner::cip::CipSint _brakeOutputConnector; + eipScanner::cip::CipSint _triggerPositionCaptureConnector; + eipScanner::cip::CipDint _maxDecelerationRate; + eipScanner::cip::CipSint _stopSensorConnector; + eipScanner::cip::CipSint _followEncoderMode; + eipScanner::cip::CipDint _followDivisor; + eipScanner::cip::CipDint _followMultiplier; + }; +} +} +} +} + + +#endif // EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTORCONFIGOBJECT_H diff --git a/src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.cpp b/src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.cpp new file mode 100644 index 0000000..26d19af --- /dev/null +++ b/src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.cpp @@ -0,0 +1,62 @@ +// +// Created by Jan Ritzenhoff on 8/29/2024 +// +#include "EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.h" + + + +#include "EIPScanner/utils/Buffer.h" + +#include + +namespace eipScanner +{ +namespace vendor +{ +namespace teknic +{ +namespace clearlink +{ + using eipScanner::utils::Buffer; + + SDMotorInputObject::SDMotorInputObject(eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr si, const eipScanner::MessageRouter::SPtr messageRouter) + : AttributeBaseObject(CLASS_ID, instanceId, si, messageRouter), _commandedPosition(0), _commandedVelocity(0), _targetPosition(0), _targetVelocity(0), _capturedPosition(0), _measuredTorque(0), _motorStatus(0), _motorShutdowns(0) + { + + _getAllAttributesIndividually(); + } + + std::vector SDMotorInputObject::_getAttributeReferences() + { + return {std::ref(_commandedPosition), std::ref(_commandedVelocity), std::ref(_targetPosition), + std::ref(_targetVelocity), std::ref(_capturedPosition), std::ref(_measuredTorque), + std::ref(_motorStatus), std::ref(_motorShutdowns)}; + } + + eipScanner::cip::CipDint SDMotorInputObject::getCommandedPosition() const { return _commandedPosition; } + eipScanner::cip::CipDint SDMotorInputObject::getCommandedVelocity() const { return _commandedVelocity; } + eipScanner::cip::CipDint SDMotorInputObject::getTargetPosition() const { return _targetPosition; } + eipScanner::cip::CipDint SDMotorInputObject::getTargetVelocity() const { return _targetVelocity; } + eipScanner::cip::CipDint SDMotorInputObject::getCapturedPosition() const { return _capturedPosition; } + eipScanner::cip::CipReal SDMotorInputObject::getMeasuredTorque() const { return _measuredTorque; } + eipScanner::cip::CipDword SDMotorInputObject::getMotorStatus() const { return _motorStatus; } + eipScanner::cip::CipDword SDMotorInputObject::getMotorShutdowns() const { return _motorShutdowns; } + + void SDMotorInputObject::printMotorInputState(eipScanner::utils::Logger logger) + { + eipScanner::cip::CipDword lastMotorStatus = getMotorStatus(); + + for (int stateBit = InputState::AtTargetPosition; stateBit < InputState::NUM_STATES; ++stateBit) + { + // Check if the ith bit is set + if (lastMotorStatus & (1 << stateBit)) + { + // Print the corresponding state + logger << "State " << stateToString(InputState(stateBit)) << " is set." << std::endl; + } + } + } +} +} +} +} diff --git a/src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.h b/src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.h new file mode 100644 index 0000000..ec5c011 --- /dev/null +++ b/src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.h @@ -0,0 +1,215 @@ +// +// Created by Jan Ritzenhoff on 8/29/2024 +// + +// Based on: +// Step and Direction Motor Input Object (65hex - 4 instances) +// * https://www.teknic.com/files/downloads/clearlink_ethernet-ip_object_reference.pdf#page=41 + +#ifndef EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTORINPUTOBJECT_H +#define EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTORINPUTOBJECT_H + +#include "EIPScanner/cip/CipRevision.h" +#include "EIPScanner/cip/CipString.h" + +#include "EIPScanner/utils/Logger.h" + +#include "EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h" + +namespace eipScanner +{ +namespace vendor +{ +namespace teknic +{ +namespace clearlink +{ + + /** + * @class SDMotorInputObject + * + * @brief Implements interface to Identity Object (0x65). + * + * It reads all data from the CIP instance in the constructor + */ + class SDMotorInputObject : public AttributeBaseObject + { + public: + static const eipScanner::cip::CipUint CLASS_ID = 0x65; + + /** + * @brief Creates an instance and reads all its data via EIP + * @note Used for testing + * @param instanceId + * @param si + * @param messageRouter + */ + SDMotorInputObject(eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr si, const eipScanner::MessageRouter::SPtr messageRouter); + + /** + * @brief Gets CommandedPosition [AttrID=1] + * @return + */ + eipScanner::cip::CipDint getCommandedPosition() const; + + /** + * @brief Gets CommandedVelocity [AttrID=2] + * @return + */ + eipScanner::cip::CipDint getCommandedVelocity() const; + + /** + * @brief Gets TargetPosition [AttrID=3] + * @return + */ + eipScanner::cip::CipDint getTargetPosition() const; + + /** + * @brief Gets TargetVelocity [AttrID=4] + * @return + */ + eipScanner::cip::CipDint getTargetVelocity() const; + + /** + * @brief Gets CapturedPosition [AttrID=5] + * @return + */ + eipScanner::cip::CipDint getCapturedPosition() const; + + /** + * @brief Gets MeasuredTorque [AttrID=6] + * @return + */ + eipScanner::cip::CipReal getMeasuredTorque() const; + + /** + * @brief Gets MotorStatus [AttrID=7] + * @return + */ + eipScanner::cip::CipDword getMotorStatus() const; + + /** + * @brief Gets MotorShutdowns [AttrID=8] + * @return + */ + eipScanner::cip::CipDword getMotorShutdowns() const; + + enum InputState + { + AtTargetPosition = 0, + StepsActive = 1, + AtVelocity = 2, + MoveDirection = 3, + InPositiveLimit = 4, + InNegativeLimit = 5, + InEStopSensor = 6, + InHomeSensor = 7, + Homing = 8, + MotorInFault = 9, + Enabled = 10, + OutsideSoftLimits = 11, + PositionalMove = 12, + HasHomed = 13, + HLFB_On = 14, + HasTorqueMeasurement = 15, + ReadyToHome = 16, + ShutdownsPresent = 17, + AddToPositionAck = 18, + LoadPositionMoveAck = 19, + LoadVelocityMoveAck = 20, + ClearMotorFaultAck = 21, + NUM_STATES = 22 + // 22 - 31 are reserved + }; + + /** + * @brief Prints out all of the states that are true + */ + void printMotorInputState(eipScanner::utils::Logger logger); + + /** + * @brief Checks if the motor is in a specific state + */ + bool isInState(InputState state) + { + return _motorStatus & (1 << state); + } + + void repopulateFromAdapter() + { + _getAllAttributesIndividually(); + } + + private: + virtual std::vector _getAttributeReferences(); + + eipScanner::cip::CipDint _commandedPosition; + eipScanner::cip::CipDint _commandedVelocity; + eipScanner::cip::CipDint _targetPosition; + eipScanner::cip::CipDint _targetVelocity; + eipScanner::cip::CipDint _capturedPosition; + eipScanner::cip::CipReal _measuredTorque; + eipScanner::cip::CipDword _motorStatus; + eipScanner::cip::CipDword _motorShutdowns; + + std::string stateToString(InputState state) + { + switch (state) + { + case AtTargetPosition: + return "AtTargetPosition"; + case StepsActive: + return "StepsActive"; + case AtVelocity: + return "AtVelocity"; + case MoveDirection: + return "MoveDirection"; + case InPositiveLimit: + return "InPositiveLimit"; + case InNegativeLimit: + return "InNegativeLimit"; + case InEStopSensor: + return "InEStopSensor"; + case InHomeSensor: + return "InHomeSensor"; + case Homing: + return "Homing"; + case MotorInFault: + return "MotorInFault"; + case Enabled: + return "Enabled"; + case OutsideSoftLimits: + return "OutsideSoftLimits"; + case PositionalMove: + return "PositionalMove"; + case HasHomed: + return "HasHomed"; + case HLFB_On: + return "HLFB_On"; + case HasTorqueMeasurement: + return "HasTorqueMeasurement"; + case ReadyToHome: + return "ReadyToHome"; + case ShutdownsPresent: + return "ShutdownsPresent"; + case AddToPositionAck: + return "AddToPositionAck"; + case LoadPositionMoveAck: + return "LoadPositionMoveAck"; + case LoadVelocityMoveAck: + return "LoadVelocityMoveAck"; + case ClearMotorFaultAck: + return "ClearMotorFaultAck"; + case NUM_STATES: + return "NUM_STATES"; + default: + return "Unknown State"; + } + } + }; +} +} +} +} + +#endif // EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTORINPUTOBJECT_H diff --git a/src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.cpp b/src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.cpp new file mode 100644 index 0000000..c6440df --- /dev/null +++ b/src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.cpp @@ -0,0 +1,69 @@ +// +// Created by Jan Ritzenhoff on 8/29/2024 +// + +#include "EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.h" + +#include "EIPScanner/utils/Buffer.h" + +#include + +namespace eipScanner +{ +namespace vendor +{ +namespace teknic +{ +namespace clearlink +{ + using eipScanner::utils::Buffer; + + SDMotorOutputObject::SDMotorOutputObject(eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr si, const eipScanner::MessageRouter::SPtr messageRouter) + : AttributeBaseObject(CLASS_ID, instanceId, si, messageRouter), _moveDistance(0), _jogVelocity(0), _velocityLimitForPositionalMove(0), _accelerationLimitForPositionalMove(0), _decelerationLimit(0), _outputRegister(0), _addToPosition(0) + { + + _getAllAttributesIndividually(); + } + + void SDMotorOutputObject::setAllAttributesIndividually() + { + _setAllAttributesIndividually(); + } + + std::vector SDMotorOutputObject::_getAttributeReferences() + { + return {std::ref(_moveDistance), std::ref(_jogVelocity), std::ref(_velocityLimitForPositionalMove), std::ref(_accelerationLimitForPositionalMove), + std::ref(_decelerationLimit), std::ref(_outputRegister), std::ref(_addToPosition)}; + } + + eipScanner::cip::CipDint SDMotorOutputObject::getMoveDistance() const { return _moveDistance; } + void SDMotorOutputObject::setMoveDistance(eipScanner::cip::CipDint moveDistance) { _moveDistance = moveDistance; } + + eipScanner::cip::CipDint SDMotorOutputObject::getJogVelocity() const { return _jogVelocity; } + void SDMotorOutputObject::setJogVelocity(eipScanner::cip::CipDint jogVelocity) { _jogVelocity = jogVelocity; } + + eipScanner::cip::CipUdint SDMotorOutputObject::getVelocityLimitForPositionalMove() const { return _velocityLimitForPositionalMove; } + void SDMotorOutputObject::setVelocityLimitForPositionalMove(eipScanner::cip::CipUdint velocityLimitForPositionalMove) + { + _velocityLimitForPositionalMove = velocityLimitForPositionalMove; + } + + eipScanner::cip::CipUdint SDMotorOutputObject::getAccelerationLimitForPositionalMove() const { return _accelerationLimitForPositionalMove; } + void SDMotorOutputObject::setAccelerationLimitForPositionalMove(eipScanner::cip::CipUdint accelerationLimitForPositionalMove) + { + _accelerationLimitForPositionalMove = accelerationLimitForPositionalMove; + } + + eipScanner::cip::CipUdint SDMotorOutputObject::getDecelerationLimit() const { return _decelerationLimit; } + void SDMotorOutputObject::setDecelerationLimit(eipScanner::cip::CipUdint decelerationLimit) { _decelerationLimit = decelerationLimit; } + + eipScanner::cip::CipDword SDMotorOutputObject::getOutputRegister() const { return _outputRegister; } + void SDMotorOutputObject::setOutputRegister(eipScanner::cip::CipDword outputRegister) { _outputRegister = outputRegister; } + + eipScanner::cip::CipDint SDMotorOutputObject::getAddToPosition() const { return _addToPosition; } + void SDMotorOutputObject::setAddToPosition(eipScanner::cip::CipDint addToPosition) { _addToPosition = addToPosition; } + +} +} +} +} diff --git a/src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.h b/src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.h new file mode 100644 index 0000000..4571af0 --- /dev/null +++ b/src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.h @@ -0,0 +1,197 @@ +// +// Created by Jan Ritzenhoff on 8/29/2024 +// + +// Based on: +// Step and Direction Motor Output Object (66hex - 4 instances) +// * https://www.teknic.com/files/downloads/clearlink_ethernet-ip_object_reference.pdf#page=46 + +#ifndef EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTOROUTPUTOBJECT_H +#define EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTOROUTPUTOBJECT_H + +#include "EIPScanner/cip/CipRevision.h" +#include "EIPScanner/cip/CipString.h" + +#include "EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h" + + +namespace eipScanner +{ +namespace vendor +{ +namespace teknic +{ +namespace clearlink +{ + + /** + * @class SDMotorOutputObject + * + * @brief Implements interface to Identity Object (0x66). + * + * It reads all data from the CIP instance in the constructor + */ + class SDMotorOutputObject : public AttributeBaseObject + { + public: + static const eipScanner::cip::CipUint CLASS_ID = 0x66; + + /** + * @brief Creates an instance and reads all its data via EIP + * @note Used for testing + * @param instanceId + * @param si + * @param messageRouter + */ + SDMotorOutputObject(eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr si, const eipScanner::MessageRouter::SPtr messageRouter); + + // ------------------------------------------------------------- + + void setAllAttributesIndividually(); + + // ------------------------------------------------------------- + + /** + * @brief Gets MoveDistance [AttrID=1] + * @return + */ + eipScanner::cip::CipDint getMoveDistance() const; + + /** + * @brief Gets JogVelocity [AttrID=2] + * @return + */ + eipScanner::cip::CipDint getJogVelocity() const; + + /** + * @brief Gets VelocityLimitForPositionalMove [AttrID=3] + * @return + */ + eipScanner::cip::CipUdint getVelocityLimitForPositionalMove() const; + + /** + * @brief Gets AccelerationLimitForPositionalMove [AttrID=4] + * @return + */ + eipScanner::cip::CipUdint getAccelerationLimitForPositionalMove() const; + + /** + * @brief Gets DecelerationLimit [AttrID=5] + * @return + */ + eipScanner::cip::CipUdint getDecelerationLimit() const; + + /** + * @brief Gets OutputRegister [AttrID=6] + * @return + */ + eipScanner::cip::CipDword getOutputRegister() const; + + /** + * @brief Gets AddToPosition [AttrID=7] + * @return + */ + eipScanner::cip::CipDint getAddToPosition() const; + + // ------------------------------------------------------------- + + /** + * @brief Sets MoveDistance [AttrID=1] + * @return + */ + void setMoveDistance(eipScanner::cip::CipDint moveDistance); + + /** + * @brief Sets JogVelocity [AttrID=2] + * @return + */ + void setJogVelocity(eipScanner::cip::CipDint jogVelocity); + + /** + * @brief Sets VelocityLimitForPositionalMove [AttrID=3] + * @return + */ + void setVelocityLimitForPositionalMove(eipScanner::cip::CipUdint velocityLimitForPositionalMove); + + /** + * @brief Sets AccelerationLimitForPositionalMove [AttrID=4] + * @return + */ + void setAccelerationLimitForPositionalMove(eipScanner::cip::CipUdint accelerationLimitForPositionalMove); + + /** + * @brief Sets DecelerationLimit [AttrID=5] + * @return + */ + void setDecelerationLimit(eipScanner::cip::CipUdint decelerationLimit); + + /** + * @brief Sets OutputRegister [AttrID=6] + * @return + */ + void setOutputRegister(eipScanner::cip::CipDword outputRegister); + + /** + * @brief Sets AddToPosition [AttrID=7] + * @return + */ + void setAddToPosition(eipScanner::cip::CipDint addToPosition); + + enum OutputFlag + { + Enable = 0, + AbsoluteMove = 1, + HomingMove = 2, + LoadPositionMove = 3, + LoadVelocityMove = 4, + SoftwareEStop = 5, + ClearAlerts = 6, + ClearMotorFault = 7, + // 8-31 are reserved + }; + + /** + * @brief Sets a motor flag + */ + void setOutputFlag(OutputFlag flag, bool value) + { + if (value) + { + _outputRegister |= (1 << flag); + } + else + { + _outputRegister &= ~(1 << flag); + } + } + + /** + * @brief Checks if the motor is controlled to have a specific state + */ + bool hasFlagSet(OutputFlag flag) + { + return _outputRegister & (1 << flag); + } + + void repopulateFromAdapter() + { + _getAllAttributesIndividually(); + } + + private: + virtual std::vector _getAttributeReferences(); + + eipScanner::cip::CipDint _moveDistance; + eipScanner::cip::CipDint _jogVelocity; + eipScanner::cip::CipUdint _velocityLimitForPositionalMove; + eipScanner::cip::CipUdint _accelerationLimitForPositionalMove; + eipScanner::cip::CipUdint _decelerationLimit; + eipScanner::cip::CipDword _outputRegister; + eipScanner::cip::CipDint _addToPosition; + }; +} +} +} +} + +#endif // EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTOROUTPUTOBJECT_H From a635b309bfc21b6df67d2fcea941d5c2746b994b Mon Sep 17 00:00:00 2001 From: jan-ati Date: Mon, 7 Oct 2024 15:35:41 -0400 Subject: [PATCH 17/18] Update MessageRouter.cpp Changed the log-level of the Send: Request printout to be a DEBUG message. This avoids a large amount of message spam --- src/EIPScanner/MessageRouter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EIPScanner/MessageRouter.cpp b/src/EIPScanner/MessageRouter.cpp index c985dab..7f86395 100644 --- a/src/EIPScanner/MessageRouter.cpp +++ b/src/EIPScanner/MessageRouter.cpp @@ -40,7 +40,7 @@ namespace eipScanner { const std::vector& additionalPacketItems) const { assert(si); - Logger(LogLevel::INFO) << "Send request: service=0x" << std::hex << static_cast(service) + Logger(LogLevel::DEBUG) << "Send request: service=0x" << std::hex << static_cast(service) << " epath=" << path.toString(); MessageRouterRequest request{service, path, data, _use_8_bit_path_segments}; From 4d96bca43310742366cd9e97bd722c2ea2a91dda Mon Sep 17 00:00:00 2001 From: Jan Ritzenhoff Date: Mon, 7 Oct 2024 15:44:00 -0400 Subject: [PATCH 18/18] Removed the teknic vendor source files --- src/EIPScanner/CMakeLists.txt | 1 - src/EIPScanner/vendor/teknic/CMakeLists.txt | 8 - .../teknic/clearlink/AttributeBaseObject.cpp | 83 ------ .../teknic/clearlink/AttributeBaseObject.h | 82 ------ .../teknic/clearlink/SDMotorConfigObject.cpp | 81 ------ .../teknic/clearlink/SDMotorConfigObject.h | 258 ------------------ .../teknic/clearlink/SDMotorInputObject.cpp | 62 ----- .../teknic/clearlink/SDMotorInputObject.h | 215 --------------- .../teknic/clearlink/SDMotorOutputObject.cpp | 69 ----- .../teknic/clearlink/SDMotorOutputObject.h | 197 ------------- 10 files changed, 1056 deletions(-) delete mode 100644 src/EIPScanner/vendor/teknic/CMakeLists.txt delete mode 100644 src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.cpp delete mode 100644 src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h delete mode 100644 src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.cpp delete mode 100644 src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.h delete mode 100644 src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.cpp delete mode 100644 src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.h delete mode 100644 src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.cpp delete mode 100644 src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.h diff --git a/src/EIPScanner/CMakeLists.txt b/src/EIPScanner/CMakeLists.txt index b13e48e..637d35f 100644 --- a/src/EIPScanner/CMakeLists.txt +++ b/src/EIPScanner/CMakeLists.txt @@ -25,7 +25,6 @@ add_subdirectory(utils) if(ENABLE_VENDOR_SRC) add_subdirectory(vendor/ra) add_subdirectory(vendor/yaskawa) - add_subdirectory(vendor/teknic) endif() diff --git a/src/EIPScanner/vendor/teknic/CMakeLists.txt b/src/EIPScanner/vendor/teknic/CMakeLists.txt deleted file mode 100644 index c6d5b1b..0000000 --- a/src/EIPScanner/vendor/teknic/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -set(SOURCE_FILES - ${CMAKE_CURRENT_LIST_DIR}/clearlink/AttributeBaseObject.cpp - ${CMAKE_CURRENT_LIST_DIR}/clearlink/SDMotorConfigObject.cpp - ${CMAKE_CURRENT_LIST_DIR}/clearlink/SDMotorInputObject.cpp - ${CMAKE_CURRENT_LIST_DIR}/clearlink/SDMotorOutputObject.cpp) - -target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) -target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.cpp b/src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.cpp deleted file mode 100644 index c59bd87..0000000 --- a/src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.cpp +++ /dev/null @@ -1,83 +0,0 @@ -// -// Created by Jan Ritzenhoff on 8/29/2024. -// - -#include "EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h" - -#include - -namespace eipScanner -{ -namespace vendor -{ -namespace teknic -{ -namespace clearlink -{ - AttributeBaseObject::AttributeBaseObject(eipScanner::cip::CipUint classId, eipScanner::cip::CipUint instanceId, - const eipScanner::SessionInfoIf::SPtr sessionInfo, const eipScanner::MessageRouter::SPtr messageRouter) - : BaseObject(classId, instanceId), _sessionInfo(sessionInfo), _messageRouter(messageRouter) {} - - void AttributeBaseObject::_getAllAttributesIndividually() - { - std::vector classAttributes = _getAttributeReferences(); - - for (uint8_t fieldIndex = 0; fieldIndex < classAttributes.size(); ++fieldIndex) - { - - // actually send the explicit message - auto getAttributeResponse = _messageRouter->sendRequest(_sessionInfo, eipScanner::cip::ServiceCodes::GET_ATTRIBUTE_SINGLE, - eipScanner::cip::EPath(getClassId(), getInstanceId(), fieldIndex + 1)); - - // check the getAttributeResponse code - if (getAttributeResponse.getGeneralStatusCode() != eipScanner::cip::GeneralStatusCodes::SUCCESS) - { - logGeneralAndAdditionalStatus(getAttributeResponse); - // throw std::runtime_error("Failed to read attribute with status code: " + std::to_string(getAttributeResponse.getGeneralStatusCode())); - continue; - } - - eipScanner::utils::Buffer getBuffer(getAttributeResponse.getData()); - - auto fieldReference = classAttributes[fieldIndex]; - // pass a reference of the getBuffer to the lambda function and the first argument of the lambda function is the actual field reference - std::visit([&getBuffer](auto &fieldRef) - { getBuffer >> fieldRef; }, - fieldReference); - } - } - - void AttributeBaseObject::_setAllAttributesIndividually() - { - std::vector classAttributes = _getAttributeReferences(); - - for (uint8_t fieldIndex = 0; fieldIndex < classAttributes.size(); ++fieldIndex) - { - - auto fieldReference = classAttributes[fieldIndex]; - - eipScanner::utils::Buffer setBuffer; - - // pass a reference of the buffer to the lambda function - std::visit([&setBuffer](auto &fieldRef) - { setBuffer << fieldRef; }, - fieldReference); - - // actually send the explicit message - auto setAttributeResponse = _messageRouter->sendRequest(_sessionInfo, eipScanner::cip::ServiceCodes::SET_ATTRIBUTE_SINGLE, - eipScanner::cip::EPath(getClassId(), getInstanceId(), fieldIndex + 1), - setBuffer.data()); - - // check the setAttributeResponse code - if (setAttributeResponse.getGeneralStatusCode() != eipScanner::cip::GeneralStatusCodes::SUCCESS) - { - logGeneralAndAdditionalStatus(setAttributeResponse); - throw std::runtime_error("Failed to read attribute with status code: " + std::to_string(setAttributeResponse.getGeneralStatusCode())); - } - } - } - -} -} -} -} \ No newline at end of file diff --git a/src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h b/src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h deleted file mode 100644 index 529ff06..0000000 --- a/src/EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h +++ /dev/null @@ -1,82 +0,0 @@ -// -// Created by Jan Ritzenhoff on 8/29/2024. -// - -#ifndef EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_ATTRIBUTEBASEOBJECT_H -#define EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_ATTRIBUTEBASEOBJECT_H - -#include -#include -#include - -#include "EIPScanner/cip/Types.h" -#include "EIPScanner/BaseObject.h" -#include "EIPScanner/SessionInfo.h" -#include "EIPScanner/MessageRouter.h" - -#include "EIPScanner/utils/Buffer.h" - -namespace eipScanner -{ -namespace vendor -{ -namespace teknic -{ -namespace clearlink -{ - - /** - * @class AttributeBaseObject - * - * @brief Base class for all the CIP Objects that access all attributes independently using explicit messaging - */ - class AttributeBaseObject : public eipScanner::BaseObject - { - public: - /** - * @brief Creates an CIP instance - * @param classId the class ID of the the new instance - * @param instanceId the instance ID of the the new instanc - */ - AttributeBaseObject(eipScanner::cip::CipUint classId, eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr sessionInfo, const eipScanner::MessageRouter::SPtr messageRouter); - - protected: - using ReflexiveFieldReference = std::variant, - std::reference_wrapper, - std::reference_wrapper, - std::reference_wrapper, - std::reference_wrapper, - std::reference_wrapper, - std::reference_wrapper, - std::reference_wrapper, - std::reference_wrapper, - std::reference_wrapper, - std::reference_wrapper, - std::reference_wrapper, - std::reference_wrapper, - std::reference_wrapper, - std::reference_wrapper>; - // std::reference_wrapper, (this is typedeffed' to the same thing as the DWord. Including both in the variant confuses the compiler) - - virtual std::vector _getAttributeReferences() = 0; - - /** - * @brief Gets the whole assembly to the device as individual get_attribute_single messages - */ - void _getAllAttributesIndividually(); - - /** - * @brief Sets the whole assembly to the device as individual set_attribute_single messages - */ - void _setAllAttributesIndividually(); - - private: - const eipScanner::SessionInfoIf::SPtr _sessionInfo; - const eipScanner::MessageRouter::SPtr _messageRouter; - }; -} -} -} -} - -#endif // EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_ATTRIBUTEBASEOBJECT_H diff --git a/src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.cpp b/src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.cpp deleted file mode 100644 index 2c28a1d..0000000 --- a/src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.cpp +++ /dev/null @@ -1,81 +0,0 @@ -// -// Created by Jan Ritzenhoff on 8/28/2024 -// -#include "EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.h" - -#include "EIPScanner/utils/Buffer.h" - -#include - -namespace eipScanner -{ -namespace vendor -{ -namespace teknic -{ -namespace clearlink -{ - using eipScanner::utils::Buffer; - - SDMotorConfigObject::SDMotorConfigObject(eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr si, const eipScanner::MessageRouter::SPtr messageRouter) - : AttributeBaseObject(CLASS_ID, instanceId, si, messageRouter), _configRegister(0), _softLimitPosition1(0), _softLimitPosition2(0), _positiveLimitConnector(0), _negativeLimitConnector(0), _homeSensorConnector(0), _brakeOutputConnector(0), _triggerPositionCaptureConnector(0), _maxDecelerationRate(0), _stopSensorConnector(0), _followEncoderMode(0), _followDivisor(0), _followMultiplier(0) - { - - _getAllAttributesIndividually(); - } - - void SDMotorConfigObject::setAllAttributesIndividually() - { - _setAllAttributesIndividually(); - } - - std::vector SDMotorConfigObject::_getAttributeReferences() - { - return {std::ref(_configRegister), std::ref(_softLimitPosition1), std::ref(_softLimitPosition2), - std::ref(_positiveLimitConnector), std::ref(_negativeLimitConnector), std::ref(_homeSensorConnector), - std::ref(_brakeOutputConnector), std::ref(_triggerPositionCaptureConnector), std::ref(_maxDecelerationRate), - std::ref(_stopSensorConnector), std::ref(_followEncoderMode), std::ref(_followDivisor), std::ref(_followMultiplier)}; - } - - eipScanner::cip::CipDword SDMotorConfigObject::getConfigRegister() const { return _configRegister; } - void SDMotorConfigObject::setConfigRegister(eipScanner::cip::CipDword configRegister) { _configRegister = configRegister; } - - eipScanner::cip::CipDint SDMotorConfigObject::getSoftLimitPosition1() const { return _softLimitPosition1; } - void SDMotorConfigObject::setSoftLimitPosition1(eipScanner::cip::CipDint softLimitPosition1) { _softLimitPosition1 = softLimitPosition1; } - - eipScanner::cip::CipDint SDMotorConfigObject::getSoftLimitPosition2() const { return _softLimitPosition2; } - void SDMotorConfigObject::setSoftLimitPosition2(eipScanner::cip::CipDint softLimitPosition2) { _softLimitPosition2 = softLimitPosition2; } - - eipScanner::cip::CipSint SDMotorConfigObject::getPositiveLimitConnector() const { return _positiveLimitConnector; } - void SDMotorConfigObject::setPositiveLimitConnector(eipScanner::cip::CipSint positiveLimitConnector) { _positiveLimitConnector = positiveLimitConnector; } - - eipScanner::cip::CipSint SDMotorConfigObject::getNegativeLimitConnector() const { return _negativeLimitConnector; } - void SDMotorConfigObject::setNegativeLimitConnector(eipScanner::cip::CipSint negativeLimitConnector) { _negativeLimitConnector = negativeLimitConnector; } - - eipScanner::cip::CipSint SDMotorConfigObject::getHomeSensorConnector() const { return _homeSensorConnector; } - void SDMotorConfigObject::setHomeSensorConnector(eipScanner::cip::CipSint homeSensorConnector) { _homeSensorConnector = homeSensorConnector; } - - eipScanner::cip::CipSint SDMotorConfigObject::getBrakeOutputConnector() const { return _brakeOutputConnector; } - void SDMotorConfigObject::setBrakeOutputConnector(eipScanner::cip::CipSint brakeOutputConnector) { _brakeOutputConnector = brakeOutputConnector; } - - eipScanner::cip::CipSint SDMotorConfigObject::getTriggerPositionCaptureConnector() const { return _triggerPositionCaptureConnector; } - void SDMotorConfigObject::setTriggerPositionCaptureConnector(eipScanner::cip::CipSint triggerPositionCaptureConnector) { _triggerPositionCaptureConnector = triggerPositionCaptureConnector; } - - eipScanner::cip::CipDint SDMotorConfigObject::getMaxDecelerationRate() const { return _maxDecelerationRate; } - void SDMotorConfigObject::setMaxDecelerationRate(eipScanner::cip::CipDint maxDecelerationRate) { _maxDecelerationRate = maxDecelerationRate; } - - eipScanner::cip::CipSint SDMotorConfigObject::getStopSensorConnector() const { return _stopSensorConnector; } - void SDMotorConfigObject::setStopSensorConnector(eipScanner::cip::CipSint stopSensorConnector) { _stopSensorConnector = stopSensorConnector; } - - eipScanner::cip::CipSint SDMotorConfigObject::getFollowEncoderMode() const { return _followEncoderMode; } - void SDMotorConfigObject::setFollowEncoderMode(eipScanner::cip::CipSint followEncoderMode) { _followEncoderMode = followEncoderMode; } - - eipScanner::cip::CipDint SDMotorConfigObject::getFollowDivisor() const { return _followDivisor; } - void SDMotorConfigObject::setFollowDivisor(eipScanner::cip::CipDint followDivisor) { _followDivisor = followDivisor; } - - eipScanner::cip::CipDint SDMotorConfigObject::getFollowMultiplier() const { return _followMultiplier; } - void SDMotorConfigObject::setFollowMultiplier(eipScanner::cip::CipDint followMultiplier) { _followMultiplier = followMultiplier; } -} -} -} -} diff --git a/src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.h b/src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.h deleted file mode 100644 index ea0e954..0000000 --- a/src/EIPScanner/vendor/teknic/clearlink/SDMotorConfigObject.h +++ /dev/null @@ -1,258 +0,0 @@ -// -// Created by Jan Ritzenhoff on 8/28/2024 -// - -// Based on: -// Step and Direction Motor Configuration Object (64hex - 4 instances) -// * https://www.teknic.com/files/downloads/clearlink_ethernet-ip_object_reference.pdf#page=37 - -#ifndef EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTORCONFIGOBJECT_H -#define EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTORCONFIGOBJECT_H - -#include "EIPScanner/cip/CipRevision.h" -#include "EIPScanner/cip/CipString.h" - -#include "EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h" - - -namespace eipScanner -{ -namespace vendor -{ -namespace teknic -{ -namespace clearlink -{ - /** - * @class SDMotorConfigObject - * - * @brief Implements interface to Identity Object (0x64). - * - * It reads all data from the CIP instance in the constructor - */ - class SDMotorConfigObject : public AttributeBaseObject - { - public: - static const eipScanner::cip::CipUint CLASS_ID = 0x64; - - /** - * @brief Creates an instance and reads all its data via EIP - * @note Used for testing - * @param instanceId - * @param si - * @param messageRouter - */ - SDMotorConfigObject(eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr si, const eipScanner::MessageRouter::SPtr messageRouter); - - /** - * @brief Gets Config Register [AttrID=1] - * @return - */ - eipScanner::cip::CipDword getConfigRegister() const; - - /** - * @brief Gets SoftLimitPosition1 [AttrID=2] - * @return - */ - eipScanner::cip::CipDint getSoftLimitPosition1() const; - - /** - * @brief Gets SoftLimitPosition2 [AttrID=3] - * @return - */ - eipScanner::cip::CipDint getSoftLimitPosition2() const; - - /** - * @brief Gets PositiveLimitConnector [AttrID=4] - * @return - */ - eipScanner::cip::CipSint getPositiveLimitConnector() const; - - /** - * @brief Gets NegativeLimitConnector [AttrID=5] - * @return - */ - eipScanner::cip::CipSint getNegativeLimitConnector() const; - - /** - * @brief Gets HomeSensorConnector [AttrID=6] - * @return - */ - eipScanner::cip::CipSint getHomeSensorConnector() const; - - /** - * @brief Gets BrakeOutputConnector [AttrID=7] - * @return - */ - eipScanner::cip::CipSint getBrakeOutputConnector() const; - - /** - * @brief Gets TriggerPositionCaptureConnector [AttrID=8] - * @return - */ - eipScanner::cip::CipSint getTriggerPositionCaptureConnector() const; - - /** - * @brief Gets MaxDecelerationRate [AttrID=9] - * @return - */ - eipScanner::cip::CipDint getMaxDecelerationRate() const; - - /** - * @brief Gets StopSensorConnector [AttrID=10] - * @return - */ - eipScanner::cip::CipSint getStopSensorConnector() const; - - /** - * @brief Gets FollowEncoderMode [AttrID=11] - * @return - */ - eipScanner::cip::CipSint getFollowEncoderMode() const; - - /** - * @brief Gets FollowDivisor [AttrID=12] - * @return - */ - eipScanner::cip::CipDint getFollowDivisor() const; - - /** - * @brief Gets FollowMultiplier [AttrID=13] - * @return - */ - eipScanner::cip::CipDint getFollowMultiplier() const; - - // ------------------------------------------------------------- - - void setAllAttributesIndividually(); - - // ------------------------------------------------------------- - - /** - * @brief Sets Config Register [AttrID=1] - * @return - */ - void setConfigRegister(eipScanner::cip::CipDword configRegister); - - /** - * @brief Sets SoftLimitPosition1 [AttrID=2] - * @return - */ - void setSoftLimitPosition1(eipScanner::cip::CipDint softLimitPosition1); - - /** - * @brief Sets SoftLimitPosition2 [AttrID=3] - * @return - */ - void setSoftLimitPosition2(eipScanner::cip::CipDint softLimitPosition2); - - /** - * @brief Sets PositiveLimitConnector [AttrID=4] - * @return - */ - void setPositiveLimitConnector(eipScanner::cip::CipSint positiveLimitConnector); - - /** - * @brief Sets NegativeLimitConnector [AttrID=5] - * @return - */ - void setNegativeLimitConnector(eipScanner::cip::CipSint negativeLimitConnector); - - /** - * @brief Sets HomeSensorConnector [AttrID=6] - * @return - */ - void setHomeSensorConnector(eipScanner::cip::CipSint homeSensorConnector); - - /** - * @brief Sets BrakeOutputConnector [AttrID=7] - * @return - */ - void setBrakeOutputConnector(eipScanner::cip::CipSint brakeOutputConnector); - - /** - * @brief Sets TriggerPositionCaptureConnector [AttrID=8] - * @return - */ - void setTriggerPositionCaptureConnector(eipScanner::cip::CipSint triggerPositionCaptureConnector); - - /** - * @brief Sets MaxDecelerationRate [AttrID=9] - * @return - */ - void setMaxDecelerationRate(eipScanner::cip::CipDint maxDecelerationRate); - - /** - * @brief Sets StopSensorConnector [AttrID=10] - * @return - */ - void setStopSensorConnector(eipScanner::cip::CipSint stopSensorConnector); - - /** - * @brief Sets FollowEncoderMode [AttrID=11] - * @return - */ - void setFollowEncoderMode(eipScanner::cip::CipSint followEncoderMode); - - /** - * @brief Sets FollowDivisor [AttrID=12] - * @return - */ - void setFollowDivisor(eipScanner::cip::CipDint followDivisor); - - /** - * @brief Sets FollowMultiplier [AttrID=13] - * @return - */ - void setFollowMultiplier(eipScanner::cip::CipDint followMultiplier); - - enum ConfigFlag - { - HomingEnable = 0, - HomeSensorActiveLevel = 1, - EnableInversion = 2, - HLFBInversion = 3, // NOTE: The default if HIGH - PositionCaptureActiveLevel = 4, - SoftwareLimitEnable = 5 - // 6 - 31 are reserved - }; - - /** - * @brief Sets a motor config flag - */ - void setConfigFlag(ConfigFlag flag, bool value) - { - if (value) - { - _configRegister |= (1 << flag); - } - else - { - _configRegister &= ~(1 << flag); - } - } - - private: - virtual std::vector _getAttributeReferences(); - - eipScanner::cip::CipDword _configRegister; - eipScanner::cip::CipDint _softLimitPosition1; - eipScanner::cip::CipDint _softLimitPosition2; - eipScanner::cip::CipSint _positiveLimitConnector; - eipScanner::cip::CipSint _negativeLimitConnector; - eipScanner::cip::CipSint _homeSensorConnector; - eipScanner::cip::CipSint _brakeOutputConnector; - eipScanner::cip::CipSint _triggerPositionCaptureConnector; - eipScanner::cip::CipDint _maxDecelerationRate; - eipScanner::cip::CipSint _stopSensorConnector; - eipScanner::cip::CipSint _followEncoderMode; - eipScanner::cip::CipDint _followDivisor; - eipScanner::cip::CipDint _followMultiplier; - }; -} -} -} -} - - -#endif // EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTORCONFIGOBJECT_H diff --git a/src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.cpp b/src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.cpp deleted file mode 100644 index 26d19af..0000000 --- a/src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// -// Created by Jan Ritzenhoff on 8/29/2024 -// -#include "EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.h" - - - -#include "EIPScanner/utils/Buffer.h" - -#include - -namespace eipScanner -{ -namespace vendor -{ -namespace teknic -{ -namespace clearlink -{ - using eipScanner::utils::Buffer; - - SDMotorInputObject::SDMotorInputObject(eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr si, const eipScanner::MessageRouter::SPtr messageRouter) - : AttributeBaseObject(CLASS_ID, instanceId, si, messageRouter), _commandedPosition(0), _commandedVelocity(0), _targetPosition(0), _targetVelocity(0), _capturedPosition(0), _measuredTorque(0), _motorStatus(0), _motorShutdowns(0) - { - - _getAllAttributesIndividually(); - } - - std::vector SDMotorInputObject::_getAttributeReferences() - { - return {std::ref(_commandedPosition), std::ref(_commandedVelocity), std::ref(_targetPosition), - std::ref(_targetVelocity), std::ref(_capturedPosition), std::ref(_measuredTorque), - std::ref(_motorStatus), std::ref(_motorShutdowns)}; - } - - eipScanner::cip::CipDint SDMotorInputObject::getCommandedPosition() const { return _commandedPosition; } - eipScanner::cip::CipDint SDMotorInputObject::getCommandedVelocity() const { return _commandedVelocity; } - eipScanner::cip::CipDint SDMotorInputObject::getTargetPosition() const { return _targetPosition; } - eipScanner::cip::CipDint SDMotorInputObject::getTargetVelocity() const { return _targetVelocity; } - eipScanner::cip::CipDint SDMotorInputObject::getCapturedPosition() const { return _capturedPosition; } - eipScanner::cip::CipReal SDMotorInputObject::getMeasuredTorque() const { return _measuredTorque; } - eipScanner::cip::CipDword SDMotorInputObject::getMotorStatus() const { return _motorStatus; } - eipScanner::cip::CipDword SDMotorInputObject::getMotorShutdowns() const { return _motorShutdowns; } - - void SDMotorInputObject::printMotorInputState(eipScanner::utils::Logger logger) - { - eipScanner::cip::CipDword lastMotorStatus = getMotorStatus(); - - for (int stateBit = InputState::AtTargetPosition; stateBit < InputState::NUM_STATES; ++stateBit) - { - // Check if the ith bit is set - if (lastMotorStatus & (1 << stateBit)) - { - // Print the corresponding state - logger << "State " << stateToString(InputState(stateBit)) << " is set." << std::endl; - } - } - } -} -} -} -} diff --git a/src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.h b/src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.h deleted file mode 100644 index ec5c011..0000000 --- a/src/EIPScanner/vendor/teknic/clearlink/SDMotorInputObject.h +++ /dev/null @@ -1,215 +0,0 @@ -// -// Created by Jan Ritzenhoff on 8/29/2024 -// - -// Based on: -// Step and Direction Motor Input Object (65hex - 4 instances) -// * https://www.teknic.com/files/downloads/clearlink_ethernet-ip_object_reference.pdf#page=41 - -#ifndef EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTORINPUTOBJECT_H -#define EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTORINPUTOBJECT_H - -#include "EIPScanner/cip/CipRevision.h" -#include "EIPScanner/cip/CipString.h" - -#include "EIPScanner/utils/Logger.h" - -#include "EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h" - -namespace eipScanner -{ -namespace vendor -{ -namespace teknic -{ -namespace clearlink -{ - - /** - * @class SDMotorInputObject - * - * @brief Implements interface to Identity Object (0x65). - * - * It reads all data from the CIP instance in the constructor - */ - class SDMotorInputObject : public AttributeBaseObject - { - public: - static const eipScanner::cip::CipUint CLASS_ID = 0x65; - - /** - * @brief Creates an instance and reads all its data via EIP - * @note Used for testing - * @param instanceId - * @param si - * @param messageRouter - */ - SDMotorInputObject(eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr si, const eipScanner::MessageRouter::SPtr messageRouter); - - /** - * @brief Gets CommandedPosition [AttrID=1] - * @return - */ - eipScanner::cip::CipDint getCommandedPosition() const; - - /** - * @brief Gets CommandedVelocity [AttrID=2] - * @return - */ - eipScanner::cip::CipDint getCommandedVelocity() const; - - /** - * @brief Gets TargetPosition [AttrID=3] - * @return - */ - eipScanner::cip::CipDint getTargetPosition() const; - - /** - * @brief Gets TargetVelocity [AttrID=4] - * @return - */ - eipScanner::cip::CipDint getTargetVelocity() const; - - /** - * @brief Gets CapturedPosition [AttrID=5] - * @return - */ - eipScanner::cip::CipDint getCapturedPosition() const; - - /** - * @brief Gets MeasuredTorque [AttrID=6] - * @return - */ - eipScanner::cip::CipReal getMeasuredTorque() const; - - /** - * @brief Gets MotorStatus [AttrID=7] - * @return - */ - eipScanner::cip::CipDword getMotorStatus() const; - - /** - * @brief Gets MotorShutdowns [AttrID=8] - * @return - */ - eipScanner::cip::CipDword getMotorShutdowns() const; - - enum InputState - { - AtTargetPosition = 0, - StepsActive = 1, - AtVelocity = 2, - MoveDirection = 3, - InPositiveLimit = 4, - InNegativeLimit = 5, - InEStopSensor = 6, - InHomeSensor = 7, - Homing = 8, - MotorInFault = 9, - Enabled = 10, - OutsideSoftLimits = 11, - PositionalMove = 12, - HasHomed = 13, - HLFB_On = 14, - HasTorqueMeasurement = 15, - ReadyToHome = 16, - ShutdownsPresent = 17, - AddToPositionAck = 18, - LoadPositionMoveAck = 19, - LoadVelocityMoveAck = 20, - ClearMotorFaultAck = 21, - NUM_STATES = 22 - // 22 - 31 are reserved - }; - - /** - * @brief Prints out all of the states that are true - */ - void printMotorInputState(eipScanner::utils::Logger logger); - - /** - * @brief Checks if the motor is in a specific state - */ - bool isInState(InputState state) - { - return _motorStatus & (1 << state); - } - - void repopulateFromAdapter() - { - _getAllAttributesIndividually(); - } - - private: - virtual std::vector _getAttributeReferences(); - - eipScanner::cip::CipDint _commandedPosition; - eipScanner::cip::CipDint _commandedVelocity; - eipScanner::cip::CipDint _targetPosition; - eipScanner::cip::CipDint _targetVelocity; - eipScanner::cip::CipDint _capturedPosition; - eipScanner::cip::CipReal _measuredTorque; - eipScanner::cip::CipDword _motorStatus; - eipScanner::cip::CipDword _motorShutdowns; - - std::string stateToString(InputState state) - { - switch (state) - { - case AtTargetPosition: - return "AtTargetPosition"; - case StepsActive: - return "StepsActive"; - case AtVelocity: - return "AtVelocity"; - case MoveDirection: - return "MoveDirection"; - case InPositiveLimit: - return "InPositiveLimit"; - case InNegativeLimit: - return "InNegativeLimit"; - case InEStopSensor: - return "InEStopSensor"; - case InHomeSensor: - return "InHomeSensor"; - case Homing: - return "Homing"; - case MotorInFault: - return "MotorInFault"; - case Enabled: - return "Enabled"; - case OutsideSoftLimits: - return "OutsideSoftLimits"; - case PositionalMove: - return "PositionalMove"; - case HasHomed: - return "HasHomed"; - case HLFB_On: - return "HLFB_On"; - case HasTorqueMeasurement: - return "HasTorqueMeasurement"; - case ReadyToHome: - return "ReadyToHome"; - case ShutdownsPresent: - return "ShutdownsPresent"; - case AddToPositionAck: - return "AddToPositionAck"; - case LoadPositionMoveAck: - return "LoadPositionMoveAck"; - case LoadVelocityMoveAck: - return "LoadVelocityMoveAck"; - case ClearMotorFaultAck: - return "ClearMotorFaultAck"; - case NUM_STATES: - return "NUM_STATES"; - default: - return "Unknown State"; - } - } - }; -} -} -} -} - -#endif // EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTORINPUTOBJECT_H diff --git a/src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.cpp b/src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.cpp deleted file mode 100644 index c6440df..0000000 --- a/src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.cpp +++ /dev/null @@ -1,69 +0,0 @@ -// -// Created by Jan Ritzenhoff on 8/29/2024 -// - -#include "EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.h" - -#include "EIPScanner/utils/Buffer.h" - -#include - -namespace eipScanner -{ -namespace vendor -{ -namespace teknic -{ -namespace clearlink -{ - using eipScanner::utils::Buffer; - - SDMotorOutputObject::SDMotorOutputObject(eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr si, const eipScanner::MessageRouter::SPtr messageRouter) - : AttributeBaseObject(CLASS_ID, instanceId, si, messageRouter), _moveDistance(0), _jogVelocity(0), _velocityLimitForPositionalMove(0), _accelerationLimitForPositionalMove(0), _decelerationLimit(0), _outputRegister(0), _addToPosition(0) - { - - _getAllAttributesIndividually(); - } - - void SDMotorOutputObject::setAllAttributesIndividually() - { - _setAllAttributesIndividually(); - } - - std::vector SDMotorOutputObject::_getAttributeReferences() - { - return {std::ref(_moveDistance), std::ref(_jogVelocity), std::ref(_velocityLimitForPositionalMove), std::ref(_accelerationLimitForPositionalMove), - std::ref(_decelerationLimit), std::ref(_outputRegister), std::ref(_addToPosition)}; - } - - eipScanner::cip::CipDint SDMotorOutputObject::getMoveDistance() const { return _moveDistance; } - void SDMotorOutputObject::setMoveDistance(eipScanner::cip::CipDint moveDistance) { _moveDistance = moveDistance; } - - eipScanner::cip::CipDint SDMotorOutputObject::getJogVelocity() const { return _jogVelocity; } - void SDMotorOutputObject::setJogVelocity(eipScanner::cip::CipDint jogVelocity) { _jogVelocity = jogVelocity; } - - eipScanner::cip::CipUdint SDMotorOutputObject::getVelocityLimitForPositionalMove() const { return _velocityLimitForPositionalMove; } - void SDMotorOutputObject::setVelocityLimitForPositionalMove(eipScanner::cip::CipUdint velocityLimitForPositionalMove) - { - _velocityLimitForPositionalMove = velocityLimitForPositionalMove; - } - - eipScanner::cip::CipUdint SDMotorOutputObject::getAccelerationLimitForPositionalMove() const { return _accelerationLimitForPositionalMove; } - void SDMotorOutputObject::setAccelerationLimitForPositionalMove(eipScanner::cip::CipUdint accelerationLimitForPositionalMove) - { - _accelerationLimitForPositionalMove = accelerationLimitForPositionalMove; - } - - eipScanner::cip::CipUdint SDMotorOutputObject::getDecelerationLimit() const { return _decelerationLimit; } - void SDMotorOutputObject::setDecelerationLimit(eipScanner::cip::CipUdint decelerationLimit) { _decelerationLimit = decelerationLimit; } - - eipScanner::cip::CipDword SDMotorOutputObject::getOutputRegister() const { return _outputRegister; } - void SDMotorOutputObject::setOutputRegister(eipScanner::cip::CipDword outputRegister) { _outputRegister = outputRegister; } - - eipScanner::cip::CipDint SDMotorOutputObject::getAddToPosition() const { return _addToPosition; } - void SDMotorOutputObject::setAddToPosition(eipScanner::cip::CipDint addToPosition) { _addToPosition = addToPosition; } - -} -} -} -} diff --git a/src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.h b/src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.h deleted file mode 100644 index 4571af0..0000000 --- a/src/EIPScanner/vendor/teknic/clearlink/SDMotorOutputObject.h +++ /dev/null @@ -1,197 +0,0 @@ -// -// Created by Jan Ritzenhoff on 8/29/2024 -// - -// Based on: -// Step and Direction Motor Output Object (66hex - 4 instances) -// * https://www.teknic.com/files/downloads/clearlink_ethernet-ip_object_reference.pdf#page=46 - -#ifndef EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTOROUTPUTOBJECT_H -#define EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTOROUTPUTOBJECT_H - -#include "EIPScanner/cip/CipRevision.h" -#include "EIPScanner/cip/CipString.h" - -#include "EIPScanner/vendor/teknic/clearlink/AttributeBaseObject.h" - - -namespace eipScanner -{ -namespace vendor -{ -namespace teknic -{ -namespace clearlink -{ - - /** - * @class SDMotorOutputObject - * - * @brief Implements interface to Identity Object (0x66). - * - * It reads all data from the CIP instance in the constructor - */ - class SDMotorOutputObject : public AttributeBaseObject - { - public: - static const eipScanner::cip::CipUint CLASS_ID = 0x66; - - /** - * @brief Creates an instance and reads all its data via EIP - * @note Used for testing - * @param instanceId - * @param si - * @param messageRouter - */ - SDMotorOutputObject(eipScanner::cip::CipUint instanceId, const eipScanner::SessionInfoIf::SPtr si, const eipScanner::MessageRouter::SPtr messageRouter); - - // ------------------------------------------------------------- - - void setAllAttributesIndividually(); - - // ------------------------------------------------------------- - - /** - * @brief Gets MoveDistance [AttrID=1] - * @return - */ - eipScanner::cip::CipDint getMoveDistance() const; - - /** - * @brief Gets JogVelocity [AttrID=2] - * @return - */ - eipScanner::cip::CipDint getJogVelocity() const; - - /** - * @brief Gets VelocityLimitForPositionalMove [AttrID=3] - * @return - */ - eipScanner::cip::CipUdint getVelocityLimitForPositionalMove() const; - - /** - * @brief Gets AccelerationLimitForPositionalMove [AttrID=4] - * @return - */ - eipScanner::cip::CipUdint getAccelerationLimitForPositionalMove() const; - - /** - * @brief Gets DecelerationLimit [AttrID=5] - * @return - */ - eipScanner::cip::CipUdint getDecelerationLimit() const; - - /** - * @brief Gets OutputRegister [AttrID=6] - * @return - */ - eipScanner::cip::CipDword getOutputRegister() const; - - /** - * @brief Gets AddToPosition [AttrID=7] - * @return - */ - eipScanner::cip::CipDint getAddToPosition() const; - - // ------------------------------------------------------------- - - /** - * @brief Sets MoveDistance [AttrID=1] - * @return - */ - void setMoveDistance(eipScanner::cip::CipDint moveDistance); - - /** - * @brief Sets JogVelocity [AttrID=2] - * @return - */ - void setJogVelocity(eipScanner::cip::CipDint jogVelocity); - - /** - * @brief Sets VelocityLimitForPositionalMove [AttrID=3] - * @return - */ - void setVelocityLimitForPositionalMove(eipScanner::cip::CipUdint velocityLimitForPositionalMove); - - /** - * @brief Sets AccelerationLimitForPositionalMove [AttrID=4] - * @return - */ - void setAccelerationLimitForPositionalMove(eipScanner::cip::CipUdint accelerationLimitForPositionalMove); - - /** - * @brief Sets DecelerationLimit [AttrID=5] - * @return - */ - void setDecelerationLimit(eipScanner::cip::CipUdint decelerationLimit); - - /** - * @brief Sets OutputRegister [AttrID=6] - * @return - */ - void setOutputRegister(eipScanner::cip::CipDword outputRegister); - - /** - * @brief Sets AddToPosition [AttrID=7] - * @return - */ - void setAddToPosition(eipScanner::cip::CipDint addToPosition); - - enum OutputFlag - { - Enable = 0, - AbsoluteMove = 1, - HomingMove = 2, - LoadPositionMove = 3, - LoadVelocityMove = 4, - SoftwareEStop = 5, - ClearAlerts = 6, - ClearMotorFault = 7, - // 8-31 are reserved - }; - - /** - * @brief Sets a motor flag - */ - void setOutputFlag(OutputFlag flag, bool value) - { - if (value) - { - _outputRegister |= (1 << flag); - } - else - { - _outputRegister &= ~(1 << flag); - } - } - - /** - * @brief Checks if the motor is controlled to have a specific state - */ - bool hasFlagSet(OutputFlag flag) - { - return _outputRegister & (1 << flag); - } - - void repopulateFromAdapter() - { - _getAllAttributesIndividually(); - } - - private: - virtual std::vector _getAttributeReferences(); - - eipScanner::cip::CipDint _moveDistance; - eipScanner::cip::CipDint _jogVelocity; - eipScanner::cip::CipUdint _velocityLimitForPositionalMove; - eipScanner::cip::CipUdint _accelerationLimitForPositionalMove; - eipScanner::cip::CipUdint _decelerationLimit; - eipScanner::cip::CipDword _outputRegister; - eipScanner::cip::CipDint _addToPosition; - }; -} -} -} -} - -#endif // EIPSCANNER_VENDOR_TEKNIC_CLEARLINK_SDMOTOROUTPUTOBJECT_H