Skip to content

李娜 / SO664-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit f6bde77b 由 LN
选项

上料机构固定气缸上升端DI改为下降端。

1 个父辈 f09113a0
全部展开
内嵌 并排
正在显示 10 个修改的文件 包含 69 行增加 和 21 行删除
dll/CodeLibrary.dll
此文件类型无法预览
dll/zxing.dll
此文件类型无法预览
source/AssemblyLineClient/记录.txt
20200303 20200310
1.T5增加固定气缸下降DI
X93 T5固定气缸1下降端
X94 T5固定气缸2下降端
20200303
三楼环形线更新文件：20210303-AssemblyLine-更新，修改内容： 三楼环形线更新文件：20210303-AssemblyLine-更新，修改内容：
1.入料线阻挡下降1.5秒。 1.入料线阻挡下降1.5秒。
2.T3,T4 料架送出时，若出口有料架，出料线转动5秒 2.T3,T4 料架送出时，若出口有料架，出料线转动5秒
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -130,6 +130,12 @@ ...@@ -130,6 +130,12 @@
<Content Include="libdmtx.dll"> <Content Include="libdmtx.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="MvCameraControl.Net.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="MvCameraControl.Net.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="opencv_world420.dll"> <Content Include="opencv_world420.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
......
source/DeviceLibrary/LineConfig/Config_Line.csv
...@@ -204,8 +204,8 @@ DI,105,T5定位气缸1上升端,SL_LocationCylinder_Up1,69,HC,X69 ...@@ -204,8 +204,8 @@ DI,105,T5定位气缸1上升端,SL_LocationCylinder_Up1,69,HC,X69
DI,105,T5定位气缸1下降端,SL_LocationCylinder_Down1,70,HC,X70 DI,105,T5定位气缸1下降端,SL_LocationCylinder_Down1,70,HC,X70
DI,105,T5定位气缸2上升端,SL_LocationCylinder_Up2,71,HC,X71 DI,105,T5定位气缸2上升端,SL_LocationCylinder_Up2,71,HC,X71
DI,105,T5定位气缸2下降端,SL_LocationCylinder_Down2,72,HC,X72 DI,105,T5定位气缸2下降端,SL_LocationCylinder_Down2,72,HC,X72
DI,105,T5固定气缸1上升端,SL_FixedCylinder_Up1,73,HC,X73 DI,105,T5固定气缸1下降端,SL_FixedCylinder_Down1,73,HC,X73
DI,105,T5固定气缸2上升端,SL_FixedCylinder_Up2,74,HC,X74 DI,105,T5固定气缸2下降端,SL_FixedCylinder_Down2,74,HC,X74
DI,105,T5定位工位顶升上升端,SL_TopCylinder_Up,75,HC,X75 DI,105,T5定位工位顶升上升端,SL_TopCylinder_Up,75,HC,X75
DI,105,T5定位工位顶升下降端,SL_TopCylinder_Down,76,HC,X76 DI,105,T5定位工位顶升下降端,SL_TopCylinder_Down,76,HC,X76
DI,105,T5出口顶升上升端,SL_OutTopCylinder_Up,77,HC,X77 DI,105,T5出口顶升上升端,SL_OutTopCylinder_Up,77,HC,X77
...@@ -290,8 +290,8 @@ DI,104,T4定位气缸1上升端,SL_LocationCylinder_Up1,117,HC,X117 ...@@ -290,8 +290,8 @@ DI,104,T4定位气缸1上升端,SL_LocationCylinder_Up1,117,HC,X117
DI,104,T4定位气缸1下降端,SL_LocationCylinder_Down1,118,HC,X118 DI,104,T4定位气缸1下降端,SL_LocationCylinder_Down1,118,HC,X118
DI,104,T4定位气缸2上升端,SL_LocationCylinder_Up2,119,HC,X119 DI,104,T4定位气缸2上升端,SL_LocationCylinder_Up2,119,HC,X119
DI,104,T4定位气缸2下降端,SL_LocationCylinder_Down2,120,HC,X120 DI,104,T4定位气缸2下降端,SL_LocationCylinder_Down2,120,HC,X120
DI,104,T4固定气缸1上升端,SL_FixedCylinder_Up1,121,HC,X121 DI,104,T4固定气缸1下降端,SL_FixedCylinder_Down1,121,HC,X121
DI,104,T4固定气缸2上升端,SL_FixedCylinder_Up2,122,HC,X122 DI,104,T4固定气缸2下降端,SL_FixedCylinder_Down2,122,HC,X122
DI,104,T4定位工位顶升上升端,SL_TopCylinder_Up,123,HC,X123 DI,104,T4定位工位顶升上升端,SL_TopCylinder_Up,123,HC,X123
DI,104,T4定位工位顶升下降端,SL_TopCylinder_Down,124,HC,X124 DI,104,T4定位工位顶升下降端,SL_TopCylinder_Down,124,HC,X124
DI,104,T4出口顶升上升端,SL_OutTopCylinder_Up,125,HC,X125 DI,104,T4出口顶升上升端,SL_OutTopCylinder_Up,125,HC,X125
...@@ -545,8 +545,8 @@ DI,103,T3定位气缸1上升端,SL_LocationCylinder_Up1,245,HC,X245 ...@@ -545,8 +545,8 @@ DI,103,T3定位气缸1上升端,SL_LocationCylinder_Up1,245,HC,X245
DI,103,T3定位气缸1下降端,SL_LocationCylinder_Down1,246,HC,X246 DI,103,T3定位气缸1下降端,SL_LocationCylinder_Down1,246,HC,X246
DI,103,T3定位气缸2上升端,SL_LocationCylinder_Up2,247,HC,X247 DI,103,T3定位气缸2上升端,SL_LocationCylinder_Up2,247,HC,X247
DI,103,T3定位气缸2下降端,SL_LocationCylinder_Down2,248,HC,X248 DI,103,T3定位气缸2下降端,SL_LocationCylinder_Down2,248,HC,X248
DI,103,T3固定气缸1上升端,SL_FixedCylinder_Up1,249,HC,X249 DI,103,T3固定气缸1下降端,SL_FixedCylinder_Down1,249,HC,X249
DI,103,T3固定气缸2上升端,SL_FixedCylinder_Up2,250,HC,X250 DI,103,T3固定气缸2下降端,SL_FixedCylinder_Down2,250,HC,X250
DI,103,T3定位工位顶升上升端,SL_TopCylinder_Up,251,HC,X251 DI,103,T3定位工位顶升上升端,SL_TopCylinder_Up,251,HC,X251
DI,103,T3定位工位顶升下降端,SL_TopCylinder_Down,252,HC,X252 DI,103,T3定位工位顶升下降端,SL_TopCylinder_Down,252,HC,X252
DI,103,T3出口顶升上升端,SL_OutTopCylinder_Up,253,HC,X253 DI,103,T3出口顶升上升端,SL_OutTopCylinder_Up,253,HC,X253
...@@ -783,8 +783,8 @@ DI,101,T1定位气缸1上升端,SL_LocationCylinder_Up1,357,HC,X357 ...@@ -783,8 +783,8 @@ DI,101,T1定位气缸1上升端,SL_LocationCylinder_Up1,357,HC,X357
DI,101,T1定位气缸1下降端,SL_LocationCylinder_Down1,358,HC,X358 DI,101,T1定位气缸1下降端,SL_LocationCylinder_Down1,358,HC,X358
DI,101,T1定位气缸2上升端,SL_LocationCylinder_Up2,359,HC,X359 DI,101,T1定位气缸2上升端,SL_LocationCylinder_Up2,359,HC,X359
DI,101,T1定位气缸2下降端,SL_LocationCylinder_Down2,360,HC,X360 DI,101,T1定位气缸2下降端,SL_LocationCylinder_Down2,360,HC,X360
DI,101,T1固定气缸1上升端,SL_FixedCylinder_Up1,361,HC,X361 DI,101,T1固定气缸1下降端,SL_FixedCylinder_Down1,361,HC,X361
DI,101,T1固定气缸2上升端,SL_FixedCylinder_Up2,362,HC,X362 DI,101,T1固定气缸2下降端,SL_FixedCylinder_Down2,362,HC,X362
DI,101,T1定位工位顶升上升端,SL_TopCylinder_Up,363,HC,X363 DI,101,T1定位工位顶升上升端,SL_TopCylinder_Up,363,HC,X363
DI,101,T1定位工位顶升下降端,SL_TopCylinder_Down,364,HC,X364 DI,101,T1定位工位顶升下降端,SL_TopCylinder_Down,364,HC,X364
DI,101,T1出口顶升上升端,SL_OutTopCylinder_Up,365,HC,X365 DI,101,T1出口顶升上升端,SL_OutTopCylinder_Up,365,HC,X365
...@@ -869,8 +869,8 @@ DI,102,T2定位气缸1上升端,SL_LocationCylinder_Up1,405,HC,X405 ...@@ -869,8 +869,8 @@ DI,102,T2定位气缸1上升端,SL_LocationCylinder_Up1,405,HC,X405
DI,102,T2定位气缸1下降端,SL_LocationCylinder_Down1,406,HC,X406 DI,102,T2定位气缸1下降端,SL_LocationCylinder_Down1,406,HC,X406
DI,102,T2定位气缸2上升端,SL_LocationCylinder_Up2,407,HC,X407 DI,102,T2定位气缸2上升端,SL_LocationCylinder_Up2,407,HC,X407
DI,102,T2定位气缸2下降端,SL_LocationCylinder_Down2,408,HC,X408 DI,102,T2定位气缸2下降端,SL_LocationCylinder_Down2,408,HC,X408
DI,102,T2固定气缸1上升端,SL_FixedCylinder_Up1,409,HC,X409 DI,102,T2固定气缸1下降端,SL_FixedCylinder_Down1,409,HC,X409
DI,102,T2固定气缸2上升端,SL_FixedCylinder_Up2,410,HC,X410 DI,102,T2固定气缸2下降端,SL_FixedCylinder_Down2,410,HC,X410
DI,102,T2定位工位顶升上升端,SL_TopCylinder_Up,411,HC,X411 DI,102,T2定位工位顶升上升端,SL_TopCylinder_Up,411,HC,X411
DI,102,T2定位工位顶升下降端,SL_TopCylinder_Down,412,HC,X412 DI,102,T2定位工位顶升下降端,SL_TopCylinder_Down,412,HC,X412
DI,102,T2出口顶升上升端,SL_OutTopCylinder_Up,413,HC,X413 DI,102,T2出口顶升上升端,SL_OutTopCylinder_Up,413,HC,X413
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -575,8 +575,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -575,8 +575,21 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.SL_FixedCylinder_Up, IO_VALUE.HIGH); IOMove(IO_Type.SL_FixedCylinder_Up, IO_VALUE.HIGH);
if (moveinfo != null) if (moveinfo != null)
{ {
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up1, IO_VALUE.HIGH)); if (Config.DIList.ContainsKey(IO_Type.SL_FixedCylinder_Up1) && Config.DIList.ContainsKey(IO_Type.SL_FixedCylinder_Up2))
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up2, IO_VALUE.HIGH)); {
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up1, IO_VALUE.HIGH));
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up2, IO_VALUE.HIGH));
}
else
{
moveinfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
}
if (Config.DIList.ContainsKey(IO_Type.SL_FixedCylinder_Down1) && Config.DIList.ContainsKey(IO_Type.SL_FixedCylinder_Down2))
{
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Down1, IO_VALUE.LOW));
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Down2, IO_VALUE.LOW));
}
} }
} }
...@@ -586,10 +599,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -586,10 +599,22 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.SL_FixedCylinder_Down, IO_VALUE.HIGH); IOMove(IO_Type.SL_FixedCylinder_Down, IO_VALUE.HIGH);
if (moveinfo != null) if (moveinfo != null)
{ {
moveinfo.WaitList.Add(WaitResultInfo.WaitTime(2000)); if (Config.DIList.ContainsKey(IO_Type.SL_FixedCylinder_Down1) && Config.DIList.ContainsKey(IO_Type.SL_FixedCylinder_Down2))
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up1, IO_VALUE.LOW)); {
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up2, IO_VALUE.LOW)); moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Down1, IO_VALUE.HIGH));
} moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Down2, IO_VALUE.HIGH));
}
else
{
moveinfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
}
if (Config.DIList.ContainsKey(IO_Type.SL_FixedCylinder_Up1) && Config.DIList.ContainsKey(IO_Type.SL_FixedCylinder_Up2))
{
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up1, IO_VALUE.LOW));
moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up2, IO_VALUE.LOW));
}
}
} }
public void TrayLCylinderBefore(LineMoveInfo moveinfo = null) public void TrayLCylinderBefore(LineMoveInfo moveinfo = null)
...@@ -661,12 +686,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -661,12 +686,23 @@ namespace OnlineStore.DeviceLibrary
} }
public bool IsFixedCylinderUp() public bool IsFixedCylinderUp()
{ {
if (IOValue(IO_Type.SL_FixedCylinder_Up1).Equals(IO_VALUE.HIGH) && if (Config.DIList.ContainsKey(IO_Type.SL_FixedCylinder_Up1) && Config.DIList.ContainsKey(IO_Type.SL_FixedCylinder_Up1))
IOValue(IO_Type.SL_FixedCylinder_Up2).Equals(IO_VALUE.HIGH))
{ {
return true; if (IOValue(IO_Type.SL_FixedCylinder_Up1).Equals(IO_VALUE.HIGH) &&
IOValue(IO_Type.SL_FixedCylinder_Up2).Equals(IO_VALUE.HIGH))
{
return true;
}
} }
else
{
if (IOValue(IO_Type.SL_FixedCylinder_Down1).Equals(IO_VALUE.LOW) &&
IOValue(IO_Type.SL_FixedCylinder_Down2).Equals(IO_VALUE.LOW))
{
return true;
}
}
return false; return false;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!