Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 1f248698 由 LN
选项

1

1 个父辈 b1cebe83
全部展开
内嵌 并排
正在显示 3 个修改的文件 包含 27 行增加 和 30 行删除
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -170,16 +170,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -170,16 +170,13 @@ namespace OnlineStore.DeviceLibrary
Task.Factory.StartNew(delegate Task.Factory.StartNew(delegate
{ {
IOManager.instance.ConnectionIOList(cioList); IOManager.instance.ConnectionIOList(cioList);
Thread.Sleep(5); Thread.Sleep(5);
// if (!IsDebug)
//{
Task.Factory.StartNew(delegate Task.Factory.StartNew(delegate
{ {
string[] rfidArray = rfidList.ToArray(); string[] rfidArray = rfidList.ToArray();
//连接rfip //连接rfip
RFIDManager.RfidReader.Open(rfidArray); RFIDManager.RfidReader.Open(rfidArray);
}); });
//}
addLastDI(IO_Type.Airpressure_Check, IOValue(IO_Type.Airpressure_Check)); addLastDI(IO_Type.Airpressure_Check, IOValue(IO_Type.Airpressure_Check));
addLastDI(IO_Type.SuddenStop_BTN, IOValue(IO_Type.SuddenStop_BTN)); addLastDI(IO_Type.SuddenStop_BTN, IOValue(IO_Type.SuddenStop_BTN));
addLastDI(IO_Type.Reset_BTN, IOValue(IO_Type.Reset_BTN)); addLastDI(IO_Type.Reset_BTN, IOValue(IO_Type.Reset_BTN));
......
source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs
...@@ -3,7 +3,7 @@ using System; ...@@ -3,7 +3,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
namespace OnlineStore.LoadCSVLibrary namespace OnlineStore.LoadCSVLibrary
{ {
...@@ -40,8 +40,8 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -40,8 +40,8 @@ namespace OnlineStore.LoadCSVLibrary
public int SubType { get; set; } public int SubType { get; set; }
public string ConfigStr { get; set; } public string ConfigStr { get; set; }
public override string ToString() public override string ToString()
{ {
// return "ConfigBase。" + "类型：" + ProType + "，说明：" + Explain + "，名称：" + ProName + "，属性值：" + ProVale; // return "ConfigBase。" + "类型：" + ProType + "，说明：" + Explain + "，名称：" + ProName + "，属性值：" + ProVale;
...@@ -50,9 +50,9 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -50,9 +50,9 @@ namespace OnlineStore.LoadCSVLibrary
public virtual void CheckField() public virtual void CheckField()
{ {
if (String.IsNullOrEmpty(ProType) || String.IsNullOrEmpty(ProName) || String.IsNullOrEmpty(ProValue)) if (String.IsNullOrEmpty(ProType) || String.IsNullOrEmpty(ProName) || String.IsNullOrEmpty(ProValue))
{ {
throw new CVSFieldNotMatchingExection(ToString() + "，【类型："+ProType+"】【名称："+ProName+"】【属性值："+ProValue+"】必须配置值！"); throw new CVSFieldNotMatchingExection(ToString() + "，【类型：" + ProType + "】【名称：" + ProName + "】【属性值：" + ProValue + "】必须配置值！");
} }
} }
} }
...@@ -64,7 +64,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -64,7 +64,7 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary> /// <summary>
/// 伺服ON的Do信号 /// 伺服ON的Do信号
/// </summary> /// </summary>
public string ServerOnDO ="" ; public string ServerOnDO = "";
/// <summary> /// <summary>
/// 伺服刹车信号 /// 伺服刹车信号
/// </summary> /// </summary>
...@@ -84,7 +84,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -84,7 +84,7 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
//[CSVAttribute("目标速度")] //[CSVAttribute("目标速度")]
public int TargetSpeed { get; set; } public int TargetSpeed { get; set; }
/// <summary> /// <summary>
/// 加速度 /// 加速度
/// </summary> /// </summary>
...@@ -106,20 +106,20 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -106,20 +106,20 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary> /// <summary>
/// 可以误差的脉冲范围的最大值 /// 可以误差的脉冲范围的最大值
/// </summary> /// </summary>
public int CanErrorCountMax = 100; public int CanErrorCountMax = 500;
/// <summary> /// <summary>
/// 出入库目标值（只有出入库过程中才会有效） /// 出入库目标值（只有出入库过程中才会有效）
/// </summary> /// </summary>
public int TargetPosition { get; set; } public int TargetPosition { get; set; }
/// <summary> /// <summary>
/// 最小位置 /// 最小位置
/// </summary> /// </summary>
public int PositionMin { get; set; } public int PositionMin { get; set; }
/// <summary> /// <summary>
/// 最大位置 /// 最大位置
/// </summary> /// </summary>
public int PositionMax { get; set; } public int PositionMax { get; set; }
public string GetNameStr() public string GetNameStr()
{ {
...@@ -133,7 +133,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -133,7 +133,7 @@ namespace OnlineStore.LoadCSVLibrary
} }
return false; return false;
} }
/// <summary> /// <summary>
/// 下拉列表显示 /// 下拉列表显示
/// </summary> /// </summary>
...@@ -147,29 +147,29 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -147,29 +147,29 @@ namespace OnlineStore.LoadCSVLibrary
{ {
} }
} }
/// <summary> /// <summary>
/// 使用康泰克板卡表示轴编号，使用Ac伺服电机表示伺服地址 /// 使用康泰克板卡表示轴编号，使用Ac伺服电机表示伺服地址
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public short GetAxisValue() public short GetAxisValue()
{ {
if (ProValue.Equals("") || ProValue.Equals("-1")) if (ProValue.Equals("") || ProValue.Equals("-1"))
{ {
return -1; return -1;
} }
return (short)Convert.ToInt32(ProValue); return (short)Convert.ToInt32(ProValue);
} }
public override void CheckField() public override void CheckField()
{ {
if (String.IsNullOrEmpty( ProType) || String.IsNullOrEmpty( ProName ) || String.IsNullOrEmpty( DeviceName ) || String.IsNullOrEmpty( ProValue )) if (String.IsNullOrEmpty(ProType) || String.IsNullOrEmpty(ProName) || String.IsNullOrEmpty(DeviceName) || String.IsNullOrEmpty(ProValue))
{ {
throw new CVSFieldNotMatchingExection(ToString() + "，【类型：ProType】【名称：ProName】【属性值：ProVale】【设备名称：DeviceName】必须配置值！"); throw new CVSFieldNotMatchingExection(ToString() + "，【类型：ProType】【名称：ProName】【属性值：ProVale】【设备名称：DeviceName】必须配置值！");
} }
} }
} }
/// <summary> /// <summary>
/// io配置 /// io配置
/// </summary> /// </summary>
...@@ -195,7 +195,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -195,7 +195,7 @@ namespace OnlineStore.LoadCSVLibrary
} }
else else
{ {
return DeviceName; return DeviceName;
} }
} }
return IP; return IP;
...@@ -229,13 +229,13 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -229,13 +229,13 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary> /// <summary>
/// SlaveID /// SlaveID
/// </summary> /// </summary>
[CSVAttribute("SlaveID") ] [CSVAttribute("SlaveID")]
public byte SlaveID { get; set; } public byte SlaveID { get; set; }
public string DisplayStr public string DisplayStr
{ {
get get
{ {
return ElectricalDefinition + "-" + Explain + "-" + ProName+""; return ElectricalDefinition + "-" + Explain + "-" + ProName + "";
} }
set set
{ {
...@@ -278,5 +278,5 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -278,5 +278,5 @@ namespace OnlineStore.LoadCSVLibrary
public static string AXIS = "AXIS"; public static string AXIS = "AXIS";
public static string PRO = "PRO"; public static string PRO = "PRO";
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!