基类+板卡驱动修改

wells.liu

2020-07-03 e1ac4d0e483426d5a410b6b4ae04e819f59b621e

基类+板卡驱动修改

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

@@ -196,7 +196,7 @@

        public virtual async void SaveOriginImage(Bitmap map, Bitmap showImage, string imgSetId)
        {
            Task.Run(() =>
            await Task.Run(() =>
            {
                OnImageUpdated?.Invoke(this, showImage, imgSetId);
            });

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

@@ -26,9 +26,9 @@
        public abstract void ResetAlarm();
        public abstract ResponseMessage Run(IOperationConfig config);

        public void ExcuteMonitorInvok(DateTime dateTime, string invokeDevice, IDevice device, IMonitorSet monitorSet)
        public void ExcuteMonitorInvok(DateTime dateTime, string invokeDevice, IDevice device, IMonitorSet monitorSet, AsyncCallback OnMethodInvoked)
        {
            OnMonitorInvoke?.BeginInvoke(dateTime, invokeDevice, device, monitorSet, null, null);
            OnMonitorInvoke?.BeginInvoke(dateTime, invokeDevice, device, monitorSet, OnMethodInvoked, null);
        }

        public void ExcuteMonitorAlarm(DateTime dateTime, IDevice device, IWarningSet warningSet)
@@ -134,6 +134,10 @@
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(IORefrenceItemCollectionEditor), typeof(UITypeEditor))]
        public List<IORefrenceItem> PreCheckIOCollection { get; set; } = new List<IORefrenceItem>();
        [Category("IO操作配置")]
        [Description("超时设置，单位：ms")]
        [DisplayName("IO预检查超时")]
        public int PreCheckIOTimeout { get; set; } = 0;

        [Category("IO操作配置")]
        [DisplayName("IO输出定义集合")]
@@ -146,6 +150,10 @@
        [Description("IO确认定义集合")]
        [TypeConverter(typeof(CollectionCountConvert))]
        public List<IORefrenceItem> IOConfirmCollection { get; set; } = new List<IORefrenceItem>();
        [Category("IO操作配置")]
        [Description("超时设置，单位：ms")]
        [DisplayName("IO确认超时")]
        public int IOConfirmTimeout { get; set; } = 0;

        [Category("板卡运动配置")]
        [DisplayName("运动配置集合")]
@@ -153,6 +161,10 @@
        [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;

        public string GetDisplayText()
        {

 src/Bro.Device.GTSCard/GTSCardDriver.cs

@@ -23,7 +23,7 @@
        // 异常事件
        public Action<Exception> OnExceptionRaised;

        public GTSCardInitialConfig IConfig
        public GTSCardInitialConfig IIConfig
        {
            get
            {
@@ -77,7 +77,10 @@

        public override ResponseMessage Run(IOperationConfig config)
        {
            throw new NotImplementedException();
            ResponseMessage responseMessage = new ResponseMessage();


            return responseMessage;
        }
        #endregion

@@ -840,7 +843,7 @@
                        //    return tempNew[index].Value;
                        //}).ToList();

                        ExcuteMonitorInvok(DateTime.Now, monitorSet.InvokeDevice, this, monitorSet);
                        ExcuteMonitorInvok(DateTime.Now, monitorSet.InvokeDevice, this, monitorSet, OnMethodInvoked);
                    }
                }
            });