This commit is contained in:
backuppc
2026-01-30 16:58:14 +09:00
parent 3a8cbd3283
commit faf13f5c37
22 changed files with 1137 additions and 417 deletions

View File

@@ -34,6 +34,7 @@ namespace arDev
}
}
public eNarumiTurn State { get; set; }
//public eNarumiTurn StateNew { get; set; }
public NarumiTurnInfo()
{
Start = new DateTime(1982, 11, 23);

View File

@@ -160,11 +160,19 @@ namespace arDev
// [Turn Completion Check]
if (frame.DataString.Contains("LEFT-TURN OK"))
{
if (TurnInformation != null) { TurnInformation.State = eNarumiTurn.Left; TurnInformation.End = DateTime.Now; }
if (TurnInformation != null)
{
TurnInformation.State = eNarumiTurn.Left;
TurnInformation.End = DateTime.Now;
}
}
else if (frame.DataString.Contains("RIGHT-TURN OK"))
{
if (TurnInformation != null) { TurnInformation.State = eNarumiTurn.Right; TurnInformation.End = DateTime.Now; }
if (TurnInformation != null)
{
TurnInformation.State = eNarumiTurn.Right;
TurnInformation.End = DateTime.Now;
}
}
// $로 시작되는 AGV 상태 표시
//var text_Sts_Etc = Encoding.Default.GetString(bRcvData, 3, bRcvData.Length - 2).TrimStart(' '); //20210311 김정만 - SmartX FrameWork 사용 안함으로 주석처리
@@ -278,23 +286,23 @@ namespace arDev
//agv가 멈춰있고 들어온경우, 턴 작업이었다면 턴 셋팅을 한다
// [REMOVED] Logic replaced by message-based check ($AGV...TURN OK)
if (false && system1.agv_run == false && system1.agv_stop == true &&
TurnInformation != null)
{
if (TurnInformation.Start.Year > 2000)
{
if (TurnInformation.State == eNarumiTurn.LeftIng || TurnInformation.State == eNarumiTurn.RightIng)
{
TurnInformation.End = DateTime.Now;
if (TurnInformation.State == eNarumiTurn.LeftIng) TurnInformation.State = eNarumiTurn.Left;
if (TurnInformation.State == eNarumiTurn.RightIng) TurnInformation.State = eNarumiTurn.Right;
}
}
else
{
//시작시간이 설정되지 않았다면 처리하지 않는다.
}
}
//if (false && system1.agv_run == false && system1.agv_stop == true &&
// TurnInformation != null)
//{
// if (TurnInformation.Start.Year > 2000)
// {
// if (TurnInformation.StateNew == eNarumiTurn.LeftIng || TurnInformation.StateNew == eNarumiTurn.RightIng)
// {
// TurnInformation.End = DateTime.Now;
// if (TurnInformation.State == eNarumiTurn.LeftIng) TurnInformation.State = eNarumiTurn.Left;
// if (TurnInformation.State == eNarumiTurn.RightIng) TurnInformation.State = eNarumiTurn.Right;
// }
// }
// else
// {
// //시작시간이 설정되지 않았다면 처리하지 않는다.
// }
//}
if (idx <= rcvdNow.Length - 2)
{