Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
ACSingleStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 00737a8b
由
几米阳光
编写于
2018-05-21 09:25:48 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
修改料盘检测信号
1 个父辈
56e9ed9a
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
25 行增加
和
24 行删除
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/AC_SA_Config.cs
source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
查看文件 @
00737a8
...
...
@@ -3,8 +3,8 @@ DI,急停,SuddenStop_BTN,200,192.168.200.10,0,急停,X01,DI-01,0
DI,复位,Reset_BTN,201,192.168.200.10,0,复位,X02,DI-02,0
DI,自动,AutoRun_Single,202,192.168.200.10,0,自动,X03,DI-03,0
DI,气压检测,Airpressure_Check,203,192.168.200.10,0,气压检测,X04,DI-04,0
DI,料
盘检测1,TrayCheck_1,204,192.168.200.10,0,料盘检测1
,X05,DI-05,0
DI,
料盘检测2,TrayCheck_2,205,192.168.200.10,0,料盘检测2
,X06,DI-06,0
DI,料
仓门口料盘检测,TrayCheck_Door,204,192.168.200.10,0,料仓门口料盘检测
,X05,DI-05,0
DI,
叉子料盘检测,TrayCheck_Fixture,205,192.168.200.10,0,叉子料盘检测
,X06,DI-06,0
DI,进料口门上升端,Door_Up,206,192.168.200.10,0,进料口门上升端,X07,DI-07,0
DI,进料口门下降端,Door_Down,207,192.168.200.10,0,进料口门下降端,X08,DI-08,0
DI,定位气缸上升端,LocationCylinder_Up,208,192.168.200.10,0,定位气缸上升端,X09,DI-09,0
...
...
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
查看文件 @
00737a8
...
...
@@ -303,8 +303,8 @@ namespace OnlineStore.DeviceLibrary
LogUtil
.
info
(
LOGGER
,
StoreName
+
"到待机状态,进出轴到P1,判断叉子没有料盘"
);
ACAxisMove
(
Config
.
InOut_Axis
,
Config
.
InOutAxis_P1_Position
,
Config
.
InOutAxis_P1_Speed
);
//判断叉子没有料盘
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_
3
,
IO_VALUE
.
LOW
));
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_4
,
IO_VALUE
.
LOW
));
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_
Fixture
,
IO_VALUE
.
LOW
));
//
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_4, IO_VALUE.LOW));
}
public
override
void
Reset
()
{
...
...
@@ -397,8 +397,8 @@ namespace OnlineStore.DeviceLibrary
AxisCountClear
(
Config
.
InOut_Axis
);
ACAxisMove
(
Config
.
InOut_Axis
,
Config
.
InOutAxis_P1_Position
,
Config
.
InOutAxis_P1_Speed
);
//判断叉子没有料盘
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_
3
,
IO_VALUE
.
LOW
));
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_4
,
IO_VALUE
.
LOW
));
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_
Fixture
,
IO_VALUE
.
LOW
));
//
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_4, IO_VALUE.LOW));
CloseDoorAndWait
();
break
;
case
StoreMoveStep
.
BOX_H_InOutToP1
:
...
...
@@ -510,8 +510,8 @@ namespace OnlineStore.DeviceLibrary
AxisCountClear
(
Config
.
InOut_Axis
);
ACAxisMove
(
Config
.
InOut_Axis
,
Config
.
InOutAxis_P1_Position
,
Config
.
InOutAxis_P1_Speed
);
//判断叉子没有料盘
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_
3
,
IO_VALUE
.
LOW
));
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_4
,
IO_VALUE
.
LOW
));
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_
Fixture
,
IO_VALUE
.
LOW
));
//
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_4, IO_VALUE.LOW));
CloseDoorAndWait
();
break
;
...
...
@@ -942,11 +942,12 @@ namespace OnlineStore.DeviceLibrary
{
//判断是否需要出入库
if
(
StoreMove
.
MoveType
.
Equals
(
StoreMoveType
.
None
))
{
IO_VALUE
checkIO
=
KNDIOValue
(
IO_Type
.
TrayCheck_
1
);
IO_VALUE
checkIO2
=
KNDIOValue
(
IO_Type
.
TrayCheck_2
);
IO_VALUE
checkIO
=
KNDIOValue
(
IO_Type
.
TrayCheck_
Door
);
//
IO_VALUE checkIO2 = KNDIOValue(IO_Type.TrayCheck_2);
//判断料门口是否有料
if
((
checkIO
.
Equals
(
IO_VALUE
.
HIGH
))
&&
checkIO2
.
Equals
(
IO_VALUE
.
HIGH
))
{
if
((
checkIO
.
Equals
(
IO_VALUE
.
HIGH
))
)
//if ((checkIO.Equals(IO_VALUE.HIGH)) && checkIO2.Equals(IO_VALUE.HIGH))
{
if
(
IsScanCode
)
{
return
;
...
...
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
查看文件 @
00737a8
...
...
@@ -252,8 +252,8 @@ namespace OnlineStore.DeviceLibrary
//料盘检测
InStoreLog
(
" 入库:SI_00 检测料盘信号"
);
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
SI_00_TrayCheck
);
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_
1
,
IO_VALUE
.
HIGH
));
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_2
,
IO_VALUE
.
HIGH
));
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_
Door
,
IO_VALUE
.
HIGH
));
//
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_2, IO_VALUE.HIGH));
}
else
{
...
...
@@ -622,8 +622,8 @@ namespace OnlineStore.DeviceLibrary
ACAxisMove
(
Config
.
UpDown_Axis
,
moveP
.
UpDown_P2
,
Config
.
UpDownAxis_P2_Speed
);
ACAxisMove
(
Config
.
Middle_Axis
,
moveP
.
Middle_P1
,
Config
.
MiddleAxis_P1_Speed
);
//此处需要等待box门口没有盘
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_
1
,
IO_VALUE
.
LOW
));
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_2
,
IO_VALUE
.
LOW
));
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
TrayCheck_
Door
,
IO_VALUE
.
LOW
));
//
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_2, IO_VALUE.LOW));
}
else
if
(
StoreMove
.
MoveStep
==
StoreMoveStep
.
SO_08_ToDoorPosition
)
...
...
source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs
查看文件 @
00737a8
...
...
@@ -405,10 +405,10 @@ namespace OnlineStore.LoadCSVLibrary
MustHaveDIList
.
Add
(
IO_Type
.
Reset_BTN
);
MustHaveDIList
.
Add
(
IO_Type
.
AutoRun_Single
);
MustHaveDIList
.
Add
(
IO_Type
.
Airpressure_Check
);
MustHaveDIList
.
Add
(
IO_Type
.
TrayCheck_
1
);
MustHaveDIList
.
Add
(
IO_Type
.
TrayCheck_2
);
MustHaveDIList
.
Add
(
IO_Type
.
TrayCheck_
3
);
MustHaveDIList
.
Add
(
IO_Type
.
TrayCheck_4
);
MustHaveDIList
.
Add
(
IO_Type
.
TrayCheck_
Door
);
//
MustHaveDIList.Add(IO_Type.TrayCheck_2);
MustHaveDIList
.
Add
(
IO_Type
.
TrayCheck_
Fixture
);
//
MustHaveDIList.Add(IO_Type.TrayCheck_4);
MustHaveDIList
.
Add
(
IO_Type
.
Door_Up
);
MustHaveDIList
.
Add
(
IO_Type
.
Door_Down
);
...
...
source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs
查看文件 @
00737a8
...
...
@@ -263,13 +263,13 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary>
/// 进料口料盘确认1 TrayCheck_1
/// </summary>
public
static
string
TrayCheck_
1
=
"TrayCheck_1
"
;
public
static
string
TrayCheck_
Door
=
"TrayCheck_Door
"
;
/// <summary>
/// 进料口料盘确认2 TrayCheck_2
/// </summary>
public
static
string
TrayCheck_2
=
"TrayCheck_2"
;
public
static
string
TrayCheck_
3
=
"TrayCheck_3
"
;
public
static
string
TrayCheck_4
=
"TrayCheck_4"
;
//
public static string TrayCheck_2 = "TrayCheck_2";
public
static
string
TrayCheck_
Fixture
=
"TrayCheck_Fixture
"
;
//
public static string TrayCheck_4 = "TrayCheck_4";
/// <summary>
/// 进出料口门上升端 Door_Up
/// </summary>
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论