Skip to content

孙克 / URSolderingRobot

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

代码修改

1 个父辈 fa888d67
内嵌 并排
正在显示 7 个修改的文件 包含 11 行增加 和 130 行删除
Common/Setting_Init.cs
using System; 
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace URSoldering.Common namespace URSoldering.Common
{ {
...@@ -112,7 +109,7 @@ namespace URSoldering.Common ...@@ -112,7 +109,7 @@ namespace URSoldering.Common
/// <summary> /// <summary>
/// 是否需要连接Mes,1=需要，0不需要 /// 是否需要连接Mes,1=需要，0不需要
/// </summary> /// </summary>
public static string Mes_IsConnect = "Mes_IsConnect"; //public static string Mes_IsConnect = "Mes_IsConnect";
public static string VideoCameraName = "VideoCameraName"; public static string VideoCameraName = "VideoCameraName";
//public static string CodeCameraName = "CodeCameraName"; //public static string CodeCameraName = "CodeCameraName";
......
DeviceLibrary/Robot/LineStepBean.cs
 
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace URSoldering.DeviceLibrary namespace URSoldering.DeviceLibrary
{ {
/// <summary> /// <summary>
......
DeviceLibrary/Robot/MoveType.cs
using URSoldering.DeviceLibrary; using URSoldering.DeviceLibrary;
using URSoldering.LoadCSVLibrary; using URSoldering.LoadCSVLibrary;
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace URSoldering.DeviceLibrary namespace URSoldering.DeviceLibrary
{ {
......
DeviceLibrary/Robot/soldering/WeldRobotBean_Partial.cs
...@@ -489,11 +489,11 @@ namespace URSoldering.DeviceLibrary ...@@ -489,11 +489,11 @@ namespace URSoldering.DeviceLibrary
if (speed.Equals(0) || time <= 0) if (speed.Equals(0) || time <= 0)
{ {
isAlarm = false; isAlarm = false;
LogUtil.error("焊接中第【" + WeldMoveStep.ResetCount + "】次 检测到送丝器报警， 速度【" + speed + "】时间【" + times + "】配置不完整，不反转处理"); LogUtil.error("焊接中第【" + WeldMoveStep.ResetCount + "】次 检测到送丝器报警， 速度【" + speed + "】时间【" + time + "】配置不完整，不反转处理");
} }
else else
{ {
LogUtil.error("焊接中第【" + WeldMoveStep.ResetCount + "】次 检测到送丝器报警， 开始反向送丝，速度【" + speed + "】时间【" + times + "】"); LogUtil.error("焊接中第【" + WeldMoveStep.ResetCount + "】次 检测到送丝器报警， 开始反向送丝，速度【" + speed + "】时间【" + time + "】");
WeldMoveStep.LastSetpTime = DateTime.Now; WeldMoveStep.LastSetpTime = DateTime.Now;
WeldMoveStep.WaitList.Clear(); WeldMoveStep.WaitList.Clear();
......
DeviceLibrary/RobotConfig/solderingConfig/SolderingRobotConfig.csv
...@@ -31,9 +31,7 @@ DO,送丝电机启动,SendWireStart,106,192.168.200.11,0,送丝电机启动,Y07,DO-07,0 ...@@ -31,9 +31,7 @@ DO,送丝电机启动,SendWireStart,106,192.168.200.11,0,送丝电机启动,Y07,DO-07,0
,自动指示灯（绿色）,AutoRunSingle,113,192.168.200.11,0,自动指示灯（绿色）,Y14,DO-14,0 ,自动指示灯（绿色）,AutoRunSingle,113,192.168.200.11,0,自动指示灯（绿色）,Y14,DO-14,0
,待机指示灯（黄色）,WaitSingle,114,192.168.200.11,0,待机指示灯（黄色）,Y15,DO-15,0 ,待机指示灯（黄色）,WaitSingle,114,192.168.200.11,0,待机指示灯（黄色）,Y15,DO-15,0
,故障指示灯（红色）,AlarmSingle,115,192.168.200.11,0,故障指示灯（红色）,Y16,DO-16,0 ,故障指示灯（红色）,AlarmSingle,115,192.168.200.11,0,故障指示灯（红色）,Y16,DO-16,0
,,,,,,,,, ,,,,,,,,,
PRO,EMSIP地址,EMS_IP,192.168.200.4,,,,,,
PRO,EMS端口号,EMS_Port,12345,,,,,,
PRO,尤傲机器人IP,UR_IP,192.168.200.13,,,,,, PRO,尤傲机器人IP,UR_IP,192.168.200.13,,,,,,
PRO,焊接多少块板子后，清洗烙铁,ClearCount,1,,,,,, PRO,焊接多少块板子后，清洗烙铁,ClearCount,1,,,,,,
PRO,清洗IO的毫秒数,ClearMSenconds,3000,,,,,, PRO,清洗IO的毫秒数,ClearMSenconds,3000,,,,,,
......
DeviceLibrary/bean/RobotBean.cs
using URSoldering.Common; using URSoldering.Common;
using URSoldering.LoadCSVLibrary; using URSoldering.LoadCSVLibrary;
using log4net; using log4net;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Timers; using System.Timers;
namespace URSoldering.DeviceLibrary namespace URSoldering.DeviceLibrary
......
LoadCVSLibrary/robotConfig/config/SolderingRobotConfig.cs
...@@ -18,12 +18,9 @@ namespace URSoldering.LoadCSVLibrary ...@@ -18,12 +18,9 @@ namespace URSoldering.LoadCSVLibrary
public SolderingRobotConfig(int id, string cid, string type, string filepath) public SolderingRobotConfig(int id, string cid, string type, string filepath)
: base(id, cid, type, filepath) : base(id, cid, type, filepath)
{ {
} }
/// <summary> /// <summary>
/// PRO 尤傲机器人IP UR_IP 192.168.200.13 /// PRO 尤傲机器人IP UR_IP 192.168.200.13
/// </summary> /// </summary>
[ConfigProAttribute("UR_IP")] [ConfigProAttribute("UR_IP")]
public string UR_IP { get; set; } public string UR_IP { get; set; }
...@@ -58,107 +55,7 @@ namespace URSoldering.LoadCSVLibrary ...@@ -58,107 +55,7 @@ namespace URSoldering.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("JBC_SendWire_Port")] [ConfigProAttribute("JBC_SendWire_Port")]
public string JBC_SendWire_Port { get; set; } public string JBC_SendWire_Port { get; set; }
///// <summary>
///// PRO 硕科 端口号 ShuoKe_PortName COM1
///// </summary>
//[ConfigProAttribute("ShuoKe_PortName",false)]
//public string ShuoKe_PortName { get; set; }
///// <summary>
///// PRO 硕科 波特率 ShuoKe_PortBaudrate 9600
///// </summary>
//[ConfigProAttribute("ShuoKe_PortBaudrate",false)]
//public int ShuoKe_PortBaudrate { get; set; }
///// <summary>
///// PRO 硕科 奇偶校验 ShuoKe_PortParity 0
///// </summary>
//[ConfigProAttribute("ShuoKe_PortParity",false)]
//public int ShuoKe_PortParity { get; set; }
///// <summary>
///// PRO 硕科 停止位 ShuoKe_StopBits 1
///// </summary>
//[ConfigProAttribute("ShuoKe_StopBits",false)]
//public int ShuoKe_StopBits { get; set; }
///// <summary>
///// PRO 硕科送丝器 初速度 SendWire_StartSpeed 50000
///// </summary>
//[ConfigProAttribute("SendWire_StartSpeed",false)]
//public int SendWire_StartSpeed { get; set; }
///// <summary>
///// PRO 硕科送丝器 最大速度 SendWire_MaxSpeed 200000
///// </summary>
//[ConfigProAttribute("SendWire_MaxSpeed",false)]
//public int SendWire_MaxSpeed { get; set; }
///// <summary>
///// PRO 硕科送丝器 末速度 SendWire_EndSpeed 70000
///// </summary>
//[ConfigProAttribute("SendWire_EndSpeed",false)]
//public int SendWire_EndSpeed { get; set; }
///// <summary>
///// PRO 硕科送丝器 加速度 SendWire_AddSpeed 50000
///// </summary>
//[ConfigProAttribute("SendWire_AddSpeed",false)]
//public int SendWire_AddSpeed { get; set; }
///// <summary>
///// PRO 硕科送丝器 减速度 SendWire_DelSpeed 50000
///// </summary>
//[ConfigProAttribute("SendWire_DelSpeed",false)]
//public int SendWire_DelSpeed { get; set; }
///// <summary>
///// PRO 硕科送丝器 归零速度 SendWire_HomeSpeed 50000
///// </summary>
//[ConfigProAttribute("SendWire_HomeSpeed",false)]
//public int SendWire_HomeSpeed { get; set; }
///// <summary>
///// PRO 硕科送丝器 电机地址 SendWire_Slv 1
///// </summary>
//[ConfigProAttribute("SendWire_Slv",false)]
//public int SendWire_Slv { get; set; }
///// <summary>
///// PRO 硕科流水线 初速度 Line_StartSpeed 50000
///// </summary>
//[ConfigProAttribute("Line_StartSpeed",false)]
//public int Line_StartSpeed { get; set; }
///// <summary>
///// PRO 硕科流水线 最大速度 Line_MaxSpeed 200000
///// </summary>
//[ConfigProAttribute("Line_MaxSpeed",false)]
//public int Line_MaxSpeed { get; set; }
///// <summary>
///// PRO 硕科流水线 末速度 Line_EndSpeed 70000
///// </summary>
//[ConfigProAttribute("Line_EndSpeed",false)]
//public int Line_EndSpeed { get; set; }
///// <summary>
///// PRO 硕科流水线 加速度 Line_AddSpeed 50000
///// </summary>
//[ConfigProAttribute("Line_AddSpeed",false)]
//public int Line_AddSpeed { get; set; }
///// <summary>
///// PRO 硕科流水线 减速度 Line_DelSpeed 50000
///// </summary>
//[ConfigProAttribute("Line_DelSpeed",false)]
//public int Line_DelSpeed { get; set; }
///// <summary>
///// PRO 硕科流水线 归零速度 Line_HomeSpeed 50000
///// </summary>
//[ConfigProAttribute("Line_HomeSpeed",false)]
//public int Line_HomeSpeed { get; set; }
///// <summary>
///// PRO 硕科流水线 电机地址 Line_Slv 1
///// </summary>
//[ConfigProAttribute("Line_Slv",false)]
//public int Line_Slv { get; set; }
//public string JBC_EquipmentPort = "";
//public string JBC_SerialPort = "";
//public string Epson_IP = "";
protected override void initMustHavePro() protected override void initMustHavePro()
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!