21번 레시피라면 기존처럼 동작하도록 수정

- RCC NG 프로세스 추가
- 현장 코드에 있는 프로젝트 속성 수정
- RCC 장비 옵션 선택 기능 Disable

AuroraDevices/AuroraPLC/AuroraPLC.csproj

@@ -39,10 +39,6 @@
     <Reference Include="Aurora">
       <HintPath>..\..\External\Aurora\bin\Aurora.exe</HintPath>
     </Reference>
-    <Reference Include="AuroraMotor, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\_out\x64-Debug\AuroraMotor.dll</HintPath>
-    </Reference>
     <Reference Include="hermes.csharp">
       <HintPath>..\..\External\Aurora\csharp_lib\hermes.csharp.dll</HintPath>
     </Reference>
@@ -161,6 +157,10 @@
       <Project>{304a2f8d-b543-4ffe-b14f-ddff839d4efb}</Project>
       <Name>AuroraDeviceCommon</Name>
     </ProjectReference>
+    <ProjectReference Include="..\AuroraMotor\AuroraMotor.csproj">
+      <Project>{49a61fb7-ec36-4035-b7bc-63ab983590b4}</Project>
+      <Name>AuroraMotor</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

Machines/ILSOS_KS/ILSOS_KS.csproj

@@ -66,9 +66,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\_out\x64-Debug\AuroraDeviceCommon.dll</HintPath>
     </Reference>
-    <Reference Include="AuroraTriggerBoard">
-      <HintPath>..\..\_out\x64-Debug\AuroraTriggerBoard.dll</HintPath>
-    </Reference>
     <Reference Include="AuroraUIComponent, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\_out\x64-Debug\AuroraUIComponent.dll</HintPath>
@@ -315,6 +312,10 @@
       <Project>{1A47B1F3-5BDE-41DF-8F4D-25298AD4F6DE}</Project>
       <Name>AuroraPLC</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\AuroraDevices\AuroraTriggerBoard\AuroraTriggerBoard.csproj">
+      <Project>{ffbd974d-a4ac-4705-8473-7a62268728f8}</Project>
+      <Name>AuroraTriggerBoard</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\AuroraVision\MilCommon\MilCommon.csproj">
       <Project>{30FCD6D2-8E66-45E4-93A9-701A1A47DB9E}</Project>
       <Name>MilCommon</Name>
@@ -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</PostBuildEvent>
+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</PostBuildEvent>
   </PropertyGroup>
   <Import Project="..\..\packages\Microsoft.ML.OnnxRuntime.Managed.1.22.2\build\netstandard2.0\Microsoft.ML.OnnxRuntime.Managed.targets" Condition="Exists('..\..\packages\Microsoft.ML.OnnxRuntime.Managed.1.22.2\build\netstandard2.0\Microsoft.ML.OnnxRuntime.Managed.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

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")]

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<string> 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<SystemParameter>(CommonSettingIds.SystemParameter);
             var mainPage = WeldingRecipeManager.GetWeldingPage();
@@ -623,7 +626,17 @@ namespace ILSOS_KS.Sequences
                     }
                     else
                     {
-                        Log.W("Pattern is not found.");
+                        recipeRequestId = (short)_PLC.ReadDWord((int)eWordOutput.PC_RECIPE_NO, isInput: false).data;
+                        if (recipeRequestId == 21) {
+                            Log.I(string.Format($"TEST!! Welding : ExecuteList_{_WeldingScannerListNo}"));
+                        }
+                        else {
+                            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 +686,7 @@ namespace ILSOS_KS.Sequences
                 }
             }
 
-            return SequenceAction.Ok();
+            return SEQ_READY_SCANNER_LIST;
         }
         //private SequenceActionResult AfterWeldCheckBead(SequenceContext context, string id, SequenceActionResult param)
         //{

WeldingComponents/WeldingCommon/Views/Manual/RCC/UCManualRCCOperation.xaml

@@ -156,7 +156,7 @@
                         <Border Grid.Row="0" Grid.Column="0" MinHeight="30">
                             <TextBlock Margin="10 0" FontSize="12" Foreground="#FFBBBBBB" FontWeight="Bold" Text="Option Type" VerticalAlignment="Center" HorizontalAlignment="Right"/>
                         </Border>
-                        <ComboBox Grid.Row="0" Grid.Column="1" ItemsSource="{Binding OptionList}" SelectedItem="{Binding SelectedOption}" Height="30" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="12" Padding="2"/>
+                        <ComboBox Grid.Row="0" Grid.Column="1" ItemsSource="{Binding OptionList}" SelectedItem="{Binding SelectedOption}" Height="30" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontSize="12" Padding="2" IsEnabled="False"/>
                     </Grid>
 
                     <!-- SelectedOption is SMW-->

WeldingComponents/WeldingCommon/Views/Manual/RCC/UCManualRCCOperationViewModel.cs

@@ -402,7 +402,7 @@ namespace WeldingCommon.Views
             _Stopwatch = new Stopwatch();
 
             OptionList = new ObservableCollection<string> { "SMW", "Inzi", "LFW", "KS", "Flangeless" };
-            SelectedOption = OptionList[0];
+            SelectedOption = OptionList[3];
 
             var pixelResolution = ((_SystemParameter.CameraPixelSize) / _SystemParameter.LensMagnification) / 1000.0;
             _ObjectGenerator = new ObjectGenerator(pixelResolution);