From d770494ff003af50af546a4e6170e1d33aa07e22 Mon Sep 17 00:00:00 2001 From: choieigun Date: Tue, 7 Jul 2026 16:57:20 +0900 Subject: [PATCH] =?UTF-8?q?1.0.0.3=20=ED=94=84=EB=A1=9C=EA=B7=B8=EB=9E=A8?= =?UTF-8?q?=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20-=20RCC=20NG=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=84=B8=EC=8A=A4=20=EC=B6=94=EA=B0=80=20-?= =?UTF-8?q?=20=ED=98=84=EC=9E=A5=20=EC=BD=94=EB=93=9C=EC=97=90=20=EC=9E=88?= =?UTF-8?q?=EB=8A=94=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=EC=86=8D?= =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95=20-=20RCC=20=EC=9E=A5=EB=B9=84?= =?UTF-8?q?=20=EC=98=B5=EC=85=98=20=EC=84=A0=ED=83=9D=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20Disable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AuroraDevices/AuroraPLC/AuroraPLC.csproj | 8 +++---- Machines/ILSOS_KS/ILSOS_KS.csproj | 21 ++++++++++--------- Machines/ILSOS_KS/Properties/AssemblyInfo.cs | 4 ++-- Machines/ILSOS_KS/Sequences/SeqAutoRunKS.cs | 17 ++++++++++----- .../Manual/RCC/UCManualRCCOperation.xaml | 2 +- .../RCC/UCManualRCCOperationViewModel.cs | 2 +- 6 files changed, 31 insertions(+), 23 deletions(-) diff --git a/AuroraDevices/AuroraPLC/AuroraPLC.csproj b/AuroraDevices/AuroraPLC/AuroraPLC.csproj index e26ec3f..63a9097 100644 --- a/AuroraDevices/AuroraPLC/AuroraPLC.csproj +++ b/AuroraDevices/AuroraPLC/AuroraPLC.csproj @@ -39,10 +39,6 @@ ..\..\External\Aurora\bin\Aurora.exe - - False - ..\..\_out\x64-Debug\AuroraMotor.dll - ..\..\External\Aurora\csharp_lib\hermes.csharp.dll @@ -161,6 +157,10 @@ {304a2f8d-b543-4ffe-b14f-ddff839d4efb} AuroraDeviceCommon + + {49a61fb7-ec36-4035-b7bc-63ab983590b4} + AuroraMotor + diff --git a/Machines/ILSOS_KS/ILSOS_KS.csproj b/Machines/ILSOS_KS/ILSOS_KS.csproj index e053b0a..4ff337d 100644 --- a/Machines/ILSOS_KS/ILSOS_KS.csproj +++ b/Machines/ILSOS_KS/ILSOS_KS.csproj @@ -66,9 +66,6 @@ False ..\..\_out\x64-Debug\AuroraDeviceCommon.dll - - ..\..\_out\x64-Debug\AuroraTriggerBoard.dll - False ..\..\_out\x64-Debug\AuroraUIComponent.dll @@ -315,6 +312,10 @@ {1A47B1F3-5BDE-41DF-8F4D-25298AD4F6DE} AuroraPLC + + {ffbd974d-a4ac-4705-8473-7a62268728f8} + AuroraTriggerBoard + {30FCD6D2-8E66-45E4-93A9-701A1A47DB9E} MilCommon @@ -353,13 +354,13 @@ xcopy "$(SolutionDir)\External\Graphviz\*.*" "$(TargetDir)Graphviz\*.*" /s /d /y xcopy "$(SolutionDir)\Packages\MIL\*.dll" "$(TargetDir)" /s /d /y /I xcopy "$(SolutionDir)\External\AuroraVision\_dummyImages" "$(TargetDir)_dummyImages" /s /d /y /I xcopy "$(SolutionDir)\External\AuroraVision\lib" "$(TargetDir)" /s /d /y /I -xcopy "$(SolutionDir)\External\LaserScanner\*.dll" "$(TargetDir)" /s /d /y /I -xcopy "$(SolutionDir)\External\OpenCvSharp4\*.dll" "$(TargetDir)" /s /d /y /I -xcopy "$(SolutionDir)\External\Ajin\*.dll" "$(TargetDir)" /s /d /y /I -xcopy "$(SolutionDir)\External\Ajin\*.lib" "$(TargetDir)" /s /d /y /I -xcopy "$(SolutionDir)\External\AuroraPLC\*.dll" "$(TargetDir)" /s /d /y /I -xcopy "$(SolutionDir)\External\PAIX\*.dll" "$(TargetDir)" /s /d /y /I -xcopy "$(SolutionDir)\External\PAIX\*.lib" "$(TargetDir)" /s /d /y /I +xcopy "$(SolutionDir)\External\LaserScanner\*.dll" "$(TargetDir)" /s /d /y +xcopy "$(SolutionDir)\External\OpenCvSharp4\*.dll" "$(TargetDir)" /s /d /y +xcopy "$(SolutionDir)\External\Ajin\*.dll" "$(TargetDir)" /s /d /y +xcopy "$(SolutionDir)\External\Ajin\*.lib" "$(TargetDir)" /s /d /y +xcopy "$(SolutionDir)\External\AuroraPLC\*.dll" "$(TargetDir)" /s /d /y +xcopy "$(SolutionDir)\External\PAIX\*.dll" "$(TargetDir)" /s /d /y +xcopy "$(SolutionDir)\External\PAIX\*.lib" "$(TargetDir)" /s /d /y diff --git a/Machines/ILSOS_KS/Properties/AssemblyInfo.cs b/Machines/ILSOS_KS/Properties/AssemblyInfo.cs index 0761e52..18a5a56 100644 --- a/Machines/ILSOS_KS/Properties/AssemblyInfo.cs +++ b/Machines/ILSOS_KS/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.1")] -[assembly: AssemblyFileVersion("1.0.0.1")] +[assembly: AssemblyVersion("1.0.0.3")] +[assembly: AssemblyFileVersion("1.0.0.3")] diff --git a/Machines/ILSOS_KS/Sequences/SeqAutoRunKS.cs b/Machines/ILSOS_KS/Sequences/SeqAutoRunKS.cs index 7f17e55..6a1d102 100644 --- a/Machines/ILSOS_KS/Sequences/SeqAutoRunKS.cs +++ b/Machines/ILSOS_KS/Sequences/SeqAutoRunKS.cs @@ -315,7 +315,7 @@ namespace ILSOS_KS.Sequences sb.AddAction(SEQ_GENERATE_WELDING_OBJECT, GenerateWeldingObject); //Image Processing - sb.AddAction(SEQ_BEFORE_WELD_MOVE_OBJECT, BeforeWeldMoveObject); + sb.AddDecision(SEQ_BEFORE_WELD_MOVE_OBJECT, BeforeWeldMoveObject); sb.AddAction(SEQ_AFTER_WELD_CHECK_BEAD, AfterWeldCheckBead); sb.AddDecision(SEQ_CHECK_RCC_MODE, CheckRCCMode); sb.AddDecision(SEQ_CHECK_BEFORE_OR_AFTER, CheckBeforeOrAfter); @@ -372,6 +372,9 @@ namespace ILSOS_KS.Sequences > sb[SEQ_SEND_EVENT_SENDER].Send(EVENT_TRIGGER_SAVE_FILE) > sb[SEQ_CHECK_BEFORE_OR_AFTER] > sb[SEQ_BEFORE_WELD_MOVE_OBJECT] > sb[SEQ_READY_SCANNER_LIST]); + // RCC NG인 경우 + sb.Flows(sb[SEQ_BEFORE_WELD_MOVE_OBJECT] > sb[SEQ_CHECK_PAGENO]); + sb.Flows(sb[SEQ_CHECK_RCC_MODE] // RCC FlyingVision > sb[SEQ_SET_SCOUT_FLYING_VISION_SEQ] > sb[SEQ_DO_ID_SCOUT_FLYING_VISION_SEQ] > sb[SEQ_GET_SCOUT_FLYING_VISION_SEQ] @@ -534,7 +537,7 @@ namespace ILSOS_KS.Sequences } } - private SequenceActionResult BeforeWeldMoveObject(SequenceContext context, string id, SequenceActionResult param) + private string BeforeWeldMoveObject(SequenceContext context, string id, ICollection branches, SequenceActionResult param) { @@ -560,7 +563,7 @@ namespace ILSOS_KS.Sequences // 4 Page 시퀀스 사용으로 spiral 페이지 사용시 RCC 사용안함 if (_PageNoRcc % 2 == 1) - return SequenceAction.Ok(); + return SEQ_READY_SCANNER_LIST; _SystemParameter = context.GetSetting(CommonSettingIds.SystemParameter); var mainPage = WeldingRecipeManager.GetWeldingPage(); @@ -623,7 +626,11 @@ namespace ILSOS_KS.Sequences } else { - Log.W("Pattern is not found."); + Log.W("RCC Pattern is not found. NG Process"); + _PLC.WriteBit((int)eBitOutput.PC_LBAD_RESULT_NG, true); + pre_welding = true; + context.Wait(1000); + return SEQ_CHECK_PAGENO; } @@ -673,7 +680,7 @@ namespace ILSOS_KS.Sequences } } - return SequenceAction.Ok(); + return SEQ_READY_SCANNER_LIST; } //private SequenceActionResult AfterWeldCheckBead(SequenceContext context, string id, SequenceActionResult param) //{ diff --git a/WeldingComponents/WeldingCommon/Views/Manual/RCC/UCManualRCCOperation.xaml b/WeldingComponents/WeldingCommon/Views/Manual/RCC/UCManualRCCOperation.xaml index 9230298..4f267ec 100644 --- a/WeldingComponents/WeldingCommon/Views/Manual/RCC/UCManualRCCOperation.xaml +++ b/WeldingComponents/WeldingCommon/Views/Manual/RCC/UCManualRCCOperation.xaml @@ -156,7 +156,7 @@ - + diff --git a/WeldingComponents/WeldingCommon/Views/Manual/RCC/UCManualRCCOperationViewModel.cs b/WeldingComponents/WeldingCommon/Views/Manual/RCC/UCManualRCCOperationViewModel.cs index 07b2d81..8c1c564 100644 --- a/WeldingComponents/WeldingCommon/Views/Manual/RCC/UCManualRCCOperationViewModel.cs +++ b/WeldingComponents/WeldingCommon/Views/Manual/RCC/UCManualRCCOperationViewModel.cs @@ -402,7 +402,7 @@ namespace WeldingCommon.Views _Stopwatch = new Stopwatch(); OptionList = new ObservableCollection { "SMW", "Inzi", "LFW", "KS", "Flangeless" }; - SelectedOption = OptionList[0]; + SelectedOption = OptionList[3]; var pixelResolution = ((_SystemParameter.CameraPixelSize) / _SystemParameter.LensMagnification) / 1000.0; _ObjectGenerator = new ObjectGenerator(pixelResolution);