Skip to content

刘韬 / SO815-AutoInOutStore

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

调试修改

1 个父辈 45436e18
全部展开
内嵌 并排
正在显示 8 个修改的文件 包含 53 行增加 和 49 行删除
source/ACSingleStore/App.config
......@@ -6,7 +6,7 @@
<appSettings>
<!--是否开机自动启动料仓-->
<add key="App_AutoRun" value="1" />
<add key ="CodeRun" value ="1"/>
<add key ="CodeRun" value ="0"/>
<add key="App_Title" value="料仓_批量上下料" />
<add key="scanner_start_command" value="S" />
<!-- 开始吹气的判断值（配置值=服务器发送的湿度值-开始吹气值）-->
......
source/ACSingleStore/FrmStoreBox.cs
......@@ -160,8 +160,8 @@ namespace OnlineStore.AutoInOutStore
timer1.Start();
}
private DateTime preReadModblsTime = DateTime.Now;
private void timer1_Tick(object sender, EventArgs e)
{
private void timer1_Tick(object sender, EventArgs e)
{
if (this.Visible.Equals(false))
{
return;
......
source/DeviceLibrary/KangNaiDe/KNDManager.cs
......@@ -408,7 +408,7 @@ namespace OnlineStore.DeviceLibrary
if (DIValueMap.ContainsKey(configIO.DeviceName))
{
List<KNDIO> allIo = new List<KNDIO>(DIValueMap[configIO.DeviceName]);
List<KNDIO> list = (from m in allIo where m.IOAddress.Equals(configIO.GetIOValue()) select m).ToList<KNDIO>();
List<KNDIO> list = (from m in allIo where m.IOAddress.Equals(configIO.GetIOAddr()) select m).ToList<KNDIO>();
if (list.Count > 0)
{
value = list[0].IoValue;
......@@ -420,7 +420,7 @@ namespace OnlineStore.DeviceLibrary
if (DOValueMap.ContainsKey(configIO.DeviceName))
{
List<KNDIO> allIo = new List<KNDIO>(DOValueMap[configIO.DeviceName]);
List<KNDIO> list = (from m in allIo where m.SlaveId.Equals(configIO.SlaveID) && m.IOAddress.Equals(configIO.GetIOValue()) select m).ToList<KNDIO>();
List<KNDIO> list = (from m in allIo where m.SlaveId.Equals(configIO.SlaveID) && m.IOAddress.Equals(configIO.GetIOAddr()) select m).ToList<KNDIO>();
if (list.Count > 0)
{
value = list[0].IoValue;
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -546,8 +546,12 @@ namespace OnlineStore.DeviceLibrary
}
}
IsIntSlvBlock = true;
KND.IOMove(IO_Type.Axis_Brake, IO_VALUE.HIGH);
return true;
if (ACServerManager.ServerOnStatus(Config.UpDown_Axis.DeviceName, Config.UpDown_Axis.GetAxisValue()))
{
KND.IOMove(IO_Type.Axis_Brake, IO_VALUE.HIGH);
return true;
}
return false;
}
/// <summary>
/// 打开所有轴
......
source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs
......@@ -240,48 +240,48 @@ namespace OnlineStore.LoadCSVLibrary
}
public override int GetValue()
{
return GetIOValue();
return GetValue();
}
public int GetIOValue()
{
if (IoValue >= -1)
{
return IoValue;
}
try
{
if (ProVale.Equals("") || ProVale.Equals("-1"))
{
IoValue = -1;
}
else if (ProType.Equals(ConfigItemType.DI))
{
IoValue = Convert.ToInt32(ProVale, 8);
}
else if (ProType.Equals(ConfigItemType.DO))
{
if (ProVale.Length == 2)
{
int a = Convert.ToInt32(ProVale.Substring(0, 1), 16) - 8;
string str =a+ProVale.Substring(1,1);
IoValue = Convert.ToInt32( str, 8);
//IoValue = a + b;
}
else
{
IoValue = Convert.ToInt32(ProVale, 16) - Convert.ToInt32("80", 16);
}
}
//LOGGER.Info("IO转换：（" + ElectricalDefinition + "）" + ProVale + "=" + IoValue);
}
catch (Exception ex)
{
LOGGER.Error("出错了：", ex);
return -1;
}
return IoValue;
}
//public int GetIOValue()
//{
// if (IoValue >= -1)
// {
// return IoValue;
// }
// try
// {
// if (ProVale.Equals("") || ProVale.Equals("-1"))
// {
// IoValue = -1;
// }
// else if (ProType.Equals(ConfigItemType.DI))
// {
// IoValue = Convert.ToInt32(ProVale, 8);
// }
// else if (ProType.Equals(ConfigItemType.DO))
// {
// if (ProVale.Length == 2)
// {
// int a = Convert.ToInt32(ProVale.Substring(0, 1), 16) - 8;
// string str =a+ProVale.Substring(1,1);
// IoValue = Convert.ToInt32( str, 8);
// //IoValue = a + b;
// }
// else
// {
// IoValue = Convert.ToInt32(ProVale, 16) - Convert.ToInt32("80", 16);
// }
// }
// //LOGGER.Info("IO转换：（" + ElectricalDefinition + "）" + ProVale + "=" + IoValue);
// }
// catch (Exception ex)
// {
// LOGGER.Error("出错了["+ ProVale + "]["+ToString()+"]：" +ex.Message);
// return -1;
// }
// return IoValue;
//}
public override string ToString()
{
......
source/LoadCVSLibrary/storeConfig/config/StoreConfig.cs
......@@ -123,7 +123,7 @@ namespace OnlineStore.LoadCSVLibrary
if (IO_Type.GetTypeList().Contains(con.ProName))
{
ConfigIO io = (ConfigIO)con;
if (!DIODeviceNameList.Contains(io.DeviceName) && (io.GetIOValue() >= 0 || io.GetIOAddr() >= 0))
if (!DIODeviceNameList.Contains(io.DeviceName) && io.GetIOAddr() >= 0)
{
DIODeviceNameList.Add(io.DeviceName);
}
......@@ -139,7 +139,7 @@ namespace OnlineStore.LoadCSVLibrary
if (IO_Type.GetTypeList().Contains(con.ProName))
{
ConfigIO io = (ConfigIO)con;
if (!DIODeviceNameList.Contains(io.DeviceName) && io.GetIOValue() >= 0)
if (!DIODeviceNameList.Contains(io.DeviceName) && io.GetIOAddr() >= 0)
{
DIODeviceNameList.Add(io.DeviceName);
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!