From 7971d855ba2cf9772b46a7f67e2b669c0afcb91b Mon Sep 17 00:00:00 2001
From: patrick <patrick.xu@broconcentric.com>
Date: 星期二, 22 十月 2019 11:30:35 +0800
Subject: [PATCH] 1. 添加标定操作及界面 2. 修改配置界面方法调用参数 3. SeerAGV添加电池信息监听 4. 添加AGV电池充电操作 5. 修改AGV状态变化操作，添加操作锁
---
src/A032.Process/ProcessControl.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/A032.Process/ProcessControl.cs b/src/A032.Process/ProcessControl.cs
index 7ceda2f..dfd85ab 100644
--- a/src/A032.Process/ProcessControl.cs
+++ b/src/A032.Process/ProcessControl.cs
@@ -263,7 +263,7 @@
});
}
- Dictionary<string, MethodInfo> InvokeMethodDict = new Dictionary<string, MethodInfo>();
+ //Dictionary<string, MethodInfo> InvokeMethodDict = new Dictionary<string, MethodInfo>();
public List<ProcessMethodAttribute> CollectProcessMethods()
{
List<ProcessMethodAttribute> resultList = new List<ProcessMethodAttribute>();
@@ -275,7 +275,7 @@
if (attr != null)
{
resultList.Add(attr);
- InvokeMethodDict[attr.MethodCode] = m;
+ //InvokeMethodDict[attr.MethodCode] = m;
}
});
@@ -289,19 +289,16 @@
StationConfig = LoadStationConfig(configPath);
#region 涓埆閰嶇疆鐨勭壒鍒鐞�
-
#endregion
_warningRemains.CollectionChanged -= _warningRemains_CollectionChanged;
_warningRemains.CollectionChanged += _warningRemains_CollectionChanged;
InitialPLCs();
- InitialRobots();
InitialAGVs();
+ InitialRobots();
InitialCameras();
-
InitialAGVBindUnit();
-
InitialMachineTrayNums();
AutoFacRegister();
@@ -393,6 +390,7 @@
agv.OnAGVPositoinChanged = OnAGVPositionChanged;
agv.OnAGVTaskStatusChanged = OnAGVTaskStatusChanged;
+ agv.OnAGVBatteryLvlChanged = OnAGVBatterLvlChanged;
});
}
@@ -542,6 +540,11 @@
{
InitialHalconTool(c as IHalconToolPath);
});
+
+ Config.ProcessOpConfigDict.Values.ToList().ForEach(c =>
+ {
+ InitialHalconTool(c as IHalconToolPath);
+ });
#endregion
}
--
Gitblit v1.8.0