From f9c7928bff92596686e05a15fef21d499e954088 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期一, 06 七月 2020 18:17:41 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Model/Helper/EnumHelper.cs | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/Bro.Common.Model/Helper/EnumHelper.cs b/src/Bro.Common.Model/Helper/EnumHelper.cs
index 52c5349..fdbb5b7 100644
--- a/src/Bro.Common.Model/Helper/EnumHelper.cs
+++ b/src/Bro.Common.Model/Helper/EnumHelper.cs
@@ -447,7 +447,7 @@
/// <summary>
/// 椹揪/杩愬姩鏉垮崱杩愯妯″紡
/// </summary>
- public enum MotorMoveMode
+ public enum MotionMode
{
/// <summary>
/// 鏅�氱偣浣嶈繍鍔�
@@ -532,9 +532,9 @@
[Description("鎸囩ず鐏�-榛�")]
Light_Yellow = 1,
- [Description("鎸囩ず鐏�-绾�")]
- Light_Green = 2,
[Description("鎸囩ず鐏�-缁�")]
+ Light_Green = 2,
+ [Description("鎸囩ず鐏�-绾�")]
Light_Red = 3,
[Description("铚傞福鍣�")]
Beep = 4,
@@ -577,6 +577,16 @@
OUTPUT = 1
}
+ public enum IOValue
+ {
+ [Description("鍏抽棴")]
+ FALSE = 0,
+ [Description("寮�鍚�")]
+ TRUE = 1,
+ [Description("鍙嶈浆")]
+ REVERSE = 2,
+ }
+
/// <summary>
/// PubSubCenter浜嬩欢涓績鐨勬秷鎭被鍨�
/// </summary>
@@ -593,5 +603,15 @@
//[Description("鏇存柊鏁版嵁")]
//UpdateData,
}
+
+ public enum MachineState
+ {
+ Unknown,
+ Ready,
+ Running,
+ Alarm,
+ Pause,
+ Resetting,
+ }
}
}
--
Gitblit v1.8.0