Skip to content

刘韬 / SO815-AutoInOutStore

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

删除不需要代码及中英文

1 个父辈 cd5b2e02
全部展开
内嵌 并排
正在显示 10 个修改的文件 包含 51 行增加 和 110 行删除
source/ACSingleStore/FrmIOStatus.cs
...@@ -102,7 +102,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -102,7 +102,7 @@ namespace OnlineStore.AutoInOutStore
//IO_VALUE value = (IO_VALUE)cmbWriteValue.SelectedIndex; //IO_VALUE value = (IO_VALUE)cmbWriteValue.SelectedIndex;
IO_VALUE value = radioButton1.Checked ? IO_VALUE.HIGH : IO_VALUE.LOW; IO_VALUE value = radioButton1.Checked ? IO_VALUE.HIGH : IO_VALUE.LOW;
int time = FormUtil.GetIntValue(txtWriteTime); int time = FormUtil.GetIntValue(txtWriteTime);
int slaveId = FormUtil.GetIntValue(txtSlaveId); int slaveId = 0;
if (time > 0) if (time > 0)
{ {
IOManager.instance.WriteSingleDO(deviceName, (byte)slaveId, (ushort)index, (IO_VALUE)value, time); IOManager.instance.WriteSingleDO(deviceName, (byte)slaveId, (ushort)index, (IO_VALUE)value, time);
...@@ -134,7 +134,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -134,7 +134,7 @@ namespace OnlineStore.AutoInOutStore
// txtIp.Text = io.DeviceName; // txtIp.Text = io.DeviceName;
txtDOIndex.Text = io.GetIOAddr().ToString(); txtDOIndex.Text = io.GetIOAddr().ToString();
txtDoName.Text = io.DeviceName; txtDoName.Text = io.DeviceName;
txtSlaveId.Text = io.SlaveID.ToString(); //txtSlaveId.Text = io.SlaveID.ToString();
IOTextControl newControl = DOControlList[io.ProName]; IOTextControl newControl = DOControlList[io.ProName];
if (selectControl != null) { selectControl.BackColor = Color.White; } if (selectControl != null) { selectControl.BackColor = Color.White; }
newControl.BackColor = Color.SkyBlue; newControl.BackColor = Color.SkyBlue;
...@@ -210,7 +210,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -210,7 +210,7 @@ namespace OnlineStore.AutoInOutStore
string deviceName = txtDoName.Text; string deviceName = txtDoName.Text;
//IO_VALUE value = (IO_VALUE)cmbWriteValue.SelectedIndex; //IO_VALUE value = (IO_VALUE)cmbWriteValue.SelectedIndex;
int time = FormUtil.GetIntValue(txtWriteTime); int time = FormUtil.GetIntValue(txtWriteTime);
int slaveId = FormUtil.GetIntValue(txtSlaveId); int slaveId = 0;
KNDManager.ReadMultipleDI(deviceName, (byte)slaveId, (ushort)KNDManager.DIStartAddress, 16); KNDManager.ReadMultipleDI(deviceName, (byte)slaveId, (ushort)KNDManager.DIStartAddress, 16);
} }
private void btnReadAllDo_Click(object sender, EventArgs e) private void btnReadAllDo_Click(object sender, EventArgs e)
...@@ -219,7 +219,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -219,7 +219,7 @@ namespace OnlineStore.AutoInOutStore
//IO_VALUE value = (IO_VALUE)cmbWriteValue.SelectedIndex; //IO_VALUE value = (IO_VALUE)cmbWriteValue.SelectedIndex;
int time = FormUtil.GetIntValue(txtWriteTime); int time = FormUtil.GetIntValue(txtWriteTime);
int slaveId = FormUtil.GetIntValue(txtSlaveId); int slaveId = 0;
KNDManager.ReadMultipleDO(deviceName, (byte)slaveId, (ushort)KNDManager.DoStartAddress, 16); KNDManager.ReadMultipleDO(deviceName, (byte)slaveId, (ushort)KNDManager.DoStartAddress, 16);
} }
private void btnOpenDoor_Click(object sender, EventArgs e) private void btnOpenDoor_Click(object sender, EventArgs e)
......
source/ACSingleStore/ResourceCulture.cs
...@@ -238,10 +238,10 @@ namespace OnlineStore.AutoInOutStore ...@@ -238,10 +238,10 @@ namespace OnlineStore.AutoInOutStore
/// 请先启动料仓 /// 请先启动料仓
/// </summary> /// </summary>
public static string PleaseStartStore = "PleaseStartStore"; public static string PleaseStartStore = "PleaseStartStore";
/// <summary> ///// <summary>
/// 定位气缸不在下降端，不能移动进出轴 ///// 定位气缸不在下降端，不能移动进出轴
/// </summary> ///// </summary>
public static string CannotMove = "CannotMove"; //public static string CannotMove = "CannotMove";
/// <summary> /// <summary>
/// 警告 /// 警告
/// </summary> /// </summary>
...@@ -384,10 +384,10 @@ namespace OnlineStore.AutoInOutStore ...@@ -384,10 +384,10 @@ namespace OnlineStore.AutoInOutStore
///等待送料结束 ///等待送料结束
/// </summary> /// </summary>
public static string WaitEnd = "WaitEnd"; public static string WaitEnd = "WaitEnd";
/// <summary> ///// <summary>
///吸盘吸料失败 /////吸盘吸料失败
/// </summary> ///// </summary>
public static string XiLiaoError = "XiLiaoError"; //public static string XiLiaoError = "XiLiaoError";
/// <summary> /// <summary>
///伺服OFF ///伺服OFF
...@@ -397,10 +397,10 @@ namespace OnlineStore.AutoInOutStore ...@@ -397,10 +397,10 @@ namespace OnlineStore.AutoInOutStore
///伺服ON ///伺服ON
/// </summary> /// </summary>
public static string servoON = "servoON"; public static string servoON = "servoON";
/// <summary> ///// <summary>
///仓门状态未知 /////仓门状态未知
/// </summary> ///// </summary>
public static string NoDoorStatus = "NoDoorStatus"; //public static string NoDoorStatus = "NoDoorStatus";
/// <summary> /// <summary>
///批量出入库信息： 入库： ///批量出入库信息： 入库：
/// </summary> /// </summary>
......
source/ACSingleStore/记录.txt
 软件升降轴调试增加图示
升降轴 调试界面日志默认隐藏。
位置点放一张图，都只显示p点
读取伺服状态改为1个按钮
伺服位置读取删掉
X16删掉
20181107 20181107
1.出库时等待10秒钟，或等待拿走料盘（高度=0）才算出库结束 1.出库时等待10秒钟，或等待拿走料盘（高度=0）才算出库结束
......
source/DeviceLibrary/ResourceControl.cs
...@@ -96,10 +96,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -96,10 +96,7 @@ namespace OnlineStore.DeviceLibrary
///"入库执行中" ///"入库执行中"
/// </summary> /// </summary>
public static string InStoreExecute = "InStoreExecute"; public static string InStoreExecute = "InStoreExecute";
/// <summary>
///"故障中"
/// </summary>
public static string InTrouble = "InTrouble";
/// <summary> /// <summary>
///"料盘出仓位完成" ///"料盘出仓位完成"
/// </summary> /// </summary>
...@@ -128,10 +125,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -128,10 +125,7 @@ namespace OnlineStore.DeviceLibrary
///"出库失败" ///"出库失败"
/// </summary> /// </summary>
public static string OutStoreFailed = "OutStoreFailed"; public static string OutStoreFailed = "OutStoreFailed";
/// <summary>
///"等待信号"
/// </summary>
public static string WaitSingle = "WaitSingle";
/// <summary> /// <summary>
///"超时" ///"超时"
/// </summary> /// </summary>
...@@ -156,10 +150,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -156,10 +150,7 @@ namespace OnlineStore.DeviceLibrary
///"收到复位信号，自动复位" ///"收到复位信号，自动复位"
/// </summary> /// </summary>
public static string AutoReset = "AutoReset"; public static string AutoReset = "AutoReset";
/// <summary>
///"运动轴"
/// </summary>
public static string MoveAxis = "MoveAxis";
/// <summary> /// <summary>
///"报警" ///"报警"
/// </summary> /// </summary>
...@@ -194,14 +185,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -194,14 +185,7 @@ namespace OnlineStore.DeviceLibrary
///"时间等待：" ///"时间等待："
/// </summary> /// </summary>
public static string WaitTime = "WaitTime"; public static string WaitTime = "WaitTime";
/// <summary>
///"电钢目标位置："
/// </summary>
public static string TargetPosition = "TargetPosition";
/// <summary>
/// 此设备不支持单个入库
/// </summary>
public static string CanotSingleInStore = "CanotSingleInStore";
/// <summary> /// <summary>
///叉子不在待机位，请先将叉子退回待机位 ///叉子不在待机位，请先将叉子退回待机位
/// </summary> /// </summary>
...@@ -254,10 +238,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -254,10 +238,7 @@ namespace OnlineStore.DeviceLibrary
///未检测到气压信号 ///未检测到气压信号
/// </summary> /// </summary>
public static string NoAIr = "NoAIr"; public static string NoAIr = "NoAIr";
/// <summary>
///料盘高度
/// </summary>
public static string trayHeight = "trayHeight";
/// <summary> /// <summary>
///负限位 ///负限位
/// </summary> /// </summary>
...@@ -299,15 +280,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -299,15 +280,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
///伺服ON ///伺服ON
/// </summary> /// </summary>
public static string servoON = "servoON"; public static string servoON = "servoON";
/// <summary>
///仓门状态未知
/// </summary>
public static string NoDoorStatus = "NoDoorStatus";
/// <summary>
///批量出入库信息： 入库：
/// </summary>
public static string InstoreInfo = "InstoreInfo";
/// <summary> /// <summary>
///出库 ///出库
/// </summary> /// </summary>
...@@ -320,12 +293,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -320,12 +293,7 @@ namespace OnlineStore.DeviceLibrary
///门锁打开 ///门锁打开
/// </summary> /// </summary>
public static string doorOpen = "doorOpen"; public static string doorOpen = "doorOpen";
/// <summary>
///启动失败：压紧轴连接失败
/// </summary>
public static string PreConnectFail = "PreConnectFail";
/// <summary> /// <summary>
///启动失败：急停未开 ///启动失败：急停未开
/// </summary> /// </summary>
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -14,7 +14,7 @@ DI,上料机构出料检测,OutCheck,11,192.168.200.11,0,上料机构出料检测,X12,DI-12,0, ...@@ -14,7 +14,7 @@ DI,上料机构出料检测,OutCheck,11,192.168.200.11,0,上料机构出料检测,X12,DI-12,0,
DI,门锁气缸打开端,BatchDoor_Open,12,192.168.200.11,0,门锁气缸打开端,X13,DI-13,0, DI,门锁气缸打开端,BatchDoor_Open,12,192.168.200.11,0,门锁气缸打开端,X13,DI-13,0,
DI,门锁气缸关闭端,BatchDoor_Close,13,192.168.200.11,0,门锁气缸关闭端,X14,DI-14,0, DI,门锁气缸关闭端,BatchDoor_Close,13,192.168.200.11,0,门锁气缸关闭端,X14,DI-14,0,
DI,料盘检测2（料叉机构）,TrayCheck_Fixture,14,192.168.200.11,0,料盘检测2（料叉机构）,X15,DI-15,0, DI,料盘检测2（料叉机构）,TrayCheck_Fixture,14,192.168.200.11,0,料盘检测2（料叉机构）,X15,DI-15,0,
DI,压紧机构计量检测,CompressAxis_Check,15,192.168.200.11,0,压紧机构计量检测,X16,DI-16,0, ,压紧机构计量检测,CompressAxis_Check,15,192.168.200.11,0,压紧机构计量检测,X16,DI-16,0,
DO,自动指示灯,AutoRun_HddLed,0,192.168.200.11,0,自动指示灯,Y01,DO-01,0, DO,自动指示灯,AutoRun_HddLed,0,192.168.200.11,0,自动指示灯,Y01,DO-01,0,
DO,故障指示灯,Alarm_HddLed,1,192.168.200.11,0,故障指示灯,Y02,DO-02,0, DO,故障指示灯,Alarm_HddLed,1,192.168.200.11,0,故障指示灯,Y02,DO-02,0,
DO,待机指示灯,RunSign_HddLed,2,192.168.200.11,0,待机指示灯,Y03,DO-03,0, DO,待机指示灯,RunSign_HddLed,2,192.168.200.11,0,待机指示灯,Y03,DO-03,0,
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -315,7 +315,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -315,7 +315,7 @@ namespace OnlineStore.DeviceLibrary
{ {
InStoreLog("入库：SI_01 定位气缸下降"); InStoreLog("入库：SI_01 定位气缸下降");
StoreMove.NextMoveStep(StoreMoveStep.SI_01_LocationCylinderDown); StoreMove.NextMoveStep(StoreMoveStep.SI_01_LocationCylinderDown);
LocationDownAndWait(); //LocationDownAndWait();
} }
return true; return true;
} }
...@@ -471,7 +471,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -471,7 +471,7 @@ namespace OnlineStore.DeviceLibrary
{ {
InStoreLog("入库：SI_08 定位气缸伸出 "); InStoreLog("入库：SI_08 定位气缸伸出 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_08_LocationCylinder_Up); StoreMove.NextMoveStep(StoreMoveStep.SI_08_LocationCylinder_Up);
LocationUpAndWait(); //LocationUpAndWait();
} }
} }
} }
...@@ -488,7 +488,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -488,7 +488,7 @@ namespace OnlineStore.DeviceLibrary
{ {
InStoreLog("入库：SI_08 定位气缸伸出 "); InStoreLog("入库：SI_08 定位气缸伸出 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_08_LocationCylinder_Up); StoreMove.NextMoveStep(StoreMoveStep.SI_08_LocationCylinder_Up);
LocationUpAndWait(); //LocationUpAndWait();
} }
} }
else if (StoreMove.MoveStep == StoreMoveStep.SI_08_LocationCylinder_Up) else if (StoreMove.MoveStep == StoreMoveStep.SI_08_LocationCylinder_Up)
...@@ -510,7 +510,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -510,7 +510,7 @@ namespace OnlineStore.DeviceLibrary
{ {
InStoreLog("入库：SI_10 定位气缸退回 "); InStoreLog("入库：SI_10 定位气缸退回 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_10_LocationCylinder_Down); StoreMove.NextMoveStep(StoreMoveStep.SI_10_LocationCylinder_Down);
LocationDownAndWait(); //LocationDownAndWait();
} }
} }
else if (StoreMove.MoveStep == StoreMoveStep.SI_10_LocationCylinder_Down) else if (StoreMove.MoveStep == StoreMoveStep.SI_10_LocationCylinder_Down)
...@@ -838,7 +838,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -838,7 +838,7 @@ namespace OnlineStore.DeviceLibrary
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_01_LocationCylinderDown); StoreMove.NextMoveStep(StoreMoveStep.SO_01_LocationCylinderDown);
OutStoreLog("出库：SO_01 定位气缸下降"); OutStoreLog("出库：SO_01 定位气缸下降");
LocationDownAndWait(); //LocationDownAndWait();
} }
CodeOrInoutMsg = ""; CodeOrInoutMsg = "";
return true; return true;
...@@ -964,7 +964,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -964,7 +964,7 @@ namespace OnlineStore.DeviceLibrary
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_07_LocationCylinder_Up); StoreMove.NextMoveStep(StoreMoveStep.SO_07_LocationCylinder_Up);
OutStoreLog("出库：SO_07 定位气缸伸出 "); OutStoreLog("出库：SO_07 定位气缸伸出 ");
LocationUpAndWait(); //LocationUpAndWait();
} }
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_07_LocationCylinder_Up) else if (StoreMove.MoveStep == StoreMoveStep.SO_07_LocationCylinder_Up)
...@@ -989,7 +989,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -989,7 +989,7 @@ namespace OnlineStore.DeviceLibrary
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_10_LocationCylinder_Down); StoreMove.NextMoveStep(StoreMoveStep.SO_10_LocationCylinder_Down);
OutStoreLog("出库：SO_10 定位气缸退回 "); OutStoreLog("出库：SO_10 定位气缸退回 ");
LocationDownAndWait(); //LocationDownAndWait();
} }
} }
} }
...@@ -1003,7 +1003,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1003,7 +1003,7 @@ namespace OnlineStore.DeviceLibrary
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_10_LocationCylinder_Down); StoreMove.NextMoveStep(StoreMoveStep.SO_10_LocationCylinder_Down);
OutStoreLog("出库：SO_10 定位气缸退回 "); OutStoreLog("出库：SO_10 定位气缸退回 ");
LocationDownAndWait(); //LocationDownAndWait();
} }
} }
//此处需要等待移栽没有工作，才能把盘放入出料口 //此处需要等待移栽没有工作，才能把盘放入出料口
...@@ -1029,7 +1029,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1029,7 +1029,7 @@ namespace OnlineStore.DeviceLibrary
OutStoreLog("出库：SO_21打开仓门，压紧轴至P3（压紧前点）,定位气缸下降"); OutStoreLog("出库：SO_21打开仓门，压紧轴至P3（压紧前点）,定位气缸下降");
ComMoveToPosition(StoreMove.MoveParam.MoveP.ComPress_P3, Config.CompAxis_P3_Speed); ComMoveToPosition(StoreMove.MoveParam.MoveP.ComPress_P3, Config.CompAxis_P3_Speed);
OpenDoorAndWait(); OpenDoorAndWait();
LocationDownAndWait(); //LocationDownAndWait();
} }
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_21_OpenDoor) else if (StoreMove.MoveStep == StoreMoveStep.SO_21_OpenDoor)
...@@ -1210,46 +1210,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -1210,46 +1210,6 @@ namespace OnlineStore.DeviceLibrary
//WarnMsg = Msg; //WarnMsg = Msg;
LogUtil.error(Msg); LogUtil.error(Msg);
} }
public bool InOutAxisCanMove()
{
if (StoreManager.Store.Config.IsHasLocationCylinder.Equals(0))
{
return true;
}
if (IOManager.IOValue(IO_Type.LocationCylinder_Down).Equals(IO_VALUE.HIGH)
&& IOManager.IOValue(IO_Type.LocationCylinder_Up).Equals(IO_VALUE.LOW)
&& IOManager.IOValue(IO_Type.LocationCylinder2_Down).Equals(IO_VALUE.HIGH)
&& IOManager.IOValue(IO_Type.LocationCylinder2_Up).Equals(IO_VALUE.LOW))
{
return true;
}
return false;
}
private void LocationUpAndWait()
{
if (Config.IsHasLocationCylinder >= 1)
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Up, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Down, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder2_Up, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder2_Down, IO_VALUE.LOW));
IOManager.IOMove(IO_Type.LocationCylinder_Up, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.LocationCylinder_Down, IO_VALUE.LOW);
}
}
private void LocationDownAndWait()
{
if (Config.IsHasLocationCylinder >= 1)
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Down, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder_Up, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder2_Down, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LocationCylinder2_Up, IO_VALUE.LOW));
IOManager.IOMove(IO_Type.LocationCylinder_Down, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.LocationCylinder_Up, IO_VALUE.LOW);
}
}
public List<FixtureCodeInfo> waitOutStoreList = new List<FixtureCodeInfo>(); public List<FixtureCodeInfo> waitOutStoreList = new List<FixtureCodeInfo>();
public object waitOutListLock = ""; public object waitOutListLock = "";
......
source/LoadCVSLibrary/storeConfig/config/Store_IO_Type.cs
...@@ -158,10 +158,10 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -158,10 +158,10 @@ namespace OnlineStore.LoadCSVLibrary
/// 料盘检测2（料叉机构） TrayCheck_Fixture X15 DI-15 /// 料盘检测2（料叉机构） TrayCheck_Fixture X15 DI-15
/// </summary> /// </summary>
public static string TrayCheck_Fixture = "TrayCheck_Fixture"; public static string TrayCheck_Fixture = "TrayCheck_Fixture";
/// <summary> ///// <summary>
/// 压紧机构计量检测 CompressAxis_Check X16 DI-16 ///// 压紧机构计量检测 CompressAxis_Check X16 DI-16
/// </summary> ///// </summary>
public static string CompressAxis_Check = "CompressAxis_Check"; //public static string CompressAxis_Check = "CompressAxis_Check";
/// <summary> /// <summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!