Commit 1f248698 LN

1

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