Skip to content

feat: set location for GrindingHub 2024 #1282

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

Merged
GoetzGoerisch merged 1 commit into from
May 10, 2024
Merged

feat: set location for GrindingHub 2024 #1282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion AdditiveManufacturing/ShowcaseAMMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion GMS/BasicGMS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};

{
Expand Down
2 changes: 1 addition & 1 deletion GMS/FullGMS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand Down
2 changes: 1 addition & 1 deletion GMS/HexagonGlobal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand Down
2 changes: 1 addition & 1 deletion GMS/HexagonSim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand Down
2 changes: 1 addition & 1 deletion GMS/OGPSmartScopeCNC500.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};

{
Expand Down
2 changes: 1 addition & 1 deletion GMS/WenzelLH.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};

{
Expand Down
2 changes: 1 addition & 1 deletion MachineTools/CNShowcaseMachineTool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
}

Expand Down
2 changes: 1 addition & 1 deletion MachineTools/FullMachineTool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"});
Expand Down
2 changes: 1 addition & 1 deletion MachineTools/MRMachineTool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"};
Expand Down
2 changes: 1 addition & 1 deletion MachineTools/ShowcaseMachineTool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
}

Expand Down
2 changes: 1 addition & 1 deletion Woodworking/FullWoodworking.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down