Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 3c1d6d22
由
LN
编写于
2020-08-04 13:16:28 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
横移提前顶升bug。进仓门口的夹紧信号暂时不用。去掉入料口定位气缸上升步骤。
1 个父辈
60990f11
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
48 行增加
和
16 行删除
source/AssemblyLineClient/记录.txt
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs
source/DeviceLibrary/assemblyLine/MoveEquip.cs
source/DeviceLibrary/model/KTK_Store.cs
source/AssemblyLineClient/记录.txt
查看文件 @
3c1d6d2
20200623
进仓18个夹爪,夹紧DI信号不用
横移四个定位气缸暂时不用
20200623
入库,料仓与服务器 通信超时改为3秒。入库验证时如果超时重新发送。
入库NG的到达NG口时再调用下取消入库任务。
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
查看文件 @
3c1d6d2
...
...
@@ -306,7 +306,7 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo
.
EndStepWait
();
if
(
Config
.
SidesWayNum
>
0
)
{
CylinderMove
(
null
,
IO_Type
.
SW_LocationCylinder_Down
,
IO_Type
.
SW_LocationCylinder_Up
);
//
CylinderMove(null, IO_Type.SW_LocationCylinder_Down, IO_Type.SW_LocationCylinder_Up);
}
}
else
...
...
@@ -317,7 +317,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo
(
SecondMoveInfo
.
MoveNum
+
SecondMoveInfo
.
SLog
+
" ,托盘号【"
+
currTrayNum
+
"】需要出库,等待开始出库"
);
if
(
Config
.
SidesWayNum
>
0
)
{
CylinderMove
(
null
,
IO_Type
.
SW_LocationCylinder_Down
,
IO_Type
.
SW_LocationCylinder_Up
);
//
CylinderMove(null, IO_Type.SW_LocationCylinder_Down, IO_Type.SW_LocationCylinder_Up);
}
}
...
...
@@ -938,7 +938,7 @@ namespace OnlineStore.DeviceLibrary
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_MoveCylinder_Up
,
IO_Type
.
SL_MoveCylinder_Down
);
if
(
Config
.
SidesWayNum
>
0
)
{
CylinderMove
(
MoveInfo
,
IO_Type
.
SW_LocationCylinder_Down
,
IO_Type
.
SW_LocationCylinder_Up
);
//
CylinderMove(MoveInfo, IO_Type.SW_LocationCylinder_Down, IO_Type.SW_LocationCylinder_Up);
}
LastPosParam
.
TrayNumber
=
currTrayNum
;
InLog
(
"料盘移栽"
+
MoveInfo
.
SLog
+
":上料机构下降, 托盘号【"
+
currTrayNum
+
"】,更新托盘信息 :"
+
LastPosParam
.
ToShortStr
());
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
查看文件 @
3c1d6d2
...
...
@@ -86,7 +86,7 @@ namespace OnlineStore.DeviceLibrary
LastOutParam
=
outParam
;
//可以开始出库啦
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FO_211_AxisDownMove
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SW_LocationCylinder_Down
,
IO_Type
.
SW_LocationCylinder_Up
);
//
CylinderMove(MoveInfo, IO_Type.SW_LocationCylinder_Down, IO_Type.SW_LocationCylinder_Up);
int
height
=
outParam
.
PlateH
+
4
;
int
targetPosition
=
BatchAxis
.
GetAclPosition
()
-
height
*
Config
.
Height_ChangeValue
;
if
(
targetPosition
<
Config
.
BatchAxisP2
)
...
...
@@ -323,7 +323,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FO_05_LocationUp
);
OutLog
(
"定位工位检测到料架: "
+
MoveInfo
.
SLog
+
" 缓冲阻挡下降, 定位气缸上升,读取并缓存料架RFID"
);
UpdateLastShelfID
(
CurrShelfId
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_LocationCylinder_Down
,
IO_Type
.
S
W4
_LocationCylinder_Up
);
CylinderMove
(
MoveInfo
,
IO_Type
.
SL_LocationCylinder_Down
,
IO_Type
.
S
L
_LocationCylinder_Up
);
}
else
...
...
source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs
查看文件 @
3c1d6d2
...
...
@@ -89,10 +89,14 @@ namespace OnlineStore.DeviceLibrary
/// <returns></returns>
private
bool
Shunt_Updown2CanUp
()
{
if
(
IOValue
(
IO_Type
.
Shunt_StopDown2_Back
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
Shunt_Check3_Back
).
Equals
(
IO_VALUE
.
LOW
)
)
TimeSpan
span
=
DateTime
.
Now
-
Stop2DownTime
;
if
(
span
.
TotalMilliseconds
>=
3000
)
{
return
true
;
if
(
IOValue
(
IO_Type
.
Shunt_StopDown2_Back
).
Equals
(
IO_VALUE
.
LOW
)
&&
IOValue
(
IO_Type
.
Shunt_Check3_Back
).
Equals
(
IO_VALUE
.
LOW
))
{
return
true
;
}
}
return
false
;
}
...
...
@@ -180,7 +184,8 @@ namespace OnlineStore.DeviceLibrary
{
if
(
ShuntStop2CanDown
())
{
IOMove
(
IO_Type
.
Shunt_StopDown2_Back
,
IO_VALUE
.
HIGH
,
1200
);
Stop2DownTime
=
DateTime
.
Now
;
IOMove
(
IO_Type
.
Shunt_StopDown2_Back
,
IO_VALUE
.
HIGH
,
1500
);
shuntCheck4Watch
.
Stop
();
}
}
...
...
@@ -197,6 +202,8 @@ namespace OnlineStore.DeviceLibrary
}
shuntPro
=
false
;
}
private
DateTime
Stop2DownTime
=
DateTime
.
Now
;
private
void
ShuntBusyProcess
()
{
...
...
source/DeviceLibrary/assemblyLine/MoveEquip.cs
查看文件 @
3c1d6d2
...
...
@@ -308,6 +308,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
200
));
CylinderMove
(
MoveInfo
,
IO_Type
.
UpDownCylinder_Down
,
IO_Type
.
UpDownCylinder_Up
);
}
}
...
...
@@ -322,6 +323,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
200
));
CylinderMove
(
MoveInfo
,
IO_Type
.
UpDownCylinder_Up
,
IO_Type
.
UpDownCylinder_Down
);
}
}
...
...
@@ -335,6 +337,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
200
));
CylinderMove
(
MoveInfo
,
IO_Type
.
UpDownCylinder_Up
,
IO_Type
.
UpDownCylinder_Down
);
}
}
...
...
@@ -349,6 +352,7 @@ namespace OnlineStore.DeviceLibrary
else
{
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
MH_CylinderUp
);
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
200
));
CylinderMove
(
MoveInfo
,
IO_Type
.
UpDownCylinder_Down
,
IO_Type
.
UpDownCylinder_Up
);
}
}
...
...
source/DeviceLibrary/model/KTK_Store.cs
查看文件 @
3c1d6d2
...
...
@@ -479,18 +479,35 @@ namespace OnlineStore.DeviceLibrary
}
if
(
moveInfo
!=
null
)
{
moveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IoLowType
,
IO_VALUE
.
LOW
));
moveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IoHighType
,
IO_VALUE
.
HIGH
));
if
(
IoHighType
.
Equals
(
IO_Type
.
ClampCylinder_Slack
)
||
IoHighType
.
Equals
(
IO_Type
.
ClampCylinder_Tighten
)
||
IoHighType
.
Equals
(
IO_Type
.
UpDownCylinder_Down
)
||
IoHighType
.
Equals
(
IO_Type
.
UpDownCylinder_Up
)
// IoHighType.Equals(IO_Type.BeforeAfterCylinder_After) || IoHighType.Equals(IO_Type.BeforeAfterCylinder_Before)
IoHighType
.
Equals
(
IO_Type
.
UpDownCylinder_Down
)
||
IoHighType
.
Equals
(
IO_Type
.
UpDownCylinder_Up
)
)
{
moveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
300
));
}
else
if
(
IoHighType
.
Equals
(
IO_Type
.
BeforeAfterCylinder_After
)
||
IoHighType
.
Equals
(
IO_Type
.
BeforeAfterCylinder_Before
)){
}
else
if
(
IoHighType
.
Equals
(
IO_Type
.
BeforeAfterCylinder_After
)
||
IoHighType
.
Equals
(
IO_Type
.
BeforeAfterCylinder_Before
))
{
moveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
800
));
}
//如果是进仓门口 夹紧
if
(
baseConfig
.
DType
.
Equals
(
DeviceType
.
MoveEquip
)
&&
(
IoHighType
.
Equals
(
IO_Type
.
ClampCylinder_Slack
)))
{
moveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
500
));
moveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IoLowType
,
IO_VALUE
.
LOW
));
}
else
if
(
baseConfig
.
DType
.
Equals
(
DeviceType
.
MoveEquip
)
&&
(
IoHighType
.
Equals
(
IO_Type
.
ClampCylinder_Tighten
)))
{
//进仓门口放松
moveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
500
));
moveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IoHighType
,
IO_VALUE
.
HIGH
));
}
else
{
moveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IoLowType
,
IO_VALUE
.
LOW
));
moveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IoHighType
,
IO_VALUE
.
HIGH
));
}
}
if
(
isCheckMove
)
{
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论