From dbdc759c98819e5e37ea3f0a0556cce0c4d7847a Mon Sep 17 00:00:00 2001 From: RnD_Welder Date: Mon, 13 Apr 2026 18:44:57 +0900 Subject: [PATCH] =?UTF-8?q?AxisX2=20=3D=202=20AxisZ=20=3D4=20=EA=B2=80?= =?UTF-8?q?=EC=A6=9D=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Machines/ILSOS_PrismaticScanner/EquipDef.cs | 9 +++++---- .../ILSOS_PrismaticScanner/EquipmentSetup.cs | 20 +++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Machines/ILSOS_PrismaticScanner/EquipDef.cs b/Machines/ILSOS_PrismaticScanner/EquipDef.cs index e5c1a6c..f7b0ef6 100644 --- a/Machines/ILSOS_PrismaticScanner/EquipDef.cs +++ b/Machines/ILSOS_PrismaticScanner/EquipDef.cs @@ -24,10 +24,11 @@ namespace ILSOS_PrismaticScanner // TODO: 이정인 선임 ACS 변수 맵 수신 후 실제 번호 검증 public enum eMotorIdx { - AxisX2 = 1, - AxisY1 = 3, - AxisY2 = 4, - AxisZ = 5, + AxisX1 = 0, + AxisY1 = 1, + AxisX2 = 2, + AxisY2 = 3, + AxisZ = 4, } } diff --git a/Machines/ILSOS_PrismaticScanner/EquipmentSetup.cs b/Machines/ILSOS_PrismaticScanner/EquipmentSetup.cs index 9c29f48..f37937b 100644 --- a/Machines/ILSOS_PrismaticScanner/EquipmentSetup.cs +++ b/Machines/ILSOS_PrismaticScanner/EquipmentSetup.cs @@ -172,22 +172,22 @@ namespace ILSOS_PrismaticScanner registry.Register(DeviceIds.ACS, () => ACS, new ACSDeviceConfig()); // TODO: 축 번호는 이정인 선임 변수 맵 수신 후 검증 - var motorX2 = new ACSMotor(MotorIds.AxisX2, ACS, 1, (int)MotorIds.eMotorIdx.AxisX2); + var motorX2 = new ACSMotor(MotorIds.AxisX2, ACS, 2, (int)MotorIds.eMotorIdx.AxisX2); registry.Register(MotorIds.AxisX2, () => motorX2, new ACSMotorConfig(MotorIds.AxisX2), motor => new UCACSMotor(AuroraEnv.DeviceManager, motor.DeviceId)); - var motorY1 = new ACSMotor(MotorIds.AxisY1, ACS, 3, (int)MotorIds.eMotorIdx.AxisY1); - registry.Register(MotorIds.AxisY1, () => motorY1, - new ACSMotorConfig(MotorIds.AxisY1), - motor => new UCACSMotor(AuroraEnv.DeviceManager, motor.DeviceId)); + //var motorY1 = new ACSMotor(MotorIds.AxisY1, ACS, 3, (int)MotorIds.eMotorIdx.AxisY1); + //registry.Register(MotorIds.AxisY1, () => motorY1, + // new ACSMotorConfig(MotorIds.AxisY1), + // motor => new UCACSMotor(AuroraEnv.DeviceManager, motor.DeviceId)); - var motorY2 = new ACSMotor(MotorIds.AxisY2, ACS, 4, (int)MotorIds.eMotorIdx.AxisY2); - registry.Register(MotorIds.AxisY2, () => motorY2, - new ACSMotorConfig(MotorIds.AxisY2), - motor => new UCACSMotor(AuroraEnv.DeviceManager, motor.DeviceId)); + //var motorY2 = new ACSMotor(MotorIds.AxisY2, ACS, 4, (int)MotorIds.eMotorIdx.AxisY2); + //registry.Register(MotorIds.AxisY2, () => motorY2, + // new ACSMotorConfig(MotorIds.AxisY2), + // motor => new UCACSMotor(AuroraEnv.DeviceManager, motor.DeviceId)); - var motorZ = new ACSMotor(MotorIds.AxisZ, ACS, 5, (int)MotorIds.eMotorIdx.AxisZ); + var motorZ = new ACSMotor(MotorIds.AxisZ, ACS, 4, (int)MotorIds.eMotorIdx.AxisZ); registry.Register(MotorIds.AxisZ, () => motorZ, new ACSMotorConfig(MotorIds.AxisZ), motor => new UCACSMotor(AuroraEnv.DeviceManager, motor.DeviceId));