Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 022589ec
由
LN
编写于
2020-03-04 14:10:39 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
1.阻挡1下降改为最长下降1200ms,自动回写。
2.IO超时异常处理顺序修改。 3.上料模块出料架时,未检测到出口料架信号后,需要继续转动8秒钟。
1 个父辈
253f6a52
显示空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
20 行增加
和
12 行删除
source/AssemblyLineClient/记录.txt
source/DeviceLibrary/assemblyLine/DischargeLine.cs
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
source/DeviceLibrary/assemblyLine/MoveEquip.cs
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
source/DeviceLibrary/assemblyLine/ProvidingEquip.cs
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
source/DeviceLibrary/model/KTK_Store.cs
source/AssemblyLineClient/记录.txt
查看文件 @
022589e
...
@@ -230,6 +230,11 @@ PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=800
...
@@ -230,6 +230,11 @@ PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=800
增加 Addr_arriveRobotLocation = "/rest/api/qisda/device/arriveRobotLocation"; 接口,待料盘到达接驳台后通知服务器。
增加 Addr_arriveRobotLocation = "/rest/api/qisda/device/arriveRobotLocation"; 接口,待料盘到达接驳台后通知服务器。
20200304
1.阻挡1下降改为最长下降1200ms,自动回写。
2.IO超时异常处理顺序修改。
3.上料模块出料架时,未检测到出口料架信号后,需要继续转动8秒钟。
4.上料模块复位时,需要先夹爪放松
...
...
source/DeviceLibrary/assemblyLine/DischargeLine.cs
查看文件 @
022589e
...
@@ -250,6 +250,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -250,6 +250,7 @@ namespace OnlineStore.DeviceLibrary
TrayLine2
.
OutStoreProcess
();
TrayLine2
.
OutStoreProcess
();
}
}
IOTimeOutProcess
();
//判断流水线打开了才可以运行
//判断流水线打开了才可以运行
if
(
runStatus
.
Equals
(
LineRunStatus
.
Runing
)
&&
NoAlarm
()
&&
MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
if
(
runStatus
.
Equals
(
LineRunStatus
.
Runing
)
&&
NoAlarm
()
&&
MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
{
{
...
@@ -283,7 +284,6 @@ namespace OnlineStore.DeviceLibrary
...
@@ -283,7 +284,6 @@ namespace OnlineStore.DeviceLibrary
IOMove
(
IO_Type
.
SeparateDevice_Run
,
IO_VALUE
.
HIGH
);
IOMove
(
IO_Type
.
SeparateDevice_Run
,
IO_VALUE
.
HIGH
);
}
}
}
}
IOTimeOutProcess
();
//判断红灯状态
//判断红灯状态
if
(
NoAlarm
())
if
(
NoAlarm
())
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
查看文件 @
022589e
...
@@ -364,6 +364,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -364,6 +364,7 @@ namespace OnlineStore.DeviceLibrary
return
;
return
;
}
}
BusyMoveProcess
();
BusyMoveProcess
();
IOTimeOutProcess
();
//判断流水线打开了才可以运行
//判断流水线打开了才可以运行
if
(
MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
)
&&
NoErrorAlarm
())
if
(
MoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
)
&&
NoErrorAlarm
())
{
{
...
@@ -410,7 +411,6 @@ namespace OnlineStore.DeviceLibrary
...
@@ -410,7 +411,6 @@ namespace OnlineStore.DeviceLibrary
}
}
}
}
IOTimeOutProcess
();
}
}
/// <summary>
/// <summary>
...
@@ -691,14 +691,14 @@ namespace OnlineStore.DeviceLibrary
...
@@ -691,14 +691,14 @@ namespace OnlineStore.DeviceLibrary
bool
result
=
WaitIo
(
IO_Type
.
SL_Out_Check
,
IO_VALUE
.
LOW
,
60000
);
bool
result
=
WaitIo
(
IO_Type
.
SL_Out_Check
,
IO_VALUE
.
LOW
,
60000
);
if
(!
result
)
if
(!
result
)
{
{
LogUtil
.
info
(
logName
+
" 等待SL_Out_Check=LOW超时,等待
3
000后停止转动,发送FinishLeave"
);
LogUtil
.
info
(
logName
+
" 等待SL_Out_Check=LOW超时,等待
8
000后停止转动,发送FinishLeave"
);
}
}
else
else
{
{
LogUtil
.
info
(
logName
+
" 已收到SL_Out_Check=LOW ,等待
3
000后停止转动,发送FinishLeave"
);
LogUtil
.
info
(
logName
+
" 已收到SL_Out_Check=LOW ,等待
8
000后停止转动,发送FinishLeave"
);
}
}
//再转动2000
//再转动2000
Thread
.
Sleep
(
3
000
);
Thread
.
Sleep
(
8
000
);
//停止转动 ,阻挡上升
//停止转动 ,阻挡上升
IOMove
(
IO_Type
.
SL_OutSideWay_Run
,
IO_VALUE
.
LOW
);
IOMove
(
IO_Type
.
SL_OutSideWay_Run
,
IO_VALUE
.
LOW
);
IOMove
(
IO_Type
.
SL_Out_StopDown
,
IO_VALUE
.
LOW
);
IOMove
(
IO_Type
.
SL_Out_StopDown
,
IO_VALUE
.
LOW
);
...
@@ -709,7 +709,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -709,7 +709,7 @@ namespace OnlineStore.DeviceLibrary
AgvClient
.
SetStatus
(
Config
.
AgvOutName
,
""
,
ClientAction
.
None
,
ClientLevel
.
High
,
true
);
AgvClient
.
SetStatus
(
Config
.
AgvOutName
,
""
,
ClientAction
.
None
,
ClientLevel
.
High
,
true
);
});
});
ProcessShelfOut
=
false
;
ProcessShelfOut
=
false
;
LogUtil
.
info
(
logName
+
" 结束"
);
LogUtil
.
info
(
logName
+
"
,停止转动,
结束"
);
}
}
}
}
catch
(
TimeoutException
te
)
catch
(
TimeoutException
te
)
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
查看文件 @
022589e
...
@@ -108,7 +108,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -108,7 +108,7 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
200
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
200
));
LogUtil
.
info
(
Name
+
" ["
+
trayCount
+
"] 检测到SW_StopCheck:"
+
SecondMoveInfo
.
SLog
+
"阻挡气缸下降 ,等待 SW_StopCheck=0"
);
LogUtil
.
info
(
Name
+
" ["
+
trayCount
+
"] 检测到SW_StopCheck:"
+
SecondMoveInfo
.
SLog
+
"阻挡气缸下降 ,等待 SW_StopCheck=0"
);
//CheckLog("检测到SW_StopCheck:" + SecondMoveInfo.SLog + "阻挡气缸下降 ,等待 SW_StopCheck=0" );
//CheckLog("检测到SW_StopCheck:" + SecondMoveInfo.SLog + "阻挡气缸下降 ,等待 SW_StopCheck=0" );
IOMove
(
IO_Type
.
SW_StopDown
,
IO_VALUE
.
HIGH
);
IOMove
(
IO_Type
.
SW_StopDown
,
IO_VALUE
.
HIGH
,
1200
);
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SW_StopDown
,
IO_VALUE
.
HIGH
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SW_StopDown
,
IO_VALUE
.
HIGH
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SW_StopCheck
,
IO_VALUE
.
LOW
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SW_StopCheck
,
IO_VALUE
.
LOW
));
...
...
source/DeviceLibrary/assemblyLine/MoveEquip.cs
查看文件 @
022589e
...
@@ -221,6 +221,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -221,6 +221,7 @@ namespace OnlineStore.DeviceLibrary
return
;
return
;
}
}
BusyMoveProcess
();
BusyMoveProcess
();
IOTimeOutProcess
();
//判断流水线打开了才可以运行
//判断流水线打开了才可以运行
if
(
SecondMoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
if
(
SecondMoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
{
{
...
@@ -230,7 +231,6 @@ namespace OnlineStore.DeviceLibrary
...
@@ -230,7 +231,6 @@ namespace OnlineStore.DeviceLibrary
StartCheckFixture
();
StartCheckFixture
();
}
}
}
}
IOTimeOutProcess
();
OutStoreListPro
();
OutStoreListPro
();
}
}
...
...
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
查看文件 @
022589e
...
@@ -490,7 +490,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -490,7 +490,7 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MIO_00_Stop1Down
);
SecondMoveInfo
.
NextMoveStep
(
LineMoveStep
.
MIO_00_Stop1Down
);
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
200
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
200
));
CheckLog
(
" 托盘检测:料盘检测StopCylinder_Check1 "
+
SecondMoveInfo
.
SLog
+
"阻挡气缸1-1下降 , 等待 StopCylinder_Check1=0"
);
CheckLog
(
" 托盘检测:料盘检测StopCylinder_Check1 "
+
SecondMoveInfo
.
SLog
+
"阻挡气缸1-1下降 , 等待 StopCylinder_Check1=0"
);
IOMove
(
IO_Type
.
StopCylinder_Down1
,
IO_VALUE
.
HIGH
);
IOMove
(
IO_Type
.
StopCylinder_Down1
,
IO_VALUE
.
HIGH
,
1200
);
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
StopCylinder_Down1
,
IO_VALUE
.
HIGH
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
StopCylinder_Down1
,
IO_VALUE
.
HIGH
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
StopCylinder_Check1
,
IO_VALUE
.
LOW
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
StopCylinder_Check1
,
IO_VALUE
.
LOW
));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
...
...
source/DeviceLibrary/assemblyLine/ProvidingEquip.cs
查看文件 @
022589e
...
@@ -201,6 +201,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -201,6 +201,7 @@ namespace OnlineStore.DeviceLibrary
return
;
return
;
}
}
BusyMoveProcess
();
BusyMoveProcess
();
IOTimeOutProcess
();
//判断流水线打开了才可以运行
//判断流水线打开了才可以运行
if
(
SecondMoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
if
(
SecondMoveInfo
.
MoveType
.
Equals
(
LineMoveType
.
None
))
{
{
...
@@ -210,7 +211,6 @@ namespace OnlineStore.DeviceLibrary
...
@@ -210,7 +211,6 @@ namespace OnlineStore.DeviceLibrary
StartCheckFixture
();
StartCheckFixture
();
}
}
}
}
IOTimeOutProcess
();
}
}
public
override
bool
StartInStoreMove
(
InOutParam
param
)
public
override
bool
StartInStoreMove
(
InOutParam
param
)
{
{
...
...
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
查看文件 @
022589e
...
@@ -73,7 +73,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -73,7 +73,7 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
200
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
200
));
LogUtil
.
info
(
Name
+
" ["
+
trayCount
+
"] 托盘检测:"
+
SecondMoveInfo
.
SLog
+
"阻挡气缸1-1下降 ,等待 StopCylinder_Check1=0"
);
LogUtil
.
info
(
Name
+
" ["
+
trayCount
+
"] 托盘检测:"
+
SecondMoveInfo
.
SLog
+
"阻挡气缸1-1下降 ,等待 StopCylinder_Check1=0"
);
//CheckLog(" 托盘检测:" + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ,等待 StopCylinder_Check1=0" );
//CheckLog(" 托盘检测:" + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ,等待 StopCylinder_Check1=0" );
IOMove
(
IO_Type
.
StopCylinder_Down1
,
IO_VALUE
.
HIGH
);
IOMove
(
IO_Type
.
StopCylinder_Down1
,
IO_VALUE
.
HIGH
,
1200
);
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
StopCylinder_Down1
,
IO_VALUE
.
HIGH
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
StopCylinder_Down1
,
IO_VALUE
.
HIGH
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
StopCylinder_Check1
,
IO_VALUE
.
LOW
));
SecondMoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
StopCylinder_Check1
,
IO_VALUE
.
LOW
));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
...
...
source/DeviceLibrary/model/KTK_Store.cs
查看文件 @
022589e
...
@@ -438,8 +438,11 @@ namespace OnlineStore.DeviceLibrary
...
@@ -438,8 +438,11 @@ namespace OnlineStore.DeviceLibrary
{
{
IOManager
.
IOMove
(
IoType
,
value
,
baseConfig
.
Id
);
IOManager
.
IOMove
(
IoType
,
value
,
baseConfig
.
Id
);
Thread
.
Sleep
(
msTime
);
Thread
.
Sleep
(
msTime
);
LogUtil
.
info
(
"定时回写IO: ["
+
IoType
+
"]=["
+
value
+
"],["
+
baseConfig
.
Id
+
"],msTime="
+
msTime
);
IO_VALUE
tValue
=
value
.
Equals
(
IO_VALUE
.
HIGH
)
?
IO_VALUE
.
LOW
:
IO_VALUE
.
HIGH
;
IO_VALUE
tValue
=
value
.
Equals
(
IO_VALUE
.
HIGH
)
?
IO_VALUE
.
LOW
:
IO_VALUE
.
HIGH
;
if
(
IOValue
(
IoType
).
Equals
(
tValue
).
Equals
(
false
))
{
LogUtil
.
info
(
Name
+
"定时回写IO: ["
+
IoType
+
"]=["
+
value
+
"],["
+
baseConfig
.
Id
+
"],msTime="
+
msTime
);
}
IOManager
.
IOMove
(
IoType
,
tValue
,
baseConfig
.
Id
);
IOManager
.
IOMove
(
IoType
,
tValue
,
baseConfig
.
Id
);
});
});
}
}
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论