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/AGVBindUnit.cs | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/A032.Process/AGVBindUnit.cs b/src/A032.Process/AGVBindUnit.cs
index 507d8c8..4aa8d0b 100644
--- a/src/A032.Process/AGVBindUnit.cs
+++ b/src/A032.Process/AGVBindUnit.cs
@@ -191,6 +191,35 @@
//TaskList.CollectionChanged += TaskList_CollectionChanged;
}
+ object agvStatusLock = new object();
+ public bool SetAGVStatus(TaskStatus status)
+ {
+ lock (agvStatusLock)
+ {
+ switch (status)
+ {
+ case TaskStatus.Available:
+ break;
+ case TaskStatus.Running:
+ if (AGVStatus == TaskStatus.Available)
+ {
+ AGVStatus = status;
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ case TaskStatus.Warning:
+ break;
+ default:
+ break;
+ }
+
+ AGVStatus = status;
+ return true;
+ }
+ }
//private void TaskList_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
//{
// if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add)
@@ -288,9 +317,9 @@
{
ProcessConfig config = scope.Resolve<ProcessConfig>();
- config.RobotConfigCollection.ForEach(plc =>
+ config.RobotConfigCollection.ForEach(robot =>
{
- _hash[plc.ID] = plc.Name;
+ _hash[robot.ID] = robot.Name;
});
}
}
@@ -304,9 +333,9 @@
{
ProcessConfig config = scope.Resolve<ProcessConfig>();
- config.CameraConfigCollection.ForEach(plc =>
+ config.CameraConfigCollection.ForEach(camera =>
{
- _hash[plc.ID] = plc.Name;
+ _hash[camera.ID] = camera.Name;
});
}
}
--
Gitblit v1.8.0