Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 3e1330f3
由
LN
编写于
2020-05-29 09:19:16 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
伺服运动增加时间等待
1 个父辈
0ac1cd37
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
9 行增加
和
0 行删除
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
source/DeviceLibrary/assemblyLine/MoveEquip.cs
source/DeviceLibrary/assemblyLine/ProvidingEquip.cs
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
查看文件 @
3e1330f
...
@@ -200,6 +200,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -200,6 +200,7 @@ namespace OnlineStore.DeviceLibrary
break
;
break
;
case
LineMoveStep
.
FR_03_CylinderUp
:
case
LineMoveStep
.
FR_03_CylinderUp
:
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FR_04_UpdownAxisHome
);
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FR_04_UpdownAxisHome
);
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
LogInfo
(
MoveInfo
.
MoveType
+
":"
+
MoveInfo
.
SLog
+
": 升降伺服回原点"
);
LogInfo
(
MoveInfo
.
MoveType
+
":"
+
MoveInfo
.
SLog
+
": 升降伺服回原点"
);
UpdownAxis
.
HomeMove
(
MoveInfo
);
UpdownAxis
.
HomeMove
(
MoveInfo
);
break
;
break
;
...
@@ -234,6 +235,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -234,6 +235,7 @@ namespace OnlineStore.DeviceLibrary
break
;
break
;
case
LineMoveStep
.
FR_06_CylinderGive
:
case
LineMoveStep
.
FR_06_CylinderGive
:
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FR_11_BatchAxisHome
);
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
FR_11_BatchAxisHome
);
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
MoveInfo
.
TimeOutSeconds
=
120
;
MoveInfo
.
TimeOutSeconds
=
120
;
LogInfo
(
MoveInfo
.
MoveType
+
":"
+
MoveInfo
.
SLog
+
":提升伺服回原点"
);
LogInfo
(
MoveInfo
.
MoveType
+
":"
+
MoveInfo
.
SLog
+
":提升伺服回原点"
);
BatchAxis
.
HomeMove
(
MoveInfo
);
BatchAxis
.
HomeMove
(
MoveInfo
);
...
...
source/DeviceLibrary/assemblyLine/MoveEquip.cs
查看文件 @
3e1330f
...
@@ -303,6 +303,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -303,6 +303,7 @@ namespace OnlineStore.DeviceLibrary
{
{
if
(
UseAxis
)
if
(
UseAxis
)
{
{
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
UpdownAxis
.
AbsMove
(
MoveInfo
,
Config
.
UpDownAxisP1
,
Config
.
UpdownAxis_P1Speed
);
UpdownAxis
.
AbsMove
(
MoveInfo
,
Config
.
UpDownAxisP1
,
Config
.
UpdownAxis_P1Speed
);
}
}
else
else
...
@@ -315,6 +316,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -315,6 +316,7 @@ namespace OnlineStore.DeviceLibrary
{
{
if
(
UseAxis
)
if
(
UseAxis
)
{
{
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
int
position
=
Config
.
GetUpdownP2Detial
(
trayHeight
,
traySize
);
int
position
=
Config
.
GetUpdownP2Detial
(
trayHeight
,
traySize
);
UpdownAxis
.
AbsMove
(
MoveInfo
,
position
,
Config
.
UpdownAxis_P2Speed
);
UpdownAxis
.
AbsMove
(
MoveInfo
,
position
,
Config
.
UpdownAxis_P2Speed
);
}
}
...
@@ -327,6 +329,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -327,6 +329,7 @@ namespace OnlineStore.DeviceLibrary
{
{
if
(
UseAxis
)
if
(
UseAxis
)
{
{
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
int
position
=
Config
.
GetUpdownP3
(
trayHeight
);
int
position
=
Config
.
GetUpdownP3
(
trayHeight
);
UpdownAxis
.
AbsMove
(
MoveInfo
,
position
,
Config
.
UpdownAxis_P3Speed
);
UpdownAxis
.
AbsMove
(
MoveInfo
,
position
,
Config
.
UpdownAxis_P3Speed
);
}
}
...
@@ -340,6 +343,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -340,6 +343,7 @@ namespace OnlineStore.DeviceLibrary
if
(
UseAxis
)
if
(
UseAxis
)
{
{
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
MH_UpDownHome
);
MoveInfo
.
NextMoveStep
(
LineMoveStep
.
MH_UpDownHome
);
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
UpdownAxis
.
HomeMove
(
MoveInfo
);
UpdownAxis
.
HomeMove
(
MoveInfo
);
}
}
else
else
...
...
source/DeviceLibrary/assemblyLine/ProvidingEquip.cs
查看文件 @
3e1330f
...
@@ -226,6 +226,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -226,6 +226,7 @@ namespace OnlineStore.DeviceLibrary
{
{
if
(
UseAxis
)
if
(
UseAxis
)
{
{
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
UpdownAxis
.
AbsMove
(
MoveInfo
,
Config
.
UpDownAxisP1
,
Config
.
UpdownAxis_P1Speed
);
UpdownAxis
.
AbsMove
(
MoveInfo
,
Config
.
UpDownAxisP1
,
Config
.
UpdownAxis_P1Speed
);
}
}
else
else
...
@@ -238,6 +239,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -238,6 +239,7 @@ namespace OnlineStore.DeviceLibrary
{
{
if
(
UseAxis
)
if
(
UseAxis
)
{
{
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
int
position
=
Config
.
GetUpdownP2Detial
(
trayHeight
,
traySize
);
int
position
=
Config
.
GetUpdownP2Detial
(
trayHeight
,
traySize
);
UpdownAxis
.
AbsMove
(
MoveInfo
,
position
,
Config
.
UpdownAxis_P2Speed
);
UpdownAxis
.
AbsMove
(
MoveInfo
,
position
,
Config
.
UpdownAxis_P2Speed
);
}
}
...
@@ -250,6 +252,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -250,6 +252,7 @@ namespace OnlineStore.DeviceLibrary
{
{
if
(
UseAxis
)
if
(
UseAxis
)
{
{
MoveInfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
int
position
=
Config
.
GetUpdownP3
(
trayHeight
);
int
position
=
Config
.
GetUpdownP3
(
trayHeight
);
UpdownAxis
.
AbsMove
(
MoveInfo
,
position
,
Config
.
UpdownAxis_P3Speed
);
UpdownAxis
.
AbsMove
(
MoveInfo
,
position
,
Config
.
UpdownAxis_P3Speed
);
}
}
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论