Skip to content

孙克 / URSolderingRobot

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 4024e72c 由 几米阳光
选项

增加DI9开始焊接信号，调整界面

1 个父辈 9156bbe9
内嵌 并排
正在显示 6 个修改的文件 包含 20 行增加 和 5 行删除
DeviceLibrary/Robot/LineSolderingRobot.cs
...@@ -146,6 +146,18 @@ namespace URSoldering.DeviceLibrary ...@@ -146,6 +146,18 @@ namespace URSoldering.DeviceLibrary
} }
else if (Status.Equals(RobotStatus.Runing)) else if (Status.Equals(RobotStatus.Runing))
{ {
if (KNDIOValue(IO_Type.StartWeld).Equals(IO_VALUE.HIGH))
{
string msg= WeldRobotBean.StartWeld();
if (msg.Equals(""))
{
LogUtil.info("收到启动焊接信号：正常开始焊接");
}
else
{
LogUtil.error("收到启动焊接信号：焊接失败："+msg);
}
}
} }
else if (Status.Equals(RobotStatus.Busy)) else if (Status.Equals(RobotStatus.Busy))
{ {
......
DeviceLibrary/RobotConfig/solderingConfig/SolderingRobotConfig.csv
...@@ -7,7 +7,7 @@ DI,送丝气缸工作端,SendWire_Work,204,192.168.10.11,0,送丝气缸工作端,X05,DI-05,0 ...@@ -7,7 +7,7 @@ DI,送丝气缸工作端,SendWire_Work,204,192.168.10.11,0,送丝气缸工作端,X05,DI-05,0
DI,送丝气缸清洗端,SendWire_Clear,205,192.168.10.11,0,送丝气缸清洗端,X06,DI-06,0 DI,送丝气缸清洗端,SendWire_Clear,205,192.168.10.11,0,送丝气缸清洗端,X06,DI-06,0
DI,烙铁气缸上升端,Soldering_Up,206,192.168.10.11,0,烙铁气缸上升端,X07,DI-07,0 DI,烙铁气缸上升端,Soldering_Up,206,192.168.10.11,0,烙铁气缸上升端,X07,DI-07,0
DI,烙铁气缸下降端,Soldering_Down,207,192.168.10.11,0,烙铁气缸下降端,X08,DI-08,0 DI,烙铁气缸下降端,Soldering_Down,207,192.168.10.11,0,烙铁气缸下降端,X08,DI-08,0
,,,208,192.168.10.11,0,,X09,DI-09,0 DI,开始焊接信号,StartWeld,208,192.168.10.11,0,开始焊接信号,X09,DI-09,0
,,,209,192.168.10.11,0,,X10,DI-10,0 ,,,209,192.168.10.11,0,,X10,DI-10,0
,,,210,192.168.10.11,0,,X11,DI-11,0 ,,,210,192.168.10.11,0,,X11,DI-11,0
,,,211,192.168.10.11,0,,X12,DI-12,0 ,,,211,192.168.10.11,0,,X12,DI-12,0
......
LoadCVSLibrary/robotConfig/config/IO_Type.cs
...@@ -98,8 +98,10 @@ namespace URSoldering.LoadCSVLibrary ...@@ -98,8 +98,10 @@ namespace URSoldering.LoadCSVLibrary
/// </summary> /// </summary>
public static string SendWireStart = "SendWireStart"; public static string SendWireStart = "SendWireStart";
/// <summary>
/// DI 开始焊接信号 StartWeld
/// </summary>
public static string StartWeld = "StartWeld";
} }
} }
\ No newline at end of file \ No newline at end of file
LoadCVSLibrary/robotConfig/config/SolderingRobotConfig.cs
...@@ -70,6 +70,7 @@ namespace URSoldering.LoadCSVLibrary ...@@ -70,6 +70,7 @@ namespace URSoldering.LoadCSVLibrary
MustHaveDIList.Add(IO_Type.SendWire_Work); MustHaveDIList.Add(IO_Type.SendWire_Work);
MustHaveDIList.Add(IO_Type.Soldering_Down); MustHaveDIList.Add(IO_Type.Soldering_Down);
MustHaveDIList.Add(IO_Type.Soldering_Up); MustHaveDIList.Add(IO_Type.Soldering_Up);
MustHaveDIList.Add(IO_Type.StartWeld);
MustHaveDOList.Add(IO_Type.Fixture_Clamp); MustHaveDOList.Add(IO_Type.Fixture_Clamp);
MustHaveDOList.Add(IO_Type.Fixture_Relax); MustHaveDOList.Add(IO_Type.Fixture_Relax);
......
URSolderingClient/FrmDebugMenu.Designer.cs
...@@ -84,7 +84,7 @@ namespace URSoldering.Client ...@@ -84,7 +84,7 @@ namespace URSoldering.Client
// //
// btnSendWireDebug // btnSendWireDebug
// //
this.btnSendWireDebug.BackColor = System.Drawing.Color.Gray; this.btnSendWireDebug.BackColor = System.Drawing.Color.Peru;
this.btnSendWireDebug.FlatAppearance.BorderSize = 0; this.btnSendWireDebug.FlatAppearance.BorderSize = 0;
this.btnSendWireDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSendWireDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSendWireDebug.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSendWireDebug.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......
URSolderingClient/FrmSetting.cs
...@@ -74,7 +74,7 @@ namespace URSoldering.Client ...@@ -74,7 +74,7 @@ namespace URSoldering.Client
// return; // return;
//} //}
int sendWireSpeed = FormUtil.GetIntValue(txtsendWireSpeed); int sendWireSpeed = FormUtil.GetIntValue(txtsendWireSpeed);
if (sendWireSpeed >= 0) if (sendWireSpeed <= 0)
{ {
MessageBox.Show("请输入正确的反转送丝速度！"); MessageBox.Show("请输入正确的反转送丝速度！");
txtsendWireSpeed.Focus(); txtsendWireSpeed.Focus();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!