diff --git a/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs b/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs index 9613c9e..65425f8 100644 --- a/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs +++ b/Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs @@ -545,7 +545,7 @@ namespace ILSOS_CCW_H52A.Sequences double anglePerOneJig = 360 / (double)rotaryJigCount; //double로 바꿔서 계산해야 22가 아닌 22.5로 anglePerOneJig가 계산됨 25.08.02 weldingCount = (int)((rotaryAngleOffset + anglePerOneJig / 2) / anglePerOneJig); // _WeldingCount = 0, 1, 2, ... - weldingJigNo = (int)(weldingCount % rotaryJigCount); // _WeldingJigNo = 1, 2, ... , 12 + weldingJigNo = (int)(weldingCount % rotaryJigCount) + 1; // _WeldingJigNo = 1, 2, ... , 12 Log.I($"Angle Per One Jig : {anglePerOneJig}"); } @@ -717,7 +717,6 @@ namespace ILSOS_CCW_H52A.Sequences /// 지나갔으면 True public bool CheckInsideWeldPosition(double startAngle) { - return true; double encoderX, currentAngle; _Scanner.GetEncoder(out encoderX, out currentAngle, true); @@ -924,7 +923,6 @@ namespace ILSOS_CCW_H52A.Sequences public bool GetRotaryCanExist(int jigNo) { - return true; if (jigNo <= _RotaryJigCount) return _PLC.ReadBit((int)eBitInput.PLC_USE_WELD_JIG_1 + (jigNo - 1)).data; else diff --git a/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs b/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs index 2da2b4f..9b5f64a 100644 --- a/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs +++ b/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs @@ -148,12 +148,6 @@ namespace ILSOS_CCW_H52A.Views } } - private void start() - { - Thread.Sleep(3000); - RunSequenceAutoRun(); - - } private void PerformCmdRunSequenceAutoRun(object obj) { var result = MessageUtil.ShowYesNoMessageDialog("AutoRun Sequence", "Start AutoRun Sequence?"); @@ -174,12 +168,8 @@ namespace ILSOS_CCW_H52A.Views return; } - - th = new Thread(start); - th.Start(); + RunSequenceAutoRun(); } - - Thread th; private void OnAutoRunStartRequest() { RunSequenceAutoRun();