Skip to content

李娜 / Line-Smart-Workstation

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

底部气缸可配置

1 个父辈 66b5b84b
内嵌 并排
正在显示 4 个修改的文件 包含 20 行增加 和 7 行删除
DeviceLibrary/csvLoad/CSVBomManager.cs
...@@ -149,11 +149,11 @@ namespace TSA_V.LoadCSVLibrary ...@@ -149,11 +149,11 @@ namespace TSA_V.LoadCSVLibrary
{ {
value = "0"; value = "0";
} }
if (proName == "PositionX" || proName == "PositionY") { //if (proName == "PositionX" || proName == "PositionY") {
value = Regex.Match(value, @"\d+\.\d+|\d+").Value; // value = Regex.Match(value, @"\d+\.\d+|\d+").Value;
if (value == "") // if (value == "")
value = "0"; // value = "0";
} //}
//如果属性存在 //如果属性存在
prop.SetValue(bllIns, Convert.ChangeType(value, prop.PropertyType), null);//赋值****在这里需要考虑类型问题 prop.SetValue(bllIns, Convert.ChangeType(value, prop.PropertyType), null);//赋值****在这里需要考虑类型问题
......
DeviceLibrary/deviceLibrary/IO/IOManager.cs
...@@ -56,9 +56,11 @@ namespace TSA_V.DeviceLibrary ...@@ -56,9 +56,11 @@ namespace TSA_V.DeviceLibrary
AddDI(new ConfigIO(ConfigItemType.DI, KNDIP, slaveId, (ushort)(IOBase.instance.DIStartAddress + 9), "StopCylinder_Down", "X10_挡停气缸下降端")); AddDI(new ConfigIO(ConfigItemType.DI, KNDIP, slaveId, (ushort)(IOBase.instance.DIStartAddress + 9), "StopCylinder_Down", "X10_挡停气缸下降端"));
AddDI(new ConfigIO(ConfigItemType.DI, KNDIP, slaveId, (ushort)(IOBase.instance.DIStartAddress + 10), "SideCylinder_Forward", "X11_侧挡气缸前进端")); AddDI(new ConfigIO(ConfigItemType.DI, KNDIP, slaveId, (ushort)(IOBase.instance.DIStartAddress + 10), "SideCylinder_Forward", "X11_侧挡气缸前进端"));
AddDI(new ConfigIO(ConfigItemType.DI, KNDIP, slaveId, (ushort)(IOBase.instance.DIStartAddress + 11), "SideCylinder_Back", "X12_侧挡气缸后退端")); AddDI(new ConfigIO(ConfigItemType.DI, KNDIP, slaveId, (ushort)(IOBase.instance.DIStartAddress + 11), "SideCylinder_Back", "X12_侧挡气缸后退端"));
if (!TSAVBean.DisableBottomCylinder)
{
AddDI(new ConfigIO(ConfigItemType.DI, KNDIP, slaveId, (ushort)(IOBase.instance.DIStartAddress + 12), "BottomCylinder_Down1", "X13_底部定位气缸1下降端")); AddDI(new ConfigIO(ConfigItemType.DI, KNDIP, slaveId, (ushort)(IOBase.instance.DIStartAddress + 12), "BottomCylinder_Down1", "X13_底部定位气缸1下降端"));
AddDI(new ConfigIO(ConfigItemType.DI, KNDIP, slaveId, (ushort)(IOBase.instance.DIStartAddress + 13), "BottomCylinder_Down2", "X14_底部定位气缸2下降端")); AddDI(new ConfigIO(ConfigItemType.DI, KNDIP, slaveId, (ushort)(IOBase.instance.DIStartAddress + 13), "BottomCylinder_Down2", "X14_底部定位气缸2下降端"));
}
AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, IOBase.instance.DoStartAddress, "Run_Single", "Y01_设备运行指示灯")); AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, IOBase.instance.DoStartAddress, "Run_Single", "Y01_设备运行指示灯"));
AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 1), "Line_FStart", "Y02_线体皮带线运转")); AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 1), "Line_FStart", "Y02_线体皮带线运转"));
AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 2), "SMEMA_Up", "Y03_SMEMA前机要料请求")); AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 2), "SMEMA_Up", "Y03_SMEMA前机要料请求"));
...@@ -67,9 +69,12 @@ namespace TSA_V.DeviceLibrary ...@@ -67,9 +69,12 @@ namespace TSA_V.DeviceLibrary
AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 5), "StopCylinder_Down", "Y06_挡停气缸下降SOL")); AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 5), "StopCylinder_Down", "Y06_挡停气缸下降SOL"));
AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 6), "SideCylinder_Forward", "Y07_侧挡气缸前进SOL")); AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 6), "SideCylinder_Forward", "Y07_侧挡气缸前进SOL"));
AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 7), "SideCylinder_Back", "Y08_侧挡气缸后退SOL")); AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 7), "SideCylinder_Back", "Y08_侧挡气缸后退SOL"));
if (!TSAVBean.DisableBottomCylinder)
{
AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 8), "BottomCylinder_Up", "Y09_底部定位气缸上升SOL")); AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 8), "BottomCylinder_Up", "Y09_底部定位气缸上升SOL"));
AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 9), "BottomCylinder_Down", "Y10_底部定位气缸下降SOL")); AddDO(new ConfigIO(ConfigItemType.DO, KNDIP, slaveId, (ushort)(IOBase.instance.DoStartAddress + 9), "BottomCylinder_Down", "Y10_底部定位气缸下降SOL"));
} }
}
if (String.IsNullOrEmpty(builder.ToString()).Equals(false) && builder.ToString().Equals("\r\n").Equals(false)) if (String.IsNullOrEmpty(builder.ToString()).Equals(false) && builder.ToString().Equals("\r\n").Equals(false))
{ {
// LogUtil.info(builder.ToString()); // LogUtil.info(builder.ToString());
......
TSA-V/App.config
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
2=南京实点 2=南京实点
3=泥人科技,无线体 3=泥人科技,无线体
--> -->
<add key="UseAIOBOX" value="1" /> <add key="UseAIOBOX" value="2" />
<!--IO模块配置--> <!--IO模块配置-->
<add key="IO_IP" value="192.168.200.11" /> <add key="IO_IP" value="192.168.200.11" />
<add key="IO_Port" value="502" /> <add key="IO_Port" value="502" />
...@@ -119,6 +119,9 @@ ...@@ -119,6 +119,9 @@
<add key="WorkSingleStart" value="0" /> <add key="WorkSingleStart" value="0" />
<!--点位描述显示类型--> <!--点位描述显示类型-->
<add key="PointDisplayType" value="1" /> <add key="PointDisplayType" value="1" />
<!--禁用底部气缸-->
<add key ="DisableBottomCylinder" value="1"/>
</appSettings> </appSettings>
<log4net> <log4net>
<appender name="defaultAppender" type="log4net.Appender.RollingFileAppender"> <appender name="defaultAppender" type="log4net.Appender.RollingFileAppender">
......
TSA-V/deviceDebug/FrmIoManager.cs
...@@ -50,6 +50,11 @@ namespace TSA_V ...@@ -50,6 +50,11 @@ namespace TSA_V
timer1.Enabled = true; timer1.Enabled = true;
SetScreen(); SetScreen();
if (TSAVBean.DisableBottomCylinder)
{
btnBottomDown.Visible = false;
btnBottomUp.Visible=false;
}
} }
private void FrmMain_FormClosing(object sender, FormClosingEventArgs e) private void FrmMain_FormClosing(object sender, FormClosingEventArgs e)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!