Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
URSolderingRobot
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 5233cad6
由
几米阳光
编写于
2018-09-18 15:59:40 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
增加三色灯塔
1 个父辈
5655d465
显示空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
104 行增加
和
100 行删除
DeviceLibrary/Robot/LineSolderingRobot.cs
DeviceLibrary/RobotConfig/solderingConfig/SolderingRobotConfig.csv
DeviceLibrary/bean/RobotBean.cs
LoadCVSLibrary/robotConfig/config/IO_Type.cs
LoadCVSLibrary/robotConfig/config/SolderingRobotConfig.cs
URSolderingClient/记录.txt
doc/RC22电气IO定义(1).xlsx
DeviceLibrary/Robot/LineSolderingRobot.cs
查看文件 @
5233cad
...
@@ -61,7 +61,9 @@ namespace URSoldering.DeviceLibrary
...
@@ -61,7 +61,9 @@ namespace URSoldering.DeviceLibrary
WarnMsg
=
solderingStr
;
WarnMsg
=
solderingStr
;
return
false
;
return
false
;
}
}
KNDIOMove
(
IO_Type
.
AutoRunSingle
,
IO_VALUE
.
HIGH
);
KNDIOMove
(
IO_Type
.
AlarmSingle
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
WaitSingle
,
IO_VALUE
.
LOW
);
Status
=
RobotStatus
.
Reset
;
Status
=
RobotStatus
.
Reset
;
WeldRobotBean
.
IsInWeld
=
false
;
WeldRobotBean
.
IsInWeld
=
false
;
IsInProcess
=
false
;
IsInProcess
=
false
;
...
@@ -141,6 +143,9 @@ namespace URSoldering.DeviceLibrary
...
@@ -141,6 +143,9 @@ namespace URSoldering.DeviceLibrary
&&
KNDIOValue
(
IO_Type
.
SendWire_Work
).
Equals
(
IO_VALUE
.
HIGH
))
&&
KNDIOValue
(
IO_Type
.
SendWire_Work
).
Equals
(
IO_VALUE
.
HIGH
))
{
{
LogUtil
.
info
(
RobotName
+
"复位完成"
);
LogUtil
.
info
(
RobotName
+
"复位完成"
);
KNDIOMove
(
IO_Type
.
AutoRunSingle
,
IO_VALUE
.
HIGH
);
KNDIOMove
(
IO_Type
.
AlarmSingle
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
WaitSingle
,
IO_VALUE
.
LOW
);
Status
=
RobotStatus
.
Runing
;
Status
=
RobotStatus
.
Runing
;
}
}
}
}
...
@@ -187,6 +192,9 @@ namespace URSoldering.DeviceLibrary
...
@@ -187,6 +192,9 @@ namespace URSoldering.DeviceLibrary
StopMove
();
StopMove
();
WeldRobotBean
.
StopRun
();
WeldRobotBean
.
StopRun
();
this
.
Status
=
RobotStatus
.
Wait
;
this
.
Status
=
RobotStatus
.
Wait
;
KNDIOMove
(
IO_Type
.
AutoRunSingle
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
AlarmSingle
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
WaitSingle
,
IO_VALUE
.
LOW
);
LogUtil
.
info
(
RobotName
+
"停止运行"
);
LogUtil
.
info
(
RobotName
+
"停止运行"
);
}
}
public
DateTime
LastStartWeldTime
=
DateTime
.
Now
;
public
DateTime
LastStartWeldTime
=
DateTime
.
Now
;
...
@@ -241,6 +249,7 @@ namespace URSoldering.DeviceLibrary
...
@@ -241,6 +249,7 @@ namespace URSoldering.DeviceLibrary
if
(
AlarmType
.
SuddenStop
.
Equals
(
alarmType
))
if
(
AlarmType
.
SuddenStop
.
Equals
(
alarmType
))
{
{
WarnMsg
=
"收到急停信号"
;
WarnMsg
=
"收到急停信号"
;
KNDIOMove
(
IO_Type
.
AlarmSingle
,
IO_VALUE
.
HIGH
);
WeldRobotBean
.
Alarm
(
AlarmType
.
SuddenStop
);
WeldRobotBean
.
Alarm
(
AlarmType
.
SuddenStop
);
StopMove
();
StopMove
();
}
}
...
...
DeviceLibrary/RobotConfig/solderingConfig/SolderingRobotConfig.csv
查看文件 @
5233cad
...
@@ -28,9 +28,9 @@ DO,送丝电机启动,SendWireStart,106,192.168.10.11,0,送丝电机启动,Y07,DO-07,0
...
@@ -28,9 +28,9 @@ DO,送丝电机启动,SendWireStart,106,192.168.10.11,0,送丝电机启动,Y07,DO-07,0
,,,110,192.168.10.11,0,,Y11,DO-11,0
,,,110,192.168.10.11,0,,Y11,DO-11,0
,,,111,192.168.10.11,0,,Y12,DO-12,0
,,,111,192.168.10.11,0,,Y12,DO-12,0
,,,112,192.168.10.11,0,,Y13,DO-13,0
,,,112,192.168.10.11,0,,Y13,DO-13,0
,自动指示灯(绿色),AutoRunSingle,113,192.168.10.11,0,自动指示灯(绿色),Y14,DO-14,0
DO
,自动指示灯(绿色),AutoRunSingle,113,192.168.10.11,0,自动指示灯(绿色),Y14,DO-14,0
,待机指示灯(黄色),WaitSingle,114,192.168.10.11,0,待机指示灯(黄色),Y15,DO-15,0
DO
,待机指示灯(黄色),WaitSingle,114,192.168.10.11,0,待机指示灯(黄色),Y15,DO-15,0
,故障指示灯(红色),AlarmSingle,115,192.168.10.11,0,故障指示灯(红色),Y16,DO-16,0
DO
,故障指示灯(红色),AlarmSingle,115,192.168.10.11,0,故障指示灯(红色),Y16,DO-16,0
,,,,,,,,,
,,,,,,,,,
PRO,尤傲机器人IP,UR_IP,192.168.1.118,,,,,,
PRO,尤傲机器人IP,UR_IP,192.168.1.118,,,,,,
PRO,焊接多少块板子后,清洗烙铁,ClearCount,10,,,,,,
PRO,焊接多少块板子后,清洗烙铁,ClearCount,10,,,,,,
...
...
DeviceLibrary/bean/RobotBean.cs
查看文件 @
5233cad
...
@@ -50,50 +50,50 @@ namespace URSoldering.DeviceLibrary
...
@@ -50,50 +50,50 @@ namespace URSoldering.DeviceLibrary
/// </summary>
/// </summary>
private
void
LedTimer_Elapsed
(
object
sender
,
ElapsedEventArgs
e
)
private
void
LedTimer_Elapsed
(
object
sender
,
ElapsedEventArgs
e
)
{
{
//
if (Status.Equals(RobotStatus.Reset))
if
(
Status
.
Equals
(
RobotStatus
.
Reset
))
//{
{
//
if (KNDIOValue(IO_Type.AutoRunSingle).Equals(IO_VALUE.LOW))
if
(
KNDIOValue
(
IO_Type
.
AutoRunSingle
).
Equals
(
IO_VALUE
.
LOW
))
//
{
{
//
KNDIOMove(IO_Type.AutoRunSingle, IO_VALUE.HIGH);
KNDIOMove
(
IO_Type
.
AutoRunSingle
,
IO_VALUE
.
HIGH
);
//
}
}
//
if (KNDIOValue(IO_Type.WaitSingle).Equals(IO_VALUE.HIGH))
if
(
KNDIOValue
(
IO_Type
.
WaitSingle
).
Equals
(
IO_VALUE
.
HIGH
))
//
{
{
//
KNDIOMove(IO_Type.WaitSingle, IO_VALUE.LOW);
KNDIOMove
(
IO_Type
.
WaitSingle
,
IO_VALUE
.
LOW
);
//
}
}
//
else
else
//
{
{
//
KNDIOMove(IO_Type.WaitSingle, IO_VALUE.HIGH);
KNDIOMove
(
IO_Type
.
WaitSingle
,
IO_VALUE
.
HIGH
);
//
}
}
//
}
}
//else if (Status.Equals(RobotStatus.Busy)
)
else
if
(
Status
.
Equals
(
RobotStatus
.
Busy
)
)
//
{
{
//
//忙碌或转动,绿灯常亮,黄灯灭,红灯亮时绿灯不亮
//忙碌或转动,绿灯常亮,黄灯灭,红灯亮时绿灯不亮
//
if (KNDIOValue(IO_Type.WaitSingle).Equals(IO_VALUE.HIGH))
if
(
KNDIOValue
(
IO_Type
.
WaitSingle
).
Equals
(
IO_VALUE
.
HIGH
))
//
{
{
//
KNDIOMove(IO_Type.WaitSingle, IO_VALUE.LOW);
KNDIOMove
(
IO_Type
.
WaitSingle
,
IO_VALUE
.
LOW
);
// }
}
//
if (KNDIOValue(IO_Type.AutoRunSingle).Equals(IO_VALUE.LOW))
if
(
KNDIOValue
(
IO_Type
.
AutoRunSingle
).
Equals
(
IO_VALUE
.
LOW
))
//
{
{
//
KNDIOMove(IO_Type.AutoRunSingle, IO_VALUE.HIGH);
KNDIOMove
(
IO_Type
.
AutoRunSingle
,
IO_VALUE
.
HIGH
);
//
}
}
//
}
}
//
else if (Status.Equals(RobotStatus.Runing))
else
if
(
Status
.
Equals
(
RobotStatus
.
Runing
))
//
{
{
//
//等待状态,黄灯灭,绿灯闪烁,红灯亮时绿灯不亮
//等待状态,黄灯灭,绿灯闪烁,红灯亮时绿灯不亮
//
if (KNDIOValue(IO_Type.WaitSingle).Equals(IO_VALUE.HIGH))
if
(
KNDIOValue
(
IO_Type
.
WaitSingle
).
Equals
(
IO_VALUE
.
HIGH
))
//
{
{
//
KNDIOMove(IO_Type.WaitSingle, IO_VALUE.LOW);
KNDIOMove
(
IO_Type
.
WaitSingle
,
IO_VALUE
.
LOW
);
// }
}
//
if (KNDIOValue(IO_Type.AutoRunSingle).Equals(IO_VALUE.HIGH))
if
(
KNDIOValue
(
IO_Type
.
AutoRunSingle
).
Equals
(
IO_VALUE
.
HIGH
))
//
{
{
//
KNDIOMove(IO_Type.AutoRunSingle, IO_VALUE.LOW);
KNDIOMove
(
IO_Type
.
AutoRunSingle
,
IO_VALUE
.
LOW
);
//
}
}
//
else
else
//
{
{
//
KNDIOMove(IO_Type.AutoRunSingle, IO_VALUE.HIGH);
KNDIOMove
(
IO_Type
.
AutoRunSingle
,
IO_VALUE
.
HIGH
);
//
}
}
//
}
}
}
}
protected
virtual
void
mainTimer_Elapsed
(
object
sender
,
ElapsedEventArgs
e
)
protected
virtual
void
mainTimer_Elapsed
(
object
sender
,
ElapsedEventArgs
e
)
...
@@ -132,38 +132,40 @@ namespace URSoldering.DeviceLibrary
...
@@ -132,38 +132,40 @@ namespace URSoldering.DeviceLibrary
//连接上IO模块后,夹具夹紧
//连接上IO模块后,夹具夹紧
KNDIOMove
(
IO_Type
.
Fixture_Clamp
,
IO_VALUE
.
HIGH
);
KNDIOMove
(
IO_Type
.
Fixture_Clamp
,
IO_VALUE
.
HIGH
);
KNDIOMove
(
IO_Type
.
Fixture_Relax
,
IO_VALUE
.
LOW
);
KNDIOMove
(
IO_Type
.
Fixture_Relax
,
IO_VALUE
.
LOW
);
}
}
public
static
bool
IsFixtureClamp
()
public
static
bool
IsFixtureClamp
()
{
{
//return true;
if
(
KNDIOValue
(
IO_Type
.
Fixture_Clamp
).
Equals
(
IO_VALUE
.
HIGH
)
&&
KNDIOValue
(
IO_Type
.
Fixture_Relax
).
Equals
(
IO_VALUE
.
LOW
))
{
return
true
;
return
true
;
//if (KNDIOValue(IO_Type.Fixture_Clamp).Equals(IO_VALUE.HIGH) && KNDIOValue(IO_Type.Fixture_Relax).Equals(IO_VALUE.LOW))
}
//{
else
// return true;
{
//}
LogUtil
.
error
(
"夹具夹紧信号不到位"
);
//else
return
false
;
//{
}
// LogUtil.error("夹具夹紧信号不到位");
// return false;
//}
}
}
public
static
bool
ShuddenOK
()
public
static
bool
ShuddenOK
()
{
{
return
true
;
//
return true;
//
if (!baseConfig.RobotDIList.ContainsKey(IO_Type.SuddenStop_Single))
if
(!
baseConfig
.
RobotDIList
.
ContainsKey
(
IO_Type
.
SuddenStop_Single
))
//
{
{
//
return false;
return
false
;
//
}
}
//
ConfigIO configIo = baseConfig.RobotDIList[IO_Type.SuddenStop_Single];
ConfigIO
configIo
=
baseConfig
.
RobotDIList
[
IO_Type
.
SuddenStop_Single
];
//
if (KNDManager.IsConnection(configIo.DeviceName))
if
(
KNDManager
.
IsConnection
(
configIo
.
DeviceName
))
//
{
{
//
IO_VALUE value = KNDIOValue(IO_Type.SuddenStop_Single);
IO_VALUE
value
=
KNDIOValue
(
IO_Type
.
SuddenStop_Single
);
//
if (value.Equals(IO_VALUE.HIGH))
if
(
value
.
Equals
(
IO_VALUE
.
HIGH
))
//
{
{
//
return true;
return
true
;
//
}
}
//
}
}
//
return false;
return
false
;
}
}
public
static
void
KNDIOMove
(
string
ioType
,
IO_VALUE
ioValue
)
public
static
void
KNDIOMove
(
string
ioType
,
IO_VALUE
ioValue
)
...
@@ -244,21 +246,11 @@ namespace URSoldering.DeviceLibrary
...
@@ -244,21 +246,11 @@ namespace URSoldering.DeviceLibrary
return
ioValue
;
return
ioValue
;
}
}
/// <summary>
public
void
CloseLed
(
)
/// 信号灯
{
/// </summary>
KNDIOMove
(
IO_Type
.
AutoRunSingle
,
IO_VALUE
.
LOW
);
/// <param name="status"></param>
KNDIOMove
(
IO_Type
.
AlarmSingle
,
IO_VALUE
.
LOW
);
public
void
UpdateShowLight
(
RobotStatus
status
)
KNDIOMove
(
IO_Type
.
WaitSingle
,
IO_VALUE
.
LOW
);
{
//KNDIOMove(IO_Type.AutoRunSingle, IO_VALUE.LOW);
//KNDIOMove(IO_Type.AlarmSingle, IO_VALUE.LOW);
//KNDIOMove(IO_Type.WaitSingle, IO_VALUE.LOW);
//KNDIOMove(IO_Type.DeviceRunON, IO_VALUE.LOW);
//if (status > RobotStatus.Wait)
//{
// KNDIOMove(IO_Type.AutoRunSingle, IO_VALUE.HIGH);
// KNDIOMove(IO_Type.DeviceRunON, IO_VALUE.HIGH);
//}
}
}
#
endregion
#
endregion
...
...
LoadCVSLibrary/robotConfig/config/IO_Type.cs
查看文件 @
5233cad
...
@@ -40,19 +40,19 @@ namespace URSoldering.LoadCSVLibrary
...
@@ -40,19 +40,19 @@ namespace URSoldering.LoadCSVLibrary
}
}
return
TypeList
;
return
TypeList
;
}
}
///
//
<summary>
/// <summary>
///
//
DO 自动指示灯(绿色) AutoRunSingle DO-14
/// DO 自动指示灯(绿色) AutoRunSingle DO-14
///
//
</summary>
/// </summary>
//
public static string AutoRunSingle = "AutoRunSingle";
public
static
string
AutoRunSingle
=
"AutoRunSingle"
;
///
//
<summary>
/// <summary>
///
//
DO 故障指示灯(红色) AlarmSingleDO-15
/// DO 故障指示灯(红色) AlarmSingleDO-15
///
//
</summary>
/// </summary>
//
public static string AlarmSingle = "AlarmSingle";
public
static
string
AlarmSingle
=
"AlarmSingle"
;
///
//
<summary>
/// <summary>
///
//
DO 待机指示灯(黄色) WaitSingle DO-16
/// DO 待机指示灯(黄色) WaitSingle DO-16
///
//
</summary>
/// </summary>
//
public static string WaitSingle = "WaitSingle";
public
static
string
WaitSingle
=
"WaitSingle"
;
///// <summary>
///// <summary>
///// DO 设备运转ON DeviceRunON Y04 DO-04
///// DO 设备运转ON DeviceRunON Y04 DO-04
///// </summary>
///// </summary>
...
...
LoadCVSLibrary/robotConfig/config/SolderingRobotConfig.cs
查看文件 @
5233cad
...
@@ -80,6 +80,9 @@ namespace URSoldering.LoadCSVLibrary
...
@@ -80,6 +80,9 @@ namespace URSoldering.LoadCSVLibrary
MustHaveDOList
.
Add
(
IO_Type
.
Soldering_Up
);
MustHaveDOList
.
Add
(
IO_Type
.
Soldering_Up
);
MustHaveDOList
.
Add
(
IO_Type
.
SendWireStart
);
MustHaveDOList
.
Add
(
IO_Type
.
SendWireStart
);
MustHaveDOList
.
Add
(
IO_Type
.
AutoRunSingle
);
MustHaveDOList
.
Add
(
IO_Type
.
AlarmSingle
);
MustHaveDOList
.
Add
(
IO_Type
.
WaitSingle
);
}
}
}
}
}
}
URSolderingClient/记录.txt
查看文件 @
5233cad
...
@@ -3,13 +3,13 @@
...
@@ -3,13 +3,13 @@
UR机器人是否到位判断条件修改:只判断X.Y.Z坐标是否一致
UR机器人是否到位判断条件修改:只判断X.Y.Z坐标是否一致
修改
20180916
修改
1,编程里的高度和宽度定义做个示意图。
1,编程里的高度和宽度定义做个示意图。
2,机器人微调:前后左右动作反了。
2,机器人微调:前后左右动作反了。
3,微调动作时,机器人是斜着动作。
3,微调动作时,机器人是斜着动作。
4,程序里送丝速度需要加单位(毫米每秒)
4,程序里送丝速度需要加单位(毫米每秒)
20180917修改:增加三色信号灯塔
...
...
doc/RC22电气IO定义(1).xlsx
0 → 100644
查看文件 @
5233cad
此文件类型无法预览
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论