Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-ACPackingStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 5dfc728d
由
LN
编写于
2019-12-18 17:35:06 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
1
1 个父辈
f72c9764
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
26 行增加
和
14 行删除
source/ACPackingStore/FrmBox.Designer.cs
source/ACPackingStore/FrmIOStatus.Designer.cs
source/ACPackingStore/FrmIOStatus.cs
source/ACPackingStore/FrmStore.Designer.cs
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean.cs
source/DeviceLibrary/device/IO/IOManager.cs
source/ACPackingStore/FrmBox.Designer.cs
查看文件 @
5dfc728
此文件的差异被折叠,
点击展开。
source/ACPackingStore/FrmIOStatus.Designer.cs
查看文件 @
5dfc728
此文件的差异被折叠,
点击展开。
source/ACPackingStore/FrmIOStatus.cs
查看文件 @
5dfc728
...
...
@@ -322,5 +322,17 @@ namespace OnlineStore.ACPackingStore
{
BtnMove
(
btnBlow
,
"开始吹气"
,
"停止吹气"
,
IO_Type
.
StartOrStopBlow
);
}
private
void
btnCloseCyDo_Click
(
object
sender
,
EventArgs
e
)
{
boxBean
.
IOMove
(
IO_Type
.
EntranceDoor_Open
,
IO_VALUE
.
LOW
);
boxBean
.
IOMove
(
IO_Type
.
EntranceDoor_Close
,
IO_VALUE
.
LOW
);
boxBean
.
IOMove
(
IO_Type
.
TopCylinder_Down
,
IO_VALUE
.
LOW
);
boxBean
.
IOMove
(
IO_Type
.
TopCylinder_Up
,
IO_VALUE
.
LOW
);
boxBean
.
IOMove
(
IO_Type
.
NGDoorCylinder_Down
,
IO_VALUE
.
LOW
);
boxBean
.
IOMove
(
IO_Type
.
NGDoowCylinder_Up
,
IO_VALUE
.
LOW
);
boxBean
.
IOMove
(
IO_Type
.
LocationCylinder_Down
,
IO_VALUE
.
LOW
);
boxBean
.
IOMove
(
IO_Type
.
LocationCylinder_Up
,
IO_VALUE
.
LOW
);
}
}
}
source/ACPackingStore/FrmStore.Designer.cs
查看文件 @
5dfc728
...
...
@@ -78,11 +78,11 @@
this
.
tabControl1
.
Controls
.
Add
(
this
.
tabPage1
);
this
.
tabControl1
.
DrawMode
=
System
.
Windows
.
Forms
.
TabDrawMode
.
OwnerDrawFixed
;
this
.
tabControl1
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
10.5F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
tabControl1
.
Location
=
new
System
.
Drawing
.
Point
(
5
,
75
);
this
.
tabControl1
.
Location
=
new
System
.
Drawing
.
Point
(
5
,
50
);
this
.
tabControl1
.
Multiline
=
true
;
this
.
tabControl1
.
Name
=
"tabControl1"
;
this
.
tabControl1
.
SelectedIndex
=
0
;
this
.
tabControl1
.
Size
=
new
System
.
Drawing
.
Size
(
1342
,
6
50
);
this
.
tabControl1
.
Size
=
new
System
.
Drawing
.
Size
(
1342
,
6
75
);
this
.
tabControl1
.
TabIndex
=
0
;
this
.
tabControl1
.
DrawItem
+=
new
System
.
Windows
.
Forms
.
DrawItemEventHandler
(
this
.
tabControl1_DrawItem
);
//
...
...
@@ -96,7 +96,7 @@
this
.
tabPage1
.
Controls
.
Add
(
this
.
logBox
);
this
.
tabPage1
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
29
);
this
.
tabPage1
.
Name
=
"tabPage1"
;
this
.
tabPage1
.
Size
=
new
System
.
Drawing
.
Size
(
1334
,
6
17
);
this
.
tabPage1
.
Size
=
new
System
.
Drawing
.
Size
(
1334
,
6
42
);
this
.
tabPage1
.
TabIndex
=
0
;
this
.
tabPage1
.
Text
=
" 日志信息 "
;
this
.
tabPage1
.
UseVisualStyleBackColor
=
true
;
...
...
@@ -169,7 +169,7 @@
this
.
logBox
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
logBox
.
Location
=
new
System
.
Drawing
.
Point
(
10
,
48
);
this
.
logBox
.
Name
=
"logBox"
;
this
.
logBox
.
Size
=
new
System
.
Drawing
.
Size
(
1316
,
5
63
);
this
.
logBox
.
Size
=
new
System
.
Drawing
.
Size
(
1316
,
5
88
);
this
.
logBox
.
TabIndex
=
106
;
this
.
logBox
.
Text
=
""
;
//
...
...
@@ -177,11 +177,12 @@
//
this
.
lblWarnMsg
.
Anchor
=
((
System
.
Windows
.
Forms
.
AnchorStyles
)(((
System
.
Windows
.
Forms
.
AnchorStyles
.
Top
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Left
)
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Right
)));
this
.
lblWarnMsg
.
BackColor
=
System
.
Drawing
.
Color
.
Transparent
;
this
.
lblWarnMsg
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
10.5F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
lblWarnMsg
.
ForeColor
=
System
.
Drawing
.
Color
.
Red
;
this
.
lblWarnMsg
.
Location
=
new
System
.
Drawing
.
Point
(
281
,
4
);
this
.
lblWarnMsg
.
Name
=
"lblWarnMsg"
;
this
.
lblWarnMsg
.
Size
=
new
System
.
Drawing
.
Size
(
1062
,
69
);
this
.
lblWarnMsg
.
Size
=
new
System
.
Drawing
.
Size
(
1062
,
72
);
this
.
lblWarnMsg
.
TabIndex
=
96
;
this
.
lblWarnMsg
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleCenter
;
//
...
...
@@ -284,31 +285,31 @@
// toolStripMenuItem2
//
this
.
toolStripMenuItem2
.
Name
=
"toolStripMenuItem2"
;
this
.
toolStripMenuItem2
.
Size
=
new
System
.
Drawing
.
Size
(
1
6
0
,
26
);
this
.
toolStripMenuItem2
.
Size
=
new
System
.
Drawing
.
Size
(
1
8
0
,
26
);
this
.
toolStripMenuItem2
.
Text
=
"启用调试"
;
this
.
toolStripMenuItem2
.
Click
+=
new
System
.
EventHandler
(
this
.
toolStripMenuItem2_Click
);
//
// toolStripSeparator6
//
this
.
toolStripSeparator6
.
Name
=
"toolStripSeparator6"
;
this
.
toolStripSeparator6
.
Size
=
new
System
.
Drawing
.
Size
(
1
5
7
,
6
);
this
.
toolStripSeparator6
.
Size
=
new
System
.
Drawing
.
Size
(
1
7
7
,
6
);
//
// 二维码学习ToolStripMenuItem
//
this
.
二维码学习
ToolStripMenuItem
.
Name
=
"二维码学习ToolStripMenuItem"
;
this
.
二维码学习
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
6
0
,
26
);
this
.
二维码学习
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
8
0
,
26
);
this
.
二维码学习
ToolStripMenuItem
.
Text
=
"二维码学习"
;
this
.
二维码学习
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
二维码学习
ToolStripMenuItem_Click
);
//
// toolStripSeparator7
//
this
.
toolStripSeparator7
.
Name
=
"toolStripSeparator7"
;
this
.
toolStripSeparator7
.
Size
=
new
System
.
Drawing
.
Size
(
1
5
7
,
6
);
this
.
toolStripSeparator7
.
Size
=
new
System
.
Drawing
.
Size
(
1
7
7
,
6
);
//
// 托盘编码ToolStripMenuItem
//
this
.
托盘编码
ToolStripMenuItem
.
Name
=
"托盘编码ToolStripMenuItem"
;
this
.
托盘编码
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
6
0
,
26
);
this
.
托盘编码
ToolStripMenuItem
.
Size
=
new
System
.
Drawing
.
Size
(
1
8
0
,
26
);
this
.
托盘编码
ToolStripMenuItem
.
Text
=
"托盘编码"
;
this
.
托盘编码
ToolStripMenuItem
.
Click
+=
new
System
.
EventHandler
(
this
.
托盘编码
ToolStripMenuItem_Click
);
//
...
...
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean.cs
查看文件 @
5dfc728
...
...
@@ -317,7 +317,7 @@ namespace OnlineStore.DeviceLibrary
case
StoreMoveStep
.
BOX_H05_OtherAxisBack
:
MoveInfo
.
NextMoveStep
(
StoreMoveStep
.
BOX_H06_MiddleAxisToP1
);
LogInfo
(
MoveInfo
.
MoveType
+
": 旋转轴运动到P1,上下轴走到P1,压紧轴到P1
!
"
);
LogInfo
(
MoveInfo
.
MoveType
+
": 旋转轴运动到P1,上下轴走到P1,压紧轴到P1
"
);
ACAxisMove
(
Config
.
Middle_Axis
,
Config
.
MiddleAxis_P1
,
Config
.
MiddleAxis_P1_Speed
);
ACAxisMove
(
Config
.
UpDown_Axis
,
Config
.
UpDownAxis_P1
,
Config
.
UpDownAxis_P1_Speed
);
ACAxisMove
(
Config
.
Comp_Axis
,
Config
.
CompAxis_P1_Position
,
Config
.
CompAxis_P1_Speed
);
...
...
@@ -335,7 +335,7 @@ namespace OnlineStore.DeviceLibrary
break
;
case
StoreMoveStep
.
BOX_H55_TOP1_CompressHome
:
MoveInfo
.
NextMoveStep
(
StoreMoveStep
.
BOX_H56_TOP1_OtherAxisToP1
);
LogInfo
(
MoveInfo
.
MoveType
+
": 旋转轴运动到P1,上下轴走到P1,压紧轴到P1
!
"
);
LogInfo
(
MoveInfo
.
MoveType
+
": 旋转轴运动到P1,上下轴走到P1,压紧轴到P1
"
);
ACAxisMove
(
Config
.
Middle_Axis
,
Config
.
MiddleAxis_P1
,
Config
.
MiddleAxis_P1_Speed
);
ACAxisMove
(
Config
.
UpDown_Axis
,
Config
.
UpDownAxis_P1
,
Config
.
UpDownAxis_P1_Speed
);
ACAxisMove
(
Config
.
Comp_Axis
,
Config
.
CompAxis_P1_Position
,
Config
.
CompAxis_P1_Speed
);
...
...
source/DeviceLibrary/device/IO/IOManager.cs
查看文件 @
5dfc728
...
...
@@ -23,8 +23,7 @@ namespace OnlineStore.DeviceLibrary
if
(
configIo
!=
null
)
{
instance
.
WriteSingleDO
(
configIo
.
IO_IP
,
configIo
.
SlaveID
,
configIo
.
GetIOAddr
(),
ioValue
);
Thread
.
Sleep
(
60
);
Thread
.
Sleep
(
10
);
}
else
{
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论