Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

xcd

2020-07-08 f39f00ee0ee41e169fa24ccb85b4af36090dbd25

 src/Bro.Common.Device/DeviceBase/MotionCardBase.cs

@@ -26,6 +26,50 @@
        public abstract ResponseMessage MoveToPoint(IOperationConfig opConfig);
        public abstract void ResetAlarm();
        public abstract ResponseMessage Run(IOperationConfig config);
        /// <summary>
        /// 清除状态
        /// </summary>
        /// <param name="startAxisIndex">起始轴号</param>
        /// <param name="count">数量</param>
        /// <returns></returns>
        public abstract bool ClearStatus(int startAxisIndex, int count);

        /// <summary>
        /// 读取轴状态
        /// </summary>
        /// <param name="axisNum">轴号</param>
        /// <returns></returns>
        public abstract int GetAxisStatus(int axisNum);

        /// <summary>
        /// 位置清零
        /// </summary>
        /// <param name="startAxisIndex">起始轴号</param>
        /// <param name="count">数量</param>
        /// <returns></returns>
        public abstract bool PositionReset(int startAxisIndex, int count);

        public abstract bool AllAxisOn();

        public abstract bool AllAxisOff();

        public abstract Task<bool> AxisOnAsync(int axisNum);

        public abstract Task<bool> AxisOffAsync(int axisNum);

        /// <summary>
        /// 单个轴 运动(点到点 jog 回零...）
        /// </summary>
        /// <param name="optionPara">运动参数对象</param>
        public abstract Task<bool> SingleAxisMoving(MovingOption optionPara);

        /// <summary>
        /// 某个轴运动停止
        /// </summary>
        /// <param name="axisNum">轴号</param>
        /// <param name="option">0表示平滑停止，1表示紧急停止</param>
        /// <returns></returns>
        public abstract Task<bool> MoveStop(int axisNum, int option);

        public virtual void ExcuteMonitorInvoke(DateTime dateTime, string invokeDevice, IDevice device, IMonitorSet monitorSet)
        {
@@ -47,9 +91,17 @@
            }
        }

        /// <summary>
        /// IO的监听值
        /// </summary>
        public List<IOItem> MonitorValues { get; set; } = new List<IOItem>();

        public abstract void WriteOutput(short cardNum, short index, IOValue value);
        /// <summary>
        /// 轴的运动状态值
        /// </summary>
        public List<AxisMovingStatus> AxisMovingOptionValues { get; set; } = new List<AxisMovingStatus>();

        public abstract void WriteOutput(short index, IOValue value);
    }

    public class MotionCardInitialConfigBase : InitialConfigBase, IMonitorConfig
@@ -147,6 +199,7 @@
        }
    }

    [Device("MotionOperationSet", "运动操作配置基类", EnumHelper.DeviceAttributeType.OperationConfig)]
    public class MotionCardOperationSet : IComplexDisplay
    {
        [Category("IO操作配置")]
@@ -177,16 +230,19 @@
        [DisplayName("IO确认超时")]
        public int IOConfirmTimeout { get; set; } = 0;

        //[Category("板卡运动配置")]
        //[DisplayName("运动配置集合")]
        //[Description("MovingOps：运动配置集合")]
        //[TypeConverter(typeof(CollectionCountConvert))]
        //[Editor(typeof(ComplexCollectionEditor<MovingOption>), typeof(UITypeEditor))]
        //public List<MovingOption> MovingOps { get; set; } = new List<MovingOption>();
        [Category("板卡运动配置")]
        [DisplayName("运动配置集合")]
        [Description("MovingOps：运动配置集合")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<MovingOption>), typeof(UITypeEditor))]
        public List<MovingOption> MovingOps { get; set; } = new List<MovingOption>();
        [Category("板卡运动配置")]
        [Description("超时设置，单位：ms")]
        [DisplayName("运动超时")]
        public int MovingTimeout { get; set; } = 0;
        [TypeConverter(typeof(ComplexObjectConvert))]
        [Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
        public MotionOperationCollection MotionOperationCollection { get; set; } = new MotionOperationCollection();


        public string GetDisplayText()
        {
@@ -220,19 +276,34 @@
            }

            string moving = "";
            MovingOps.ForEach(i =>
            {
                moving += i.GetDisplayText() + " ";
            });
            if (moving != "")
            {
                moving = " 运动：" + moving;
            }
            //MovingOps.ForEach(i =>
            //{
            //    moving += i.GetDisplayText() + " ";
            //});
            //if (moving != "")
            //{
            //    moving = " 运动：" + moving;
            //}

            return (preCheck + output + confirm + moving).Trim();
        }
    }

    public class MotionOperationCollection : OperationConfigBase, IComplexDisplay
    {
        [Category("运动配置")]
        [DisplayName("运动配置集合")]
        [Description("MovingOps：运动配置集合")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<MovingOption>), typeof(UITypeEditor))]
        public List<MovingOption> MovingOps { get; set; } = new List<MovingOption>();

        public string GetDisplayText()
        {
            return $"{string.Join(" ", MovingOps.Select(u => u.GetDisplayText()))}";
        }
    }

    //[Device("MotionCardOperationConfigCollection", "板卡操作配置基类集合", EnumHelper.DeviceAttributeType.OperationConfig)]
    //public class MotionCardOperationConfigCollection : OperationConfigBase
    //{