Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): update deps/open62541 digest to 258d6ad #1080

Merged
merged 7 commits into from
Aug 4, 2023
Merged

chore(deps): update deps/open62541 digest to 258d6ad #1080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7fa7efa
chore(deps): update deps/open62541 digest to 7ca9cfb
renovate[bot] Jul 6, 2023
d8c2978
fix(deps): Update MachineryNodeIds to new name
GoetzGoerisch Jul 6, 2023
7e9c27d
fix(deps): Change to GMS release version
GoetzGoerisch Jul 7, 2023
cf984b5
fix(deps): Bump Machinery/Result to release
GoetzGoerisch Jul 7, 2023
0095b13
fix(GMS): Update include sort
GoetzGoerisch Jul 10, 2023
ecc2058
fix: Adjustments to GMS Result
ccvca Aug 4, 2023
2ab5704
refactor: Linting
GoetzGoerisch Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@ jobs:
echo "CMAKE_GENERATOR=Visual Studio 17 2022">> "$env:GITHUB_ENV"
echo "ARG_CTEST=-C Debug">> "$env:GITHUB_ENV"
- name: Build server with dependencies
# yamllint disable rule:line-length
run: |
mkdir -p build
cd build
cmake ../Sample-Server/.github/ -DCMAKE_INSTALL_PREFIX:PATH=${{ env.CMAKE_INSTALL_PREFIX }}
cmake --build .
# yamllint enable rule:line-length
- name: Upload Artefacts
uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -70,10 +72,12 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2.9.1
- name: PrepareReg Names
# yamllint disable rule:line-length
run: |
echo IMAGE_REPOSITORY="$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_ENV"
echo IMAGE_TAG="$(echo "${{ github.ref }}" | tr '[:upper:]' '[:lower:]' | awk '{sub(/([^\/]*\/){2}/,""); gsub(/\/|_/, "-")}1')" >> "$GITHUB_ENV"
echo IS_NOT_PR="${{ env.IS_NOT_PR }})"
# yamllint enable rule:line-length
- name: Login to GitHub Container Registry
uses: docker/login-action@v2.2.0
if: env.IS_NOT_PR == 'true' && ${{ github.actor }} != 'dependabot'
Expand Down
22 changes: 11 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ configure_file(cmake/empty.bsd.template "${CMAKE_BINARY_DIR}/model/Opc.Ua.Machin
ua_generate_nodeset_and_datatypes(
NAME "machinery"
FILE_NS "${UA_NODESET_DIR}/Machinery/Opc.Ua.Machinery.NodeSet2.xml"
FILE_CSV "${UA_NODESET_DIR}/Machinery/NodeIds.csv"
FILE_CSV "${UA_NODESET_DIR}/Machinery/Opc.Ua.Machinery.NodeIds.csv"
FILE_BSD "${CMAKE_BINARY_DIR}/model/Opc.Ua.Machinery.Types.bsd"
NAMESPACE_MAP "3:http://opcfoundation.org/UA/Machinery/"
TARGET_PREFIX "${PROJECT_NAME}"
Expand Down Expand Up @@ -185,9 +185,9 @@ target_link_libraries(ua_gen_woodworking PUBLIC ua_gen_machinery)

ua_generate_nodeset_and_datatypes(
NAME "machinery_result"
FILE_NS "${PROJECT_SOURCE_DIR}/model/GMS/Opc.Ua.MachineryResult.NodeSet2.xml"
FILE_CSV "${PROJECT_SOURCE_DIR}/model/GMS/Opc.Ua.MachineryResult.NodeSet2.csv"
FILE_BSD "${PROJECT_SOURCE_DIR}/model/GMS/Opc.Ua.MachineryResult.NodeSet2.bsd"
FILE_NS "${UA_NODESET_DIR}/Machinery/Result/Opc.Ua.Machinery.Result.NodeSet2.xml"
FILE_CSV "${UA_NODESET_DIR}/Machinery/Result/NodeIds.csv"
FILE_BSD "${PROJECT_SOURCE_DIR}/model/MachineryResult/Opc.Ua.Machinery.Result.NodeSet2.bsd"
NAMESPACE_MAP "7:http://opcfoundation.org/UA/Machinery/Result/"
TARGET_PREFIX "${PROJECT_NAME}"
OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
Expand All @@ -207,13 +207,13 @@ target_link_libraries(ua_gen_machinery_result PUBLIC open62541::open62541)

ua_generate_nodeset_and_datatypes(
NAME "gms"
FILE_NS "${PROJECT_SOURCE_DIR}/model/GMS/opc.ua.gms.nodeset2.xml"
FILE_CSV "${PROJECT_SOURCE_DIR}/model/GMS/opc.ua.gms.nodeset2.csv"
FILE_BSD "${PROJECT_SOURCE_DIR}/model/GMS/opc.ua.gms.nodeset2.bsd"
NAMESPACE_MAP "8:http://opcfoundation.org/GMS/"
FILE_NS "${UA_NODESET_DIR}/GMS/opc.ua.gms.nodeset2.xml"
FILE_CSV "${UA_NODESET_DIR}/GMS/opc.ua.gms.nodesids.csv"
FILE_BSD "${UA_NODESET_DIR}/GMS/opc.ua.gms.types.bsd"
NAMESPACE_MAP "8:http://opcfoundation.org/UA/GMS/"
TARGET_PREFIX "${PROJECT_NAME}"
OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
DEPENDS di ia machinery machinery_result machinetool
DEPENDS di ia machinery_result machinetool machinery
)

add_library(ua_gen_gms)
Expand Down Expand Up @@ -248,7 +248,7 @@ ua_generate_nodeset_and_datatypes(
FILE_NS "${UA_NODESET_DIR}/PADIM/Opc.Ua.PADIM.NodeSet2.xml"
FILE_CSV "${UA_NODESET_DIR}/PADIM/Opc.Ua.PADIM.NodeIds.csv"
FILE_BSD "${CMAKE_BINARY_DIR}/model/Opc.Ua.PADIM.Types.bsd"
NAMESPACE_MAP "6:http://opcfoundation.org/UA/PADIM/"
NAMESPACE_MAP "10:http://opcfoundation.org/UA/PADIM/"
TARGET_PREFIX "${PROJECT_NAME}"
OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
DEPENDS di irdi
Expand Down Expand Up @@ -284,7 +284,7 @@ ua_generate_nodeset_and_datatypes(
FILE_NS "${PROJECT_SOURCE_DIR}/model/AdditiveManufacturing/Opc.Ua.AdditiveManufacturing.NodeSet2.xml"
FILE_CSV "${PROJECT_SOURCE_DIR}/model/AdditiveManufacturing/Opc.Ua.AdditiveManufacturing.NodeSet2.csv"
FILE_BSD "${PROJECT_SOURCE_DIR}/model/AdditiveManufacturing/Opc.Ua.AdditiveManufacturing.NodeSet2.bsd"
NAMESPACE_MAP "8:http://opcfoundation.org/UA/AdditiveManufacturing/NodeSet2/"
NAMESPACE_MAP "12:http://opcfoundation.org/UA/AdditiveManufacturing/NodeSet2/"
TARGET_PREFIX "${PROJECT_NAME}"
OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
DEPENDS di
Expand Down
4 changes: 2 additions & 2 deletions GMS/BasicGMS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ void BasicGMS::InstantiateResultManagement() {
initCorrection(corr3, "corr3", "c_456", 0.75);
}

void BasicGMS::initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value) {
void BasicGMS::initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value) {
corr.Identifier = Identifier;
corr.CharacteristicIdentfier = CharacteristicIdentfier;
corr.CharacteristicIdentifier = CharacteristicIdentifier;
InstantiateOptional(corr.CorrectionValueAbsolute, m_pServer, n);
corr.CorrectionValueAbsolute->Value = value;
corr.CorrectionValueAbsolute->EngineeringUnits.value.DisplayName.text = "µm";
Expand Down
2 changes: 1 addition & 1 deletion GMS/BasicGMS.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class BasicGMS : public InstantiatedMachineTool {
void InstantiateTools();
int m_simStep = 0;

void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value);
void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value);

void InstantiateResultManagement();
};
3 changes: 2 additions & 1 deletion GMS/FullGMS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ void FullGMS::InstantiateEquipment() {
sensor1.Axes->push_back("Y");

InstantiateOptional(sensor1.Capabilities, m_pServer, n);
sensor1.Capabilities->push_back(UA_ToolCapabilities::UA_TOOLCAPABILITIES_PTMEAS);
/// \todo Must be updated to release specification
// sensor1.Capabilities->push_back(UA_ToolCapabilities::UA_TOOLCAPABILITIES_PTMEAS);

InstantiateOptional(sensor1.IsQualifiedStatus, m_pServer, n);
sensor1.IsQualifiedStatus = UA_ToolIsQualifiedStatus::UA_TOOLISQUALIFIEDSTATUS_QUALIFIED;
Expand Down
2 changes: 1 addition & 1 deletion GMS/HexagonGlobal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class HexagonGlobal : public InstantiatedMachineTool {
void InstantiateTools();
int m_simStep = 0;

void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value);
void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value);

void InstantiateResultManagement();
};
2 changes: 1 addition & 1 deletion GMS/HexagonSim.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class HexagonSim : public InstantiatedMachineTool {
void InstantiateTools();
int m_simStep = 0;

void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value);
void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value);

void InstantiateResultManagement();
};
4 changes: 2 additions & 2 deletions GMS/OGPSmartScopeCNC500.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ void OGPSmartScopeCNC500::InstantiateResultManagement() {
initCorrection(corr3, "corr3", "c_456", 0.75);
}

void OGPSmartScopeCNC500::initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value) {
void OGPSmartScopeCNC500::initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value) {
corr.Identifier = Identifier;
corr.CharacteristicIdentfier = CharacteristicIdentfier;
corr.CharacteristicIdentifier = CharacteristicIdentifier;
InstantiateOptional(corr.CorrectionValueAbsolute, m_pServer, n);
corr.CorrectionValueAbsolute->Value = value;
corr.CorrectionValueAbsolute->EngineeringUnits.value.DisplayName.text = "µm";
Expand Down
2 changes: 1 addition & 1 deletion GMS/OGPSmartScopeCNC500.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class OGPSmartScopeCNC500 : public InstantiatedMachineTool {
void InstantiateTools();
int m_simStep = 0;

void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value);
void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value);

void InstantiateResultManagement();
};
4 changes: 2 additions & 2 deletions GMS/WenzelLH.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ void WenzelLH::InstantiateResultManagement() {
initCorrection(corr3, "corr3", "c_456", 0.75);
}

void WenzelLH::initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value) {
void WenzelLH::initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value) {
corr.Identifier = Identifier;
corr.CharacteristicIdentfier = CharacteristicIdentfier;
corr.CharacteristicIdentifier = CharacteristicIdentifier;
InstantiateOptional(corr.CorrectionValueAbsolute, m_pServer, n);
corr.CorrectionValueAbsolute->Value = value;
corr.CorrectionValueAbsolute->EngineeringUnits.value.DisplayName.text = "µm";
Expand Down
2 changes: 1 addition & 1 deletion GMS/WenzelLH.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class WenzelLH : public InstantiatedMachineTool {
void InstantiateTools();
int m_simStep = 0;

void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value);
void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value);

void InstantiateResultManagement();
};
4 changes: 2 additions & 2 deletions SampleServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ UA_StatusCode setServerConfig(UA_ServerConfig *pConfig, const Configuration::Con
pConfig->applicationDescription.productUri = UA_STRING_ALLOC("https://github.com/umati/Sample-Server/");

// Do not limit clients
UA_CertificateVerification_AcceptAll(&pConfig->certificateVerification);
UA_CertificateVerification_AcceptAll(&pConfig->secureChannelPKI);
// Use Default sizes
std::vector<std::string> serverUrls;
{
Expand Down Expand Up @@ -160,7 +160,7 @@ UA_StatusCode setServerConfig(UA_ServerConfig *pConfig, const Configuration::Con
}
}
status = UA_AccessControl_default(
pConfig, true, NULL, &pConfig->securityPolicies[pConfig->securityPoliciesSize - 1].policyUri, users.size(), users.size() == 0 ? nullptr : &users[0]);
pConfig, true, &pConfig->securityPolicies[pConfig->securityPoliciesSize - 1].policyUri, users.size(), users.size() == 0 ? nullptr : &users[0]);
if (status != UA_STATUSCODE_GOOD) {
return status;
}
Expand Down
2 changes: 1 addition & 1 deletion TypeDefinition/GMS/Constants.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
#include "../../src_generated/types_gms_generated.h"

namespace constants {
constexpr const char *NsGMSUri = "http://opcfoundation.org/GMS/";
constexpr const char *NsGMSUri = "http://opcfoundation.org/UA/GMS/";
}
6 changes: 3 additions & 3 deletions TypeDefinition/GMS/CorrectionType.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace GMS {
struct CorrectionType_t {
BindableMemberValue<std::string> CharacteristicIdentfier;
BindableMemberValue<std::string> CharacteristicIdentifier;
BindableMember<ns0::AnalogUnitType_t<double>> CorrectionValueAbsolute;
BindableMember<ns0::AnalogUnitType_t<double>> CorrectionValueRelative;
BindableMemberValue<std::string> Description;
Expand All @@ -24,8 +24,8 @@ struct CorrectionType_t {

REFL_TYPE(GMS::CorrectionType_t, UmatiServerLib::attribute::UaObjectType(UmatiServerLib::constexp::NodeId(constants::NsGMSUri, UA_GMSID_CORRECTIONTYPE)))
REFL_FIELD(
CharacteristicIdentfier,
UmatiServerLib::attribute::MemberInTypeNodeId(UmatiServerLib::constexp::NodeId(constants::NsGMSUri, UA_GMSID_CORRECTIONTYPE_CHARACTERISTICIDENTFIER)))
CharacteristicIdentifier,
UmatiServerLib::attribute::MemberInTypeNodeId(UmatiServerLib::constexp::NodeId(constants::NsGMSUri, UA_GMSID_CORRECTIONTYPE_CHARACTERISTICIDENTIFIER)))
REFL_FIELD(
CorrectionValueAbsolute,
UmatiServerLib::attribute::MemberInTypeNodeId(UmatiServerLib::constexp::NodeId(constants::NsGMSUri, UA_GMSID_CORRECTIONTYPE_CORRECTIONVALUEABSOLUTE)),
Expand Down
16 changes: 15 additions & 1 deletion TypeDefinition/GMS/WorkspaceType.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,23 @@ struct CylindricalWorkspaceType_t : public WorkspaceType_t {
BindableMemberValue<UA_Double> Radius;
};

namespace internalTypes {

static const UA_DataType UA_WorkspaceType = {
UA_TYPENAME("WorkspaceType") /* .typeName */
{0, UA_NODEIDTYPE_NUMERIC, {3006}}, /* .typeId */
{0, UA_NODEIDTYPE_NUMERIC, {0}}, /* .binaryEncodingId, the numericidentifier used on the wire (thenamespaceindex is from .typeId) */
0, /* .memSize */
UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
true, /* .pointerFree */
false, /* .overlayable (depends on endianness and the absence of padding) */
0, /* .membersSize */
NULL};
} // namespace internalTypes

} // namespace GMS

REFL_TYPE(GMS::WorkspaceType_t, UmatiServerLib::attribute::UaDataType(&UA_TYPES_GMS[UA_TYPES_GMS_WORKSPACETYPE]))
REFL_TYPE(GMS::WorkspaceType_t, UmatiServerLib::attribute::UaDataType(&GMS::internalTypes::UA_WorkspaceType))
REFL_END

REFL_TYPE(
Expand Down
2 changes: 1 addition & 1 deletion deps/open62541
Open in desktop
Submodule open62541 updated 230 files
Loading