Skip to content

孙克 / URSolderingRobot

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

去掉不需要的配置

1 个父辈 8d7a5970
内嵌 并排
正在显示 6 个修改的文件 包含 109 行增加 和 121 行删除
Common/Setting_Init.cs
......@@ -55,11 +55,9 @@ namespace URSoldering.Common
public static string BOARD_IMAGE_DEFAULT = "BOARD_IMAGE_DEFAULT";
/// <summary>
/// 焊接机器人待机点
/// </summary>
/// </summary>
public static string Soldering_HomePoint = "Soldering_HomePoint";
/// <summary>
/// 焊接机器人清洗点1
/// </summary>
......@@ -77,17 +75,7 @@ namespace URSoldering.Common
/// </summary>
public static string Soldering_RobotMax = "Soldering_RobotMax";
public static string Soldering_LIM_Z = "Soldering_LIM_Z";
//public static string Soldering_U_Min = "Soldering_U_Min";
//public static string Soldering_X_Min = "Soldering_X_Min";
//public static string Soldering_Y_Min = "Soldering_Y_Min";
//public static string Soldering_Z_Min = "Soldering_Z_Min";
//public static string Soldering_U_Max = "Soldering_U_Max";
//public static string Soldering_X_Max = "Soldering_X_Max";
//public static string Soldering_Y_Max = "Soldering_Y_Max";
//public static string Soldering_Z_Max = "Soldering_Z_Max";
public static string Soldering_LIM_Z = "Soldering_LIM_Z";
public static string SendWire_Change = "SendWire_Change";
public static string Slave_ID = "Slave_ID";
......
DeviceLibrary/DeviceLibrary.csproj
......@@ -93,7 +93,6 @@
<Compile Include="deviceLibrary\jbc\SolderingManager.cs" />
<Compile Include="deviceLibrary\kangnaide\KNDManager.cs" />
<Compile Include="deviceLibrary\kangnaide\MasterTcpClient.cs" />
<Compile Include="deviceLibrary\shuoke\ShuoKeControls.cs" />
<Compile Include="deviceLibrary\urRobot\URRobotControl.cs" />
<Compile Include="deviceLibrary\urRobot\URRobotManager.cs" />
<Compile Include="Robot\MoveType.cs" />
......
DeviceLibrary/Robot/soldering/WeldRobotBean.cs
......@@ -106,7 +106,7 @@ namespace URSoldering.DeviceLibrary
}
});
//SendWireManager.Init();
SolderingManager.Init(RobotConfig.JBC_SerialPort, RobotConfig.JBC_EquipmentPort);
SolderingManager.Init(RobotConfig.JBC_Soldering_Port, RobotConfig.JBC_Soldering_Num);
SendWireManager.Init(RobotConfig.JBC_SendWire_Port);
isInit = true;
......@@ -128,7 +128,7 @@ namespace URSoldering.DeviceLibrary
});
}
SendWireManager.Init(RobotConfig.JBC_SendWire_Port);
SolderingManager.Init(RobotConfig.JBC_SerialPort, RobotConfig.JBC_EquipmentPort);
SolderingManager.Init(RobotConfig.JBC_Soldering_Port, RobotConfig.JBC_Soldering_Num);
}
/// <summary>
/// 开始运行
......@@ -303,7 +303,7 @@ namespace URSoldering.DeviceLibrary
IsFree = false;
if (SolderSleep)
{
SolderingManager.Init(RobotConfig.JBC_SerialPort, RobotConfig.JBC_EquipmentPort);
SolderingManager.Init(RobotConfig.JBC_Soldering_Port, RobotConfig.JBC_Soldering_Num);
SolderSleep = false;
}
}
......
DeviceLibrary/Robot/soldering/WeldRobotBean_Partial.cs
......@@ -314,7 +314,8 @@ namespace URSoldering.DeviceLibrary
int speed = (int)WeldMoveStep.CurrPoint.startSendWireSpeed * SendWireXiShu;
WeldLog(" 慢速送丝，速度：" + speed + " ：" + time.ToString() + "秒");
SendWireManager.SendWire( time, speed);
WeldMoveStep.WaitList.Add(WaitResultInfo.WaitShuoKe(RobotConfig.SendWire_Slv, false));
int ms = (int)(time * 1000);
WeldMoveStep.WaitList.Add(WaitResultInfo.WaitTime(ms));
}
else
{
......@@ -330,8 +331,8 @@ namespace URSoldering.DeviceLibrary
if (time > 0)
{
SendWireManager.SendWire( time, speed);
//硕科步进驱动走对应的相对位置
WeldMoveStep.WaitList.Add(WaitResultInfo.WaitShuoKe(RobotConfig.SendWire_Slv, false));
int ms = (int)(time * 1000);
WeldMoveStep.WaitList.Add(WaitResultInfo.WaitTime(ms));
}
}
private static void SendWireDown()
......
LoadCVSLibrary/robotConfig/config/SolderingRobotConfig.cs
......@@ -62,103 +62,103 @@ namespace URSoldering.LoadCSVLibrary
/// <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 = "";
///// <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()
{
......
URSolderingClient/FrmSoldDebug.cs
......@@ -27,7 +27,7 @@ namespace URSoldering.Client
private void FrmMain_Load(object sender, EventArgs e)
{
timer2.Start();
txtSoldingCom.Text = WeldRobotBean.RobotConfig.JBC_SerialPort;
txtSoldingCom.Text = WeldRobotBean.RobotConfig.JBC_Soldering_Port;
if (SolderingManager.IsRun)
{
SoldStatus(true);
......@@ -68,7 +68,7 @@ namespace URSoldering.Client
}
private void btnOpenSold_Click(object sender, EventArgs e)
{
if (SolderingManager.Init(WeldRobotBean.RobotConfig.JBC_SerialPort,WeldRobotBean.RobotConfig.JBC_EquipmentPort))
if (SolderingManager.Init(WeldRobotBean.RobotConfig.JBC_Soldering_Port,WeldRobotBean.RobotConfig.JBC_Soldering_Num))
{
SoldStatus(true);
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!