From 1f791d02577c0cd3a878f50795b7850f3628b155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6tz=20G=C3=B6risch?= <47734341+GoetzGoerisch@users.noreply.github.com> Date: Mon, 22 Apr 2024 08:48:17 +0200 Subject: [PATCH] feat: HMI 2024 (#1268) --- AdditiveManufacturing/ShowcaseAMMachine.cpp | 2 +- GMS/BasicGMS.cpp | 2 +- GMS/HexagonGlobal.cpp | 2 +- GMS/HexagonSim.cpp | 2 +- GMS/OGPSmartScopeCNC500.cpp | 2 +- GMS/WenzelLH.cpp | 2 +- MachineTools/FullMachineTool.cpp | 2 +- MachineTools/MRMachineTool.cpp | 2 +- MachineTools/ShowcaseMachineTool.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/AdditiveManufacturing/ShowcaseAMMachine.cpp b/AdditiveManufacturing/ShowcaseAMMachine.cpp index 1276112c..9591a0a3 100644 --- a/AdditiveManufacturing/ShowcaseAMMachine.cpp +++ b/AdditiveManufacturing/ShowcaseAMMachine.cpp @@ -16,7 +16,7 @@ ShowcaseAMMachine::ShowcaseAMMachine(UA_Server *pServer) : InstantiatedAMMachine void ShowcaseAMMachine::CreateObject() { InstantiatedAMMachine::CreateObject(); mt.Identification->ProductInstanceUri = "http://www.3yourmind.com/#ShowcaseAMMachine"; - mt.Identification->Location = "BXP 9 9502/N 52.491225 E 13.388392"; + mt.Identification->Location = "HMI 8 D16/BXP 9 9502/N 52.491225 E 13.388392"; InstantiateEquipment(); } diff --git a/GMS/BasicGMS.cpp b/GMS/BasicGMS.cpp index f854e3ee..896c9098 100644 --- a/GMS/BasicGMS.cpp +++ b/GMS/BasicGMS.cpp @@ -134,7 +134,7 @@ void BasicGMS::InstantiateIdentification() { mt.Identification->YearOfConstruction = 2022; mt.Identification->SoftwareRevision = "v1.05"; mt.Identification->DeviceClass = "CoordinateMeasuringMachine"; - mt.Identification->Location = "CCMT W4 A411/EMO 9 F24/VIRTUAL 0 0/N 48.7685303 E 9.1653923"; + mt.Identification->Location = "HMI 8 D16/EMO 9 F24/VIRTUAL 0 0/N 48.7685303 E 9.1653923"; mt.Identification->Model = {"", MachineName}; { diff --git a/GMS/HexagonGlobal.cpp b/GMS/HexagonGlobal.cpp index 62470313..e92c8f11 100644 --- a/GMS/HexagonGlobal.cpp +++ b/GMS/HexagonGlobal.cpp @@ -94,7 +94,7 @@ void HexagonGlobal::InstantiateIdentification() { mt.Identification->YearOfConstruction = 2023; mt.Identification->SoftwareRevision = "PC-DMIS 2023.1"; mt.Identification->DeviceClass = "Coordinate Measuring Machine"; - mt.Identification->Location = "CCMT W4 A411/EMO 6 B65/VIRTUAL 0 0/N 48.6939789 E 9.1839305"; + mt.Identification->Location = "EMO 6 B65/VIRTUAL 0 0/N 48.6939789 E 9.1839305"; mt.Identification->Model = {"", "GLOBAL S"}; mt.Identification->SerialNumber = "GLOD001413IA"; } diff --git a/GMS/HexagonSim.cpp b/GMS/HexagonSim.cpp index d50767f7..8f788188 100644 --- a/GMS/HexagonSim.cpp +++ b/GMS/HexagonSim.cpp @@ -94,7 +94,7 @@ void HexagonSim::InstantiateIdentification() { mt.Identification->YearOfConstruction = 2021; mt.Identification->SoftwareRevision = "Quindos7 - V 7.22.22096"; mt.Identification->DeviceClass = "Coordinate Measuring Machine"; - mt.Identification->Location = "EMO 6 B65/VIRTUAL 0 0/N 50.5514144 E 8.4764728"; + mt.Identification->Location = "HMI 8 D16/EMO 6 B65/VIRTUAL 0 0/N 50.5514144 E 8.4764728"; mt.Identification->Model = {"", MachineName}; mt.Identification->SerialNumber = "0104"; } diff --git a/GMS/OGPSmartScopeCNC500.cpp b/GMS/OGPSmartScopeCNC500.cpp index c0a6eb00..3dcf75fa 100644 --- a/GMS/OGPSmartScopeCNC500.cpp +++ b/GMS/OGPSmartScopeCNC500.cpp @@ -134,7 +134,7 @@ void OGPSmartScopeCNC500::InstantiateIdentification() { mt.Identification->YearOfConstruction = 2022; mt.Identification->SoftwareRevision = "V1.0.0"; mt.Identification->DeviceClass = "GMS"; - mt.Identification->Location = "CCMT W4 A411/EMO 6 C77/VIRTUAL 0 0/N 48.694241 E 9.183833"; + mt.Identification->Location = "HMI 8 D16/EMO 6 C77/VIRTUAL 0 0/N 48.694241 E 9.183833"; mt.Identification->Model = {"", MachineName}; { diff --git a/GMS/WenzelLH.cpp b/GMS/WenzelLH.cpp index d199994d..01bb471e 100644 --- a/GMS/WenzelLH.cpp +++ b/GMS/WenzelLH.cpp @@ -134,7 +134,7 @@ void WenzelLH::InstantiateIdentification() { mt.Identification->YearOfConstruction = 2022; mt.Identification->SoftwareRevision = "V1.0.0"; mt.Identification->DeviceClass = "GMS"; - mt.Identification->Location = "CCMT W4 A411/EMO 6 B79/VIRTUAL 0 0/N 48.694241 E 9.183833"; + mt.Identification->Location = "HMI 8 D16/EMO 6 B79/VIRTUAL 0 0/N 48.694241 E 9.183833"; mt.Identification->Model = {"", MachineName}; { diff --git a/MachineTools/FullMachineTool.cpp b/MachineTools/FullMachineTool.cpp index 284284fc..e062bcb6 100644 --- a/MachineTools/FullMachineTool.cpp +++ b/MachineTools/FullMachineTool.cpp @@ -121,7 +121,7 @@ void FullMachineTool::InstantiateIdentification() { mt.Identification->ComponentName = {"", MachineName}; mt.Identification->ProductCode = "2021-47110815"; mt.Identification->SoftwareRevision = "1.00.1"; - mt.Identification->Location = "CCMT W4 A411/BXP 9 9502/VIRTUAL 0 0/N 48.781340 E 9.165731"; + mt.Identification->Location = "HMI 8 D16/BXP 9 9502/VIRTUAL 0 0/N 48.781340 E 9.165731"; mt.Identification->Model = {"", MachineName}; auto &swOS = mt.Identification->SoftwareIdentification->SoftwareItem.Add(m_pServer, n, {m_nsIndex, "OS"}); diff --git a/MachineTools/MRMachineTool.cpp b/MachineTools/MRMachineTool.cpp index 25c71f57..652406f1 100644 --- a/MachineTools/MRMachineTool.cpp +++ b/MachineTools/MRMachineTool.cpp @@ -42,7 +42,7 @@ void MRMachineTool::InstantiateIdentification() { InstantiateOptional(mt.Identification->Location, m_pServer, n); InstantiateOptional(mt.Identification->Model, m_pServer, n); - mt.Identification->Location = "CCMT W4 A411/BXP 9 9502/VIRTUAL 0 0/N 48.781340 E 9.165731"; + mt.Identification->Location = "HMI 8 D16/BXP 9 9502/VIRTUAL 0 0/N 48.781340 E 9.165731"; mt.Identification->SerialNumber = std::string{"070-101-098-14"}; mt.Identification->Manufacturer = {"", "ISW UA4MT Team"}; mt.Identification->Model = {"", "T3IUTH"}; diff --git a/MachineTools/ShowcaseMachineTool.cpp b/MachineTools/ShowcaseMachineTool.cpp index 949c4a48..8ff6d4c0 100644 --- a/MachineTools/ShowcaseMachineTool.cpp +++ b/MachineTools/ShowcaseMachineTool.cpp @@ -35,7 +35,7 @@ void ShowcaseMachineTool::InstantiateIdentification() { mt.Identification->SoftwareRevision = "v1.02.1"; mt.Identification->DeviceClass = "Machining centre (other)"; mt.Identification->ProductInstanceUri = "https://showcase.umati.org/Specs/Machinetools.html"; - mt.Identification->Location = "CCMT W4 A411/TMTS 2 Q0603/SIMTOS 2 07E285/VIRTUAL 0 0/N 49.871215 E 8.654204"; + mt.Identification->Location = "HMI 8 D16/TMTS 2 Q0603/SIMTOS 2 07E285/VIRTUAL 0 0/N 49.871215 E 8.654204"; mt.Identification->Model = {"", MachineName}; }