Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
李娜
/
SO664-HCSingleStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 5d7070cf
由
LN
编写于
2020-11-03 15:37:04 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
增加错误码显示。配置修改
1 个父辈
2eff3a6e
显示空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
96 行增加
和
42 行删除
source/DeviceLibrary/AXIS/AxisManager.cs
source/DeviceLibrary/AXIS/HC/HCAxisManager.cs
source/DeviceLibrary/AXIS/PanasonicServo/ACServerManager.cs
source/DeviceLibrary/StoreConfig/BoxConfig_1.csv
source/DeviceLibrary/StoreConfig/BoxConfig_2.csv
source/DeviceLibrary/StoreConfig/linePositions_1.csv
source/DeviceLibrary/StoreConfig/linePositions_2.csv
source/HCSingleStore/userControl/AxisMoveControl.Designer.cs
source/HCSingleStore/userControl/AxisMoveControl.cs
source/HuichuanLibrary/HCBoardManager_Axis.cs
source/DeviceLibrary/AXIS/AxisManager.cs
查看文件 @
5d7070c
...
...
@@ -80,5 +80,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public
abstract
int
GetLimitPositiveSingle
(
string
portName
,
short
slvAddr
);
public
abstract
short
GetErrorCode
(
string
portName
,
short
slvAddr
);
}
}
source/DeviceLibrary/AXIS/HC/HCAxisManager.cs
查看文件 @
5d7070c
...
...
@@ -153,6 +153,9 @@ namespace OnlineStore.DeviceLibrary
}
return
false
;
}
public
override
short
GetErrorCode
(
string
portName
,
short
slvAddr
)
{
return
HCBoardManager
.
GetAxErrCode
(
slvAddr
);
}
}
}
source/DeviceLibrary/AXIS/PanasonicServo/ACServerManager.cs
查看文件 @
5d7070c
...
...
@@ -513,5 +513,9 @@ namespace OnlineStore.DeviceLibrary
}
return
false
;
}
public
override
short
GetErrorCode
(
string
portName
,
short
slvAddr
)
{
return
0
;
}
}
}
source/DeviceLibrary/StoreConfig/BoxConfig_1.csv
查看文件 @
5d7070c
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
AXIS,0,(轴一)旋转轴,Middle_Axis,4,HC,,
1500,1000,1000,200,600,1
000,10,100,0,0
AXIS,0,(轴二)升降轴轴,UpDown_Axis,5,HC,,
150,400,400,100,200,5
00,10,100,0,0
AXIS,0,(轴三)进出轴,InOut_Axis,6,HC,,500,
300,300,100,300,5
00,10,100,0,0
AXIS,0,(轴四)压紧轴,Comp_Axis,7,HC,,
100,300,300,20,60,2
00,10,100,0,0
AXIS,0,(轴一)旋转轴,Middle_Axis,4,HC,,
500,1000,1000,100,300,3
000,10,100,0,0
AXIS,0,(轴二)升降轴轴,UpDown_Axis,5,HC,,
200,1000,1000,100,200,30
00,10,100,0,0
AXIS,0,(轴三)进出轴,InOut_Axis,6,HC,,500,
1000,1000,200,500,50
00,10,100,0,0
AXIS,0,(轴四)压紧轴,Comp_Axis,7,HC,,
3000,1000,1000,1500,2000,30
00,10,100,0,0
,,,,,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口取料点 P1,UpDownAxis_DoorOPosition_P1,
3045
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,
32530
0,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,
32530
0,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,
3045
00,,,,,,,,,,,,
PRO,0,旋转轴(轴1)P1 待机原位点,MiddleAxis_P1_Position,
35930
0,,,,,,,,,,,,
PRO,0,进出轴(轴3)P1待机原位点,InOutAxis_P1_Position,100
0
,,,,,,,,,,,,
PRO,0,压紧轴(轴4)P1待机原位点,CompressAxis_P1_Position,
280
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口取料点 P1,UpDownAxis_DoorOPosition_P1,
17
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,
175
0,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,
175
0,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,
17
00,,,,,,,,,,,,
PRO,0,旋转轴(轴1)P1 待机原位点,MiddleAxis_P1_Position,
93
0,,,,,,,,,,,,
PRO,0,进出轴(轴3)P1待机原位点,InOutAxis_P1_Position,100,,,,,,,,,,,,
PRO,0,压紧轴(轴4)P1待机原位点,CompressAxis_P1_Position,
1
00,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,升降轴(轴2)P1速度,UpDownAxis_P1_Speed,1000,,,,,,,,,,,,
PRO,0,升降轴(轴2)P2速度,UpDownAxis_P2_Speed,600,,,,,,,,,,,,
...
...
source/DeviceLibrary/StoreConfig/BoxConfig_2.csv
查看文件 @
5d7070c
类型,分类编号,说明,名称,属性值,设备名称,电器定义,目标速度,加速度,减速度,回零低速,回零高速,回零加速度,脉冲最小误差,脉冲最大误差,脉冲最小限位,脉冲最大限位
AXIS,0,(轴一)旋转轴,Middle_Axis,0,HC,,
1000,1000,1000,100,30
0,3000,10,100,0,0
AXIS,0,(轴二)升降轴轴,UpDown_Axis,1,HC,,200,
1000,1000,100,20
0,3000,10,100,0,0
AXIS,0,(轴三)进出轴,InOut_Axis,2,HC,,500
,1000,1000,200,5
00,5000,10,100,0,0
AXIS,0,(轴四)压紧轴,Comp_Axis,3,HC,,3000
,1000,1000,1500,2000,3
000,10,100,0,0
AXIS,0,(轴一)旋转轴,Middle_Axis,0,HC,,
500,1000,1000,30,25
0,3000,10,100,0,0
AXIS,0,(轴二)升降轴轴,UpDown_Axis,1,HC,,200,
800,800,20,25
0,3000,10,100,0,0
AXIS,0,(轴三)进出轴,InOut_Axis,2,HC,,500
0,5000,5000,200,8
00,5000,10,100,0,0
AXIS,0,(轴四)压紧轴,Comp_Axis,3,HC,,3000
0,15000,15000,3000,5000,10
000,10,100,0,0
,,,,,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口取料点 P1,UpDownAxis_DoorOPosition_P1,
3045
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,
32530
0,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,
32530
0,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,
3045
00,,,,,,,,,,,,
PRO,0,旋转轴(轴1)P1 待机原位点,MiddleAxis_P1_Position,
35930
0,,,,,,,,,,,,
PRO,0,进出轴(轴3)P1待机原位点,InOutAxis_P1_Position,100
0
,,,,,,,,,,,,
PRO,0,压紧轴(轴4)P1待机原位点,CompressAxis_P1_Position,
280
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口取料点 P1,UpDownAxis_DoorOPosition_P1,
17
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,
175
0,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,
175
0,,,,,,,,,,,,
PRO,0,升降轴(轴2)进料口出料缓冲点 P8,UpDownAxis_DoorIBPosition_P8,
17
00,,,,,,,,,,,,
PRO,0,旋转轴(轴1)P1 待机原位点,MiddleAxis_P1_Position,
93
0,,,,,,,,,,,,
PRO,0,进出轴(轴3)P1待机原位点,InOutAxis_P1_Position,100,,,,,,,,,,,,
PRO,0,压紧轴(轴4)P1待机原位点,CompressAxis_P1_Position,
1
00,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,升降轴(轴2)P1速度,UpDownAxis_P1_Speed,1000,,,,,,,,,,,,
PRO,0,升降轴(轴2)P2速度,UpDownAxis_P2_Speed,
6
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)P2速度,UpDownAxis_P2_Speed,
5
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)P3速度,UpDownAxis_P3_Speed,1000,,,,,,,,,,,,
PRO,0,升降轴(轴2)P4速度,UpDownAxis_P4_Speed,
1
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)P4速度,UpDownAxis_P4_Speed,
5
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)P5速度,UpDownAxis_P5_Speed,1000,,,,,,,,,,,,
PRO,0,升降轴(轴2)P6速度,UpDownAxis_P6_Speed,
1
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)P7速度,UpDownAxis_P7_Speed,
1
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)P8速度,UpDownAxis_P8_Speed,
1
00,,,,,,,,,,,,
PRO,0,旋转轴(轴1)P1速度,MiddleAxis_P1_Speed,
5
00,,,,,,,,,,,,
PRO,0,旋转轴(轴1)P2速度,MiddleAxis_P2_Speed,
5
00,,,,,,,,,,,,
PRO,0,进出轴(轴3)P1速度,InOutAxis_P1_Speed,
5
00,,,,,,,,,,,,
PRO,0,进出轴(轴3)P2速度,InOutAxis_P2_Speed,
5
00,,,,,,,,,,,,
PRO,0,进出轴(轴3)P3速度,InOutAxis_P3_Speed,
5
00,,,,,,,,,,,,
PRO,0,压紧轴(轴4)P1速度,CompAxis_P1_Speed,
8
00,,,,,,,,,,,,
PRO,0,压紧轴(轴4)P2速度,CompAxis_P2_Speed,
8
00,,,,,,,,,,,,
PRO,0,压紧轴(轴4)P3速度,CompAxis_P3_Speed,
8
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)P6速度,UpDownAxis_P6_Speed,
5
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)P7速度,UpDownAxis_P7_Speed,
5
00,,,,,,,,,,,,
PRO,0,升降轴(轴2)P8速度,UpDownAxis_P8_Speed,
5
00,,,,,,,,,,,,
PRO,0,旋转轴(轴1)P1速度,MiddleAxis_P1_Speed,
3
00,,,,,,,,,,,,
PRO,0,旋转轴(轴1)P2速度,MiddleAxis_P2_Speed,
3
00,,,,,,,,,,,,
PRO,0,进出轴(轴3)P1速度,InOutAxis_P1_Speed,
60
00,,,,,,,,,,,,
PRO,0,进出轴(轴3)P2速度,InOutAxis_P2_Speed,
60
00,,,,,,,,,,,,
PRO,0,进出轴(轴3)P3速度,InOutAxis_P3_Speed,
60
00,,,,,,,,,,,,
PRO,0,压紧轴(轴4)P1速度,CompAxis_P1_Speed,
200
00,,,,,,,,,,,,
PRO,0,压紧轴(轴4)P2速度,CompAxis_P2_Speed,
200
00,,,,,,,,,,,,
PRO,0,压紧轴(轴4)P3速度,CompAxis_P3_Speed,
200
00,,,,,,,,,,,,
PRO,0,出入库多少次,会自动重置旋转轴,Box_ResetMCount,1000,,,,,,,,,,,,
PRO,0,出入库多少次,会自动重置所有轴操作,Box_ResetACount,100,,,,,,,,,,,,
PRO,0,IO信号超时时间(毫秒),IOSingle_TimerOut,10000,,,,,,,,,,,,
...
...
source/DeviceLibrary/StoreConfig/linePositions_1.csv
查看文件 @
5d7070c
位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴进料口取料点P2
4D0101AA0001,455,44,15,1,
360000,-2000,13300,13300,-2000,106000,242000,134900,12185
0
4D0101AA0001,455,44,15,1,
800,2600,2500,2500,2600,2300,11000,1000,200
0
4D0101AA0002,454,44,15,1,360000,48000,64000,64000,48000,106000,242000,134900,121850
4D0101AA0003,453,44,15,1,360000,98600,114600,114600,98600,106000,242000,134900,121850
4D0101AA0004,452,44,15,1,360000,149300,165300,165300,149300,106000,242000,134900,121850
...
...
source/DeviceLibrary/StoreConfig/linePositions_2.csv
查看文件 @
5d7070c
位置,优先级,高度,宽度,料仓ID,中轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴进料口取料点P2
4D0201AA0001,455,44,15,2,
360000,-2000,13300,13300,-2000,106000,242000,134900,12185
0
4D0201AA0001,455,44,15,2,
1500,2600,2500,2500,2600,2300,11000,1000,200
0
4D0201AA0002,454,44,15,2,360000,48000,64000,64000,48000,106000,242000,134900,121850
4D0201AA0003,453,44,15,2,360000,98600,114600,114600,98600,106000,242000,134900,121850
4D0201AA0004,452,44,15,2,360000,149300,165300,165300,149300,106000,242000,134900,121850
...
...
source/HCSingleStore/userControl/AxisMoveControl.Designer.cs
查看文件 @
5d7070c
...
...
@@ -99,6 +99,7 @@
this
.
txtAxisDeviceName
=
new
System
.
Windows
.
Forms
.
TextBox
();
this
.
lblServerOn
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
timer1
=
new
System
.
Windows
.
Forms
.
Timer
(
this
.
components
);
this
.
lblAlarmcode
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
groupAxis
.
SuspendLayout
();
this
.
groupBox2
.
SuspendLayout
();
this
.
groupBox1
.
SuspendLayout
();
...
...
@@ -125,6 +126,7 @@
//
// groupBox2
//
this
.
groupBox2
.
Controls
.
Add
(
this
.
lblAlarmcode
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
label4
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
lblhomeSts
);
this
.
groupBox2
.
Controls
.
Add
(
this
.
label2
);
...
...
@@ -180,7 +182,7 @@
// label2
//
this
.
label2
.
AutoSize
=
true
;
this
.
label2
.
Location
=
new
System
.
Drawing
.
Point
(
4
17
,
65
);
this
.
label2
.
Location
=
new
System
.
Drawing
.
Point
(
4
33
,
90
);
this
.
label2
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
2
,
0
,
2
,
0
);
this
.
label2
.
Name
=
"label2"
;
this
.
label2
.
Size
=
new
System
.
Drawing
.
Size
(
71
,
17
);
...
...
@@ -191,7 +193,7 @@
// lblAxEncAcc
//
this
.
lblAxEncAcc
.
AutoSize
=
true
;
this
.
lblAxEncAcc
.
Location
=
new
System
.
Drawing
.
Point
(
494
,
65
);
this
.
lblAxEncAcc
.
Location
=
new
System
.
Drawing
.
Point
(
510
,
90
);
this
.
lblAxEncAcc
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
2
,
0
,
2
,
0
);
this
.
lblAxEncAcc
.
Name
=
"lblAxEncAcc"
;
this
.
lblAxEncAcc
.
Size
=
new
System
.
Drawing
.
Size
(
17
,
17
);
...
...
@@ -939,6 +941,17 @@
this
.
timer1
.
Interval
=
1000
;
this
.
timer1
.
Tick
+=
new
System
.
EventHandler
(
this
.
timer1_Tick
);
//
// lblAlarmcode
//
this
.
lblAlarmcode
.
AutoSize
=
true
;
this
.
lblAlarmcode
.
Location
=
new
System
.
Drawing
.
Point
(
433
,
65
);
this
.
lblAlarmcode
.
Margin
=
new
System
.
Windows
.
Forms
.
Padding
(
2
,
0
,
2
,
0
);
this
.
lblAlarmcode
.
Name
=
"lblAlarmcode"
;
this
.
lblAlarmcode
.
Size
=
new
System
.
Drawing
.
Size
(
68
,
17
);
this
.
lblAlarmcode
.
TabIndex
=
19
;
this
.
lblAlarmcode
.
Text
=
"错误码:160"
;
this
.
lblAlarmcode
.
Visible
=
false
;
//
// AxisMoveControl
//
this
.
AutoScaleMode
=
System
.
Windows
.
Forms
.
AutoScaleMode
.
None
;
...
...
@@ -1029,5 +1042,6 @@
private
System
.
Windows
.
Forms
.
Label
lblAxisPrfMode
;
private
System
.
Windows
.
Forms
.
Label
label50
;
private
System
.
Windows
.
Forms
.
Timer
timer1
;
private
System
.
Windows
.
Forms
.
Label
lblAlarmcode
;
}
}
source/HCSingleStore/userControl/AxisMoveControl.cs
查看文件 @
5d7070c
...
...
@@ -359,7 +359,7 @@ namespace OnlineStore.AutoCountClient
return
;
}
//【3】更新界面显示
ShowlbSts
(
lblALM
,
sts
.
ALM
);
//报警信号
ShowlbSts
(
lblALM
,
sts
.
ALM
,
true
);
//报警信号
ShowlbSts
(
lblWARN
,
sts
.
WARN
);
//警告信号
ShowlbSts
(
lblEMG
,
sts
.
EMG
);
//急停信号
ShowlbSts
(
lblSvOn
,
sts
.
ServoOn
);
//使能信号
...
...
@@ -386,15 +386,30 @@ namespace OnlineStore.AutoCountClient
string
homesstr
=
HCBoardManager
.
AxisHomeSts
(
value
);
lblhomeSts
.
Text
=
homesstr
;
}
private
void
ShowlbSts
(
Label
lbl
,
int
value
)
private
void
ShowlbSts
(
Label
lbl
,
int
value
,
bool
isAlarm
=
false
)
{
if
(
value
.
Equals
(
1
))
{
if
(
isAlarm
)
{
lbl
.
BackColor
=
Color
.
Red
;
lblAlarmcode
.
Visible
=
true
;
lblAlarmcode
.
ForeColor
=
Color
.
Red
;
lblAlarmcode
.
Text
=
"错误码:"
+
HCBoardManager
.
GetAxErrCode
(
SlvAddr
);
}
else
{
lbl
.
BackColor
=
Color
.
Lime
;
}
}
else
if
(
value
.
Equals
(
0
))
{
lbl
.
BackColor
=
Color
.
LightGray
;
if
(
isAlarm
)
{
lblAlarmcode
.
Visible
=
false
;
}
}
else
{
...
...
source/HuichuanLibrary/HCBoardManager_Axis.cs
查看文件 @
5d7070c
...
...
@@ -575,6 +575,22 @@ namespace HuichuanLibrary
}
return
true
;
}
public
static
short
GetAxErrCode
(
short
axisNo
)
{
if
(!
CardInitOk
())
{
return
-
1
;
}
short
outV
=
-
1
;
UInt32
ret
=
ImcApi
.
IMC_GetAxErrCode
(
nCardHandle
,
axisNo
,
ref
outV
);
if
(
ret
!=
0
)
{
ShowErrorLog
(
" Axis["
+
axisNo
+
"] GetAxEncAcc FAIL, ErrorCode=0x"
+
ret
.
ToString
(
"x8"
));
return
-
1
;
}
return
outV
;
}
#
endregion
#
region
轴状态
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论