From 6ca2f993973295e4da82634761da0e5c00e0ef8e Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 08:54:27 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Model/Helper/EnumHelper.cs | 133 +++++++++++++++++++++++++++++--------------
1 files changed, 89 insertions(+), 44 deletions(-)
diff --git a/src/Bro.Common.Model/Helper/EnumHelper.cs b/src/Bro.Common.Model/Helper/EnumHelper.cs
index 905013c..f22bca9 100644
--- a/src/Bro.Common.Model/Helper/EnumHelper.cs
+++ b/src/Bro.Common.Model/Helper/EnumHelper.cs
@@ -392,6 +392,26 @@
Measuring = 21,
MeasureDoneOK = 22,
MeasureDoneNG = 23,
+
+ CanStretchLeft = 41,
+ CanStretchRight = 42,
+ CanStretchTop = 43,
+ CanStretchBottom = 44,
+
+ CanStretchLeftUpperCorner = 45,
+ CanStretchLeftLowerCorner = 46,
+ CanStretchRightUpperCorner = 47,
+ CanStretchRightLowerCorner = 48,
+
+ StretchingLeft = 31,
+ StretchingRight = 32,
+ StretchingTop = 33,
+ StretchingBottom = 34,
+
+ StretchingLeftUpperCorner = 35,
+ StretchingLeftLowerCorner = 36,
+ StretchingRightUpperCorner = 37,
+ StretchingRightLowerCorner = 38,
}
public enum MouseState
@@ -400,15 +420,21 @@
HoverElement = 2,
InSideElement = 3,
+ MoveElement = 4,
+
StretchingLeft = 11,
StretchingRight = 12,
- StretchingUp = 13,
- StretchingDown = 14,
- MoveElement = 15,
+ StretchingTop = 13,
+ StretchingBottom = 14,
+
+ StretchingLeftUpperCorner = 15,
+ StretchingLeftLowerCorner = 16,
+ StretchingRightUpperCorner =17,
+ StretchingRightLowerCorner = 18,
New = 21,
Editing = 22,
- SelectedElement = 23,
+ //SelectedElement = 23,
MovingAll = 31,
@@ -447,7 +473,7 @@
/// <summary>
/// 椹揪/杩愬姩鏉垮崱杩愯妯″紡
/// </summary>
- public enum MotorMoveMode
+ public enum MotionMode
{
/// <summary>
/// 鏅�氱偣浣嶈繍鍔�
@@ -523,44 +549,26 @@
}
/// <summary>
- /// 椹揪IO瀹氫箟绫诲瀷
+ /// IO棰勫畾涔夌被鍨� 涓昏閽堝杈撳嚭
/// </summary>
- public enum MotorIODefine
+ public enum IOPrestatement
{
- Nothing,
- InputStartLeft,
- InputStartRight,
- InputCurtainLeft,
- InputCurtainRight,
- InputSafeDoor,
- InputEmergency,
- InputReset,
- InputScrew1,
- InputScrew2,
- InputSuckLeft,
- InputSuckRight,
- InputSuckXYZ,
- InputCylinderLeftLimitFront,
- InputCylinderLeftLimitBack,
- InputCylinderRightLimitFront,
- InputCylinderRightLimitBack,
+ [Description("鑷畾涔�")]
+ Customized = 0,
+ [Description("鎸囩ず鐏�-榛�")]
+ Light_Yellow = 1,
+ [Description("鎸囩ず鐏�-缁�")]
+ Light_Green = 2,
+ [Description("鎸囩ず鐏�-绾�")]
+ Light_Red = 3,
+ [Description("铚傞福鍣�")]
+ Beep = 4,
+ [Description("鐓ф槑鐏�")]
+ Light = 5,
- OutputYellow,
- OutputGreen,
- OutputRed,
- OutputBeep,
- OutputLight,
- OutputMotorPower,
- OutputInitOK,
- OutputZLock,
- OutputLeftCylinder,
- OutputRightCylinder,
- OutputLeftSuck,
- OutputRightSuck,
- OutputScrewBlow,
- OutputCamera,
- OutputScrewSuck,
+ [Description("鎬ュ仠")]
+ EmergencyStop = 99,
}
/// <summary>
@@ -587,12 +595,49 @@
/// <summary>
/// 杩愬姩鏉垮崱 IO 绫诲瀷锛圛N OUT锛�
/// </summary>
- public enum IOModel
+ public enum IOType
{
- [Description("In杈撳叆")]
- In = 0,
- [Description("Out杈撳嚭")]
- Out = 1
+ [Description("INPUT")]
+ INPUT = 0,
+ [Description("OUTPUT")]
+ OUTPUT = 1
+ }
+
+ public enum IOValue
+ {
+ [Description("鍏抽棴")]
+ FALSE = 0,
+ [Description("寮�鍚�")]
+ TRUE = 1,
+ [Description("鍙嶈浆")]
+ REVERSE = 2,
+ }
+
+ /// <summary>
+ /// PubSubCenter浜嬩欢涓績鐨勬秷鎭被鍨�
+ /// </summary>
+ public enum PubSubCenterMessageType
+ {
+ /// <summary>
+ /// 杩愯鐣岄潰鏇存柊浜у搧涓嬫媺
+ /// </summary>
+ [Description("鏇存柊浜у搧涓嬫媺")]
+ UpdateProductionCodes,
+ ///// <summary>
+ ///// 鏇存柊鏁版嵁
+ ///// </summary>
+ //[Description("鏇存柊鏁版嵁")]
+ //UpdateData,
+ }
+
+ public enum MachineState
+ {
+ Unknown,
+ Ready,
+ Running,
+ Alarm,
+ Pause,
+ Resetting,
}
}
}
--
Gitblit v1.8.0