RobotAutomationDevelopment-Dept/LGES-2170-ACW_CCW-Welder
12
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

테스트 코드 삭제

Browse Source
This commit is contained in:
최민영 2026-03-25 20:59:05 +09:00
parent d2dbbf257d
commit 84eef8e9e4
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Machines/ILSOS_CCW_H52A/Sequences/SeqAutoRunCCWH52A.cs
View File

@ -545,7 +545,7 @@ namespace ILSOS_CCW_H52A.Sequences
double anglePerOneJig = 360 / (double)rotaryJigCount; //double로 바꿔서 계산해야 22가 아닌 22.5로 anglePerOneJig가 계산됨 25.08.02 double anglePerOneJig = 360 / (double)rotaryJigCount; //double로 바꿔서 계산해야 22가 아닌 22.5로 anglePerOneJig가 계산됨 25.08.02
weldingCount = (int)((rotaryAngleOffset + anglePerOneJig / 2) / anglePerOneJig); // _WeldingCount = 0, 1, 2, ... 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}"); Log.I($"Angle Per One Jig : {anglePerOneJig}");
} }
@ -717,7 +717,6 @@ namespace ILSOS_CCW_H52A.Sequences
/// <returns> 지나갔으면 True </returns> /// <returns> 지나갔으면 True </returns>
public bool CheckInsideWeldPosition(double startAngle) public bool CheckInsideWeldPosition(double startAngle)
{ {
return true;
double encoderX, currentAngle; double encoderX, currentAngle;
_Scanner.GetEncoder(out encoderX, out currentAngle, true); _Scanner.GetEncoder(out encoderX, out currentAngle, true);
@ -924,7 +923,6 @@ namespace ILSOS_CCW_H52A.Sequences
public bool GetRotaryCanExist(int jigNo) public bool GetRotaryCanExist(int jigNo)
{ {
return true;
if (jigNo <= _RotaryJigCount) if (jigNo <= _RotaryJigCount)
return _PLC.ReadBit((int)eBitInput.PLC_USE_WELD_JIG_1 + (jigNo - 1)).data; return _PLC.ReadBit((int)eBitInput.PLC_USE_WELD_JIG_1 + (jigNo - 1)).data;
else else

12
Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs
View File

@ -148,12 +148,6 @@ namespace ILSOS_CCW_H52A.Views
} }
} }
private void start()
{
Thread.Sleep(3000);
RunSequenceAutoRun();
}
private void PerformCmdRunSequenceAutoRun(object obj) private void PerformCmdRunSequenceAutoRun(object obj)
{ {
var result = MessageUtil.ShowYesNoMessageDialog("AutoRun Sequence", "Start AutoRun Sequence?"); var result = MessageUtil.ShowYesNoMessageDialog("AutoRun Sequence", "Start AutoRun Sequence?");
@ -174,12 +168,8 @@ namespace ILSOS_CCW_H52A.Views
return; return;
} }
RunSequenceAutoRun();
th = new Thread(start);
th.Start();
} }
Thread th;
private void OnAutoRunStartRequest() private void OnAutoRunStartRequest()
{ {
RunSequenceAutoRun(); RunSequenceAutoRun();