Skip to content

刘韬 / SO775-DUOStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit e42042fd 由 刘韬
选项

加入T4进出轴代码

1 个父辈 6847c33d
全部展开
内嵌 并排
正在显示 13 个修改的文件 包含 224 行增加 和 38 行删除
source/Common/Setting_Init.cs
......@@ -101,6 +101,8 @@ namespace OnlineStore.Common
public static string CurrShelfNum = "CurrShelfNum";
public static string CurrShelfType = "CurrShelfType";
//是否有T4进出轴
public static string HasT4Axis = "HasT4Axis";
}
}
source/DUOStore/App.config
......@@ -53,6 +53,7 @@
<add key ="CurrShelfNum" value ="-1"/>
<!--当前料架信息-料架类型，0=空料架，1=入库料架，2=出库料架-->
<add key ="CurrShelfType" value ="-1"/>
<add key ="HasT4Axis" value ="true"/>
</appSettings>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......
source/DUOStore/FrmAxisMove.cs
......@@ -56,6 +56,13 @@ namespace OnlineStore.DUOStore
txtUpdownP5.Text = StoreManager.Store.Config.UpdownAxis_P5.ToString();
txtUpdownP6.Text = StoreManager.Store.Config.UpdownAxis_P6.ToString();
txtInOutP1.Text = StoreManager.Store.Config.InOutAxis_P1.ToString();
txtInOutP2.Text = StoreManager.Store.Config.InOutAxis_P2.ToString();
txtInOutP3.Text = StoreManager.Store.Config.InOutAxis_P3.ToString();
txtInOutP4.Text = StoreManager.Store.Config.InOutAxis_P4.ToString();
}
internal void DebugStatus(bool isDebug)
{
......@@ -136,6 +143,25 @@ namespace OnlineStore.DUOStore
AxisABSMove(StoreManager.Store.T3_UpdownAxis, txtUpdownP6, StoreManager.Store.Config.UpdownAxis_P6Speed);
}
private void btnInOutP1_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T4_InOut_Axis, txtInOutP1, StoreManager.Store.Config.InOutAxis_P1Speed);
}
private void btnInOutP2_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T4_InOut_Axis, txtInOutP2, StoreManager.Store.Config.InOutAxis_P2Speed);
}
private void btnInOutP3_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T4_InOut_Axis, txtInOutP3, StoreManager.Store.Config.InOutAxis_P3Speed);
}
private void btnInOutP4_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T4_InOut_Axis, txtInOutP4, StoreManager.Store.Config.InOutAxis_P4Speed);
}
private void btnSaveP_Click(object sender, EventArgs e)
{
Store_Config config = StoreManager.Config;
......@@ -152,6 +178,11 @@ namespace OnlineStore.DUOStore
config.UpdownAxis_P5 = FormUtil.GetIntValue(txtUpdownP5);
config.UpdownAxis_P6 = FormUtil.GetIntValue(txtUpdownP6);
config.InOutAxis_P1 = FormUtil.GetIntValue(txtInOutP1);
config.InOutAxis_P2 = FormUtil.GetIntValue(txtInOutP2);
config.InOutAxis_P3 = FormUtil.GetIntValue(txtInOutP3);
config.InOutAxis_P4 = FormUtil.GetIntValue(txtInOutP4);
bool result = StoreManager.UpdateStoreConfig(config);
if (result)
{
......@@ -183,5 +214,6 @@ namespace OnlineStore.DUOStore
{
AxisABSMove(StoreManager.Store.T2_MiddleAxis, txtT2P4, StoreManager.Store.Config.MiddleAxis_P4Speed);
}
}
}
source/DUOStore/FrmIOStatus.cs
......@@ -305,12 +305,12 @@ namespace OnlineStore.DUOStore
private void btnClamp_Click(object sender, EventArgs e)
{
ElectricClamp.Clamp();
ElectricGripper.Clamp();
}
private void btnRelax_Click(object sender, EventArgs e)
{
ElectricClamp.Release();
ElectricGripper.Release();
}
private void btnLDoorUp_Click(object sender, EventArgs e)
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -79,7 +79,7 @@
<Compile Include="duoStore\BoxBean_Partial.cs" />
<Compile Include="duoStore\BoxBean_Shelf.cs" />
<Compile Include="duoStore\DUOStoreBean_Partial.cs" />
<Compile Include="duoStore\ElectricClamp.cs" />
<Compile Include="duoStore\ElectricGripper.cs" />
<Compile Include="duoStore\EquipBase.cs" />
<Compile Include="duoStore\HumitureBean.cs" />
<Compile Include="duoStore\DUOStoreBean.cs" />
......
source/DeviceLibrary/StoreConfig/StoreConfig.csv
......@@ -125,6 +125,14 @@ PRO,0,T3_升降轴P4速度/快速度,UpdownAxis_P4Speed,503,,,,,,,,,,,,
PRO,0,T3_升降轴P5速度/慢速度,UpdownAxis_P5Speed,504,,,,,,,,,,,,
PRO,0,T32_升降轴P6速度/快速度,UpdownAxis_P6Speed,505,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,T4_进出轴待机点 P1,InOutAxis_P1,5000,,,,,,,,,,,,
PRO,0,T4_进出轴7寸取料点P2,InOutAxis_P2,5000,,,,,,,,,,,,
PRO,0,T4_进出轴13寸取料点P3,InOutAxis_P3,5000,,,,,,,,,,,,
PRO,0,T4_进出轴放料点P4,InOutAxis_P4,5000,,,,,,,,,,,,
PRO,0,T4_进出轴待机点 P1Speed,InOutAxis_P1Speed,5000,,,,,,,,,,,,
PRO,0,T4_进出轴7寸取料点P2Speed,InOutAxis_P2Speed,5000,,,,,,,,,,,,
PRO,0,T4_进出轴13寸取料点P3Speed,InOutAxis_P3Speed,5000,,,,,,,,,,,,
PRO,0,T4_进出轴放料点P4Speed,InOutAxis_P4Speed,5000,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,,预警温度,WarnTemperate,80,,,,,,,,,,,,
PRO,,预警湿度,WarnHumidity,80,,,,,,,,,,,,
......
source/DeviceLibrary/duoStore/DUOStoreBean.cs
......@@ -26,12 +26,12 @@ namespace OnlineStore.DeviceLibrary
/// 取料提升机构气缸
/// </summary>
//public HoisterCylinder hoisterCylinder = new HoisterCylinder(0);
public ElectricClamp electricClamp = new ElectricClamp(0);
public ElectricGripper electricClamp = new ElectricGripper(0);
public AxisBean T1_BatchAxis = null;
public AxisBean T2_MiddleAxis = null;
public AxisBean T3_UpdownAxis = null;
public AxisBean T4_InOut_Axis = null;
public bool HasT4Axis = false;
#region 初始化
......@@ -75,9 +75,10 @@ namespace OnlineStore.DeviceLibrary
CodeManager.LoadConfig();
CurrShelfNum = ConfigAppSettings.GetIntValue(Setting_Init.CurrShelfNum);
CurrShelfType = ConfigAppSettings.GetIntValue(Setting_Init.CurrShelfType);
HasT4Axis = Convert.ToBoolean(ConfigAppSettings.GetValue(Setting_Init.HasT4Axis));
Task.Factory.StartNew(delegate
{
// RFIDManager.RfidReader.Open(rfidList.ToArray());
//RFIDManager.RfidReader.Open(rfidList.ToArray());
IOManager.instance.ConnectionIOList(ioList);
IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
......@@ -218,9 +219,10 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LR_02_LineRun))
{
MoveInfo.NextMoveStep(StoreMoveStep.LR_03_BatchAxisHome);
LogUtil.info(Name + "复位 " + MoveInfo.MoveStep + " ：夹爪放松，提升轴回原点，上下轴回原点，流水线停止");
LogUtil.info(Name + "复位 " + MoveInfo.MoveStep + " ：夹爪回原点，提升轴回原点，上下轴回原点，流水线停止");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
ElectricClamp.Release(MoveInfo);
ElectricGripper.HomeReset(MoveInfo);
T1_BatchAxis.HomeMove(MoveInfo);
T3_UpdownAxis.HomeMove(MoveInfo);
LineStop(MoveInfo);
......@@ -228,11 +230,11 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LR_03_BatchAxisHome))
{
MoveInfo.NextMoveStep(StoreMoveStep.LR_04_BatchToP1);
LogUtil.info(Name + "复位 " + MoveInfo.MoveStep + " ：提升轴到P1点["+ Config.BatchAxis_P1 + "]，上下轴到待机点P2["+ Config.UpdownAxis_P2 + "]");
LogUtil.info(Name + "复位 " + MoveInfo.MoveStep + " ：夹爪放松，提升轴到P1点["+ Config.BatchAxis_P1 + "]，上下轴到待机点P2["+ Config.UpdownAxis_P2 + "]");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
T1_BatchAxis.AbsMove(MoveInfo, Config.BatchAxis_P1, Config.BatchAxis_P1Speed);
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed);
ElectricGripper.Release(MoveInfo);
}
else if (MoveInfo.IsStep(StoreMoveStep.LR_04_BatchToP1))
{
......
source/DeviceLibrary/duoStore/DUOStoreBean_Partial.cs
......@@ -247,12 +247,16 @@ namespace OnlineStore.DeviceLibrary
InOutStoreLog("取料， BOX1 升降轴到料门口高点[" + Config.UpdownAxis_P4 + "]，旋转轴到料仓门口 P2 [" + Config.MiddleAxis_P2 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P4, Config.UpdownAxis_P4Speed);
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P2, Config.MiddleAxis_P2Speed);
if (HasT4Axis)
T4_InOut_Axis.AbsMove(MoveInfo, Config.InOutAxis_P2, Config.InOutAxis_P2Speed);
}
else
{
InOutStoreLog("取料， BOX2 升降轴到料门口高点[" + Config.UpdownAxis_P6 + "]，旋转轴到料仓门口 P3 [" + Config.MiddleAxis_P3 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P6, Config.UpdownAxis_P6Speed);
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P3, Config.MiddleAxis_P3Speed);
if (HasT4Axis)
T4_InOut_Axis.AbsMove(MoveInfo, Config.InOutAxis_P3, Config.InOutAxis_P3Speed);
}
}
else if (MoveInfo.IsStep(StoreMoveStep.LO_12_ToBoxDoor))
......@@ -273,7 +277,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.LO_14_CylinderTighten);
InOutStoreLog("取料：夹爪气缸夹紧");
ElectricClamp.Clamp(MoveInfo);
ElectricGripper.Clamp(MoveInfo);
}
else if (MoveInfo.IsStep(StoreMoveStep.LO_14_CylinderTighten))
{
......@@ -294,6 +298,8 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.LO_16_MiddleToP1);
InOutStoreLog("取料：旋转轴到料串位置P1 ["+Config.MiddleAxis_P1+"]");
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P1, Config.MiddleAxis_P1Speed);
if (HasT4Axis)
T4_InOut_Axis.AbsMove(MoveInfo, Config.InOutAxis_P4, Config.InOutAxis_P4Speed);
}
else if (MoveInfo.IsStep(StoreMoveStep.LO_16_MiddleToP1))
{
......@@ -311,13 +317,15 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.LO_19_CylinderRelax);
InOutStoreLog("料盘移栽： 夹爪气缸放松");
ElectricClamp.Release(MoveInfo);
ElectricGripper.Release(MoveInfo);
}
else if (MoveInfo.IsStep(StoreMoveStep.LO_19_CylinderRelax))
{
MoveInfo.NextMoveStep(StoreMoveStep.LO_20_UpdownUp);
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed);
if (HasT4Axis)
T4_InOut_Axis.AbsMove(MoveInfo, Config.InOutAxis_P1, Config.InOutAxis_P1Speed);
//只有提升轴位置过低时才需要到P3
int currPosition = T1_BatchAxis.GetAclPosition();
if (currPosition <= (Config.BatchAxis_P1 + Config.BatchAxis_ChangeValue * 40))
......@@ -648,6 +656,8 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.LI_11_AxisToTray);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
InOutStoreLog("入料检测：有料盘：升降轴到料串高点P2["+ Config.UpdownAxis_P2 + "]，旋转轴到料串位置P4["+ Config.MiddleAxis_P4 + "]");
if (HasT4Axis)
T4_InOut_Axis.AbsMove(MoveInfo, Config.InOutAxis_P4, Config.InOutAxis_P1Speed);
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed);
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P4, Config.MiddleAxis_P4Speed);
}
......@@ -664,7 +674,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_13_CylinderTighten);
InOutStoreLog("取料：夹爪气缸夹紧");
ElectricClamp.Clamp(MoveInfo);
ElectricGripper.Clamp(MoveInfo);
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_13_CylinderTighten))
{
......@@ -687,14 +697,16 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StoreMoveStep.LI_16_BatchAxisToP2))
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_17_SaveSize);
InOutStoreLog("取料：记录高度尺寸");
LastWidth = GetWidth();
LastHeight = GetHeight();
InOutStoreLog($"取料：记录高度尺寸 LastWidth:{LastWidth}, LastHeight{LastHeight}");
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_17_SaveSize))
{
LI_18_GetPosID();
InOutStoreLog("取料：进出轴回到待机点到P1 [" + Config.InOutAxis_P1 + "],计算高度,");
if (HasT4Axis)
T4_InOut_Axis.AbsMove(MoveInfo, Config.InOutAxis_P1, Config.InOutAxis_P1Speed);
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_18_GetPosID))
......@@ -744,12 +756,16 @@ namespace OnlineStore.DeviceLibrary
InOutStoreLog("料盘移栽：获取库位号完成， BOX " + storeId + " 升降轴到料门口高点P4[" + Config.UpdownAxis_P4 + "]，旋转轴到料仓门口 P2[" + Config.MiddleAxis_P2 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P4, Config.UpdownAxis_P4Speed);
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P2, Config.MiddleAxis_P2Speed);
if (HasT4Axis)
T4_InOut_Axis.AbsMove(MoveInfo, Config.InOutAxis_P2, Config.InOutAxis_P2Speed);
}
else
{
InOutStoreLog("料盘移栽：获取库位号完成， BOX " + storeId + " 升降轴到料门口高点P6[" + Config.UpdownAxis_P6 + "]，旋转轴到料仓门口 P3[" + Config.MiddleAxis_P3 + "]");
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P6, Config.UpdownAxis_P6Speed);
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P3, Config.MiddleAxis_P3Speed);
if (HasT4Axis)
T4_InOut_Axis.AbsMove(MoveInfo, Config.InOutAxis_P3, Config.InOutAxis_P3Speed);
}
ClearTimeoutAlarm("入料口无料盘");
......@@ -780,7 +796,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(StoreMoveStep.LI_24_CylinderRelax);
InOutStoreLog("料盘移栽： 上料气缸放松");
ElectricClamp.Release(MoveInfo);
ElectricGripper.Release(MoveInfo);
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_24_CylinderRelax))
{
......@@ -803,6 +819,8 @@ namespace OnlineStore.DeviceLibrary
InOutStoreLog("料盘移栽：旋转轴返回待机点P1["+ Config.MiddleAxis_P1 + "],升降轴到料串高点P2["+ Config.UpdownAxis_P2 + "]");
T2_MiddleAxis.AbsMove(MoveInfo, Config.MiddleAxis_P1, Config.MiddleAxis_P1Speed);
T3_UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P2, Config.UpdownAxis_P2Speed);
if (HasT4Axis)
T4_InOut_Axis.AbsMove(MoveInfo, Config.InOutAxis_P1, Config.InOutAxis_P1Speed);
}
else if (MoveInfo.IsStep(StoreMoveStep.LI_26_AxisToWait))
{
......@@ -1179,6 +1197,9 @@ namespace OnlineStore.DeviceLibrary
public int GetWidth()
{
if (IOManager.IOValue(IO_Type.TrayCheck_11to15, 0).Equals(IO_VALUE.HIGH))
return 13;
return 7;
}
......
source/DeviceLibrary/duoStore/ElectricClamp.cs → source/DeviceLibrary/duoStore/ElectricGripper.cs
......@@ -7,43 +7,54 @@ using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
public class ElectricClamp
public class ElectricGripper
{
private static int subType = 0;
public static bool needClamp = false;
public ElectricClamp(int subType)
public static Enum GripperType = GripperTypeE.None;
public ElectricGripper(int subType)
{
//this.subType = subType;
}
public static void Clamp(StoreMoveInfo moveInfo = null)
{
needClamp = true;
GripperType = GripperTypeE.Gripper;
if (!IsBusy)
{
IOManager.IOMove(IO_Type.Clamp_SetPos0, IO_VALUE.LOW, subType);
IOManager.IOMove(IO_Type.Clamp_SetPos1, IO_VALUE.HIGH, subType);
setAction("01000");
IOManager.IOMove(IO_Type.Clamp_DoAction, IO_VALUE.HIGH, subType);
}
if (moveInfo != null)
moveInfo.WaitList.Add(WaitResultInfo.WaitElectricClamp());
moveInfo.WaitList.Add(WaitResultInfo.WaitAction(new Func<WaitResultInfo, bool>(WaitAction)));
}
public static bool Release(StoreMoveInfo moveInfo = null)
{
needClamp = false;
GripperType = GripperTypeE.Release;
if (!IsBusy)
{
IOManager.IOMove(IO_Type.Clamp_SetPos0, IO_VALUE.HIGH, subType);
IOManager.IOMove(IO_Type.Clamp_SetPos1, IO_VALUE.LOW, subType);
setAction("10000");
IOManager.IOMove(IO_Type.Clamp_DoAction, IO_VALUE.HIGH, subType);
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
return true;
}
else
{
return false;
if (moveInfo != null)
moveInfo.WaitList.Add(WaitResultInfo.WaitElectricClamp());
moveInfo.WaitList.Add(WaitResultInfo.WaitAction(new Func<WaitResultInfo, bool>(WaitAction)));
return false;
}
}
public static void HomeReset(StoreMoveInfo moveInfo = null) {
GripperType = GripperTypeE.Reset;
if (!IsBusy)
{
setAction("11111");
IOManager.IOMove(IO_Type.Clamp_DoAction, IO_VALUE.HIGH, subType);
}
if (moveInfo != null)
//moveInfo.WaitList.Add(WaitResultInfo.WaitElectricClamp());
moveInfo.WaitList.Add(WaitResultInfo.WaitAction(new Func<WaitResultInfo, bool>(WaitAction)));
}
public static bool IsBusy {
get {
......@@ -56,5 +67,62 @@ namespace OnlineStore.DeviceLibrary
return IOManager.IOValue(IO_Type.Clamp_OnPosition, subType).Equals(IO_VALUE.HIGH);
}
}
static bool WaitAction(WaitResultInfo w)
{
if (ElectricGripper.IsBusy)
return false;
if (ElectricGripper.GripperType.Equals(ElectricGripper.GripperTypeE.Gripper))
{
if (ElectricGripper.IsClamp)
return true;
else
{
ElectricGripper.Clamp();
return false; ;
}
}
else if (ElectricGripper.GripperType.Equals(ElectricGripper.GripperTypeE.Release))
{
return ElectricGripper.Release();
}
else if (ElectricGripper.GripperType.Equals(ElectricGripper.GripperTypeE.Reset))
{
return ElectricGripper.IsBusy;
}
else {
return true;
}
}
public static int state
{
get
{
int s1 = (int)IOManager.IOValue(IO_Type.Clamp_Abnormal1, subType);
int s2 = (int)IOManager.IOValue(IO_Type.Clamp_Abnormal2, subType);
int s3 = (int)IOManager.IOValue(IO_Type.Clamp_ObjRecognize1, subType);
int s4 = (int)IOManager.IOValue(IO_Type.Clamp_ObjRecognize2, subType);
int s5 = (int)IOManager.IOValue(IO_Type.Clamp_ObjRecognize3, subType);
string b = s1.ToString() + s2 + s3 + s4 + s5;
return Convert.ToInt32(b, 2);
}
}
public static void setAction(string s) {
for (int i = 0; i < 5; i++)
{
IOManager.IOMove("Clamp_SetPos"+i,s[i]=='1'? IO_VALUE.HIGH : IO_VALUE.LOW, subType);
}
}
public enum GripperTypeE
{
Gripper,
Release,
Reset,
None
}
}
}
source/DeviceLibrary/duoStore/EquipBase.cs
......@@ -237,7 +237,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (wait.IoType.Equals(IO_Type.Clamp_OnPosition))
{
ElectricClamp.Clamp();
ElectricGripper.Clamp();
}
else if (span.TotalMilliseconds > timeOutMs && NoAlarm())
{
......@@ -257,23 +257,29 @@ namespace OnlineStore.DeviceLibrary
{
wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds);
}
else if (wait.WaitType.Equals(WaitEnum.W012_ElectricClampEvent))
else if (wait.WaitType.Equals(WaitEnum.W013_Action))
{
if (ElectricClamp.IsBusy)
wait.IsEnd = wait.Action.Invoke(wait);
LogUtil.info($"{Name} 自定义等待 IsEnd={wait.IsEnd},Type={wait.Action.GetType()}");
}
else if (wait.WaitType.Equals(WaitEnum.W012_ElectricGripperEvent))
{
if (ElectricGripper.IsBusy)
break;
if (ElectricClamp.needClamp)
if (ElectricGripper.GripperType.Equals(ElectricGripper.GripperTypeE.Gripper))
{
if (ElectricClamp.IsClamp)
if (ElectricGripper.IsClamp)
wait.IsEnd = true;
else
{
ElectricClamp.Clamp();
ElectricGripper.Clamp();
break;
}
}
else {
wait.IsEnd = ElectricClamp.Release();
else if (ElectricGripper.GripperType.Equals(ElectricGripper.GripperTypeE.Release))
{
wait.IsEnd = ElectricGripper.Release();
}
}
else
......
source/DeviceLibrary/store/model/StoreMoveInfo.cs
......@@ -214,10 +214,16 @@ namespace OnlineStore.DeviceLibrary
wait.WaitType = WaitEnum.W011_DoorCloseEvent;
return wait;
}
public static WaitResultInfo WaitAction(Func<WaitResultInfo, bool> a) {
WaitResultInfo wait = new WaitResultInfo();
wait.WaitType = WaitEnum.W013_Action;
wait.Action = a;
return wait;
}
public static WaitResultInfo WaitElectricClamp()
{
WaitResultInfo wait = new WaitResultInfo();
wait.WaitType = WaitEnum.W012_ElectricClampEvent;
wait.WaitType = WaitEnum.W012_ElectricGripperEvent;
return wait;
}
public string ToStr()
......@@ -324,6 +330,11 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public bool IsEnd { get; set; }
/// <summary>
/// 等待事件代理
/// </summary>
public Func<WaitResultInfo, bool> Action { get; set; }
public int AgvAction = 0;
}
......@@ -376,7 +387,11 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 等待电夹爪事件
/// </summary>
internal static int W012_ElectricClampEvent = 12;
internal static int W012_ElectricGripperEvent = 12;
/// <summary>
/// 通用代理等待方法
/// </summary>
internal static int W013_Action = 13;
}
public enum MoveType
{
......
source/LoadCVSLibrary/storeConfig/config/Store_Config.cs
......@@ -257,6 +257,37 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
[ConfigProAttribute("UpdownAxis_P6Speed")]
public int UpdownAxis_P6Speed { get; set; }
/// <summary>
/// T4_进出轴待机点 P1
/// </summary>
[ConfigProAttribute("InOutAxis_P1")]
public int InOutAxis_P1 { get; set; }
/// <summary>
/// T4_进出轴7寸取料点P2
/// </summary>
[ConfigProAttribute("InOutAxis_P2")]
public int InOutAxis_P2 { get; set; }
/// <summary>
/// T4_进出轴13寸取料点P3
/// </summary>
[ConfigProAttribute("InOutAxis_P3")]
public int InOutAxis_P3 { get; set; }
/// <summary>
/// T4_进出轴放料点P4
/// </summary>
[ConfigProAttribute("InOutAxis_P4")]
public int InOutAxis_P4 { get; set; }
[ConfigProAttribute("InOutAxis_P1Speed")]
public int InOutAxis_P1Speed { get; set; }
[ConfigProAttribute("InOutAxis_P2Speed")]
public int InOutAxis_P2Speed { get; set; }
[ConfigProAttribute("InOutAxis_P3Speed")]
public int InOutAxis_P3Speed { get; set; }
[ConfigProAttribute("InOutAxis_P4Speed")]
public int InOutAxis_P4Speed { get; set; }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!