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/Bro.Device.SeerAGV/SeerAGVConfig.cs | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/src/Bro.Device.SeerAGV/SeerAGVConfig.cs b/src/Bro.Device.SeerAGV/SeerAGVConfig.cs index 67482a1..a094f0c 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)] @@ -62,7 +94,7 @@ } public int SyncHead { get; set; } = 0x5A; - public int Version { get; set; } + public int Version { get; set; } = 0x01; public int SeqNum { get; set; } public int DataLength { get; set; } public int TypeCode { get; set; } @@ -138,6 +170,8 @@ CancelTask = 0x0BBB, PauseTask = 0x0BB9, TaskOrder = 0x0BEB, + + QueryBattery = 0x2AFF, } public enum AGVTaskStatus -- Gitblit v1.8.0