From f9fbff4cbb1801db4aaed93583e5dc1262cd92ed Mon Sep 17 00:00:00 2001 From: Goetz Goerisch Date: Fri, 10 May 2024 07:27:43 +0000 Subject: [PATCH] feat: set location for GrindingHub 2024 --- AdditiveManufacturing/ShowcaseAMMachine.cpp | 2 +- GMS/BasicGMS.cpp | 2 +- GMS/FullGMS.cpp | 2 +- GMS/HexagonGlobal.cpp | 2 +- GMS/HexagonSim.cpp | 2 +- GMS/OGPSmartScopeCNC500.cpp | 2 +- GMS/WenzelLH.cpp | 2 +- MachineTools/CNShowcaseMachineTool.cpp | 2 +- MachineTools/FullMachineTool.cpp | 2 +- MachineTools/MRMachineTool.cpp | 2 +- MachineTools/ShowcaseMachineTool.cpp | 2 +- Woodworking/FullWoodworking.cpp | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/AdditiveManufacturing/ShowcaseAMMachine.cpp b/AdditiveManufacturing/ShowcaseAMMachine.cpp index 9591a0a3..dd1141aa 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 = "HMI 8 D16/BXP 9 9502/N 52.491225 E 13.388392"; + mt.Identification->Location = "GRIND 9 D21/VIRTUAL 1 1/N 52.491225 E 13.388392"; InstantiateEquipment(); } diff --git a/GMS/BasicGMS.cpp b/GMS/BasicGMS.cpp index 896c9098..e597fb89 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 = "HMI 8 D16/EMO 9 F24/VIRTUAL 0 0/N 48.7685303 E 9.1653923"; + mt.Identification->Location = "GRIND 9 D21/VIRTUAL 1 1/N 48.7685303 E 9.1653923"; mt.Identification->Model = {"", MachineName}; { diff --git a/GMS/FullGMS.cpp b/GMS/FullGMS.cpp index 91bd6346..3fa9c24b 100644 --- a/GMS/FullGMS.cpp +++ b/GMS/FullGMS.cpp @@ -68,7 +68,7 @@ void FullGMS::InstantiateIdentification() { gms.Identification->YearOfConstruction = 2022; gms.Identification->SoftwareRevision = "v1.05"; gms.Identification->DeviceClass = "CoordinateMeasuringMachine"; - gms.Identification->Location = "BXP 9 9502/VIRTUAL 0 0/N 48.7685303 E 9.2653923"; + gms.Identification->Location = "VIRTUAL 1 1/N 48.7685303 E 9.2653923"; gms.Identification->Model = {"", MachineName}; gms.Identification->SubDeviceClass = "CoordinateMeasuringMachine"; } diff --git a/GMS/HexagonGlobal.cpp b/GMS/HexagonGlobal.cpp index e92c8f11..f30b8a0a 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 = "EMO 6 B65/VIRTUAL 0 0/N 48.6939789 E 9.1839305"; + mt.Identification->Location = "EMO 6 B65/VIRTUAL 1 1/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 8f788188..683ced24 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 = "HMI 8 D16/EMO 6 B65/VIRTUAL 0 0/N 50.5514144 E 8.4764728"; + mt.Identification->Location = "GRIND 9 D21/VIRTUAL 1 1/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 3dcf75fa..fd50fca8 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 = "HMI 8 D16/EMO 6 C77/VIRTUAL 0 0/N 48.694241 E 9.183833"; + mt.Identification->Location = "GRIND 9 D21/VIRTUAL 1 1/N 48.694241 E 9.183833"; mt.Identification->Model = {"", MachineName}; { diff --git a/GMS/WenzelLH.cpp b/GMS/WenzelLH.cpp index 01bb471e..78bbaca6 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 = "HMI 8 D16/EMO 6 B79/VIRTUAL 0 0/N 48.694241 E 9.183833"; + mt.Identification->Location = "GRIND 9 D21/VIRTUAL 1 1/N 48.694241 E 9.183833"; mt.Identification->Model = {"", MachineName}; { diff --git a/MachineTools/CNShowcaseMachineTool.cpp b/MachineTools/CNShowcaseMachineTool.cpp index 17cd6466..59fe8534 100644 --- a/MachineTools/CNShowcaseMachineTool.cpp +++ b/MachineTools/CNShowcaseMachineTool.cpp @@ -37,7 +37,7 @@ void CNShowcaseMachineTool::InstantiateIdentification() { mt.Identification->SoftwareRevision = "v1.02.3"; mt.Identification->DeviceClass = "Machining centre"; mt.Identification->ProductInstanceUri = "http://amtc.tech"; - mt.Identification->Location = "AMB 10 A75/IMTS E3 134744/VIRTUAL 0 0/N 31.282196 E 121.212046"; + mt.Identification->Location = "DCS 1 1/VIRTUAL 1 1/N 31.282196 E 121.212046"; mt.Identification->Model = {"", MachineName}; } diff --git a/MachineTools/FullMachineTool.cpp b/MachineTools/FullMachineTool.cpp index e062bcb6..3d24203f 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 = "HMI 8 D16/BXP 9 9502/VIRTUAL 0 0/N 48.781340 E 9.165731"; + mt.Identification->Location = "GRIND 9 D21//VIRTUAL 1 1/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 652406f1..b5d78d8f 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 = "HMI 8 D16/BXP 9 9502/VIRTUAL 0 0/N 48.781340 E 9.165731"; + mt.Identification->Location = "GRIND 9 D21/VIRTUAL 1 1/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 8ff6d4c0..4152ee2f 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 = "HMI 8 D16/TMTS 2 Q0603/SIMTOS 2 07E285/VIRTUAL 0 0/N 49.871215 E 8.654204"; + mt.Identification->Location = "GRIND 9 D21/TMTS 2 Q0603/SIMTOS 2 07E285/VIRTUAL 1 1/N 49.871215 E 8.654204"; mt.Identification->Model = {"", MachineName}; } diff --git a/Woodworking/FullWoodworking.cpp b/Woodworking/FullWoodworking.cpp index 2f6d8cf3..a72c15d1 100644 --- a/Woodworking/FullWoodworking.cpp +++ b/Woodworking/FullWoodworking.cpp @@ -58,7 +58,7 @@ void FullWoodworking::InstantiateIdentification() { ww.Identification->InitialOperationDate = std::chrono::system_clock::now(); ww.Identification->AssetId = "123456"; ww.Identification->ComponentName = {"", "Machine"}; - ww.Identification->Location = "BXP 9 9502/VIRTUAL 0 0/N 49.628661 E 9.654903"; + ww.Identification->Location = "VIRTUAL 1 1/N 49.628661 E 9.654903"; } void FullWoodworking::InstantiateMachineFlags() {