Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
李娜
/
SO827-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
图表
网络
创建新的问题
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 38617346
由
LN
编写于
2021-03-23 13:45:34 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
固定气缸定义和逻辑修改
1 个父辈
9d738d31
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
43 行增加
和
28 行删除
source/AssemblyLineClient/记录.txt
source/DeviceLibrary/LineConfig/Config_Line.csv
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
source/DeviceLibrary/eyemLib.dll
source/DeviceLibrary/libdmtx.dll
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
source/AssemblyLineClient/记录.txt
查看文件 @
3861734
20200316
20210322
固定气缸DI修改
DI 101 T1固定气缸上升端 SL_FixedCylinder_Up 89 HC X89
DI 101 T1固定气缸下降端 SL_FixedCylinder_Down 90 HC X90
20200316
环形线RFID用12001
环形线RFID用12001
出料机构RFID用13000
出料机构RFID用13000
...
...
source/DeviceLibrary/LineConfig/Config_Line.csv
查看文件 @
3861734
...
@@ -124,8 +124,8 @@ DI,101,T1定位气缸1上升端,SL_LocationCylinder_Up1,85,HC,X85,,,,,
...
@@ -124,8 +124,8 @@ DI,101,T1定位气缸1上升端,SL_LocationCylinder_Up1,85,HC,X85,,,,,
DI,101,T1定位气缸1下降端,SL_LocationCylinder_Down1,86,HC,X86,,,,,
DI,101,T1定位气缸1下降端,SL_LocationCylinder_Down1,86,HC,X86,,,,,
DI,101,T1定位气缸2上升端,SL_LocationCylinder_Up2,87,HC,X87,,,,,
DI,101,T1定位气缸2上升端,SL_LocationCylinder_Up2,87,HC,X87,,,,,
DI,101,T1定位气缸2下降端,SL_LocationCylinder_Down2,88,HC,X88,,,,,
DI,101,T1定位气缸2下降端,SL_LocationCylinder_Down2,88,HC,X88,,,,,
DI,101,T1固定气缸
1上升端,SL_FixedCylinder_Up1
,89,HC,X89,,,,,
DI,101,T1固定气缸
上升端,SL_FixedCylinder_Up
,89,HC,X89,,,,,
DI,101,T1固定气缸
2上升端,SL_FixedCylinder_Up2
,90,HC,X90,,,,,
DI,101,T1固定气缸
下降端,SL_FixedCylinder_Down
,90,HC,X90,,,,,
DI,101,T1定位工位顶升上升端,SL_TopCylinder_Up,91,HC,X91,,,,,
DI,101,T1定位工位顶升上升端,SL_TopCylinder_Up,91,HC,X91,,,,,
DI,101,T1定位工位顶升下降端,SL_TopCylinder_Down,92,HC,X92,,,,,
DI,101,T1定位工位顶升下降端,SL_TopCylinder_Down,92,HC,X92,,,,,
DI,101,T1出口顶升上升端,SL_OutTopCylinder_Up,93,HC,X93,,,,,
DI,101,T1出口顶升上升端,SL_OutTopCylinder_Up,93,HC,X93,,,,,
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
查看文件 @
3861734
...
@@ -572,25 +572,27 @@ namespace OnlineStore.DeviceLibrary
...
@@ -572,25 +572,27 @@ namespace OnlineStore.DeviceLibrary
}
}
public
void
FixedCylinderUp
(
LineMoveInfo
moveinfo
=
null
)
public
void
FixedCylinderUp
(
LineMoveInfo
moveinfo
=
null
)
{
{
IOMove
(
IO_Type
.
SL_FixedCylinder_Down
,
IO_VALUE
.
LOW
);
CylinderMove
(
moveinfo
,
IO_Type
.
SL_FixedCylinder_Down
,
IO_Type
.
SL_FixedCylinder_Up
);
IOMove
(
IO_Type
.
SL_FixedCylinder_Up
,
IO_VALUE
.
HIGH
);
//IOMove(IO_Type.SL_FixedCylinder_Down, IO_VALUE.LOW);
if
(
moveinfo
!=
null
)
//IOMove(IO_Type.SL_FixedCylinder_Up, IO_VALUE.HIGH);
{
//if (moveinfo != null)
moveinfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SL_FixedCylinder_Up1
,
IO_VALUE
.
HIGH
));
//{
moveinfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SL_FixedCylinder_Up2
,
IO_VALUE
.
HIGH
));
// moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up1, IO_VALUE.HIGH));
}
// moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up2, IO_VALUE.HIGH));
//}
}
}
public
void
FixedCylinderDown
(
LineMoveInfo
moveinfo
=
null
)
public
void
FixedCylinderDown
(
LineMoveInfo
moveinfo
=
null
)
{
{
IOMove
(
IO_Type
.
SL_FixedCylinder_Up
,
IO_VALUE
.
LOW
);
CylinderMove
(
moveinfo
,
IO_Type
.
SL_FixedCylinder_Up
,
IO_Type
.
SL_FixedCylinder_Down
);
IOMove
(
IO_Type
.
SL_FixedCylinder_Down
,
IO_VALUE
.
HIGH
);
//IOMove(IO_Type.SL_FixedCylinder_Up, IO_VALUE.LOW);
if
(
moveinfo
!=
null
)
//IOMove(IO_Type.SL_FixedCylinder_Down, IO_VALUE.HIGH);
{
//if (moveinfo != null)
moveinfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
2000
));
//{
moveinfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SL_FixedCylinder_Up1
,
IO_VALUE
.
LOW
));
// moveinfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
moveinfo
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SL_FixedCylinder_Up2
,
IO_VALUE
.
LOW
));
// moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up1, IO_VALUE.LOW));
}
// moveinfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_FixedCylinder_Up2, IO_VALUE.LOW));
//}
}
}
public
void
TrayLCylinderBefore
(
LineMoveInfo
moveinfo
=
null
)
public
void
TrayLCylinderBefore
(
LineMoveInfo
moveinfo
=
null
)
...
@@ -663,8 +665,13 @@ namespace OnlineStore.DeviceLibrary
...
@@ -663,8 +665,13 @@ namespace OnlineStore.DeviceLibrary
public
bool
IsFixedCylinderUp
()
public
bool
IsFixedCylinderUp
()
{
{
if
(
IOValue
(
IO_Type
.
SL_FixedCylinder_Up1
).
Equals
(
IO_VALUE
.
HIGH
)
&&
//if (IOValue(IO_Type.SL_FixedCylinder_Up1).Equals(IO_VALUE.HIGH) &&
IOValue
(
IO_Type
.
SL_FixedCylinder_Up2
).
Equals
(
IO_VALUE
.
HIGH
))
// IOValue(IO_Type.SL_FixedCylinder_Up2).Equals(IO_VALUE.HIGH))
//{
// return true;
//}
if
(
IOValue
(
IO_Type
.
SL_FixedCylinder_Up
).
Equals
(
IO_VALUE
.
HIGH
)
&&
IOValue
(
IO_Type
.
SL_FixedCylinder_Down
).
Equals
(
IO_VALUE
.
LOW
))
{
{
return
true
;
return
true
;
}
}
...
...
source/DeviceLibrary/eyemLib.dll
查看文件 @
3861734
此文件类型无法预览
source/DeviceLibrary/libdmtx.dll
查看文件 @
3861734
此文件类型无法预览
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
查看文件 @
3861734
...
@@ -146,14 +146,14 @@ namespace OnlineStore.LoadCSVLibrary
...
@@ -146,14 +146,14 @@ namespace OnlineStore.LoadCSVLibrary
/// DI,101,T1定位气缸2下降端,SL_LocationCylinder_Down2,88,HC,X88
/// DI,101,T1定位气缸2下降端,SL_LocationCylinder_Down2,88,HC,X88
/// </summary>
/// </summary>
public
static
string
SL_LocationCylinder_Down2
=
"SL_LocationCylinder_Down2"
;
public
static
string
SL_LocationCylinder_Down2
=
"SL_LocationCylinder_Down2"
;
/// <summary>
//
/// <summary>
///
DI,101,T1固定气缸1上升端,SL_FixedCylinder_Up1
,89,HC,X89
///
// DI,101,T1固定气缸上升端 SL_FixedCylinder_Up
,89,HC,X89
/// </summary>
///
//
</summary>
public
static
string
SL_FixedCylinder_Up1
=
"SL_FixedCylinder_Up1
"
;
//public static string SL_FixedCylinder_Up = "SL_FixedCylinder_Up
";
/// <summary>
///
//
<summary>
///
DI,101,T1固定气缸2上升端,SL_FixedCylinder_Up2
,90,HC,X90
///
// DI,101,T1固定气缸2上升端,SL_FixedCylinder_Down
,90,HC,X90
/// </summary>
///
//
</summary>
public
static
string
SL_FixedCylinder_Up2
=
"SL_FixedCylinder_Up2
"
;
//public static string SL_FixedCylinder_Down = "SL_FixedCylinder_Down
";
/// <summary>
/// <summary>
/// DI,101,T1定位工位顶升上升端,SL_TopCylinder_Up,91,HC,X91
/// DI,101,T1定位工位顶升上升端,SL_TopCylinder_Up,91,HC,X91
/// </summary>
/// </summary>
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论