Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
ACSingleStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 3479aa35
由
LN
编写于
2019-08-30 13:31:29 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
增加Y15: 允许取料信号
1 个父辈
b0f14394
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
26 行增加
和
5 行删除
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs
新建文本文档.txt
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
查看文件 @
3479aa3
...
@@ -29,7 +29,8 @@ DO,相机照明开,CameraLight_Power,110,192.168.200.11,0,相机照明开,Y11,DO-11,0,
...
@@ -29,7 +29,8 @@ DO,相机照明开,CameraLight_Power,110,192.168.200.11,0,相机照明开,Y11,DO-11,0,
,,,111,192.168.200.11,0,,Y12,DO-12,0,
,,,111,192.168.200.11,0,,Y12,DO-12,0,
,,,112,192.168.200.11,0,,Y13,DO-13,0,
,,,112,192.168.200.11,0,,Y13,DO-13,0,
,,,113,192.168.200.11,0,,Y14,DO-14,0,
,,,113,192.168.200.11,0,,Y14,DO-14,0,
,,,114,192.168.200.11,0,,Y15,DO-15,0,
DO,允许放料信号,CanPutTray,114,192.168.200.11,0,允许放料信号,Y15,DO-15,0,
DO,可取料信号,CanGetTray,115,192.168.200.11,0,可取料信号,Y16,DO-16,0,
AXIS,(轴一)旋转轴,Middle_Axis,1,COM6,0,,,,,
AXIS,(轴一)旋转轴,Middle_Axis,1,COM6,0,,,,,
AXIS,(轴二)升降轴轴,UpDown_Axis,1,COM5,0,,,,,
AXIS,(轴二)升降轴轴,UpDown_Axis,1,COM5,0,,,,,
AXIS,(轴三)进出轴,InOut_Axis,1,COM4,0,,,,,
AXIS,(轴三)进出轴,InOut_Axis,1,COM4,0,,,,,
...
@@ -123,4 +124,3 @@ PRO,模拟信号3默认高度,AIDI3_DefaultPosition,2500,,,,,,,
...
@@ -123,4 +124,3 @@ PRO,模拟信号3默认高度,AIDI3_DefaultPosition,2500,,,,,,,
,,,,,,,,, ,
,,,,,,,,, ,
PRO,模拟信号1的地址,AIDI1_Addr,7,,,,,,,
PRO,模拟信号1的地址,AIDI1_Addr,7,,,,,,,
PRO,模拟信号2的地址,AIDI2_Addr,8,,,,,,,
PRO,模拟信号2的地址,AIDI2_Addr,8,,,,,,,
DO,可取料信号,CanGetTray,115,192.168.200.11,0,,Y16,DO-16,0,
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
查看文件 @
3479aa3
...
@@ -227,6 +227,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -227,6 +227,7 @@ namespace OnlineStore.DeviceLibrary
KNDIOMove
(
IO_Type
.
AutoRun_HddLed
,
IO_VALUE
.
HIGH
);
KNDIOMove
(
IO_Type
.
AutoRun_HddLed
,
IO_VALUE
.
HIGH
);
KNDIOMove
(
IO_Type
.
RunSign_HddLed
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
RunSign_HddLed
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
CanGetTray
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
CanGetTray
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
CanPutTray
,
IO_VALUE
.
LOW
);
storeRunStatus
=
StoreRunStatus
.
HomeMoving
;
storeRunStatus
=
StoreRunStatus
.
HomeMoving
;
StoreMove
.
NewMove
(
StoreMoveType
.
ReturnHome
);
StoreMove
.
NewMove
(
StoreMoveType
.
ReturnHome
);
...
@@ -253,6 +254,8 @@ namespace OnlineStore.DeviceLibrary
...
@@ -253,6 +254,8 @@ namespace OnlineStore.DeviceLibrary
}
}
public
void
MoveToP1
()
public
void
MoveToP1
()
{
{
KNDIOMove
(
IO_Type
.
CanPutTray
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
CanGetTray
,
IO_VALUE
.
LOW
);
//压紧轴回原点,叉子回到P1,关闭门旋转轴和升降轴回到P1
//压紧轴回原点,叉子回到P1,关闭门旋转轴和升降轴回到P1
StoreMove
.
NewMove
(
StoreMoveType
.
StoreReset
);
StoreMove
.
NewMove
(
StoreMoveType
.
StoreReset
);
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
BOX_M_H_TOP1_InOutToP1
);
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
BOX_M_H_TOP1_InOutToP1
);
...
@@ -279,6 +282,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -279,6 +282,7 @@ namespace OnlineStore.DeviceLibrary
KNDIOMove
(
IO_Type
.
AutoRun_HddLed
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
AutoRun_HddLed
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
RunSign_HddLed
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
RunSign_HddLed
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
CanGetTray
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
CanGetTray
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
CanPutTray
,
IO_VALUE
.
LOW
);
//复位之前先停止运行
//复位之前先停止运行
if
(
isNeedClearAuto
)
if
(
isNeedClearAuto
)
{
{
...
@@ -853,12 +857,24 @@ namespace OnlineStore.DeviceLibrary
...
@@ -853,12 +857,24 @@ namespace OnlineStore.DeviceLibrary
TimerProcess
();
TimerProcess
();
ShowTimeLog
(
"TimerProcess"
);
ShowTimeLog
(
"TimerProcess"
);
//检查运动轴报警
//检查运动轴报警
if
(
storeRunStatus
>
StoreRunStatus
.
Wait
&&
(!
isInSuddenDown
)
&&
(!
isNoAirCheck
))
if
(
storeRunStatus
>
StoreRunStatus
.
Wait
&&
(!
isInSuddenDown
)
&&
(!
isNoAirCheck
))
{
{
ShowTimeLog
(
"开始检测轴报警"
);
ShowTimeLog
(
"开始检测轴报警"
);
CheckAxisAlarm
();
CheckAxisAlarm
();
ShowTimeLog
(
"轴报警检测完成"
);
ShowTimeLog
(
"轴报警检测完成"
);
}
}
//允许放料信号处理 需要门口无料盘
if
(
CanStarInOut
()
&&
alarmType
.
Equals
(
StoreAlarmType
.
None
))
{
if
(
KNDIOValue
(
IO_Type
.
TrayCheck_Fixture
).
Equals
(
IO_VALUE
.
LOW
)
&&
KNDIOValue
(
IO_Type
.
TrayCheck_Door
).
Equals
(
IO_VALUE
.
LOW
)
&&
GetHeight
()
<=
0
)
{
if
(
KNDIOValue
(
IO_Type
.
CanPutTray
).
Equals
(
IO_VALUE
.
LOW
))
{
KNDIOMove
(
IO_Type
.
CanPutTray
,
IO_VALUE
.
HIGH
);
}
}
}
}
}
catch
(
Exception
ex
)
catch
(
Exception
ex
)
{
{
...
@@ -1337,7 +1353,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -1337,7 +1353,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
/// </summary>
public
override
void
StopMove
(
bool
IsCloseAxis
)
public
override
void
StopMove
(
bool
IsCloseAxis
)
{
{
KNDIOMove
(
IO_Type
.
CanPutTray
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
Axis_Brake
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
Axis_Brake
,
IO_VALUE
.
LOW
);
//运动版停止
//运动版停止
ACServerManager
.
SuddenStop
(
Config
.
Middle_Axis
.
DeviceName
,
Config
.
Middle_Axis
.
GetAxisValue
());
ACServerManager
.
SuddenStop
(
Config
.
Middle_Axis
.
DeviceName
,
Config
.
Middle_Axis
.
GetAxisValue
());
...
...
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
查看文件 @
3479aa3
...
@@ -279,6 +279,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -279,6 +279,7 @@ namespace OnlineStore.DeviceLibrary
storeRunStatus
=
StoreRunStatus
.
Busy
;
storeRunStatus
=
StoreRunStatus
.
Busy
;
storeStatus
=
StoreStatus
.
InStoreExecute
;
storeStatus
=
StoreStatus
.
InStoreExecute
;
StoreMove
.
NewMove
(
StoreMoveType
.
InStore
,
param
);
StoreMove
.
NewMove
(
StoreMoveType
.
InStore
,
param
);
KNDIOMove
(
IO_Type
.
CanPutTray
,
IO_VALUE
.
LOW
);
if
(
isNeedCheckIO
)
if
(
isNeedCheckIO
)
{
{
//料盘检测
//料盘检测
...
@@ -554,6 +555,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -554,6 +555,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil
.
info
(
LOGGER
,
StoreName
+
"启动出库【"
+
posId
+
"】 "
,
storeMoveColor
);
LogUtil
.
info
(
LOGGER
,
StoreName
+
"启动出库【"
+
posId
+
"】 "
,
storeMoveColor
);
storeRunStatus
=
StoreRunStatus
.
Busy
;
storeRunStatus
=
StoreRunStatus
.
Busy
;
StoreMove
.
NewMove
(
StoreMoveType
.
OutStore
,
param
);
StoreMove
.
NewMove
(
StoreMoveType
.
OutStore
,
param
);
KNDIOMove
(
IO_Type
.
CanPutTray
,
IO_VALUE
.
LOW
);
if
(
IsHasCompress_Axis
||
Config
.
IsHasLocationCylinder
.
Equals
(
0
))
if
(
IsHasCompress_Axis
||
Config
.
IsHasLocationCylinder
.
Equals
(
0
))
{
{
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
SO_02_DeviceBack
);
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
SO_02_DeviceBack
);
...
...
source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs
查看文件 @
3479aa3
...
@@ -146,7 +146,10 @@ namespace OnlineStore.LoadCSVLibrary
...
@@ -146,7 +146,10 @@ namespace OnlineStore.LoadCSVLibrary
public
static
string
CanGetTray
=
"CanGetTray"
;
public
static
string
CanGetTray
=
"CanGetTray"
;
/// <summary>
/// DO 可放料信号 CanPutTray 114 192.168.200.11 0 Y15
/// </summary>
public
static
string
CanPutTray
=
"CanPutTray"
;
}
}
public
enum
IO_VALUE
public
enum
IO_VALUE
{
{
...
...
新建文本文档.txt
0 → 100644
查看文件 @
3479aa3
文件属性发生变化
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论