From 6428fad15dbe79e30a48ffc9aabe31e03a45426c Mon Sep 17 00:00:00 2001 From: patrick <patrick.xu@broconcentric.com> Date: 星期四, 05 十二月 2019 12:50:13 +0800 Subject: [PATCH] 1. 添加部分log信息 2. 修改部分机器人动作流程 3. 开放OperationConfig的InputData参数 --- src/Bro.Device.SeerAGV/SeerAGVConfig.cs | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/src/Bro.Device.SeerAGV/SeerAGVConfig.cs b/src/Bro.Device.SeerAGV/SeerAGVConfig.cs index 989fea4..3866776 100644 --- a/src/Bro.Device.SeerAGV/SeerAGVConfig.cs +++ b/src/Bro.Device.SeerAGV/SeerAGVConfig.cs @@ -36,6 +36,38 @@ [Category("鐩戝惉閰嶇疆")] [Description("鏄惁閲囩敤绠�鍗曠洃鍚ā寮忋�倀rue锛氱畝鍗曟ā寮忥紝鍙幏鍙栦换鍔$姸鎬侊紱false锛氬叏閮ㄦā寮忥紝鑾峰彇浠诲姟鎵�鏈変俊鎭�")] public bool IsSimpleMonitor { get; set; } = true; + + private float batteryLvlToCharge = 0.1f; + [Category("鍏呯數閰嶇疆")] + [Description("鍏呯數鐢垫睜瀹归噺锛岀數姹犲閲忎綆浜庤鍊兼椂闇�瑕佸厖鐢�")] + public float BatteryLvlToCharge + { + get => batteryLvlToCharge; + set + { + if (value >= 1 || value <= 0) + { + value = 0.1f; + } + batteryLvlToCharge = value; + } + } + + private float batteryLvlChargeDone = 0.9f; + [Category("鍏呯數閰嶇疆")] + [Description("鍏呯數瀹屾垚鐢垫睜瀹归噺锛岀數姹犲閲忛珮浜庤鍊兼椂纭鍏呯數瀹屾垚")] + public float BatteryLvlChargeDone + { + get => batteryLvlChargeDone; + set + { + if (value >= 1 || value <= 0) + { + value = 0.9f; + } + batteryLvlChargeDone = value; + } + } } [Device("SeerAGV", "SeerAGV", EnumHelper.DeviceAttributeType.OperationConfig)] @@ -44,7 +76,7 @@ } - public class SeerMessage + public class SeerMessage : IComplexDisplay { private byte[] frame = null; public byte[] Frame @@ -119,6 +151,11 @@ return msg; } + + public string GetDisplayText() + { + return ""; + } } //public enum RobotPort @@ -138,6 +175,8 @@ CancelTask = 0x0BBB, PauseTask = 0x0BB9, TaskOrder = 0x0BEB, + + QueryBattery = 0x03EF, } public enum AGVTaskStatus -- Gitblit v1.8.0