光幕触发修改为同步，消弭信号抖动问题 Excel导出测试

xcd

2020-07-15 d3a44f202c0b12cbac67c71129c3c4f480df55b9

 src/Bro.M071.Process/M071Process_MotionCard.cs

@@ -20,12 +20,18 @@
        const int FULLRESETTIME = 5;

        object machineStateLock = new object();
        //MachineState _machineStatePre = MachineState.Unknown;
        MachineState machineState = MachineState.Unknown;
        public MachineState MachineState
        {
            get => machineState;
            set
            {
                if (machineState == value)
                    return;

                //_machineStatePre = machineState;

                machineState = value;

                switch (machineState)
@@ -40,9 +46,10 @@

                        Task.Run(() =>
                        {
                            lock (machineStateLock)

                            while (MachineState == MachineState.Ready)
                            {
                                while (MachineState == MachineState.Ready)
                                lock (machineStateLock)
                                {
                                    SwitchLightGreen(true);
                                    Thread.Sleep(1000);
@@ -79,9 +86,9 @@
                        }
                        Task.Run(() =>
                        {
                            lock (machineStateLock)
                            while (MachineState == MachineState.Pause)
                            {
                                while (MachineState == MachineState.Pause)
                                lock (machineStateLock)
                                {
                                    SwitchLightYellow(true);
                                    SwitchLightGreen(true);
@@ -102,10 +109,11 @@
                        }
                        Task.Run(() =>
                        {
                            lock (machineStateLock)
                            while (MachineState == MachineState.Resetting)
                            {
                                while (MachineState == MachineState.Resetting)
                                lock (machineStateLock)
                                {

                                    SwitchLightYellow(true);
                                    Thread.Sleep(1000);
                                    SwitchLightYellow(false);
@@ -119,7 +127,36 @@
                }

                OnMachineStateChanged?.Invoke(machineState);

                //if (_machineStatePre == MachineState.Running && machineState == MachineState.Pause)
                //{
                //    Pause();
                //}
                //else if (_machineStatePre == MachineState.Pause && (machineState == MachineState.Running || machineState == MachineState.Ready))
                //{
                //    Resume();
                //}
            }
        }

        private void Pause()
        {
            #region 板卡暂停动作
            outputCtrlCard.SetImmediatePause();
            #endregion

            //_pauseHandle.WaitHandle.Reset();
            //_pauseHandle.WaitResult = true;
        }

        private void Resume(bool isResumeContinueMoving)
        {
            #region 板卡恢复动作
            outputCtrlCard.ResetImmediatePause(isResumeContinueMoving);
            #endregion

            //_pauseHandle.WaitHandle.Set();
            //_pauseHandle.WaitResult = false;
        }

        private void MotionCardSettingCheck()
@@ -185,30 +222,36 @@
            }
        }

        [ProcessMethod("MotionCardBase", "GotoReadyPosition", "运动到预备位置", InvokeType.TestInvoke)]
        public ProcessResponse GotoReadyPosition(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
        {
            MotionCardDefaultRun("GotoReadyPosition", ref opConfig, ref invokeDevice);

            LogAsync(DateTime.Now, "运动到预备位置完成", "");

            return new ProcessResponse(true);
        }

        [ProcessMethod("MotionCardBase", "Reset", "简单复位操作", InvokeType.TestInvoke)]
        public ProcessResponse Reset(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
        {
            //if (opConfig == null)
            //{
            //    var monitorSet = Config.MonitorSetCollection.FirstOrDefault(u => u.MethodCode == "Reset");
            //    if (monitorSet == null)
            //        throw new ProcessException("未配置默认复位操作");

            //    opConfig = monitorSet.OpConfig;
            //    if (opConfig == null)
            //        throw new ProcessException("未配置复位操作具体配置动作");

            //    if (invokeDevice == null)
            //    {
            //        invokeDevice = DeviceCollection.FirstOrDefault(u => u.Id == monitorSet.InvokeDevice);
            //        if (invokeDevice == null)
            //            throw new ProcessException("未配置复位操作执行设备");
            //    }
            //}

            if (IsSafetyBeamTrigged || IsSafetyDoorTrigged)
            if (ResetTimer == null)
            {
                LogAsync(DateTime.Now, $"{(IsSafetyDoorTrigged ? "安全门" : "")}{(IsSafetyBeamTrigged ? " 安全光线" : "")}触发中，复位失败", "");
                ResetTimer = new Timer(FullReset, null, -1, -1);
            }

            if (opConfig?.InputPara != null && opConfig.InputPara.Count > 0)
            {
                //大复位信号
                ResetTimer.Change(opConfig.InputPara[0] == 1 ? FULLRESETTIME * 1000 : -1, -1);

                if (opConfig.InputPara[0] == 0)
                    return new ProcessResponse(true);
            }

            if (!IsAllowedWork)
            {
                LogAsync(DateTime.Now, $"{SafetyMsg}，复位失败", "");
                return new ProcessResponse(false);
            }

@@ -216,23 +259,23 @@
            (invokeDevice as MotionCardBase).ResetAlarm();

            RaisedAlarm("");
            MachineState = MachineState.Ready;

            if (ResetTimer == null)
            if (MachineState != MachineState.Pause)
            {
                ResetTimer = new Timer(FullReset, null, -1, -1);
                MachineState = MachineState.Ready;
            }
            else
            {
                LogAsync(DateTime.Now, "设备暂停中，无法复位", "");
                return new ProcessResponse(true);
            }

            if (opConfig.InputPara.Count > 0)
            if (IsEmergencyStopped)
            {
                //大复位信号
                ResetTimer.Change(-1, opConfig.InputPara[0] == 1 ? FULLRESETTIME * 1000 : -1);
                RaisedAlarm("急停按钮未恢复，请执行大复位");
                MachineState = MachineState.Alarm;
                return new ProcessResponse(true);
            }

            //if (invokeDevice is MotionCardBase motionCard)
            //{
            //    motionCard.Run(opConfig);
            //}

            LogAsync(DateTime.Now, "普通复位动作完成", "");

@@ -255,28 +298,17 @@
        [ProcessMethod("MotionCardBase", "FullReset", "大复位操作", InvokeType.TestInvoke)]
        public ProcessResponse FullReset(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
        {
            //if (opConfig == null)
            //{
            //    var monitorSet = Config.MonitorSetCollection.FirstOrDefault(u => u.MethodCode == "FullReset");
            //    if (monitorSet == null)
            //        throw new ProcessException("未配置默认大复位操作");
            if (!IsAllowedWork)
            {
                LogAsync(DateTime.Now, $"{SafetyMsg}，大复位失败", "");
                return new ProcessResponse(false);
            }

            //    opConfig = monitorSet.OpConfig;
            //    if (opConfig == null)
            //        throw new ProcessException("未配置大复位操作具体配置动作");
            if (MachineState == MachineState.Pause)
            {
                Resume(false);
            }

            //    if (invokeDevice == null)
            //    {
            //        invokeDevice = DeviceCollection.FirstOrDefault(u => u.Id == monitorSet.InvokeDevice);
            //        if (invokeDevice == null)
            //            throw new ProcessException("未配置大复位操作执行设备");
            //    }
            //}

            //if (invokeDevice is MotionCardBase motionCard)
            //{
            //    motionCard.Run(opConfig);
            //}
            MachineState = MachineState.Resetting;
            MotionCardDefaultRun("FullReset", ref opConfig, ref invokeDevice);

@@ -285,8 +317,14 @@

            OnFullResetDone?.Invoke();

            isFullResetCovered = true;

            LogAsync(DateTime.Now, "大复位动作完成", "");

            RaisedAlarm("");
            MachineState = MachineState.Ready;

            GotoReadyPosition(null, null, null);

            return new ProcessResponse(true);
        }
@@ -296,12 +334,12 @@
        /// WaitHandle 暂停句柄  默认为非阻塞 可执行
        /// WaitResult 暂停标志 true 正常执行  false 暂停中
        /// </summary>
        ManualWaitConfirm _pauseHandle = new ManualWaitConfirm()
        {
            WaitHandle = new ManualResetEvent(true),
            WaitResult = true,
        };
        MachineState _machineStateBeforePause = MachineState.Unknown;
        //ManualWaitConfirm _pauseHandle = new ManualWaitConfirm()
        //{
        //    WaitHandle = new ManualResetEvent(true),
        //    WaitResult = true,
        //};

        List<MachineState> _statesAllowPause = new List<MachineState>() { MachineState.Running, MachineState.Ready, MachineState.Pause };
        [ProcessMethod("", "SwitchJobStatus", "流程状态切换", InvokeType.TestInvoke)]
        public ProcessResponse SwitchJobStatus(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
@@ -319,66 +357,53 @@
                throw new ProcessException("未获取板卡设备");

            bool? isToPause = null; //true 暂停 false 继续
            if (opConfig.InputPara != null && opConfig.InputPara.Count > 0)

            if (opConfig.InputPara[0] == 10)
            {
                isToPause = opConfig.InputPara[0] == 1;
                isToPause = false;
            }
            else if (opConfig.InputPara[0] == 11)
            {
                isToPause = true;
            }

            if (isToPause == null)
            {
                if (!_pauseHandle.WaitResult)
                {
                    #region 板卡暂停动作
                    motionDevice.SetImmediatePause();
                    #endregion

                    _pauseHandle.WaitHandle.Reset();
                    _pauseHandle.WaitResult = true;
                    _machineStateBeforePause = MachineState;
                    MachineState = MachineState.Pause;
                }
                else if (!_pauseHandle.WaitResult)
                {
                    #region 板卡恢复动作
                    motionDevice.ResetImmediatePause();
                    #endregion

                    _pauseHandle.WaitHandle.Set();
                    _pauseHandle.WaitResult = false;
                    MachineState = _machineStateBeforePause;
                }
                IsManualPaused = !IsManualPaused;
            }
            else
            {
                if (isToPause.Value)
                {
                    if (!_pauseHandle.WaitResult)
                    {
                        #region 板卡暂停动作
                        motionDevice.SetImmediatePause();
                        #endregion
                //if (isToPause.Value)
                //{
                //    if (!_pauseHandle.WaitResult)
                //    {
                //        //#region 板卡暂停动作
                //        //motionDevice.SetImmediatePause();
                //        //#endregion

                        _pauseHandle.WaitHandle.Reset();
                        _pauseHandle.WaitResult = true;
                        MachineState = MachineState.Pause;
                    }
                }
                else
                {
                    if (!_pauseHandle.WaitResult)
                    {
                        #region 板卡恢复动作
                        motionDevice.ResetImmediatePause();
                        #endregion
                //        //_pauseHandle.WaitHandle.Reset();
                //        //_pauseHandle.WaitResult = true;
                //        MachineState = MachineState.Pause;
                //    }
                //}
                //else
                //{
                //    if (!_pauseHandle.WaitResult)
                //    {
                //        //#region 板卡恢复动作
                //        //motionDevice.ResetImmediatePause();
                //        //#endregion

                        _pauseHandle.WaitHandle.Set();
                        _pauseHandle.WaitResult = false;
                        MachineState = _machineStateBeforePause;
                    }
                }
                //        //_pauseHandle.WaitHandle.Set();
                //        //_pauseHandle.WaitResult = false;
                //        MachineState = _machineStatePre;
                //    }
                //}

                IsManualPaused = isToPause.Value;
            }

            return new ProcessResponse(_pauseHandle.WaitResult);
            return new ProcessResponse(IsManualPaused);
        }

        ////[ProcessMethod("", "PauseJob", "暂停流程", InvokeType.TestInvoke)]
@@ -582,24 +607,98 @@
            }
        }

        bool IsAllowedWork
        {
            get => !(IsSafetyBeamTrigged || IsSafetyDoorTrigged || IsEmergencyStopped);
        }

        string SafetyMsg
        {
            get => $"{(IsSafetyBeamTrigged ? "安全光幕" : "")}{(IsSafetyDoorTrigged ? " 安全门" : "")}{(IsEmergencyStopped ? " 急停按钮" : "")}触发中";
        }

        #region 安全门 & 安全光线
        bool isSafetyDoorTrigged = false;
        bool isSafetyBeamTrigged = false;
        bool isManualPaused = false;

        public bool IsSafetyDoorTrigged
        {
            get => !Config.IsSafetyDoorBlocked && isSafetyDoorTrigged;
            set => isSafetyDoorTrigged = value;
            get => (!Config.IsSafetyDoorBlocked) && isSafetyDoorTrigged;
            set
            {
                isSafetyDoorTrigged = value;
                CheckMachinePauseState();
            }
        }
        public bool IsSafetyBeamTrigged
        {
            get => !Config.IsSafetyBeamBlocked && isSafetyBeamTrigged;
            set => isSafetyBeamTrigged = value;
            get => (!Config.IsSafetyBeamBlocked) && isSafetyBeamTrigged;
            set
            {
                isSafetyBeamTrigged = value;
                CheckMachinePauseState();
            }
        }

        public bool IsManualPaused
        {
            get => isManualPaused;
            set
            {
                isManualPaused = value;
                CheckMachinePauseState();
            }
        }

        ManualResetEventSlim _pausedHandle = new ManualResetEventSlim(true);
        MachineState _machineStateBeforePause = MachineState.Unknown;
        private void CheckMachinePauseState()
        {
            //await Task.Run(() =>
            {
                if (IsMachinePaused)
                {
                    if (MachineState == MachineState.Ready || MachineState == MachineState.Running)
                    {
                        _machineStateBeforePause = MachineState;
                    }
                    MachineState = MachineState.Pause;
                    _pausedHandle.Reset();

                    if (_machineStateBeforePause == MachineState.Running)
                    {
                        Pause();
                    }
                }
                else
                {
                    if (MachineState == MachineState.Pause)
                    {
                        if (_machineStateBeforePause == MachineState.Running)
                        {
                            Resume(true);
                        }
                        _pausedHandle.Set();
                        RaisedAlarm("");
                        MachineState = _machineStateBeforePause;
                    }
                }
            }
            //);
        }

        public bool IsMachinePaused
        {
            get => IsSafetyBeamTrigged || IsSafetyDoorTrigged || IsManualPaused;
        }

        [ProcessMethod("", "SafetyDoorSignal", "安全门信号监控，正常ON，OFF时报警", InvokeType.TestInvoke)]
        public ProcessResponse SafetyDoorSignal(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
        {
            //if (MachineState != MachineState.Running && MachineState != MachineState.Pause)
            //    return new ProcessResponse(true);

            if (opConfig.InputPara == null || opConfig.InputPara.Count == 0)
                throw new ProcessException("安全门监控未配置输入信号");

@@ -608,7 +707,6 @@
            if (IsSafetyDoorTrigged)
            {
                RaisedAlarm("安全门未正常关闭");
                MachineState = MachineState.Alarm;
            }

            return new ProcessResponse(true);
@@ -625,6 +723,43 @@
            if (IsSafetyBeamTrigged)
            {
                RaisedAlarm("安全光线被遮挡");
            }

            return new ProcessResponse(true);
        }
        #endregion

        #region 急停
        bool isEmergencyStopped = false;
        bool isFullResetCovered = true;
        public bool IsEmergencyStopped
        {
            get => isEmergencyStopped && isFullResetCovered;
            set
            {
                if (value)
                {
                    isFullResetCovered = false;
                    isEmergencyStopped = true;
                }
                else
                {
                    isEmergencyStopped = false;
                }
            }
        }

        [ProcessMethod("", "EmergencyStop", "急停按钮被拍下", InvokeType.TestInvoke)]
        public ProcessResponse EmergencyStop(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
        {
            if (opConfig.InputPara == null || opConfig.InputPara.Count == 0)
                throw new ProcessException("急停按钮未配置输入信号");

            IsEmergencyStopped = opConfig.InputPara[0] == 0;

            if (isEmergencyStopped)
            {
                RaisedAlarm("急停按钮被拍下");
                MachineState = MachineState.Alarm;
            }