Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
刘韬
/
SO815-AutoInOutStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
图表
网络
创建新的问题
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 502503f2
由
几米阳光
编写于
2019-03-01 16:48:27 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
增加上料轴慢速匀速上升速度
1 个父辈
d15390f4
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
26 行增加
和
7 行删除
source/ACSingleStore/记录.txt
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
source/LoadCVSLibrary/storeConfig/config/AUTO_SA_Config.cs
source/ACSingleStore/记录.txt
查看文件 @
502503f
...
@@ -122,8 +122,8 @@ PRO,最后一盘料需要补充的高度,LastTrayAddHeight,10,,,,,,,,,
...
@@ -122,8 +122,8 @@ PRO,最后一盘料需要补充的高度,LastTrayAddHeight,10,,,,,,,,,
1768450
1796771
...
...
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
查看文件 @
502503f
...
@@ -129,6 +129,7 @@ PRO,硕科步进电机(压紧轴)原点返回速度,CompressAxis_HomeSpeed,4000,,,,,,,
...
@@ -129,6 +129,7 @@ PRO,硕科步进电机(压紧轴)原点返回速度,CompressAxis_HomeSpeed,4000,,,,,,,
PRO,硕科步进电机轴地址(压紧轴),CompressAxis_Slv,1,,,,,, ,
PRO,硕科步进电机轴地址(压紧轴),CompressAxis_Slv,1,,,,,, ,
,,,,,,,,,,
,,,,,,,,,,
PRO,(轴五)上料轴目标速度,BatchAxis_TargetSpeed,300,,,,,,,
PRO,(轴五)上料轴目标速度,BatchAxis_TargetSpeed,300,,,,,,,
PRO,(轴五)上料轴慢速匀速上升速度,BatchAxis_SlowSpeed,150,,,,,,,
PRO,(轴五)上料轴加速度,BatchAxis_AddSpeed,300,,,,,,,
PRO,(轴五)上料轴加速度,BatchAxis_AddSpeed,300,,,,,,,
PRO,(轴五)上料轴减速度,BatchAxis_DelSpeed,300,,,,,,,
PRO,(轴五)上料轴减速度,BatchAxis_DelSpeed,300,,,,,,,
PRO,(轴五)上料轴原点低速,BatchAxis_HomeLowSpeed,20,,,,,,,
PRO,(轴五)上料轴原点低速,BatchAxis_HomeLowSpeed,20,,,,,,,
...
...
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
查看文件 @
502503f
...
@@ -4,6 +4,7 @@ using System;
...
@@ -4,6 +4,7 @@ using System;
using
System.Collections.Generic
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Linq
;
using
System.Text
;
using
System.Text
;
using
System.Threading
;
namespace
OnlineStore.DeviceLibrary
namespace
OnlineStore.DeviceLibrary
{
{
...
@@ -175,8 +176,18 @@ namespace OnlineStore.DeviceLibrary
...
@@ -175,8 +176,18 @@ namespace OnlineStore.DeviceLibrary
break
;
break
;
case
StoreMoveStep
.
AUTO_R01_CloseDoor
:
case
StoreMoveStep
.
AUTO_R01_CloseDoor
:
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
AUTO_R02_AutoAxisHome
);
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
AUTO_R02_AutoAxisHome
);
LogUtil
.
info
(
Name
+
"复位中:批量上下料轴原点返回"
);
StoreMove
.
TimeOutSeconds
=
120
;
StoreMove
.
TimeOutSeconds
=
120
;
if
(
ACServerManager
.
GetAlarmStatus
(
StoreManager
.
Config
.
Batch_Axis
.
DeviceName
,
StoreManager
.
Config
.
Batch_Axis
.
GetAxisValue
()).
Equals
(
1
))
{
LogUtil
.
info
(
Name
+
"复位中:批量上下料轴清理报警,然后原点返回"
);
ACServerManager
.
AlarmClear
(
StoreManager
.
Config
.
Batch_Axis
.
DeviceName
,
StoreManager
.
Config
.
Batch_Axis
.
GetAxisValue
());
Thread
.
Sleep
(
100
);
}
else
{
LogUtil
.
info
(
Name
+
"复位中:批量上下料轴原点返回"
);
}
ACAxisHomeMove
(
StoreManager
.
Config
.
Batch_Axis
);
ACAxisHomeMove
(
StoreManager
.
Config
.
Batch_Axis
);
break
;
break
;
case
StoreMoveStep
.
AUTO_R02_AutoAxisHome
:
case
StoreMoveStep
.
AUTO_R02_AutoAxisHome
:
...
@@ -335,8 +346,8 @@ namespace OnlineStore.DeviceLibrary
...
@@ -335,8 +346,8 @@ namespace OnlineStore.DeviceLibrary
if
(
KND
.
IOValue
(
IO_Type
.
SuckingDisc_Air
).
Equals
(
IO_VALUE
.
HIGH
))
if
(
KND
.
IOValue
(
IO_Type
.
SuckingDisc_Air
).
Equals
(
IO_VALUE
.
HIGH
))
{
{
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
AUTO_I07_BatchAxisUp
);
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
AUTO_I07_BatchAxisUp
);
LogUtil
.
info
(
Name
+
"入料: 批量上下料轴上升速度【"
+
StoreManager
.
Config
.
Batch
_Axis
.
Target
Speed
+
"】"
);
LogUtil
.
info
(
Name
+
"入料: 批量上下料轴上升速度【"
+
StoreManager
.
Config
.
Batch
Axis_Slow
Speed
+
"】"
);
ACAxisSpeedMove
(
StoreManager
.
Config
.
Batch_Axis
,
StoreManager
.
Config
.
Batch
_Axis
.
TargetSpeed
);
ACAxisSpeedMove
(
StoreManager
.
Config
.
Batch_Axis
,
StoreManager
.
Config
.
Batch
Axis_SlowSpeed
);
CylinderMove
(
IO_Type
.
SuckingDisc_Up
,
IO_Type
.
SuckingDisc_Down
,
true
);
CylinderMove
(
IO_Type
.
SuckingDisc_Up
,
IO_Type
.
SuckingDisc_Down
,
true
);
if
(
StoreManager
.
Config
.
Default_TrayWidth
.
Equals
(
7
))
if
(
StoreManager
.
Config
.
Default_TrayWidth
.
Equals
(
7
))
{
{
...
...
source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
查看文件 @
502503f
...
@@ -4,6 +4,7 @@ using System;
...
@@ -4,6 +4,7 @@ using System;
using
System.Collections.Generic
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Linq
;
using
System.Text
;
using
System.Text
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
namespace
OnlineStore.DeviceLibrary
namespace
OnlineStore.DeviceLibrary
...
@@ -19,7 +20,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -19,7 +20,7 @@ namespace OnlineStore.DeviceLibrary
//AutoAxisIsMove = 1;
//AutoAxisIsMove = 1;
StartMovePosition
=
ACServerManager
.
GetActualtPosition
(
moveAxis
.
DeviceName
,
moveAxis
.
GetAxisValue
());
StartMovePosition
=
ACServerManager
.
GetActualtPosition
(
moveAxis
.
DeviceName
,
moveAxis
.
GetAxisValue
());
EndMovePosition
=
StartMovePosition
;
EndMovePosition
=
StartMovePosition
;
LogUtil
.
info
(
"当前坐标:"
+
StartMovePosition
+
",批量上料轴开始匀速"
+
targetSpeed
+
"上升"
);
LogUtil
.
debug
(
"当前坐标:"
+
StartMovePosition
+
",批量上料轴开始匀速"
+
targetSpeed
+
"上升"
);
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitBatchAxisStop
(
moveAxis
,
0
));
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitBatchAxisStop
(
moveAxis
,
0
));
BatchAxisController
.
StartCheck
();
BatchAxisController
.
StartCheck
();
ACServerManager
.
SpeedMove
(
moveAxis
.
DeviceName
,
moveAxis
.
GetAxisValue
(),
targetSpeed
);
ACServerManager
.
SpeedMove
(
moveAxis
.
DeviceName
,
moveAxis
.
GetAxisValue
(),
targetSpeed
);
...
@@ -246,6 +247,8 @@ namespace OnlineStore.DeviceLibrary
...
@@ -246,6 +247,8 @@ namespace OnlineStore.DeviceLibrary
else
if
(
ACServerManager
.
GetLimitPositiveSingle
(
wait
.
AxisInfo
).
Equals
(
1
))
else
if
(
ACServerManager
.
GetLimitPositiveSingle
(
wait
.
AxisInfo
).
Equals
(
1
))
{
{
LogUtil
.
info
(
wait
.
ToStr
()
+
" 检测到正极限信号,可以停止运动"
);
LogUtil
.
info
(
wait
.
ToStr
()
+
" 检测到正极限信号,可以停止运动"
);
ACServerManager
.
SuddenStop
(
wait
.
AxisInfo
.
DeviceName
,
wait
.
AxisInfo
.
GetAxisValue
());
Thread
.
Sleep
(
50
);
result
=
true
;
result
=
true
;
}
}
if
(
result
)
if
(
result
)
...
...
source/LoadCVSLibrary/storeConfig/config/AUTO_SA_Config.cs
查看文件 @
502503f
...
@@ -568,7 +568,11 @@ namespace OnlineStore.LoadCSVLibrary
...
@@ -568,7 +568,11 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
/// </summary>
[
ConfigProAttribute
(
"BatchAxis_P1_Speed"
,
true
)]
[
ConfigProAttribute
(
"BatchAxis_P1_Speed"
,
true
)]
public
int
BatchAxis_P1_Speed
{
get
;
set
;
}
public
int
BatchAxis_P1_Speed
{
get
;
set
;
}
/// <summary>
/// PRO (轴五)上料轴慢速匀速上升速度 BatchAxis_SlowSpeed 150
/// </summary>
[
ConfigProAttribute
(
"BatchAxis_SlowSpeed"
,
true
)]
public
int
BatchAxis_SlowSpeed
{
get
;
set
;
}
/// <summary>
/// <summary>
/// PRO(轴五)上料轴出料时距离检测信号需要下降的高度 BatchAxis_OutDownPosition
/// PRO(轴五)上料轴出料时距离检测信号需要下降的高度 BatchAxis_OutDownPosition
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论