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

RCC NG 기능 추가

Browse Source
This commit is contained in:
최이근 2026-07-07 16:57:20 +09:00
parent d3a6541beb
commit e9dea7d845
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AuroraDevices/AuroraPLC/AuroraPLC.csproj
View File

@ -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>

7
Machines/ILSOS_KS/ILSOS_KS.csproj
View File

@ -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>

15
Machines/ILSOS_KS/Sequences/SeqAutoRunKS.cs
View File

@ -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,9 @@ 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);
return SEQ_CHECK_PAGENO;
}
@ -673,7 +678,7 @@ namespace ILSOS_KS.Sequences
}
}
return SequenceAction.Ok();
return SEQ_READY_SCANNER_LIST;
}
//private SequenceActionResult AfterWeldCheckBead(SequenceContext context, string id, SequenceActionResult param)
//{