Skip to content

孙克 / RC1250-AssemblyLine

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

高度检测修改

1 个父辈 257c8e93
内嵌 并排
正在显示 7 个修改的文件 包含 26 行增加 和 22 行删除
source/AssemblyLineClient/App.config
......@@ -51,6 +51,7 @@
<!--当前调试的设备ID，分号分割-->
<add key ="DebugDeviceId" value ="103"/>
<add key ="NeedScanCode" value ="1"/>
<add key ="Server_Log_Open" value ="0"/>
</appSettings>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......
source/DeviceLibrary/assemblyLine/DischargeLine.cs
......@@ -154,7 +154,7 @@ namespace OnlineStore.DeviceLibrary
runStatus = LineRunStatus.Wait;
}
public override void TimerProcess()
protected override void BaseTimerProcess()
{
if (IOValue(IO_Type.DLine_SuddenStop).Equals(IO_VALUE.LOW))
{
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
......@@ -38,12 +38,12 @@ namespace OnlineStore.DeviceLibrary
protected virtual void StopMoveProcess()
{
}
public abstract void TimerProcess();
protected abstract void BaseTimerProcess();
protected abstract void CheckFixtureProcess();
protected override void mainTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
BaseTimerProcess();
TimerProcess();
}
public override void Alarm(LineAlarmType alarmType)
......@@ -125,11 +125,11 @@ namespace OnlineStore.DeviceLibrary
}
private DateTime lastProTimer = DateTime.Now;
private void BaseTimerProcess()
public void TimerProcess()
{
TimeSpan span = DateTime.Now - lastProTimer;
if (isInPro && span.TotalSeconds < 20)
if (isInPro && span.TotalSeconds < 1)
{
return;
}
......@@ -142,7 +142,7 @@ namespace OnlineStore.DeviceLibrary
isInPro = false;
return;
}
TimerProcess();
BaseTimerProcess();
}
catch (Exception ex)
{
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
......@@ -306,7 +306,7 @@ namespace OnlineStore.DeviceLibrary
}
public override void TimerProcess()
protected override void BaseTimerProcess()
{
if (IOValue(IO_Type.SL_SuddenStop_BTN).Equals(IO_VALUE.LOW))
{
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
......@@ -14,6 +14,7 @@ namespace OnlineStore.DeviceLibrary
{
if (wait.WaitType.Equals(WaitEnum.W101_BatchAxisMove))
{
//等待信号亮或者走到绝对位置才停止
if (IOValue(TargetIoType).Equals(TargetIoValue))
{
LogInfo("CheckWaitResult 检测到" + TargetIoType + "=" + TargetIoValue + ",停止运行");
......@@ -63,8 +64,8 @@ namespace OnlineStore.DeviceLibrary
{
SecondMoveInfo.NewMove(LineMoveType.CheckFixture, CheckParam);
TrayManager.UpdateSWState(Config.SidesWayNum, 2);
CheckLog("检测到SW_TrayCheck：" + SecondMoveInfo.SLog + "横移顶升气缸上升 ）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_06_TopCylinderUp);
CheckLog("检测到SW_TrayCheck：" + SecondMoveInfo.SLog + "横移顶升气缸上升 ）");
CylinderMove(SecondMoveInfo, IO_Type.SW_TopCylinder_Down, IO_Type.SW_TopCylinder_Up);
}
else
......@@ -81,9 +82,9 @@ namespace OnlineStore.DeviceLibrary
//{
SecondMoveInfo.NewMove(LineMoveType.CheckFixture, CheckParam);
TrayManager.UpdateSWState(Config.SidesWayNum, 2);
CheckLog("检测到SW_StopCheck：" + SecondMoveInfo.SLog + "阻挡气缸下降 ，最多等待1秒");
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_01_StopCylinder1Down);
IOMove(IO_Type.SW_StopDown, IO_VALUE.HIGH);
CheckLog("检测到SW_StopCheck：" + SecondMoveInfo.SLog + "阻挡气缸下降 ，最多等待1秒");
IOMove(IO_Type.SW_StopDown, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW_StopDown, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
//}
......@@ -153,18 +154,18 @@ namespace OnlineStore.DeviceLibrary
else
{
CheckLog("托盘检测：" + SecondMoveInfo.SLog + "阻挡气缸上升，等待SW_TrayCheck=1）");
IOMove(IO_Type.FL_StopCylinder_Down1, IO_VALUE.LOW);
IOMove(IO_Type.SW_StopDown, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW_StopDown, IO_VALUE.LOW));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW_TrayCheck, IO_VALUE.HIGH));
}
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_02_FixtureCheck))
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_StopCylinder2Down);
CheckLog("托盘检测：" + SecondMoveInfo.SLog + "FL阻挡1上升）");
IOMove(IO_Type.FL_StopCylinder_Down1, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.FL_StopCylinder_Down1, IO_VALUE.LOW));
}
//else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_02_FixtureCheck))
//{
// SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_StopCylinder2Down);
// CheckLog("托盘检测：" + SecondMoveInfo.SLog + "FL阻挡1上升）");
// IOMove(IO_Type.FL_StopCylinder_Down1, IO_VALUE.LOW);
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.FL_StopCylinder_Down1, IO_VALUE.LOW));
//}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_03_StopCylinder2Down))
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_04_Wait);
......@@ -485,6 +486,7 @@ namespace OnlineStore.DeviceLibrary
{
if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.HIGH))
{
MoveInfo.ShelfNoTray = false;
//定位工位有料架，直接开始入料
MoveInfo.NextMoveStep(LineMoveStep.FI_07_LocationCylinder_Up);
InLog("定位工位检测到料架： " + MoveInfo.SLog + " 缓冲阻挡上升， 定位气缸上升");
......@@ -524,6 +526,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(LineMoveStep.FI_10_AxisUpMove);
InLog("料架入库" + MoveInfo.SLog + "：上料轴开始慢速上升到P3点，等待检测到料盘");
MoveInfo.ShelfNoTray = false;
BatchAxisToP3();
}
#endregion
......@@ -873,7 +876,7 @@ namespace OnlineStore.DeviceLibrary
if (LastHeight <= 8) { LastHeight = 8; }
else
{
LastHeight = (int)Math.Ceiling(1F * LastHeight / 4) * 4;
LastHeight = (int)Math.Ceiling(1F * (LastHeight-2) / 4) * 4;
}
LogUtil.info(msg + ",归类为" + LastHeight);
return LastHeight;
......@@ -971,7 +974,7 @@ namespace OnlineStore.DeviceLibrary
}
}
}
if (NeedSaveParam)
if (NeedSaveParam&&LineManager.Line.runStatus>=LineRunStatus.HomeMoving&& LineManager.Line.CanProcessLine())
{
LogInfo(" 托盘【" + info.ToStr() + "】不需要出入库" );
}
......
source/DeviceLibrary/assemblyLine/MoveEquip.cs
......@@ -209,7 +209,7 @@ namespace OnlineStore.DeviceLibrary
}
public override void TimerProcess()
protected override void BaseTimerProcess()
{
BusyMoveProcess();
//判断流水线打开了才可以运行
......
source/DeviceLibrary/assemblyLine/ProvidingEquip.cs
......@@ -189,7 +189,7 @@ namespace OnlineStore.DeviceLibrary
runStatus = LineRunStatus.Wait;
}
public override void TimerProcess()
protected override void BaseTimerProcess()
{
BusyMoveProcess();
//判断流水线打开了才可以运行
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!