Skip to content

张东亮 / DoubleLineClient_3D

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 61953e34 由 张东亮
选项

进料与上料工位初始化信号确认

1 个父辈 ec67183f
内嵌 并排
正在显示 10 个修改的文件 包含 430 行增加 和 375 行删除
source/DeviceLibrary/LineConfig/DoubleLineConfig.csv
...@@ -25,7 +25,7 @@ DI,中间升降气缸上升端,M_Updown_Up,11,PRO_AOI_IP_1,0,中间升降气缸上升端,X12,X12,0 ...@@ -25,7 +25,7 @@ DI,中间升降气缸上升端,M_Updown_Up,11,PRO_AOI_IP_1,0,中间升降气缸上升端,X12,X12,0
DI,中间升降气缸下降端,M_Updown_Down,12,PRO_AOI_IP_1,0,中间升降气缸下降端,X13,X13,0 DI,中间升降气缸下降端,M_Updown_Down,12,PRO_AOI_IP_1,0,中间升降气缸下降端,X13,X13,0
DI,中间轨道正阻挡检测,M_LeftStopCheck,13,PRO_AOI_IP_1,0,中间轨道正阻挡检测,X14,X14,0 DI,中间轨道正阻挡检测,M_LeftStopCheck,13,PRO_AOI_IP_1,0,中间轨道正阻挡检测,X14,X14,0
DI,中间轨道反阻挡检测,M_RightStopCheck,14,PRO_AOI_IP_1,0,中间轨道反阻挡检测,X15,X15,0 DI,中间轨道反阻挡检测,M_RightStopCheck,14,PRO_AOI_IP_1,0,中间轨道反阻挡检测,X15,X15,0
DI,上料位前反阻挡检测,S1_StopCheck1,15,PRO_AOI_IP_1,0,上料位前反阻挡检测,X16,X16,0 DI,上料位前反阻挡检测,PreS1_NegStopCheck,15,PRO_AOI_IP_1,0,上料位前反阻挡检测,X16,X16,0
DO,待机状态（指示灯）,AutoRun_HddLed,0,PRO_AOI_IP_1,0,待机状态（指示灯）,Y01,Y01,0 DO,待机状态（指示灯）,AutoRun_HddLed,0,PRO_AOI_IP_1,0,待机状态（指示灯）,Y01,Y01,0
DO,运行状态（指示灯）,RunSign_HddLed,1,PRO_AOI_IP_1,0,运行状态（指示灯）,Y02,Y02,0 DO,运行状态（指示灯）,RunSign_HddLed,1,PRO_AOI_IP_1,0,运行状态（指示灯）,Y02,Y02,0
DO,故障状态（指示灯）,Alarm_HddLed,2,PRO_AOI_IP_1,0,故障状态（指示灯）,Y03,Y03,0 DO,故障状态（指示灯）,Alarm_HddLed,2,PRO_AOI_IP_1,0,故障状态（指示灯）,Y03,Y03,0
...@@ -45,10 +45,10 @@ DO,右出口轨道电机反转,R_OutLineBackRun,14,PRO_AOI_IP_1,0,右出口轨道电机反转,Y15, ...@@ -45,10 +45,10 @@ DO,右出口轨道电机反转,R_OutLineBackRun,14,PRO_AOI_IP_1,0,右出口轨道电机反转,Y15,
,,,,,,,,, ,,,,,,,,,
,,,,,,,,, ,,,,,,,,,
,,,,,,,,, ,,,,,,,,,
DI,上料位前正阻挡检测,S1_StopCheck2,0,PRO_AOI_IP_2,0,上料位前正阻挡检测,X21,X21,0 DI,上料位前正阻挡检测,PreS1_PosStopCheck,0,PRO_AOI_IP_2,0,上料位前正阻挡检测,X21,X21,0
DI,上料位反定位阻挡检测,S1_StopCheck3,1,PRO_AOI_IP_2,0,上料位反定位阻挡检测,X22,X22,0 DI,上料位反定位阻挡检测,S1_NegStopCheck,1,PRO_AOI_IP_2,0,上料位反定位阻挡检测,X22,X22,0
DI,上料位正定位阻挡检测,S1_StopCheck4,2,PRO_AOI_IP_2,0,上料位正定位阻挡检测,X23,X23,0 DI,上料位正定位阻挡检测,S1_PosStopCheck,2,PRO_AOI_IP_2,0,上料位正定位阻挡检测,X23,X23,0
DI,上料位后阻挡检测,S1_StopCheck5,3,PRO_AOI_IP_2,0,上料位后阻挡检测,X24,X24,0 DI,上料位后阻挡检测,AftS1_StopCheck,3,PRO_AOI_IP_2,0,上料位后阻挡检测,X24,X24,0
DI,上料工位顶升上升端1,S1_TopCylinderUp1,4,PRO_AOI_IP_2,0,上料工位顶升上升端1,X25,X25,0 DI,上料工位顶升上升端1,S1_TopCylinderUp1,4,PRO_AOI_IP_2,0,上料工位顶升上升端1,X25,X25,0
DI,上料工位顶升下降端1,S1_TopCylinderDown1,5,PRO_AOI_IP_2,0,上料工位顶升下降端1,X26,X26,0 DI,上料工位顶升下降端1,S1_TopCylinderDown1,5,PRO_AOI_IP_2,0,上料工位顶升下降端1,X26,X26,0
DI,上料工位顶升上升端2,S1_TopCylinderUp2,6,PRO_AOI_IP_2,0,上料工位顶升上升端2,X27,X27,0 DI,上料工位顶升上升端2,S1_TopCylinderUp2,6,PRO_AOI_IP_2,0,上料工位顶升上升端2,X27,X27,0
...@@ -73,11 +73,11 @@ DO,中间轨道正阻挡下降,M_LeftStopCylinder,7,PRO_AOI_IP_2,0,中间轨道正阻挡下降,Y28 ...@@ -73,11 +73,11 @@ DO,中间轨道正阻挡下降,M_LeftStopCylinder,7,PRO_AOI_IP_2,0,中间轨道正阻挡下降,Y28
DO,中间轨道反阻挡下降,M_RightStopCylinder,8,PRO_AOI_IP_2,0,中间轨道反阻挡下降,Y29,Y29,0 DO,中间轨道反阻挡下降,M_RightStopCylinder,8,PRO_AOI_IP_2,0,中间轨道反阻挡下降,Y29,Y29,0
DO,中间升降气缸上升,M_Updown_Up,9,PRO_AOI_IP_2,0,中间升降气缸上升,Y30,Y30,0 DO,中间升降气缸上升,M_Updown_Up,9,PRO_AOI_IP_2,0,中间升降气缸上升,Y30,Y30,0
DO,中间升降气缸下降,M_Updown_Down,10,PRO_AOI_IP_2,0,中间升降气缸下降,Y31,Y31,0 DO,中间升降气缸下降,M_Updown_Down,10,PRO_AOI_IP_2,0,中间升降气缸下降,Y31,Y31,0
DO,上料位前反阻挡下降,S1_StopCylinder1,11,PRO_AOI_IP_2,0,上料位前反阻挡下降,Y32,Y32,0 DO,上料位前反阻挡下降,PreS1_NegStopCylinder,11,PRO_AOI_IP_2,0,上料位前反阻挡下降,Y32,Y32,0
DO,上料位前正阻挡下降,S1_StopCylinder2,12,PRO_AOI_IP_2,0,上料位前正阻挡下降,Y33,Y33,0 DO,上料位前正阻挡下降,PreS1_PosStopCylinder,12,PRO_AOI_IP_2,0,上料位前正阻挡下降,Y33,Y33,0
DO,上料位反定位阻挡下降,S1_StopCylinder3,13,PRO_AOI_IP_2,0,上料位反定位阻挡下降,Y34,Y34,0 DO,上料位反定位阻挡下降,S1_NegStopCylinder,13,PRO_AOI_IP_2,0,上料位反定位阻挡下降,Y34,Y34,0
DO,上料位正定位阻挡下降,S1_StopCylinder4,14,PRO_AOI_IP_2,0,上料位正定位阻挡下降,Y35,Y35,0 DO,上料位正定位阻挡下降,S1_PosStopCylinder,14,PRO_AOI_IP_2,0,上料位正定位阻挡下降,Y35,Y35,0
DO,上料位后阻挡下降,S1_StopCylinder5,15,PRO_AOI_IP_2,0,上料位后阻挡下降,Y36,Y36,0 DO,上料位后阻挡下降,AftS1_StopCylinder,15,PRO_AOI_IP_2,0,上料位后阻挡下降,Y36,Y36,0
,,,,,,,,, ,,,,,,,,,
,,,,,,,,, ,,,,,,,,,
,,,,,,,,, ,,,,,,,,,
......
source/DeviceLibrary/doubleLine/DoubleLineBean.cs
...@@ -116,7 +116,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -116,7 +116,7 @@ namespace OnlineStore.DeviceLibrary
#region 原点返回和复位处理 #region 原点返回和复位处理
private void ReturnHome() private void ReturnHome()
{ {
HighProcess = false; LHighProcess = false;
LowProcess = false; LowProcess = false;
S1_ShelfTask = new ShelfTaskInfo(); S1_ShelfTask = new ShelfTaskInfo();
S2CanGetShelf = true; S2CanGetShelf = true;
...@@ -157,9 +157,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -157,9 +157,9 @@ namespace OnlineStore.DeviceLibrary
CheckAndMove(IO_Type.LHigh_StopCylinder1, IO_VALUE.HIGH); CheckAndMove(IO_Type.LHigh_StopCylinder1, IO_VALUE.HIGH);
//工位1只上升2个阻挡 //工位只上升2个阻挡
CheckAndMove(IO_Type.S1_StopCylinder3, IO_VALUE.HIGH); CheckAndMove(IO_Type.S1_NegStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH); CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.M_RightStopCylinder, IO_VALUE.HIGH); CheckAndMove(IO_Type.M_RightStopCylinder, IO_VALUE.HIGH);
...@@ -174,10 +174,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -174,10 +174,9 @@ namespace OnlineStore.DeviceLibrary
CheckAndMove(IO_Type.M_LeftStopCylinder, value); CheckAndMove(IO_Type.M_LeftStopCylinder, value);
CheckAndMove(IO_Type.S1_StopCylinder1, value); CheckAndMove(IO_Type.AftS1_StopCylinder, value);
CheckAndMove(IO_Type.S1_StopCylinder2, value); CheckAndMove(IO_Type.S1_PosStopCheck, value);
CheckAndMove(IO_Type.S1_StopCylinder5, value); CheckAndMove(IO_Type.PreS1_PosStopCylinder, value);
} }
public void AllLineMove(IO_VALUE value, LineMoveInfo moveInfo = null) public void AllLineMove(IO_VALUE value, LineMoveInfo moveInfo = null)
...@@ -263,11 +262,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -263,11 +262,11 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.M_LeftStopCylinder, IO_VALUE.HIGH); IOMove(IO_Type.M_LeftStopCylinder, IO_VALUE.HIGH);
IOMove(IO_Type.M_RightStopCylinder, IO_VALUE.HIGH); IOMove(IO_Type.M_RightStopCylinder, IO_VALUE.HIGH);
IOMove(IO_Type.M_LineRun, IO_VALUE.HIGH); IOMove(IO_Type.M_LineRun, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder1, IO_VALUE.LOW); CheckAndMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder3, IO_VALUE.HIGH); CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH); CheckAndMove(IO_Type.S1_NegStopCylinder, IO_VALUE.HIGH);
S1LineRun(MoveInfo); S1LineRun(MoveInfo);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck1, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.PreS1_PosStopCheck, IO_VALUE.HIGH));
} }
else else
{ {
...@@ -281,7 +280,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -281,7 +280,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(MoveStep.H05_MShlefToLeft); MoveInfo.NextMoveStep(MoveStep.H05_MShlefToLeft);
LogUtil.info(Name + " 复位：中间提升机有料架，等待料架到达S1左侧"); LogUtil.info(Name + " 复位：中间提升机有料架，等待料架到达S1左侧");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck1, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.PreS1_PosStopCheck, IO_VALUE.HIGH));
break; break;
case MoveStep.H05_MShlefToLeft: case MoveStep.H05_MShlefToLeft:
MoveInfo.NextMoveStep(MoveStep.H06_SaveLeft); MoveInfo.NextMoveStep(MoveStep.H06_SaveLeft);
......
source/DeviceLibrary/doubleLine/DoubleLineBean_S1Shelf.cs
...@@ -42,10 +42,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -42,10 +42,10 @@ namespace OnlineStore.DeviceLibrary
internal void S1_ShelfCheck() internal void S1_ShelfCheck()
{ {
//未准备料架，判断工位是否有料架 //未准备料架，判断工位是否有料架
if (IOValue(IO_Type.S1_StopCheck2).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.S1_PosStopCheck).Equals(IO_VALUE.HIGH))
{ {
//判断左侧是否有料架 //判断左侧是否有料架
if (IOValue(IO_Type.S1_StopCheck1).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.PreS1_PosStopCheck).Equals(IO_VALUE.HIGH))
{ {
if (S1_LeftShelfId.Equals("")) if (S1_LeftShelfId.Equals(""))
{ {
...@@ -61,15 +61,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -61,15 +61,14 @@ namespace OnlineStore.DeviceLibrary
SOneMoveInfo.NewMove(LineMoveType.S1Shelf); SOneMoveInfo.NewMove(LineMoveType.S1Shelf);
S1_WaitTopUp(); S1_WaitTopUp();
} }
else if (IOValue(IO_Type.S1_StopCheck1).Equals(IO_VALUE.HIGH)) else if (IOValue(IO_Type.PreS1_PosStopCheck).Equals(IO_VALUE.HIGH))
{ {
LogUtil.info(Name + "启动检测到左侧有料架，开始处理料架"); LogUtil.info(Name + "启动检测到左侧有料架，开始处理料架");
SOneMoveInfo.NewMove(LineMoveType.S1Shelf, MoveStep.S1_C06_SaveLeft); SOneMoveInfo.NewMove(LineMoveType.S1Shelf, MoveStep.S1_C06_SaveLeft);
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
IOMove(IO_Type.S1_StopCylinder1, IO_VALUE.HIGH); IOMove(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW);
IOMove(IO_Type.S1_StopCylinder2, IO_VALUE.LOW); IOMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.HIGH);
IOMove(IO_Type.S1_StopCylinder3, IO_VALUE.HIGH); IOMove(IO_Type.S1_NegStopCylinder, IO_VALUE.HIGH);
IOMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH);
} }
else else
{ {
...@@ -97,70 +96,70 @@ namespace OnlineStore.DeviceLibrary ...@@ -97,70 +96,70 @@ namespace OnlineStore.DeviceLibrary
S1Log(log + " 剩余任务：" + AllTaskInfo.ToStr() + "，需要一个新C料架"); S1Log(log + " 剩余任务：" + AllTaskInfo.ToStr() + "，需要一个新C料架");
return true; return true;
} }
else if (AllTaskInfo.packageTask > 0) //else if (AllTaskInfo.packageTask > 0)
{ //{
//需要等待S2工位无料架，才能送料架过去 // //需要等待S2工位无料架，才能送料架过去
if (NoWrokShelf()) // if (NoWrokShelf())
{ // {
//等待3秒都无料架 // //等待3秒都无料架
if (LineManager.checkWatch(pkgHasShelfWatch, 10000)) // if (LineManager.checkWatch(pkgHasShelfWatch, 10000))
{ // {
needNewShelf = Static_String.BigShelf_RFID_Prefix; // needNewShelf = Static_String.BigShelf_RFID_Prefix;
SOneMoveInfo.NewMove(LineMoveType.S1Shelf, MoveStep.S1_NewShelf); // SOneMoveInfo.NewMove(LineMoveType.S1Shelf, MoveStep.S1_NewShelf);
S1Log(log + " 剩余任务：" + AllTaskInfo.ToStr() + "，需要一个新C料架_包装料"); // S1Log(log + " 剩余任务：" + AllTaskInfo.ToStr() + "，需要一个新C料架_包装料");
return true; // return true;
} // }
} // }
else // else
{ // {
pkgHasShelfWatch.Stop(); // pkgHasShelfWatch.Stop();
} // }
} //}
else else
{ {
pkgHasShelfWatch.Stop(); pkgHasShelfWatch.Stop();
} }
return false; return false;
} }
private bool NoWrokShelf() //private bool NoWrokShelf()
{ //{
if ( // if (
String.IsNullOrEmpty(S1_CurrShelfId) && // String.IsNullOrEmpty(S1_CurrShelfId) &&
String.IsNullOrEmpty(S1_LeftShelfId) && // String.IsNullOrEmpty(S1_LeftShelfId) &&
String.IsNullOrEmpty(S1_RightShelfId) && // String.IsNullOrEmpty(S1_RightShelfId) &&
IOValue(IO_Type.M_LeftStopCheck).Equals(IO_VALUE.LOW) && // IOValue(IO_Type.M_LeftStopCheck).Equals(IO_VALUE.LOW) &&
IOValue(IO_Type.M_RightStopCheck).Equals(IO_VALUE.LOW) && // IOValue(IO_Type.M_RightStopCheck).Equals(IO_VALUE.LOW) &&
IOValue(IO_Type.S1_StopCheck1).Equals(IO_VALUE.LOW) && // IOValue(IO_Type.S1_StopCheck1).Equals(IO_VALUE.LOW) &&
IOValue(IO_Type.S1_StopCheck2).Equals(IO_VALUE.LOW) && // IOValue(IO_Type.S1_StopCheck2).Equals(IO_VALUE.LOW) &&
IOValue(IO_Type.S1_StopCheck4).Equals(IO_VALUE.LOW) && // IOValue(IO_Type.S1_StopCheck4).Equals(IO_VALUE.LOW) &&
CylinderIsOk(IO_Type.S1_TopCylinderUp1, IO_Type.S1_TopCylinderDown1) && // CylinderIsOk(IO_Type.S1_TopCylinderUp1, IO_Type.S1_TopCylinderDown1) &&
CylinderIsOk(IO_Type.S1_TopCylinderUp2, IO_Type.S1_TopCylinderDown2) && // CylinderIsOk(IO_Type.S1_TopCylinderUp2, IO_Type.S1_TopCylinderDown2) &&
IOValue(IO_Type.S1_StopCheck5).Equals(IO_VALUE.LOW) // IOValue(IO_Type.S1_StopCheck5).Equals(IO_VALUE.LOW)
) // )
{ // {
return true; // return true;
} // }
return false; // return false;
} //}
public void S1_StopMove(LineMoveInfo moveInfo, IO_VALUE iovalue, bool stop2Move = false) public void S1_StopMove(LineMoveInfo moveInfo, IO_VALUE iovalue, bool stop2Move = false)
{ {
if (moveInfo != null) if (moveInfo != null)
{ {
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCylinder2, iovalue)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.PreS1_NegStopCylinder, iovalue));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCylinder3, iovalue)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.PreS1_PosStopCylinder, iovalue));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCylinder5, iovalue)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_NegStopCylinder, iovalue));
if (stop2Move) if (stop2Move)
{ {
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCylinder4, iovalue)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_PosStopCylinder, iovalue));
} }
} }
CheckAndMove(IO_Type.S1_StopCylinder5, iovalue); CheckAndMove(IO_Type.PreS1_NegStopCylinder, iovalue);
CheckAndMove(IO_Type.S1_StopCylinder2, iovalue); CheckAndMove(IO_Type.PreS1_PosStopCylinder, iovalue);
CheckAndMove(IO_Type.S1_StopCylinder3, iovalue); CheckAndMove(IO_Type.S1_NegStopCylinder, iovalue);
if (stop2Move) if (stop2Move)
{ {
CheckAndMove(IO_Type.S1_StopCylinder4, iovalue); CheckAndMove(IO_Type.S1_PosStopCylinder, iovalue);
} }
} }
private void S1Log(string msg) private void S1Log(string msg)
...@@ -258,13 +257,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -258,13 +257,10 @@ namespace OnlineStore.DeviceLibrary
SOneMoveInfo.NextMoveStep(MoveStep.S1_C02_MDown); SOneMoveInfo.NextMoveStep(MoveStep.S1_C02_MDown);
S1Log(" 中间提升机下降，，等待下层线体有料架 "); S1Log(" 中间提升机下降，，等待下层线体有料架 ");
CylinderMove(SOneMoveInfo, IO_Type.M_Updown_Up, IO_Type.M_Updown_Down); CylinderMove(SOneMoveInfo, IO_Type.M_Updown_Up, IO_Type.M_Updown_Down);
// CylinderMove(SOneMoveInfo, IO_Type.S1_TopCylinderUp, IO_Type.S1_TopCylinderDown); CheckAndMove(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW);
// SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LLow_StopCheck3, IO_VALUE.HIGH)); CheckAndMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder2, IO_VALUE.LOW); // CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder1, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder3, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH);
} }
} }
else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C02_MDown)) else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C02_MDown))
...@@ -287,11 +283,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -287,11 +283,9 @@ namespace OnlineStore.DeviceLibrary
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.M_LineRun, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.M_LineRun, IO_VALUE.HIGH));
// SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LLow_StopCheck3, IO_VALUE.LOW)); // SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LLow_StopCheck3, IO_VALUE.LOW));
CheckAndMove(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder2, IO_VALUE.LOW); CheckAndMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder1, IO_VALUE.LOW); CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder3, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH);
} }
else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C03_MStopDown)) else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C03_MStopDown))
{ {
...@@ -302,14 +296,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -302,14 +296,14 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.LLow_StopCylinder2, IO_VALUE.LOW); IOMove(IO_Type.LLow_StopCylinder2, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder1, IO_VALUE.LOW); CheckAndMove(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder3, IO_VALUE.HIGH); CheckAndMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH); CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.HIGH);
S1LineRun(SOneMoveInfo); S1LineRun(SOneMoveInfo);
//IOMove(IO_Type.S1_LineRun, IO_VALUE.HIGH); //IOMove(IO_Type.S1_LineRun, IO_VALUE.HIGH);
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.M_LeftStopCheck, IO_VALUE.LOW)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.M_LeftStopCheck, IO_VALUE.LOW));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck1, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.PreS1_PosStopCheck, IO_VALUE.HIGH));
} }
else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C04_DToLeft)) else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C04_DToLeft))
...@@ -324,11 +318,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -324,11 +318,11 @@ namespace OnlineStore.DeviceLibrary
SOneMoveInfo.NextMoveStep(MoveStep.S1_C05_CheckS1); SOneMoveInfo.NextMoveStep(MoveStep.S1_C05_CheckS1);
S1_LeftShelfId = "00C"; S1_LeftShelfId = "00C";
S1Log("S1工位有料架，当前料架存放在左侧" + LeftSName + "，S1停止"); S1Log("S1工位有料架，当前料架存放在左侧" + LeftSName + "，S1停止");
CheckAndMove(IO_Type.S1_StopCylinder1, IO_VALUE.LOW); CheckAndMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.LOW);
// IOMove(IO_Type.S1_LineRun, IO_VALUE.LOW); // IOMove(IO_Type.S1_LineRun, IO_VALUE.LOW);
S1LineStop(); S1LineStop();
IOMove(IO_Type.M_LineRun, IO_VALUE.LOW); IOMove(IO_Type.M_LineRun, IO_VALUE.LOW);
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck1, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.PreS1_PosStopCheck, IO_VALUE.HIGH));
} }
} }
else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C05_CheckS1)) else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C05_CheckS1))
...@@ -339,18 +333,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -339,18 +333,18 @@ namespace OnlineStore.DeviceLibrary
{ {
S1_LeftShelfId = ""; S1_LeftShelfId = "";
SOneMoveInfo.NextMoveStep(MoveStep.S1_C07_ToS1); SOneMoveInfo.NextMoveStep(MoveStep.S1_C07_ToS1);
S1Log(" S1阻挡4上升，其他组的下降，下层线体停止，S1正转， 等待料架到达S1"); S1Log(" S1正阻挡上升，其他组的下降，下层线体停止，S1正转， 等待料架到达S1");
SOneMoveInfo.TimeOutSeconds = 15; SOneMoveInfo.TimeOutSeconds = 15;
S1_StopMove(SOneMoveInfo, IO_VALUE.HIGH); S1_StopMove(SOneMoveInfo, IO_VALUE.HIGH);
IOMove(IO_Type.S1_StopCylinder4, IO_VALUE.LOW); IOMove(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW);
IOMove(IO_Type.LLown_LineRun, IO_VALUE.LOW); IOMove(IO_Type.LLown_LineRun, IO_VALUE.LOW);
IOMove(IO_Type.LLow_StopCylinder2, IO_VALUE.LOW); IOMove(IO_Type.LLow_StopCylinder2, IO_VALUE.LOW);
// IOMove(IO_Type.S1_LineRun, IO_VALUE.HIGH); // IOMove(IO_Type.S1_LineRun, IO_VALUE.HIGH);
IOMove(IO_Type.M_LineRun, IO_VALUE.HIGH); IOMove(IO_Type.M_LineRun, IO_VALUE.HIGH);
// SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_LineRun, IO_VALUE.HIGH)); // SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_LineRun, IO_VALUE.HIGH));
S1LineRun(SOneMoveInfo); S1LineRun(SOneMoveInfo);
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck2, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_PosStopCheck, IO_VALUE.HIGH));
} }
else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C07_ToS1)) else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_C07_ToS1))
{ {
...@@ -451,10 +445,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -451,10 +445,9 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(SOneMoveInfo, IO_Type.M_Updown_Up, IO_Type.M_Updown_Down); CylinderMove(SOneMoveInfo, IO_Type.M_Updown_Up, IO_Type.M_Updown_Down);
// S1_StopMove(null, IO_VALUE.HIGH); // S1_StopMove(null, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder2, IO_VALUE.LOW); CheckAndMove(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder1, IO_VALUE.LOW); CheckAndMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder3, IO_VALUE.HIGH); CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH);
} }
} }
...@@ -468,14 +461,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -468,14 +461,14 @@ namespace OnlineStore.DeviceLibrary
CheckAndMove(IO_Type.M_RightStopCylinder, IO_VALUE.HIGH); CheckAndMove(IO_Type.M_RightStopCylinder, IO_VALUE.HIGH);
IOMove(IO_Type.M_LineRun, IO_VALUE.HIGH); IOMove(IO_Type.M_LineRun, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder1, IO_VALUE.LOW); CheckAndMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder3, IO_VALUE.HIGH); CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH); // CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH);
// IOMove(IO_Type.S1_LineRun, IO_VALUE.HIGH); // IOMove(IO_Type.S1_LineRun, IO_VALUE.HIGH);
S1LineRun(); S1LineRun();
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.M_LeftStopCheck, IO_VALUE.LOW)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.M_LeftStopCheck, IO_VALUE.LOW));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck1, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.PreS1_PosStopCheck, IO_VALUE.HIGH));
} }
else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_D16_CToLeft)) else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_D16_CToLeft))
{ {
...@@ -488,11 +481,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -488,11 +481,11 @@ namespace OnlineStore.DeviceLibrary
SOneMoveInfo.NextMoveStep(MoveStep.S1_D17_CheckS1); SOneMoveInfo.NextMoveStep(MoveStep.S1_D17_CheckS1);
S1_LeftShelfId = "00D"; S1_LeftShelfId = "00D";
S1Log("S1工位有料架，当前料架存放在左侧" + LeftSName + "，S1停止"); S1Log("S1工位有料架，当前料架存放在左侧" + LeftSName + "，S1停止");
CheckAndMove(IO_Type.S1_StopCylinder1, IO_VALUE.LOW); CheckAndMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.LOW);
// IOMove(IO_Type.S1_LineRun, IO_VALUE.LOW); // IOMove(IO_Type.S1_LineRun, IO_VALUE.LOW);
S1LineStop(); S1LineStop();
IOMove(IO_Type.M_LineRun, IO_VALUE.LOW); IOMove(IO_Type.M_LineRun, IO_VALUE.LOW);
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck1, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.PreS1_PosStopCheck, IO_VALUE.HIGH));
// SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000)); // SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
} }
} }
...@@ -504,16 +497,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -504,16 +497,16 @@ namespace OnlineStore.DeviceLibrary
{ {
S1_LeftShelfId = ""; S1_LeftShelfId = "";
SOneMoveInfo.NextMoveStep(MoveStep.S1_D19_ToS1); SOneMoveInfo.NextMoveStep(MoveStep.S1_D19_ToS1);
S1Log(" S1阻挡4上升，其他阻挡下降，转动工位链条等待料架到达"); S1Log(" S1正阻挡上升，其他阻挡下降，转动工位链条等待料架到达");
S1_StopMove(SOneMoveInfo, IO_VALUE.HIGH); S1_StopMove(SOneMoveInfo, IO_VALUE.HIGH);
IOMove(IO_Type.S1_StopCylinder4, IO_VALUE.LOW); IOMove(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW);
// IOMove(IO_Type.S1_LineRun, IO_VALUE.HIGH); // IOMove(IO_Type.S1_LineRun, IO_VALUE.HIGH);
S1LineRun(SOneMoveInfo); S1LineRun(SOneMoveInfo);
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.M_LineRun, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.M_LineRun, IO_VALUE.HIGH));
// SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_LineRun, IO_VALUE.HIGH)); // SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_LineRun, IO_VALUE.HIGH));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck2, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_PosStopCheck, IO_VALUE.HIGH));
} }
else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_D19_ToS1)) else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_D19_ToS1))
{ {
...@@ -545,9 +538,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -545,9 +538,9 @@ namespace OnlineStore.DeviceLibrary
else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_27_S1ShelfGo)) else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_27_S1ShelfGo))
{ {
//S2LineStop(); //S2LineStop();
IOMove(IO_Type.S1_StopCylinder2, IO_VALUE.LOW); IOMove(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW);
//IOMove(IO_Type.S2_LineRun, IO_VALUE.LOW); //IOMove(IO_Type.S2_LineRun, IO_VALUE.LOW);
string log = S1SName + "已离开，阻挡2上升 ，清空绑定信息"; string log = S1SName + "已离开，阻挡上升 ，清空绑定信息";
RemoveRealShelf(S1_CurrShelfId); RemoveRealShelf(S1_CurrShelfId);
S1_CurrShelfId = ""; S1_CurrShelfId = "";
if (!S1_LeftShelfId.Equals("")) if (!S1_LeftShelfId.Equals(""))
...@@ -559,8 +552,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -559,8 +552,8 @@ namespace OnlineStore.DeviceLibrary
{ {
S1LineStop(); S1LineStop();
//IOMove(IO_Type.S1_LineRun, IO_VALUE.LOW); //IOMove(IO_Type.S1_LineRun, IO_VALUE.LOW);
IOMove(IO_Type.S1_StopCylinder1, IO_VALUE.HIGH); IOMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.HIGH);
IOMove(IO_Type.S1_StopCylinder2, IO_VALUE.LOW); IOMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.LOW);
if (!CheckS1Task(log)) if (!CheckS1Task(log))
{ {
SOneMoveInfo.EndMove(); SOneMoveInfo.EndMove();
...@@ -587,7 +580,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -587,7 +580,7 @@ namespace OnlineStore.DeviceLibrary
S1_CurrShelfId = ""; S1_CurrShelfId = "";
// IOMove(IO_Type.S2_LineRun, IO_VALUE.LOW); // IOMove(IO_Type.S2_LineRun, IO_VALUE.LOW);
//S2LineStop(); //S2LineStop();
IOMove(IO_Type.S1_StopCylinder2, IO_VALUE.LOW); IOMove(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW);
Start_LeftShelfToS1(MoveStep.S1_32_LeftToS1, " 左->S1切换 ：" + S1SName + "到达右侧，记录料架号，清空S1信息，"); Start_LeftShelfToS1(MoveStep.S1_32_LeftToS1, " 左->S1切换 ：" + S1SName + "到达右侧，记录料架号，清空S1信息，");
} }
...@@ -611,25 +604,24 @@ namespace OnlineStore.DeviceLibrary ...@@ -611,25 +604,24 @@ namespace OnlineStore.DeviceLibrary
SOneMoveInfo.NextMoveStep(MoveStep.S1_41_S1ToLeft); SOneMoveInfo.NextMoveStep(MoveStep.S1_41_S1ToLeft);
S1Log(" 右->S1切换 ，" + S1SName + " 先到左侧，4下降，3上升，S1反转"); S1Log(" 右->S1切换 ，" + S1SName + " 先到左侧，4下降，3上升，S1反转");
CheckAndMove(IO_Type.S1_StopCylinder1, IO_VALUE.HIGH); CheckAndMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder2, IO_VALUE.LOW); CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder3, IO_VALUE.LOW); CheckAndMove(IO_Type.S1_NegStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH);
S1BackRun(SOneMoveInfo); S1BackRun(SOneMoveInfo);
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck2, IO_VALUE.LOW)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_PosStopCheck, IO_VALUE.LOW));
} }
else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_41_S1ToLeft)) else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_41_S1ToLeft))
{ {
SOneMoveInfo.NextMoveStep(MoveStep.S1_42_WaitInLeft); SOneMoveInfo.NextMoveStep(MoveStep.S1_42_WaitInLeft);
S1Log(" 右->S1切换 ，等待" + S1SName + " 完全进入左侧"); S1Log(" 右->S1切换 ，等待" + S1SName + " 完全进入左侧");
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck1, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.PreS1_NegStopCheck, IO_VALUE.HIGH));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck4, IO_VALUE.LOW)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_NegStopCheck, IO_VALUE.LOW));
// SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000)); // SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
} }
else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_42_WaitInLeft)) else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_42_WaitInLeft))
{ {
IOMove(IO_Type.S1_StopCylinder4, IO_VALUE.LOW); IOMove(IO_Type.S1_NegStopCylinder, IO_VALUE.LOW);
SOneMoveInfo.NextMoveStep(MoveStep.S1_43_WaitRightToS1); SOneMoveInfo.NextMoveStep(MoveStep.S1_43_WaitRightToS1);
S1Log(" 右->S1切换 ：" + S1SName + "到达左侧，记录料架号，等待右侧料架可以切换到S1"); S1Log(" 右->S1切换 ：" + S1SName + "到达左侧，记录料架号，等待右侧料架可以切换到S1");
S1_LeftShelfId = S1_CurrShelfId; S1_LeftShelfId = S1_CurrShelfId;
...@@ -637,25 +629,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -637,25 +629,23 @@ namespace OnlineStore.DeviceLibrary
S2CanGetShelf = false; S2CanGetShelf = false;
//SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S2_LineRun, IO_VALUE.LOW)); //SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S2_LineRun, IO_VALUE.LOW));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck5, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_NegStopCheck, IO_VALUE.HIGH));
CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.LOW); CheckAndMove(IO_Type.S1_NegStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder2, IO_VALUE.HIGH); CheckAndMove(IO_Type.S1_PosStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder1, IO_VALUE.HIGH);
} }
else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_43_WaitRightToS1)) else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_43_WaitRightToS1))
{ {
SOneMoveInfo.NextMoveStep(MoveStep.S1_44_RightToS1); SOneMoveInfo.NextMoveStep(MoveStep.S1_44_RightToS1);
S1Log(" 右->S1切换 ：" + RightSName + "开始到S1 ，4上升，3上升，1下降，2下降，S1反转，S2反转，清空S1的rfid"); S1Log(" 右->S1切换 ：" + RightSName + "开始到S1 ，S1反阻挡上升，S1正阻挡下降，S1反转，清空S1的rfid");
RFIDManager.ReadRFID(Config.S1_Rfid, true); RFIDManager.ReadRFID(Config.S1_Rfid, true);
CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.LOW); CheckAndMove(IO_Type.S1_NegStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder2, IO_VALUE.HIGH); CheckAndMove(IO_Type.S1_PosStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder1, IO_VALUE.HIGH);
S1BackRun(); S1BackRun();
//S2BackRun(); //S2BackRun();
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck2, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.AftS1_StopCheck, IO_VALUE.LOW));
} }
...@@ -663,7 +653,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -663,7 +653,7 @@ namespace OnlineStore.DeviceLibrary
{ {
SOneMoveInfo.NextMoveStep(MoveStep.S1_44_WaitShelfInS1); SOneMoveInfo.NextMoveStep(MoveStep.S1_44_WaitShelfInS1);
S1Log(" 右->S1切换 ：等待" + RightSName + "完全在S1"); S1Log(" 右->S1切换 ：等待" + RightSName + "完全在S1");
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck4, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_NegStopCheck, IO_VALUE.HIGH));
} }
else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_44_WaitShelfInS1)) else if (SOneMoveInfo.MoveStep.Equals(MoveStep.S1_44_WaitShelfInS1))
{ {
...@@ -878,7 +868,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -878,7 +868,7 @@ namespace OnlineStore.DeviceLibrary
} }
S1LineStop(); S1LineStop();
IOMove(IO_Type.S1_StopCylinder2, IO_VALUE.LOW); IOMove(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW);
SOneMoveInfo.NextMoveStep(MoveStep.S1_23_ToReady); SOneMoveInfo.NextMoveStep(MoveStep.S1_23_ToReady);
S1Log(" " + S1SName + "到达S1，顶升气缸上升，" + S1_ShelfTask.ToStr()); S1Log(" " + S1SName + "到达S1，顶升气缸上升，" + S1_ShelfTask.ToStr());
CylinderMove(SOneMoveInfo, IO_Type.S1_TopCylinderDown, IO_Type.S1_TopCylinderUp); CylinderMove(SOneMoveInfo, IO_Type.S1_TopCylinderDown, IO_Type.S1_TopCylinderUp);
...@@ -935,12 +925,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -935,12 +925,11 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(SOneMoveInfo, IO_Type.S1_TopCylinderUp, IO_Type.S1_TopCylinderDown); CylinderMove(SOneMoveInfo, IO_Type.S1_TopCylinderUp, IO_Type.S1_TopCylinderDown);
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown1, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown1, IO_VALUE.HIGH));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown2, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown2, IO_VALUE.HIGH));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck1, IO_VALUE.LOW)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_PosStopCheck, IO_VALUE.LOW));
CheckAndMove(IO_Type.S1_StopCylinder1, IO_VALUE.HIGH); CheckAndMove(IO_Type.PreS1_NegStopCylinder, IO_VALUE.LOW);
CheckAndMove(IO_Type.S1_StopCylinder2, IO_VALUE.LOW); CheckAndMove(IO_Type.S1_NegStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder3, IO_VALUE.LOW); CheckAndMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.S1_StopCylinder4, IO_VALUE.HIGH);
} }
...@@ -949,7 +938,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -949,7 +938,7 @@ namespace OnlineStore.DeviceLibrary
{ {
SOneMoveInfo.NextMoveStep(nextStep); SOneMoveInfo.NextMoveStep(nextStep);
SOneMoveInfo.CanRMoveIO = false; SOneMoveInfo.CanRMoveIO = false;
S1Log(" " + movetype + "：顶升下降，等待 ：S2链条停止，S2阻挡1上升，S2阻挡1无信号"); S1Log(" " + movetype + "：顶升下降，等待 ：S1后阻挡信号");
if (nextStep.Equals(MoveStep.S1_26_WaitS1Go)) if (nextStep.Equals(MoveStep.S1_26_WaitS1Go))
{ {
S2CanGetShelf = true; S2CanGetShelf = true;
...@@ -961,29 +950,28 @@ namespace OnlineStore.DeviceLibrary ...@@ -961,29 +950,28 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(null, IO_Type.S1_TopCylinderUp, IO_Type.S1_TopCylinderDown); CylinderMove(null, IO_Type.S1_TopCylinderUp, IO_Type.S1_TopCylinderDown);
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown1, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown1, IO_VALUE.HIGH));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown2, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown2, IO_VALUE.HIGH));
// SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S2_LineRun, IO_VALUE.LOW));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck5, IO_VALUE.LOW)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.AftS1_StopCheck, IO_VALUE.LOW));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCylinder5, IO_VALUE.LOW));
} }
private void Start_S1ShelfToRight(MoveStep nextStep, string movetype, bool ShelfIsCanGo = false) private void Start_S1ShelfToRight(MoveStep nextStep, string movetype, bool ShelfIsCanGo = false)
{ {
SOneMoveInfo.NextMoveStep(nextStep); SOneMoveInfo.NextMoveStep(nextStep);
S1Log(" " + movetype + "：" + S1SName + " 先到右侧，阻挡1上升，S1正转"); S1Log(" " + movetype + "：" + S1SName + " 先到右侧，S1后阻挡上升，S1正转");
S2CanGetShelf = ShelfIsCanGo; S2CanGetShelf = ShelfIsCanGo;
IOMove(IO_Type.S1_StopCylinder1, IO_VALUE.LOW); IOMove(IO_Type.AftS1_StopCylinder, IO_VALUE.LOW);
IOMove(IO_Type.S1_StopCylinder2, IO_VALUE.HIGH); IOMove(IO_Type.S1_PosStopCylinder, IO_VALUE.HIGH);
if (!S1_LeftShelfId.Equals("")) if (!S1_LeftShelfId.Equals(""))
{ {
IOMove(IO_Type.S1_StopCylinder3, IO_VALUE.LOW); IOMove(IO_Type.PreS1_PosStopCylinder, IO_VALUE.LOW);
} }
CylinderMove(SOneMoveInfo, IO_Type.S1_TopCylinderUp, IO_Type.S1_TopCylinderDown); CylinderMove(SOneMoveInfo, IO_Type.S1_TopCylinderUp, IO_Type.S1_TopCylinderDown);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown1, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown1, IO_VALUE.HIGH));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown2, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_TopCylinderDown2, IO_VALUE.HIGH));
S1LineRun(); S1LineRun();
//S2LineRun(); //S2LineRun();
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck2, IO_VALUE.LOW)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_PosStopCheck, IO_VALUE.LOW));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck5, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.AftS1_StopCheck, IO_VALUE.HIGH));
} }
private void Start_LeftShelfToS1(MoveStep nextStep, string movetype) private void Start_LeftShelfToS1(MoveStep nextStep, string movetype)
...@@ -991,13 +979,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -991,13 +979,13 @@ namespace OnlineStore.DeviceLibrary
SOneMoveInfo.NextMoveStep(nextStep); SOneMoveInfo.NextMoveStep(nextStep);
S1Log(movetype + "，" + LeftSName + "开始到S1，S1正转，清空S1的rfid信息"); S1Log(movetype + "，" + LeftSName + "开始到S1，S1正转，清空S1的rfid信息");
RFIDManager.ReadRFID(Config.S1_Rfid, true); RFIDManager.ReadRFID(Config.S1_Rfid, true);
IOMove(IO_Type.S1_StopCylinder2, IO_VALUE.LOW); IOMove(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW);
// IOMove(IO_Type.S1_LineRun, IO_VALUE.HIGH); // IOMove(IO_Type.S1_LineRun, IO_VALUE.HIGH);
S1LineRun(); S1LineRun();
S1_StopMove(SOneMoveInfo, IO_VALUE.HIGH); S1_StopMove(SOneMoveInfo, IO_VALUE.HIGH);
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck1, IO_VALUE.LOW)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_PosStopCylinder, IO_VALUE.LOW));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCylinder2, IO_VALUE.LOW)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.PreS1_PosStopCheck, IO_VALUE.LOW));
SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_StopCheck2, IO_VALUE.HIGH)); SOneMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.S1_PosStopCheck, IO_VALUE.HIGH));
} }
......
source/DeviceLibrary/doubleLine/DoubleLineBean_lineShelf.cs
...@@ -17,10 +17,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -17,10 +17,12 @@ namespace OnlineStore.DeviceLibrary
public string LeftUpdownRFID = ""; public string LeftUpdownRFID = "";
private Stopwatch lowWatch = new Stopwatch(); private Stopwatch lowWatch = new Stopwatch();
private Stopwatch highWatch = new Stopwatch(); private Stopwatch lhighWatch = new Stopwatch();
private Stopwatch rhighWatch = new Stopwatch();
private Stopwatch inLineWatch = new Stopwatch(); private Stopwatch inLineWatch = new Stopwatch();
private bool LowProcess = false; private bool LowProcess = false;
private bool HighProcess = false; private bool LHighProcess = false;
private bool RHighProcess = false;
private void ShelfCheckPro() private void ShelfCheckPro()
{ {
//左侧轨道 //左侧轨道
...@@ -32,17 +34,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -32,17 +34,17 @@ namespace OnlineStore.DeviceLibrary
if (IOValue(IO_Type.LHigh_StopCheck2).Equals(IO_VALUE.LOW) && if (IOValue(IO_Type.LHigh_StopCheck2).Equals(IO_VALUE.LOW) &&
IOValue(IO_Type.LHigh_StopCylinder2).Equals(IO_VALUE.LOW) && IOValue(IO_Type.LHigh_StopCylinder2).Equals(IO_VALUE.LOW) &&
IOValue(IO_Type.LHigh_StopCheck1).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.LHigh_StopCheck1).Equals(IO_VALUE.HIGH) &&
IOValue(IO_Type.LHigh_LineRun).Equals(IO_VALUE.LOW) && HighProcess.Equals(false) IOValue(IO_Type.LHigh_LineRun).Equals(IO_VALUE.LOW) && LHighProcess.Equals(false)
) )
{ {
bool isUseHighShelf = (SOneMoveInfo.MoveStep >= MoveStep.S1_D12_LineRun && SOneMoveInfo.MoveStep <= MoveStep.S1_D12_LineRun); bool isUseHighShelf = (SOneMoveInfo.MoveStep >= MoveStep.S1_D12_LineRun && SOneMoveInfo.MoveStep <= MoveStep.S1_D12_LineRun);
if (!isUseHighShelf && LineManager.checkWatch(highWatch, 3000)) if (!isUseHighShelf && LineManager.checkWatch(lhighWatch, 3000))
{ {
highWatch.Stop(); lhighWatch.Stop();
//左侧上层需要放个料架 //左侧上层需要放个料架
Task.Factory.StartNew(delegate Task.Factory.StartNew(delegate
{ {
HighProcess = true; LHighProcess = true;
LogUtil.info("左侧双层线_" + "左上层放料架到阻挡2"); LogUtil.info("左侧双层线_" + "左上层放料架到阻挡2");
IOMove(IO_Type.LHigh_LineRun, IO_VALUE.HIGH, 30000); IOMove(IO_Type.LHigh_LineRun, IO_VALUE.HIGH, 30000);
IOMove(IO_Type.LHigh_StopCylinder1, IO_VALUE.HIGH, 3000); IOMove(IO_Type.LHigh_StopCylinder1, IO_VALUE.HIGH, 3000);
...@@ -50,15 +52,43 @@ namespace OnlineStore.DeviceLibrary ...@@ -50,15 +52,43 @@ namespace OnlineStore.DeviceLibrary
{ {
IOMove(IO_Type.LHigh_LineRun, IO_VALUE.LOW); IOMove(IO_Type.LHigh_LineRun, IO_VALUE.LOW);
} }
HighProcess = false; LHighProcess = false;
}); });
} }
} }
else else
{ {
highWatch.Stop(); lhighWatch.Stop();
} }
if (IOValue(IO_Type.RHigh_StopCheck2).Equals(IO_VALUE.LOW) &&
IOValue(IO_Type.RHigh_StopCylinder2).Equals(IO_VALUE.LOW) &&
IOValue(IO_Type.RHigh_StopCheck1).Equals(IO_VALUE.HIGH) &&
IOValue(IO_Type.RHigh_LineRun).Equals(IO_VALUE.LOW) && RHighProcess.Equals(false)
)
{
if (LineManager.checkWatch(rhighWatch, 3000))
{
rhighWatch.Stop();
//右侧上层需要放个料架
Task.Factory.StartNew(delegate
{
LHighProcess = true;
LogUtil.info("右侧双层线_" + "右上层放料架到阻挡2");
IOMove(IO_Type.RHigh_LineRun, IO_VALUE.HIGH, 30000);
IOMove(IO_Type.RHigh_StopCylinder1, IO_VALUE.HIGH, 3000);
if (WaitIo(IO_Type.RHigh_StopCheck2, IO_VALUE.HIGH, 30000, "右侧_上层放料架到阻挡2"))
{
IOMove(IO_Type.RHigh_LineRun, IO_VALUE.LOW);
}
RHighProcess = false;
});
}
}
else
{
rhighWatch.Stop();
}
if (IOValue(IO_Type.LLow_StopCheck2).Equals(IO_VALUE.LOW) && if (IOValue(IO_Type.LLow_StopCheck2).Equals(IO_VALUE.LOW) &&
IOValue(IO_Type.LLow_StopCheck1).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.LLow_StopCheck1).Equals(IO_VALUE.HIGH) &&
......
source/DeviceLibrary/packageLine/LineAGVProcess.cs
...@@ -341,6 +341,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -341,6 +341,7 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.R_LineRun, IO_VALUE.LOW); IOMove(IO_Type.R_LineRun, IO_VALUE.LOW);
IOMove(IO_Type.R_LeftStopCylinder, IO_VALUE.HIGH); IOMove(IO_Type.R_LeftStopCylinder, IO_VALUE.HIGH);
IOMove(IO_Type.R_RightStopCylinder, IO_VALUE.HIGH);
benQOutStep.ToNextStep(BenQ_OUT_STEP.SHELT_OUT); benQOutStep.ToNextStep(BenQ_OUT_STEP.SHELT_OUT);
benQOutStep.AddIoWait(IO_Type.R_RightStopCheck, IO_VALUE.LOW, 5000); benQOutStep.AddIoWait(IO_Type.R_RightStopCheck, IO_VALUE.LOW, 5000);
} }
...@@ -364,6 +365,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -364,6 +365,7 @@ namespace OnlineStore.DeviceLibrary
agvClient_Dbline.FinishLeave("A6"); agvClient_Dbline.FinishLeave("A6");
IOMove(IO_Type.R_OutLineRun, IO_VALUE.LOW); IOMove(IO_Type.R_OutLineRun, IO_VALUE.LOW);
IOMove(IO_Type.R_LeftStopCylinder, IO_VALUE.LOW); IOMove(IO_Type.R_LeftStopCylinder, IO_VALUE.LOW);
IOMove(IO_Type.R_RightStopCylinder, IO_VALUE.LOW);
} }
} }
} }
......
source/DeviceLibrary/packageLine/PackageLine.cs
...@@ -78,7 +78,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -78,7 +78,7 @@ namespace OnlineStore.DeviceLibrary
//IOMove(IO_Type.Pkg_Out_Stop_Down, IO_VALUE.LOW); //IOMove(IO_Type.Pkg_Out_Stop_Down, IO_VALUE.LOW);
//双层线上层阻挡 //双层线上层阻挡
IOMove(IO_Type.RHigh_StopCylinder1, IO_VALUE.HIGH); IOMove(IO_Type.RHigh_StopCylinder1, IO_VALUE.LOW);
IOMove(IO_Type.RHigh_StopCylinder2, IO_VALUE.LOW); IOMove(IO_Type.RHigh_StopCylinder2, IO_VALUE.LOW);
// //
...@@ -123,7 +123,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -123,7 +123,7 @@ namespace OnlineStore.DeviceLibrary
ProcessBenQLeftEnter(); ProcessBenQLeftEnter();
ProcessBenQRightEnter(); ProcessBenQRightEnter();
ProcessBenQLeave(); ProcessBenQLeave();
//BenQ 右侧入料 //右侧入料
ProcessBenQEnterFromOut(); ProcessBenQEnterFromOut();
CheckA5State(); CheckA5State();
CheckA6State(); CheckA6State();
...@@ -168,7 +168,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -168,7 +168,7 @@ namespace OnlineStore.DeviceLibrary
//IOMove(IO_Type.Pkg_Line3_Forward, IO_VALUE.LOW); //IOMove(IO_Type.Pkg_Line3_Forward, IO_VALUE.LOW);
//S2工位 //S2工位
IOMove(IO_Type.S1_StopCylinder5, IO_VALUE.LOW); IOMove(IO_Type.AftS1_StopCylinder, IO_VALUE.LOW);
//IOMove(IO_Type.S2_StopCylinder2, IO_VALUE.LOW); //IOMove(IO_Type.S2_StopCylinder2, IO_VALUE.LOW);
//双层线出料口 //双层线出料口
...@@ -176,7 +176,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -176,7 +176,7 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.R_LeftStopCylinder, IO_VALUE.LOW); IOMove(IO_Type.R_LeftStopCylinder, IO_VALUE.LOW);
IOMove(IO_Type.R_StopCylinder2, IO_VALUE.LOW); IOMove(IO_Type.R_StopCylinder2, IO_VALUE.LOW);
//右侧上层阻挡 //右侧上层阻挡
IOMove(IO_Type.RHigh_StopCylinder1, IO_VALUE.HIGH); IOMove(IO_Type.RHigh_StopCylinder1, IO_VALUE.LOW);
IOMove(IO_Type.RHigh_StopCylinder2, IO_VALUE.LOW); IOMove(IO_Type.RHigh_StopCylinder2, IO_VALUE.LOW);
IOMove(IO_Type.R_LineRun, IO_VALUE.LOW); IOMove(IO_Type.R_LineRun, IO_VALUE.LOW);
......
source/DeviceLibrary/packageLine/PackageLine_BenQInShelf.cs
...@@ -178,8 +178,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -178,8 +178,8 @@ namespace OnlineStore.DeviceLibrary
benQInFromOutStep.AddIoWait(IO_Type.R_RightStopCheck, IO_VALUE.LOW, 5000); benQInFromOutStep.AddIoWait(IO_Type.R_RightStopCheck, IO_VALUE.LOW, 5000);
CheckAndMove(IO_Type.RHigh_LineRun, IO_VALUE.HIGH);//右侧上层链条运行 CheckAndMove(IO_Type.RHigh_LineRun, IO_VALUE.HIGH);//右侧上层链条运行
CheckAndMove(IO_Type.R_OutLineBackRun, IO_VALUE.HIGH); CheckAndMove(IO_Type.R_OutLineBackRun, IO_VALUE.HIGH);
IOMove(IO_Type.R_RightStopCylinder, IO_VALUE.HIGH, 5000);
IOMove(IO_Type.R_LeftStopCylinder, IO_VALUE.HIGH,5000); IOMove(IO_Type.R_LeftStopCylinder, IO_VALUE.HIGH,5000);
CheckAndMove(IO_Type.RHigh_StopCylinder1, IO_VALUE.HIGH);
} }
} }
...@@ -188,6 +188,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -188,6 +188,8 @@ namespace OnlineStore.DeviceLibrary
bool noShelf = IOManager.IOValue(IO_Type.R_LeftStopCheck).Equals(IO_VALUE.LOW) && IOManager.IOValue(IO_Type.R_RightStopCheck).Equals(IO_VALUE.LOW); bool noShelf = IOManager.IOValue(IO_Type.R_LeftStopCheck).Equals(IO_VALUE.LOW) && IOManager.IOValue(IO_Type.R_RightStopCheck).Equals(IO_VALUE.LOW);
if (noShelf && benQInFromOutStep.IsFinished())//料盘进入完成 if (noShelf && benQInFromOutStep.IsFinished())//料盘进入完成
{ {
IOMove(IO_Type.R_RightStopCylinder, IO_VALUE.LOW);
IOMove(IO_Type.R_LeftStopCylinder, IO_VALUE.LOW);
benQInFromOutStep.ToNextStep(BenQ_IN_FROM_OUT_STEP.SHELF_DOWN); benQInFromOutStep.ToNextStep(BenQ_IN_FROM_OUT_STEP.SHELF_DOWN);
CheckAndMove(IO_Type.R_LeftStopCylinder, IO_VALUE.LOW); CheckAndMove(IO_Type.R_LeftStopCylinder, IO_VALUE.LOW);
IOMove(IO_Type.R_OutLineBackRun, IO_VALUE.LOW); IOMove(IO_Type.R_OutLineBackRun, IO_VALUE.LOW);
...@@ -196,6 +198,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -196,6 +198,11 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(MoveInfo, IO_Type.R_Updown_Up, IO_Type.R_Updown_Down); CylinderMove(MoveInfo, IO_Type.R_Updown_Up, IO_Type.R_Updown_Down);
benQInFromOutStep.AddTimeWait(5000); benQInFromOutStep.AddTimeWait(5000);
} }
else
{
CheckAndMove(IO_Type.R_RightStopCylinder, IO_VALUE.HIGH);
CheckAndMove(IO_Type.R_LeftStopCylinder, IO_VALUE.HIGH);
}
} }
else if (benQInFromOutStep.IsStep(BenQ_IN_FROM_OUT_STEP.SHELF_DOWN)) else if (benQInFromOutStep.IsStep(BenQ_IN_FROM_OUT_STEP.SHELF_DOWN))
{ {
...@@ -203,7 +210,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -203,7 +210,7 @@ namespace OnlineStore.DeviceLibrary
{ {
benQInFromOutStep.ToNextStep(BenQ_IN_FROM_OUT_STEP.WAIT_SHELF_TO_READY_POS); benQInFromOutStep.ToNextStep(BenQ_IN_FROM_OUT_STEP.WAIT_SHELF_TO_READY_POS);
benQInFromOutStep.Msg = "BenQ AGV 在右侧提升机将料架送入上层平台完成"; benQInFromOutStep.Msg = "BenQ AGV 在右侧提升机将料架送入上层平台完成";
benQInFromOutStep.AddIoWait(IO_Type.RHigh_StopCheck2, IO_VALUE.HIGH); benQInFromOutStep.AddIoWait(IO_Type.RHigh_StopCheck1, IO_VALUE.HIGH);
benQInFromOutStep.AddTimeWait(10000); benQInFromOutStep.AddTimeWait(10000);
} }
} }
...@@ -214,7 +221,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -214,7 +221,7 @@ namespace OnlineStore.DeviceLibrary
benQInFromOutStep.ToNextStep(BenQ_IN_FROM_OUT_STEP.NONE); benQInFromOutStep.ToNextStep(BenQ_IN_FROM_OUT_STEP.NONE);
benQInFromOutStep.Msg = "料架已到中间提升机右侧入口，停止链条"; benQInFromOutStep.Msg = "料架已到中间提升机右侧入口，停止链条";
//agvClient_Dbline.FinishEnter("A6"); //agvClient_Dbline.FinishEnter("A6");
//IOMove(IO_Type.RHigh_LineRun, IO_VALUE.LOW);//上层链条停止 IOMove(IO_Type.RHigh_LineRun, IO_VALUE.LOW);//上层链条停止
} }
else else
{ {
......
source/DoubleLineClient_3D/FrmAbbRobot.Designer.cs
...@@ -312,7 +312,6 @@ ...@@ -312,7 +312,6 @@
this.btnReload.TabIndex = 199; this.btnReload.TabIndex = 199;
this.btnReload.Text = "重新加载"; this.btnReload.Text = "重新加载";
this.btnReload.UseVisualStyleBackColor = false; this.btnReload.UseVisualStyleBackColor = false;
this.btnReload.Visible = false;
this.btnReload.Click += new System.EventHandler(this.btnReload_Click); this.btnReload.Click += new System.EventHandler(this.btnReload_Click);
// //
// chbUseAbb // chbUseAbb
......
source/DoubleLineClient_3D/FrmDbLineIO.Designer.cs
...@@ -56,22 +56,24 @@ ...@@ -56,22 +56,24 @@
this.S2_LineBackRun = new System.Windows.Forms.Button(); this.S2_LineBackRun = new System.Windows.Forms.Button();
this.S2_TopCylinderUp = new System.Windows.Forms.Label(); this.S2_TopCylinderUp = new System.Windows.Forms.Label();
this.groupBox4 = new System.Windows.Forms.GroupBox(); this.groupBox4 = new System.Windows.Forms.GroupBox();
this.S1_StopCheck3 = new System.Windows.Forms.Label(); this.S1_TopCylinderDown2 = new System.Windows.Forms.Label();
this.S1_StopCylinder5 = new System.Windows.Forms.Button(); this.S1_TopCylinderUp2 = new System.Windows.Forms.Label();
this.S1_StopCheck5 = new System.Windows.Forms.Label(); this.S1_NegStopCheck = new System.Windows.Forms.Label();
this.S1_StopCylinder4 = new System.Windows.Forms.Button(); this.AftS1_StopCylinder = new System.Windows.Forms.Button();
this.S1_StopCheck4 = new System.Windows.Forms.Label(); this.AftS1_StopCheck = new System.Windows.Forms.Label();
this.S1_StopCylinder3 = new System.Windows.Forms.Button(); this.S1_PosStopCylinder = new System.Windows.Forms.Button();
this.S1_StopCylinder2 = new System.Windows.Forms.Button(); this.S1_PosStopCheck = new System.Windows.Forms.Label();
this.S1_StopCheck1 = new System.Windows.Forms.Label(); this.S1_NegStopCylinder = new System.Windows.Forms.Button();
this.S1_StopCylinder1 = new System.Windows.Forms.Button(); this.PreS1_PosStopCylinder = new System.Windows.Forms.Button();
this.PreS1_NegStopCheck = new System.Windows.Forms.Label();
this.PreS1_NegStopCylinder = new System.Windows.Forms.Button();
this.btnS1Down = new System.Windows.Forms.Button(); this.btnS1Down = new System.Windows.Forms.Button();
this.S1_TopCylinderDown = new System.Windows.Forms.Label(); this.S1_TopCylinderDown1 = new System.Windows.Forms.Label();
this.btnS1Up = new System.Windows.Forms.Button(); this.btnS1Up = new System.Windows.Forms.Button();
this.S1_StopCheck2 = new System.Windows.Forms.Label(); this.PreS1_PosStopCheck = new System.Windows.Forms.Label();
this.S1_LineRun = new System.Windows.Forms.Button(); this.S1_LineRun = new System.Windows.Forms.Button();
this.S1_LineBackRun = new System.Windows.Forms.Button(); this.S1_LineBackRun = new System.Windows.Forms.Button();
this.S1_TopCylinderUp = new System.Windows.Forms.Label(); this.S1_TopCylinderUp1 = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.M_RightStopCylinder = new System.Windows.Forms.Button(); this.M_RightStopCylinder = new System.Windows.Forms.Button();
this.M_LeftStopCheck = new System.Windows.Forms.Label(); this.M_LeftStopCheck = new System.Windows.Forms.Label();
...@@ -501,141 +503,165 @@ ...@@ -501,141 +503,165 @@
// groupBox4 // groupBox4
// //
this.groupBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); this.groupBox4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
this.groupBox4.Controls.Add(this.S1_StopCheck3); this.groupBox4.Controls.Add(this.S1_TopCylinderDown2);
this.groupBox4.Controls.Add(this.S1_StopCylinder5); this.groupBox4.Controls.Add(this.S1_TopCylinderUp2);
this.groupBox4.Controls.Add(this.S1_StopCheck5); this.groupBox4.Controls.Add(this.S1_NegStopCheck);
this.groupBox4.Controls.Add(this.S1_StopCylinder4); this.groupBox4.Controls.Add(this.AftS1_StopCylinder);
this.groupBox4.Controls.Add(this.S1_StopCheck4); this.groupBox4.Controls.Add(this.AftS1_StopCheck);
this.groupBox4.Controls.Add(this.S1_StopCylinder3); this.groupBox4.Controls.Add(this.S1_PosStopCylinder);
this.groupBox4.Controls.Add(this.S1_StopCylinder2); this.groupBox4.Controls.Add(this.S1_PosStopCheck);
this.groupBox4.Controls.Add(this.S1_StopCheck1); this.groupBox4.Controls.Add(this.S1_NegStopCylinder);
this.groupBox4.Controls.Add(this.S1_StopCylinder1); this.groupBox4.Controls.Add(this.PreS1_PosStopCylinder);
this.groupBox4.Controls.Add(this.PreS1_NegStopCheck);
this.groupBox4.Controls.Add(this.PreS1_NegStopCylinder);
this.groupBox4.Controls.Add(this.btnS1Down); this.groupBox4.Controls.Add(this.btnS1Down);
this.groupBox4.Controls.Add(this.S1_TopCylinderDown); this.groupBox4.Controls.Add(this.S1_TopCylinderDown1);
this.groupBox4.Controls.Add(this.btnS1Up); this.groupBox4.Controls.Add(this.btnS1Up);
this.groupBox4.Controls.Add(this.S1_StopCheck2); this.groupBox4.Controls.Add(this.PreS1_PosStopCheck);
this.groupBox4.Controls.Add(this.S1_LineRun); this.groupBox4.Controls.Add(this.S1_LineRun);
this.groupBox4.Controls.Add(this.S1_LineBackRun); this.groupBox4.Controls.Add(this.S1_LineBackRun);
this.groupBox4.Controls.Add(this.S1_TopCylinderUp); this.groupBox4.Controls.Add(this.S1_TopCylinderUp1);
this.groupBox4.Location = new System.Drawing.Point(883, 21); this.groupBox4.Location = new System.Drawing.Point(883, 21);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(375, 300); this.groupBox4.Size = new System.Drawing.Size(375, 391);
this.groupBox4.TabIndex = 45; this.groupBox4.TabIndex = 45;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "上料工位"; this.groupBox4.Text = "上料工位";
// //
// S1_StopCheck3 // S1_TopCylinderDown2
// //
this.S1_StopCheck3.BackColor = System.Drawing.Color.LightGray; this.S1_TopCylinderDown2.BackColor = System.Drawing.Color.LightGray;
this.S1_StopCheck3.Location = new System.Drawing.Point(80, 186); this.S1_TopCylinderDown2.Location = new System.Drawing.Point(152, 152);
this.S1_StopCheck3.Margin = new System.Windows.Forms.Padding(3); this.S1_TopCylinderDown2.Margin = new System.Windows.Forms.Padding(3);
this.S1_StopCheck3.Name = "S1_StopCheck3"; this.S1_TopCylinderDown2.Name = "S1_TopCylinderDown2";
this.S1_StopCheck3.Size = new System.Drawing.Size(68, 20); this.S1_TopCylinderDown2.Size = new System.Drawing.Size(111, 21);
this.S1_StopCheck3.TabIndex = 36; this.S1_TopCylinderDown2.TabIndex = 38;
this.S1_StopCheck3.Text = "检测3"; this.S1_TopCylinderDown2.Text = "X28下降到位2";
this.S1_StopCheck3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.S1_TopCylinderDown2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// S1_StopCylinder5 // S1_TopCylinderUp2
// //
this.S1_StopCylinder5.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.S1_TopCylinderUp2.BackColor = System.Drawing.Color.LightGray;
this.S1_StopCylinder5.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua; this.S1_TopCylinderUp2.Location = new System.Drawing.Point(152, 32);
this.S1_StopCylinder5.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.S1_TopCylinderUp2.Margin = new System.Windows.Forms.Padding(3);
this.S1_StopCylinder5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.S1_TopCylinderUp2.Name = "S1_TopCylinderUp2";
this.S1_StopCylinder5.Location = new System.Drawing.Point(276, 242); this.S1_TopCylinderUp2.Size = new System.Drawing.Size(111, 21);
this.S1_StopCylinder5.Name = "S1_StopCylinder5"; this.S1_TopCylinderUp2.TabIndex = 37;
this.S1_StopCylinder5.Size = new System.Drawing.Size(76, 31); this.S1_TopCylinderUp2.Text = "X27上升到位2";
this.S1_StopCylinder5.TabIndex = 35; this.S1_TopCylinderUp2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.S1_StopCylinder5.Text = "▉ 阻挡5"; //
this.S1_StopCylinder5.UseVisualStyleBackColor = true; // S1_NegStopCheck
// //
// S1_StopCheck5 this.S1_NegStopCheck.BackColor = System.Drawing.Color.LightGray;
// this.S1_NegStopCheck.Location = new System.Drawing.Point(69, 292);
this.S1_StopCheck5.BackColor = System.Drawing.Color.LightGray; this.S1_NegStopCheck.Margin = new System.Windows.Forms.Padding(3);
this.S1_StopCheck5.Location = new System.Drawing.Point(273, 203); this.S1_NegStopCheck.Name = "S1_NegStopCheck";
this.S1_StopCheck5.Margin = new System.Windows.Forms.Padding(3); this.S1_NegStopCheck.Size = new System.Drawing.Size(68, 20);
this.S1_StopCheck5.Name = "S1_StopCheck5"; this.S1_NegStopCheck.TabIndex = 36;
this.S1_StopCheck5.Size = new System.Drawing.Size(68, 20); this.S1_NegStopCheck.Text = "检测3";
this.S1_StopCheck5.TabIndex = 34; this.S1_NegStopCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.S1_StopCheck5.Text = "检测5"; //
this.S1_StopCheck5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // AftS1_StopCylinder
// //
// S1_StopCylinder4 this.AftS1_StopCylinder.FlatAppearance.BorderColor = System.Drawing.Color.Black;
// this.AftS1_StopCylinder.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua;
this.S1_StopCylinder4.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.AftS1_StopCylinder.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.S1_StopCylinder4.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua; this.AftS1_StopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S1_StopCylinder4.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.AftS1_StopCylinder.Location = new System.Drawing.Point(276, 222);
this.S1_StopCylinder4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.AftS1_StopCylinder.Name = "AftS1_StopCylinder";
this.S1_StopCylinder4.Location = new System.Drawing.Point(187, 242); this.AftS1_StopCylinder.Size = new System.Drawing.Size(76, 31);
this.S1_StopCylinder4.Name = "S1_StopCylinder4"; this.AftS1_StopCylinder.TabIndex = 35;
this.S1_StopCylinder4.Size = new System.Drawing.Size(76, 31); this.AftS1_StopCylinder.Text = "▉ 阻挡5";
this.S1_StopCylinder4.TabIndex = 13; this.AftS1_StopCylinder.UseVisualStyleBackColor = true;
this.S1_StopCylinder4.Text = "▉ 阻挡4"; //
this.S1_StopCylinder4.UseVisualStyleBackColor = true; // AftS1_StopCheck
this.S1_StopCylinder4.Click += new System.EventHandler(this.Line_StopCylinder_Click); //
// this.AftS1_StopCheck.BackColor = System.Drawing.Color.LightGray;
// S1_StopCheck4 this.AftS1_StopCheck.Location = new System.Drawing.Point(284, 191);
// this.AftS1_StopCheck.Margin = new System.Windows.Forms.Padding(3);
this.S1_StopCheck4.BackColor = System.Drawing.Color.LightGray; this.AftS1_StopCheck.Name = "AftS1_StopCheck";
this.S1_StopCheck4.Location = new System.Drawing.Point(170, 186); this.AftS1_StopCheck.Size = new System.Drawing.Size(68, 20);
this.S1_StopCheck4.Margin = new System.Windows.Forms.Padding(3); this.AftS1_StopCheck.TabIndex = 34;
this.S1_StopCheck4.Name = "S1_StopCheck4"; this.AftS1_StopCheck.Text = "检测5";
this.S1_StopCheck4.Size = new System.Drawing.Size(68, 20); this.AftS1_StopCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.S1_StopCheck4.TabIndex = 33; //
this.S1_StopCheck4.Text = "检测4"; // S1_PosStopCylinder
this.S1_StopCheck4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; //
// this.S1_PosStopCylinder.FlatAppearance.BorderColor = System.Drawing.Color.Black;
// S1_StopCylinder3 this.S1_PosStopCylinder.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua;
// this.S1_PosStopCylinder.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.S1_StopCylinder3.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.S1_PosStopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S1_StopCylinder3.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua; this.S1_PosStopCylinder.Location = new System.Drawing.Point(165, 338);
this.S1_StopCylinder3.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.S1_PosStopCylinder.Name = "S1_PosStopCylinder";
this.S1_StopCylinder3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.S1_PosStopCylinder.Size = new System.Drawing.Size(76, 31);
this.S1_StopCylinder3.Location = new System.Drawing.Point(101, 242); this.S1_PosStopCylinder.TabIndex = 13;
this.S1_StopCylinder3.Name = "S1_StopCylinder3"; this.S1_PosStopCylinder.Text = "▉ 阻挡4";
this.S1_StopCylinder3.Size = new System.Drawing.Size(77, 31); this.S1_PosStopCylinder.UseVisualStyleBackColor = true;
this.S1_StopCylinder3.TabIndex = 13; this.S1_PosStopCylinder.Click += new System.EventHandler(this.Line_StopCylinder_Click);
this.S1_StopCylinder3.Text = "▉ 阻挡3"; //
this.S1_StopCylinder3.UseVisualStyleBackColor = true; // S1_PosStopCheck
this.S1_StopCylinder3.Click += new System.EventHandler(this.Line_StopCylinder_Click); //
// this.S1_PosStopCheck.BackColor = System.Drawing.Color.LightGray;
// S1_StopCylinder2 this.S1_PosStopCheck.Location = new System.Drawing.Point(173, 292);
// this.S1_PosStopCheck.Margin = new System.Windows.Forms.Padding(3);
this.S1_StopCylinder2.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.S1_PosStopCheck.Name = "S1_PosStopCheck";
this.S1_StopCylinder2.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua; this.S1_PosStopCheck.Size = new System.Drawing.Size(68, 20);
this.S1_StopCylinder2.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.S1_PosStopCheck.TabIndex = 33;
this.S1_StopCylinder2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.S1_PosStopCheck.Text = "检测4";
this.S1_StopCylinder2.Location = new System.Drawing.Point(6, 242); this.S1_PosStopCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.S1_StopCylinder2.Name = "S1_StopCylinder2"; //
this.S1_StopCylinder2.Size = new System.Drawing.Size(77, 31); // S1_NegStopCylinder
this.S1_StopCylinder2.TabIndex = 10; //
this.S1_StopCylinder2.Text = "▉ 阻挡2"; this.S1_NegStopCylinder.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.S1_StopCylinder2.UseVisualStyleBackColor = true; this.S1_NegStopCylinder.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua;
this.S1_StopCylinder2.Click += new System.EventHandler(this.Line_StopCylinder_Click); this.S1_NegStopCylinder.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
// this.S1_NegStopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
// S1_StopCheck1 this.S1_NegStopCylinder.Location = new System.Drawing.Point(72, 338);
// this.S1_NegStopCylinder.Name = "S1_NegStopCylinder";
this.S1_StopCheck1.BackColor = System.Drawing.Color.LightGray; this.S1_NegStopCylinder.Size = new System.Drawing.Size(77, 31);
this.S1_StopCheck1.Location = new System.Drawing.Point(14, 71); this.S1_NegStopCylinder.TabIndex = 13;
this.S1_StopCheck1.Margin = new System.Windows.Forms.Padding(3); this.S1_NegStopCylinder.Text = "▉ 阻挡3";
this.S1_StopCheck1.Name = "S1_StopCheck1"; this.S1_NegStopCylinder.UseVisualStyleBackColor = true;
this.S1_StopCheck1.Size = new System.Drawing.Size(68, 20); this.S1_NegStopCylinder.Click += new System.EventHandler(this.Line_StopCylinder_Click);
this.S1_StopCheck1.TabIndex = 6; //
this.S1_StopCheck1.Text = "检测1"; // PreS1_PosStopCylinder
this.S1_StopCheck1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; //
// this.PreS1_PosStopCylinder.FlatAppearance.BorderColor = System.Drawing.Color.Black;
// S1_StopCylinder1 this.PreS1_PosStopCylinder.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua;
// this.PreS1_PosStopCylinder.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.S1_StopCylinder1.FlatAppearance.BorderColor = System.Drawing.Color.Black; this.PreS1_PosStopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S1_StopCylinder1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua; this.PreS1_PosStopCylinder.Location = new System.Drawing.Point(115, 229);
this.S1_StopCylinder1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.PreS1_PosStopCylinder.Name = "PreS1_PosStopCylinder";
this.S1_StopCylinder1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.PreS1_PosStopCylinder.Size = new System.Drawing.Size(77, 31);
this.S1_StopCylinder1.Location = new System.Drawing.Point(10, 102); this.PreS1_PosStopCylinder.TabIndex = 10;
this.S1_StopCylinder1.Name = "S1_StopCylinder1"; this.PreS1_PosStopCylinder.Text = "▉ 阻挡2";
this.S1_StopCylinder1.Size = new System.Drawing.Size(77, 31); this.PreS1_PosStopCylinder.UseVisualStyleBackColor = true;
this.S1_StopCylinder1.TabIndex = 9; this.PreS1_PosStopCylinder.Click += new System.EventHandler(this.Line_StopCylinder_Click);
this.S1_StopCylinder1.Text = "▉ 阻挡1"; //
this.S1_StopCylinder1.UseVisualStyleBackColor = true; // PreS1_NegStopCheck
this.S1_StopCylinder1.Click += new System.EventHandler(this.Line_StopCylinder_Click); //
this.PreS1_NegStopCheck.BackColor = System.Drawing.Color.LightGray;
this.PreS1_NegStopCheck.Location = new System.Drawing.Point(22, 196);
this.PreS1_NegStopCheck.Margin = new System.Windows.Forms.Padding(3);
this.PreS1_NegStopCheck.Name = "PreS1_NegStopCheck";
this.PreS1_NegStopCheck.Size = new System.Drawing.Size(68, 20);
this.PreS1_NegStopCheck.TabIndex = 6;
this.PreS1_NegStopCheck.Text = "检测1";
this.PreS1_NegStopCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// PreS1_NegStopCylinder
//
this.PreS1_NegStopCylinder.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.PreS1_NegStopCylinder.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua;
this.PreS1_NegStopCylinder.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.PreS1_NegStopCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.PreS1_NegStopCylinder.Location = new System.Drawing.Point(18, 227);
this.PreS1_NegStopCylinder.Name = "PreS1_NegStopCylinder";
this.PreS1_NegStopCylinder.Size = new System.Drawing.Size(77, 31);
this.PreS1_NegStopCylinder.TabIndex = 9;
this.PreS1_NegStopCylinder.Text = "▉ 阻挡1";
this.PreS1_NegStopCylinder.UseVisualStyleBackColor = true;
this.PreS1_NegStopCylinder.Click += new System.EventHandler(this.Line_StopCylinder_Click);
// //
// btnS1Down // btnS1Down
// //
...@@ -643,7 +669,7 @@ ...@@ -643,7 +669,7 @@
this.btnS1Down.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua; this.btnS1Down.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua;
this.btnS1Down.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.btnS1Down.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.btnS1Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnS1Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnS1Down.Location = new System.Drawing.Point(127, 107); this.btnS1Down.Location = new System.Drawing.Point(40, 107);
this.btnS1Down.Name = "btnS1Down"; this.btnS1Down.Name = "btnS1Down";
this.btnS1Down.Size = new System.Drawing.Size(79, 40); this.btnS1Down.Size = new System.Drawing.Size(79, 40);
this.btnS1Down.TabIndex = 4; this.btnS1Down.TabIndex = 4;
...@@ -651,16 +677,16 @@ ...@@ -651,16 +677,16 @@
this.btnS1Down.UseVisualStyleBackColor = true; this.btnS1Down.UseVisualStyleBackColor = true;
this.btnS1Down.Click += new System.EventHandler(this.btnS1Down_Click); this.btnS1Down.Click += new System.EventHandler(this.btnS1Down_Click);
// //
// S1_TopCylinderDown // S1_TopCylinderDown1
// //
this.S1_TopCylinderDown.BackColor = System.Drawing.Color.LightGray; this.S1_TopCylinderDown1.BackColor = System.Drawing.Color.LightGray;
this.S1_TopCylinderDown.Location = new System.Drawing.Point(111, 153); this.S1_TopCylinderDown1.Location = new System.Drawing.Point(12, 153);
this.S1_TopCylinderDown.Margin = new System.Windows.Forms.Padding(3); this.S1_TopCylinderDown1.Margin = new System.Windows.Forms.Padding(3);
this.S1_TopCylinderDown.Name = "S1_TopCylinderDown"; this.S1_TopCylinderDown1.Name = "S1_TopCylinderDown1";
this.S1_TopCylinderDown.Size = new System.Drawing.Size(111, 21); this.S1_TopCylinderDown1.Size = new System.Drawing.Size(111, 21);
this.S1_TopCylinderDown.TabIndex = 8; this.S1_TopCylinderDown1.TabIndex = 8;
this.S1_TopCylinderDown.Text = "X26下降到位"; this.S1_TopCylinderDown1.Text = "X26下降到位1";
this.S1_TopCylinderDown.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.S1_TopCylinderDown1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// btnS1Up // btnS1Up
// //
...@@ -668,7 +694,7 @@ ...@@ -668,7 +694,7 @@
this.btnS1Up.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua; this.btnS1Up.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua;
this.btnS1Up.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.btnS1Up.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.btnS1Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnS1Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnS1Up.Location = new System.Drawing.Point(127, 61); this.btnS1Up.Location = new System.Drawing.Point(40, 62);
this.btnS1Up.Name = "btnS1Up"; this.btnS1Up.Name = "btnS1Up";
this.btnS1Up.Size = new System.Drawing.Size(79, 40); this.btnS1Up.Size = new System.Drawing.Size(79, 40);
this.btnS1Up.TabIndex = 3; this.btnS1Up.TabIndex = 3;
...@@ -676,16 +702,16 @@ ...@@ -676,16 +702,16 @@
this.btnS1Up.UseVisualStyleBackColor = true; this.btnS1Up.UseVisualStyleBackColor = true;
this.btnS1Up.Click += new System.EventHandler(this.btnS1Up_Click); this.btnS1Up.Click += new System.EventHandler(this.btnS1Up_Click);
// //
// S1_StopCheck2 // PreS1_PosStopCheck
// //
this.S1_StopCheck2.BackColor = System.Drawing.Color.LightGray; this.PreS1_PosStopCheck.BackColor = System.Drawing.Color.LightGray;
this.S1_StopCheck2.Location = new System.Drawing.Point(6, 203); this.PreS1_PosStopCheck.Location = new System.Drawing.Point(124, 191);
this.S1_StopCheck2.Margin = new System.Windows.Forms.Padding(3); this.PreS1_PosStopCheck.Margin = new System.Windows.Forms.Padding(3);
this.S1_StopCheck2.Name = "S1_StopCheck2"; this.PreS1_PosStopCheck.Name = "PreS1_PosStopCheck";
this.S1_StopCheck2.Size = new System.Drawing.Size(68, 20); this.PreS1_PosStopCheck.Size = new System.Drawing.Size(68, 20);
this.S1_StopCheck2.TabIndex = 7; this.PreS1_PosStopCheck.TabIndex = 7;
this.S1_StopCheck2.Text = "检测2"; this.PreS1_PosStopCheck.Text = "检测2";
this.S1_StopCheck2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.PreS1_PosStopCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// S1_LineRun // S1_LineRun
// //
...@@ -693,7 +719,7 @@ ...@@ -693,7 +719,7 @@
this.S1_LineRun.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua; this.S1_LineRun.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua;
this.S1_LineRun.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.S1_LineRun.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.S1_LineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.S1_LineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S1_LineRun.Location = new System.Drawing.Point(234, 61); this.S1_LineRun.Location = new System.Drawing.Point(174, 59);
this.S1_LineRun.Name = "S1_LineRun"; this.S1_LineRun.Name = "S1_LineRun";
this.S1_LineRun.Size = new System.Drawing.Size(118, 40); this.S1_LineRun.Size = new System.Drawing.Size(118, 40);
this.S1_LineRun.TabIndex = 2; this.S1_LineRun.TabIndex = 2;
...@@ -707,7 +733,7 @@ ...@@ -707,7 +733,7 @@
this.S1_LineBackRun.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua; this.S1_LineBackRun.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Aqua;
this.S1_LineBackRun.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.S1_LineBackRun.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.S1_LineBackRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.S1_LineBackRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S1_LineBackRun.Location = new System.Drawing.Point(234, 107); this.S1_LineBackRun.Location = new System.Drawing.Point(174, 106);
this.S1_LineBackRun.Name = "S1_LineBackRun"; this.S1_LineBackRun.Name = "S1_LineBackRun";
this.S1_LineBackRun.Size = new System.Drawing.Size(118, 40); this.S1_LineBackRun.Size = new System.Drawing.Size(118, 40);
this.S1_LineBackRun.TabIndex = 1; this.S1_LineBackRun.TabIndex = 1;
...@@ -715,16 +741,16 @@ ...@@ -715,16 +741,16 @@
this.S1_LineBackRun.UseVisualStyleBackColor = true; this.S1_LineBackRun.UseVisualStyleBackColor = true;
this.S1_LineBackRun.Click += new System.EventHandler(this.Line_StopCylinder_Click); this.S1_LineBackRun.Click += new System.EventHandler(this.Line_StopCylinder_Click);
// //
// S1_TopCylinderUp // S1_TopCylinderUp1
// //
this.S1_TopCylinderUp.BackColor = System.Drawing.Color.LightGray; this.S1_TopCylinderUp1.BackColor = System.Drawing.Color.LightGray;
this.S1_TopCylinderUp.Location = new System.Drawing.Point(111, 32); this.S1_TopCylinderUp1.Location = new System.Drawing.Point(12, 32);
this.S1_TopCylinderUp.Margin = new System.Windows.Forms.Padding(3); this.S1_TopCylinderUp1.Margin = new System.Windows.Forms.Padding(3);
this.S1_TopCylinderUp.Name = "S1_TopCylinderUp"; this.S1_TopCylinderUp1.Name = "S1_TopCylinderUp1";
this.S1_TopCylinderUp.Size = new System.Drawing.Size(111, 21); this.S1_TopCylinderUp1.Size = new System.Drawing.Size(111, 21);
this.S1_TopCylinderUp.TabIndex = 5; this.S1_TopCylinderUp1.TabIndex = 5;
this.S1_TopCylinderUp.Text = "X27上升到位"; this.S1_TopCylinderUp1.Text = "X25上升到位1";
this.S1_TopCylinderUp.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.S1_TopCylinderUp1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// groupBox2 // groupBox2
// //
...@@ -1017,7 +1043,7 @@ ...@@ -1017,7 +1043,7 @@
this.btnBack.BackColor = System.Drawing.Color.White; this.btnBack.BackColor = System.Drawing.Color.White;
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBack.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(910, 625); this.btnBack.Location = new System.Drawing.Point(940, 666);
this.btnBack.Name = "btnBack"; this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(121, 43); this.btnBack.Size = new System.Drawing.Size(121, 43);
this.btnBack.TabIndex = 289; this.btnBack.TabIndex = 289;
...@@ -1120,6 +1146,7 @@ ...@@ -1120,6 +1146,7 @@
this.RHigh_StopCylinder2.TabIndex = 14; this.RHigh_StopCylinder2.TabIndex = 14;
this.RHigh_StopCylinder2.Text = "▉ 阻挡2"; this.RHigh_StopCylinder2.Text = "▉ 阻挡2";
this.RHigh_StopCylinder2.UseVisualStyleBackColor = true; this.RHigh_StopCylinder2.UseVisualStyleBackColor = true;
this.RHigh_StopCylinder2.Click += new System.EventHandler(this.Line_StopCylinder_Click);
// //
// RHigh_StopCheck2 // RHigh_StopCheck2
// //
...@@ -1144,6 +1171,7 @@ ...@@ -1144,6 +1171,7 @@
this.RHigh_StopCylinder1.TabIndex = 12; this.RHigh_StopCylinder1.TabIndex = 12;
this.RHigh_StopCylinder1.Text = "▉ 阻挡1"; this.RHigh_StopCylinder1.Text = "▉ 阻挡1";
this.RHigh_StopCylinder1.UseVisualStyleBackColor = true; this.RHigh_StopCylinder1.UseVisualStyleBackColor = true;
this.RHigh_StopCylinder1.Click += new System.EventHandler(this.Line_StopCylinder_Click);
// //
// RHigh_StopCheck1 // RHigh_StopCheck1
// //
...@@ -1323,7 +1351,7 @@ ...@@ -1323,7 +1351,7 @@
this.btnS1StopDown.BackColor = System.Drawing.Color.White; this.btnS1StopDown.BackColor = System.Drawing.Color.White;
this.btnS1StopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnS1StopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnS1StopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnS1StopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnS1StopDown.Location = new System.Drawing.Point(909, 338); this.btnS1StopDown.Location = new System.Drawing.Point(898, 452);
this.btnS1StopDown.Name = "btnS1StopDown"; this.btnS1StopDown.Name = "btnS1StopDown";
this.btnS1StopDown.Size = new System.Drawing.Size(103, 37); this.btnS1StopDown.Size = new System.Drawing.Size(103, 37);
this.btnS1StopDown.TabIndex = 292; this.btnS1StopDown.TabIndex = 292;
...@@ -1336,7 +1364,7 @@ ...@@ -1336,7 +1364,7 @@
this.S1StopDown.BackColor = System.Drawing.Color.White; this.S1StopDown.BackColor = System.Drawing.Color.White;
this.S1StopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.S1StopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.S1StopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.S1StopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.S1StopDown.Location = new System.Drawing.Point(1018, 338); this.S1StopDown.Location = new System.Drawing.Point(1010, 452);
this.S1StopDown.Name = "S1StopDown"; this.S1StopDown.Name = "S1StopDown";
this.S1StopDown.Size = new System.Drawing.Size(103, 37); this.S1StopDown.Size = new System.Drawing.Size(103, 37);
this.S1StopDown.TabIndex = 293; this.S1StopDown.TabIndex = 293;
...@@ -1349,7 +1377,7 @@ ...@@ -1349,7 +1377,7 @@
this.btnS1Stop.BackColor = System.Drawing.Color.White; this.btnS1Stop.BackColor = System.Drawing.Color.White;
this.btnS1Stop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnS1Stop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnS1Stop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnS1Stop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnS1Stop.Location = new System.Drawing.Point(1132, 338); this.btnS1Stop.Location = new System.Drawing.Point(1119, 452);
this.btnS1Stop.Name = "btnS1Stop"; this.btnS1Stop.Name = "btnS1Stop";
this.btnS1Stop.Size = new System.Drawing.Size(103, 37); this.btnS1Stop.Size = new System.Drawing.Size(103, 37);
this.btnS1Stop.TabIndex = 294; this.btnS1Stop.TabIndex = 294;
...@@ -1453,7 +1481,7 @@ ...@@ -1453,7 +1481,7 @@
this.grpBxState.Controls.Add(this.lblA6State); this.grpBxState.Controls.Add(this.lblA6State);
this.grpBxState.Controls.Add(this.lblA6); this.grpBxState.Controls.Add(this.lblA6);
this.grpBxState.Controls.Add(this.lblA5); this.grpBxState.Controls.Add(this.lblA5);
this.grpBxState.Location = new System.Drawing.Point(885, 408); this.grpBxState.Location = new System.Drawing.Point(892, 508);
this.grpBxState.Name = "grpBxState"; this.grpBxState.Name = "grpBxState";
this.grpBxState.Size = new System.Drawing.Size(333, 133); this.grpBxState.Size = new System.Drawing.Size(333, 133);
this.grpBxState.TabIndex = 297; this.grpBxState.TabIndex = 297;
...@@ -1597,19 +1625,19 @@ ...@@ -1597,19 +1625,19 @@
private System.Windows.Forms.Button S2_LineBackRun; private System.Windows.Forms.Button S2_LineBackRun;
private System.Windows.Forms.Label S2_TopCylinderUp; private System.Windows.Forms.Label S2_TopCylinderUp;
private System.Windows.Forms.GroupBox groupBox4; private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.Button S1_StopCylinder4; private System.Windows.Forms.Button S1_PosStopCylinder;
private System.Windows.Forms.Label S1_StopCheck4; private System.Windows.Forms.Label S1_PosStopCheck;
private System.Windows.Forms.Button S1_StopCylinder3; private System.Windows.Forms.Button S1_NegStopCylinder;
private System.Windows.Forms.Button S1_StopCylinder2; private System.Windows.Forms.Button PreS1_PosStopCylinder;
private System.Windows.Forms.Label S1_StopCheck1; private System.Windows.Forms.Label PreS1_NegStopCheck;
private System.Windows.Forms.Button S1_StopCylinder1; private System.Windows.Forms.Button PreS1_NegStopCylinder;
private System.Windows.Forms.Button btnS1Down; private System.Windows.Forms.Button btnS1Down;
private System.Windows.Forms.Label S1_TopCylinderDown; private System.Windows.Forms.Label S1_TopCylinderDown1;
private System.Windows.Forms.Button btnS1Up; private System.Windows.Forms.Button btnS1Up;
private System.Windows.Forms.Label S1_StopCheck2; private System.Windows.Forms.Label PreS1_PosStopCheck;
private System.Windows.Forms.Button S1_LineRun; private System.Windows.Forms.Button S1_LineRun;
private System.Windows.Forms.Button S1_LineBackRun; private System.Windows.Forms.Button S1_LineBackRun;
private System.Windows.Forms.Label S1_TopCylinderUp; private System.Windows.Forms.Label S1_TopCylinderUp1;
private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Button M_RightStopCylinder; private System.Windows.Forms.Button M_RightStopCylinder;
private System.Windows.Forms.Label M_LeftStopCheck; private System.Windows.Forms.Label M_LeftStopCheck;
...@@ -1671,10 +1699,12 @@ ...@@ -1671,10 +1699,12 @@
private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.Button S1_StopCylinder5; private System.Windows.Forms.Button AftS1_StopCylinder;
private System.Windows.Forms.Label S1_StopCheck5; private System.Windows.Forms.Label AftS1_StopCheck;
private System.Windows.Forms.Label S1_StopCheck3; private System.Windows.Forms.Label S1_NegStopCheck;
internal System.Windows.Forms.Button btnOpenRFID; internal System.Windows.Forms.Button btnOpenRFID;
internal System.Windows.Forms.Button button2; internal System.Windows.Forms.Button button2;
private System.Windows.Forms.Label S1_TopCylinderDown2;
private System.Windows.Forms.Label S1_TopCylinderUp2;
} }
} }
\ No newline at end of file \ No newline at end of file
source/LoadCVSLibrary/Config/bean/IO_Type.cs
...@@ -87,9 +87,9 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -87,9 +87,9 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
public static string M_RightStopCheck = "M_RightStopCheck"; public static string M_RightStopCheck = "M_RightStopCheck";
/// <summary> /// <summary>
/// DI,上料位前反阻挡检测,S1_StopCheck1,15,PRO_AOI_IP_1,0,上料位前反阻挡检测,X16,X16,0 /// DI,上料位前反阻挡检测,PreS1_NegStopCheck,15,PRO_AOI_IP_1,0,上料位前反阻挡检测,X16,X16,0
/// </summary> /// </summary>
public static string S1_StopCheck1 = "S1_StopCheck1"; public static string PreS1_NegStopCheck = "PreS1_NegStopCheck";
/// <summary> /// <summary>
...@@ -156,21 +156,21 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -156,21 +156,21 @@ namespace OnlineStore.LoadCSVLibrary
#region PRO_AOI_IP_2 #region PRO_AOI_IP_2
/// <summary> /// <summary>
///DI,上料位前正阻挡检测,S1_StopCheck2,0,PRO_AOI_IP_2,0,上料位前正阻挡检测,X21,X21,0 ///DI,上料位前正阻挡检测,PreS1_PosStopCheck,0,PRO_AOI_IP_2,0,上料位前正阻挡检测,X21,X21,0
/// </summary> /// </summary>
public static string S1_StopCheck2 = "S1_StopCheck2"; public static string PreS1_PosStopCheck = "PreS1_PosStopCheck";
/// <summary> /// <summary>
///DI,上料位反定位阻挡检测,S1_StopCheck3,1,PRO_AOI_IP_2,0,上料位反定位阻挡检测,X22,X22,0 ///DI,上料位反定位阻挡检测,S1_NegStopCheck,1,PRO_AOI_IP_2,0,上料位反定位阻挡检测,X22,X22,0
/// </summary> /// </summary>
public static string S1_StopCheck3 = "S1_StopCheck3"; public static string S1_NegStopCheck = "S1_NegStopCheck";
/// <summary> /// <summary>
///DI,上料位正定位阻挡检测,S1_StopCheck4,2,PRO_AOI_IP_2,0,上料位正定位阻挡检测,X23,X23,0 ///DI,上料位正定位阻挡检测,S1_PosStopCheck,2,PRO_AOI_IP_2,0,上料位正定位阻挡检测,X23,X23,0
/// </summary> /// </summary>
public static string S1_StopCheck4 = "S1_StopCheck4"; public static string S1_PosStopCheck = "S1_PosStopCheck";
/// <summary> /// <summary>
///DI,上料位后阻挡检测,S1_StopCheck5,3,PRO_AOI_IP_2,0,上料位后阻挡检测,X24,X24,0 ///DI,上料位后阻挡检测,AftS1_StopCheck,3,PRO_AOI_IP_2,0,上料位后阻挡检测,X24,X24,0
/// </summary> /// </summary>
public static string S1_StopCheck5 = "S1_StopCheck5"; public static string AftS1_StopCheck = "AftS1_StopCheck";
///// <summary> ///// <summary>
/////DI,上料工位顶升上升端1,S1_TopCylinderUp1,4,PRO_AOI_IP_2,0,上料工位顶升上升端1,X25,X25,0 /////DI,上料工位顶升上升端1,S1_TopCylinderUp1,4,PRO_AOI_IP_2,0,上料工位顶升上升端1,X25,X25,0
///// </summary> ///// </summary>
...@@ -266,25 +266,25 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -266,25 +266,25 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
//public static string M_Updown_Down = "M_Updown_Down"; //public static string M_Updown_Down = "M_Updown_Down";
/// <summary> /// <summary>
///DO,上料位前反阻挡下降,S1_StopCylinder1,11,PRO_AOI_IP_2,0,上料位前反阻挡下降,Y32,Y32,0 ///DO,上料位前反阻挡下降,PreS1_NegStopCylinder,11,PRO_AOI_IP_2,0,上料位前反阻挡下降,Y32,Y32,0
/// </summary> /// </summary>
public static string S1_StopCylinder1 = "S1_StopCylinder1"; public static string PreS1_NegStopCylinder = "PreS1_NegStopCylinder";
/// <summary> /// <summary>
///DO,上料位前正阻挡下降,S1_StopCylinder2,12,PRO_AOI_IP_2,0,上料位前正阻挡下降,Y33,Y33,0 ///DO,上料位前正阻挡下降,PreS1_PosStopCylinder,12,PRO_AOI_IP_2,0,上料位前正阻挡下降,Y33,Y33,0
/// </summary> /// </summary>
public static string S1_StopCylinder2 = "S1_StopCylinder2"; public static string PreS1_PosStopCylinder = "PreS1_PosStopCylinder";
/// <summary> /// <summary>
///DO,上料位反定位阻挡下降,S1_StopCylinder3,13,PRO_AOI_IP_2,0,上料位反定位阻挡下降,Y34,Y34,0 ///DO,上料位反定位阻挡下降,S1_NegStopCylinder,13,PRO_AOI_IP_2,0,上料位反定位阻挡下降,Y34,Y34,0
/// </summary> /// </summary>
public static string S1_StopCylinder3 = "S1_StopCylinder3"; public static string S1_NegStopCylinder = "S1_NegStopCylinder";
/// <summary> /// <summary>
///DO,上料位正定位阻挡下降,S1_StopCylinder4,14,PRO_AOI_IP_2,0,上料位正定位阻挡下降,Y35,Y35,0 ///DO,上料位正定位阻挡下降,S1_PosStopCylinder,14,PRO_AOI_IP_2,0,上料位正定位阻挡下降,Y35,Y35,0
/// </summary> /// </summary>
public static string S1_StopCylinder4 = "S1_StopCylinder4"; public static string S1_PosStopCylinder = "S1_PosStopCylinder";
/// <summary> /// <summary>
///DO,上料位后阻挡下降,S1_StopCylinder5,15,PRO_AOI_IP_2,0,上料位后阻挡下降,Y36,Y36,0 ///DO,上料位后阻挡下降,AftS1_StopCylinder,15,PRO_AOI_IP_2,0,上料位后阻挡下降,Y36,Y36,0
/// </summary> /// </summary>
public static string S1_StopCylinder5 = "S1_StopCylinder5"; public static string AftS1_StopCylinder = "AftS1_StopCylinder";
#endregion #endregion
#region PRO_AOI_IP_3 #region PRO_AOI_IP_3
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!