From 1161ebd25831a44067b7272df348d93c6f85a6c0 Mon Sep 17 00:00:00 2001 From: wells <123> Date: 星期六, 11 七月 2020 16:53:49 +0800 Subject: [PATCH] 板卡修复 --- src/Bro.Device.GTSCard/GTSCardDriver.cs | 789 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 591 insertions(+), 198 deletions(-) diff --git a/src/Bro.Device.GTSCard/GTSCardDriver.cs b/src/Bro.Device.GTSCard/GTSCardDriver.cs index 5a562fe..c472ba4 100644 --- a/src/Bro.Device.GTSCard/GTSCardDriver.cs +++ b/src/Bro.Device.GTSCard/GTSCardDriver.cs @@ -18,12 +18,12 @@ namespace Bro.Device.GTSCard { [Device("GTSCard", "鍥洪珮鏉垮崱", EnumHelper.DeviceAttributeType.Device)] - public class GTSCardDriver : DeviceBase, IMonitor, IMotion + public class GTSCardDriver : MotionCardBase { // 寮傚父浜嬩欢 - public Action<Exception> OnExceptionRaised; + //public Action<Exception> OnExceptionRaised; - public GTSCardInitialConfig IConfig + public GTSCardInitialConfig IIConfig { get { @@ -37,14 +37,36 @@ /// </summary> bool _isResetting = false; + /// <summary> + /// 鏄惁鏆傚仠涓� + /// </summary> + bool _isPause = false; + + /// <summary> + /// 杩愬姩杞寸珛鍗虫殏鍋� + /// </summary> + Dictionary<int, ManualResetEvent> axisImmediatePauseHandleDict = new Dictionary<int, ManualResetEvent>(); + + //Dictionary<int, CancellationTokenSource> axisMoveCancelDict = new Dictionary<int, CancellationTokenSource>(); + public void SetResetFlag(bool isReset) { _isResetting = isReset; } - public List<AxisInfo> GetCurrentAxisInfo(params string[] axisName) + public override List<AxisInfo> GetCurrentAxisInfo(params string[] axisName) { - throw new NotImplementedException(); + List<AxisInfo> axisInfos = new List<AxisInfo>(); + IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ForEach(axisSetting => + { + AxisInfo axisInfo = new AxisInfo(); + axisInfo.AxisName = axisSetting.AxisName; + var axisMovingStatus = AxisStatusList.FirstOrDefault(u => u.AxisIndex == axisSetting.AxisIndex); + axisInfo.AxisLocation = axisMovingStatus == null ? 0 : Convert.ToDouble(axisMovingStatus.CurPosition); + + axisInfos.Add(axisInfo); + }); + return axisInfos; } #region DeviceBase @@ -52,27 +74,184 @@ protected override void Init() { InitialMotionCard(); + axisImmediatePauseHandleDict = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ToDictionary(a => a.AxisIndex, a => new ManualResetEvent(true)); + //axisMoveCancelDict = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ToDictionary(a => a.AxisIndex, a => new CancellationTokenSource()); + + //axisMoveCancelDict.Values.ToList().ForEach(c => + //{ + // c = new CancellationTokenSource(); + //}); } protected override void Pause() { - throw new NotImplementedException(); + } protected override void Resume() { - throw new NotImplementedException(); + } protected override void Start() { AllAxisOn(); + + base.Start(); } protected override void Stop() { AllMoveStop(); AllAxisOff(); + } + + /// <summary> + /// 璁惧 杩愯锛堟墽琛� 鏉垮崱绯诲垪鐨勬搷浣滅殑 闆嗗悎锛� + /// </summary> + /// <param name="config"></param> + /// <returns></returns> + public override ResponseMessage Run(IOperationConfig config) + { + ResponseMessage responseMessage = new ResponseMessage(); + if (config is MotionCardOperationConfigBase motionCardOperationConfig) + { + foreach (var operationSet in motionCardOperationConfig.OperationCollection) + { + responseMessage = RunOperationSet(operationSet); + if (!responseMessage.Result) + { + return responseMessage; + } + } + } + return responseMessage; + } + + /// <summary> + /// 鎵ц 涓�涓郴鍒楃殑鎿嶄綔 + /// </summary> + private ResponseMessage RunOperationSet(MotionCardOperationSet operationSet) + { + ResponseMessage responseMessage = new ResponseMessage(); + // 1.棰勬鏌� + if (CurrentState == DeviceState.DSOpen) + { + foreach (var preCheck in operationSet.PreCheckIOCollection) + { + int timeout = operationSet.PreCheckIOTimeout; + IOValue? ioData = null; + while (CurrentState == DeviceState.DSOpen) + { + Thread.Sleep(10); + ioData = MonitorValues.FirstOrDefault(u => u.IONum == preCheck.IOItem.IONum && u.IOType == preCheck.IOItem.IOType)?.Value;//IO 鏄紑銆佸叧 浠嶮onitorValues 鑾峰彇 + timeout -= 10; + if (preCheck.CheckValue == ioData || (operationSet.PreCheckIOTimeout > 0 && timeout < 0)) + { + break; + } + } + + if (preCheck.CheckValue != ioData) + { + responseMessage.Result = false; + responseMessage.Message = $"棰勬鏌ヤ笉閫氳繃锛岄厤缃細{preCheck.GetDisplayText()}锛屽綋鍓嶅�硷細{ioData}"; + return responseMessage; + } + } + } + + // 2.鏉垮崱杩愬姩 + if (CurrentState == DeviceState.DSOpen) + { + responseMessage = MoveToPoint(new MotionOperationCollection() { MovingOps = operationSet.MovingOps }); + if (!responseMessage.Result) + { + return responseMessage; + } + } + + + // 3.IO杈撳嚭 涓嶉渶瑕佽秴鏃� + if (CurrentState == DeviceState.DSOpen) + { + foreach (var ioOutput in operationSet.IOOutputCollection) + { + var ioData = MonitorValues.FirstOrDefault(u => u.IONum == ioOutput.IOItem.IONum && u.IOType == ioOutput.IOItem.IOType)?.Value;//IO 鏄紑銆佸叧 浠嶮onitorValues 鑾峰彇 + if (ioOutput.CheckValue != ioData) + { + responseMessage.Result = false; + responseMessage.Message = $"IO杈撳嚭涓嶉�氳繃锛岄厤缃細{ioOutput.GetDisplayText()}锛屽綋鍓嶅�硷細{ioData}"; + return responseMessage; + } + } + } + + // 4.IO纭 + if (CurrentState == DeviceState.DSOpen) + { + foreach (var ioConfirm in operationSet.IOConfirmCollection) + { + int timeout = operationSet.IOConfirmTimeout; + IOValue? ioData = null; + while (CurrentState == DeviceState.DSOpen) + { + Thread.Sleep(10); + ioData = MonitorValues.FirstOrDefault(u => u.IONum == ioConfirm.IOItem.IONum && u.IOType == ioConfirm.IOItem.IOType)?.Value;//IO 鏄紑銆佸叧 浠嶮onitorValues 鑾峰彇 + timeout -= 10; + if (ioConfirm.CheckValue == ioData || (operationSet.IOConfirmTimeout > 0 && timeout < 0)) + { + break; + } + } + + if (ioConfirm.CheckValue != ioData) + { + responseMessage.Result = false; + responseMessage.Message = $"IO纭涓嶉�氳繃锛岄厤缃細{ioConfirm.GetDisplayText()}锛屽綋鍓嶅�硷細{ioData}"; + return responseMessage; + } + } + } + + return responseMessage; + } + #endregion + + #region ImmediatePause + /// <summary> + /// 鍚姩绔嬪嵆鏆傚仠 + /// </summary> + public override void SetImmediatePause() + { + if (!_isResetting) + { + var immediatePauseAxis = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled && a.IsImmediatePause).Select(u => u.AxisIndex).ToList(); + + immediatePauseAxis.ForEach(async axisIndex => + { + axisImmediatePauseHandleDict[axisIndex].Reset(); + + //axisMoveCancelDict[axisIndex].Cancel(); + + await MoveStop(axisIndex, 0);//鎵�鏈夎酱閮芥殏鍋� + }); + } + } + + /// <summary> + /// 鎭㈠绔嬪嵆鏆傚仠 + /// </summary> + public override void ResetImmediatePause() + { + var immediatePauseAxis = IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled && a.IsImmediatePause).Select(u => u.AxisIndex).ToList(); + + immediatePauseAxis.ForEach(axisIndex => + { + //axisMoveCancelDict[axisIndex] = new CancellationTokenSource(); + + axisImmediatePauseHandleDict[axisIndex].Set(); + }); } #endregion @@ -87,20 +266,21 @@ { var res = GTSCardAPI.GT_Open((short)IConfig.CardNum, 0, 1); //鎵撳紑杩愬姩鎺у埗鍣ㄣ�傚弬鏁板繀椤讳负锛�0,1锛夛紝涓嶈兘淇敼銆� res += GTSCardAPI.GT_LoadConfig((short)IConfig.CardNum, IConfig.InitialConfigFilePath); - res += GTSCardAPI.GT_ClrSts(0, 1, 8); + ClearStatus(1, IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled).Count); if (res != (short)GTSRetCode.GRCRunOK) { throw new Exception("鏉垮崱杞藉叆閰嶇疆鏂囦欢寮傚父锛岄敊璇爜锛�" + res); } } - public bool AllAxisOn() + + public override bool AllAxisOn() { List<Task<bool>> taskList = new List<Task<bool>>(); ; // 濡傛灉鏄涓酱鐨勮繍鍔� 绛夋瘡涓酱寮�鍚� - IConfig.AxisSettings.Where(a => a.IsAxisEnabled).ToList().ForEach(axisNum => + IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ForEach(axisNum => { - var task = AxisOnAsync((short)IConfig.CardNum, (short)axisNum.AxisIndex); + var task = AxisOnAsync(axisNum.AxisIndex); taskList.Add(task); }); Task.WaitAll(taskList.ToArray()); @@ -108,13 +288,13 @@ return resultOK; } - public bool AllAxisOff() + public override bool AllAxisOff() { List<Task<bool>> taskList = new List<Task<bool>>(); ; // 濡傛灉鏄涓酱鐨勮繍鍔� 绛夋瘡涓酱鍏抽棴 - IConfig.AxisSettings.Where(a => a.IsAxisEnabled).ToList().ForEach(axisNum => + IConfig.AxisSettings.FindAll(a => a.IsAxisEnabled).ForEach(axisNum => { - var task = AxisOffAsync((short)IConfig.CardNum, (short)axisNum.AxisIndex); + var task = AxisOffAsync(axisNum.AxisIndex); taskList.Add(task); }); Task.WaitAll(taskList.ToArray()); @@ -126,11 +306,11 @@ /// 鍗曚釜杞村紑鍚� /// </summary> /// <returns></returns> - public async Task<bool> AxisOnAsync(short cardNum, short axisNum) + public override async Task<bool> AxisOnAsync(int axisNum) { return await Task.Run(() => { - var ret = GTSCardAPI.GT_AxisOn(cardNum, axisNum); + var ret = GTSCardAPI.GT_AxisOn((short)IConfig.CardNum, (short)axisNum); return ret == (short)GTSRetCode.GRCRunOK; }); } @@ -139,11 +319,11 @@ /// 鍗曚釜杞村叧闂� /// </summary> /// <returns></returns> - public async Task<bool> AxisOffAsync(short cardNum, short axisNum) + public override async Task<bool> AxisOffAsync(int axisNum) { return await Task.Run(() => { - var ret = GTSCardAPI.GT_AxisOff(cardNum, axisNum); + var ret = GTSCardAPI.GT_AxisOff((short)IConfig.CardNum, (short)axisNum); return ret == (short)GTSRetCode.GRCRunOK; }); } @@ -153,26 +333,26 @@ /// </summary> /// <param name="item">杩愬姩瀵硅薄</param> /// <returns>杩愬姩鎺у埗+鍋滄鍒ゆ柇</returns> - public bool MoveToPoint(IOperationConfig opConfig) + public override ResponseMessage MoveToPoint(IOperationConfig opConfig) { - bool resultOK = false; - var gtsOperationConfig = opConfig as GTSCardOperationConfig; - List<Task<bool>> taskList = new List<Task<bool>>(); - //TaskFactory factory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.None); - // 濡傛灉鏄涓酱鐨勮繍鍔� 绛夋瘡涓酱杩愬姩缁撴潫 - foreach (var movingOp in gtsOperationConfig.MovingOps) + ResponseMessage responseMessage = new ResponseMessage(); + if (opConfig is MotionOperationCollection gtsOperationCollection) { - //var task = factory.StartNew<bool>((op) => - //{ - // return SingleAxisMoving(op as MovingOption); - //}, movingOp); - var task = SingleAxisMoving(movingOp); - taskList.Add(task); + List<Task<bool>> taskList = new List<Task<bool>>(); + foreach (var movingOp in gtsOperationCollection.MovingOps) + { + var task = SingleAxisMoving(movingOp); + taskList.Add(task); + task.Start(); + } + Task.WaitAll(taskList.ToArray()); + responseMessage.Result = taskList.All(u => u.GetAwaiter().GetResult()); + if (!responseMessage.Result) + { + responseMessage.Message = $"鐐逛綅杩愬姩寮傚父"; + } } - Task.WaitAll(taskList.ToArray()); - resultOK = taskList.All(u => u.GetAwaiter().GetResult()); - - return resultOK; + return responseMessage; } /// <summary> @@ -184,14 +364,15 @@ { List<short> resultCode = new List<short>() { 0 }; GTSCardAPI.TTrapPrm trapprm = new GTSCardAPI.TTrapPrm(); - resultCode.Add(GTSCardAPI.GT_PrfTrap((short)IConfig.CardNum, (short)optionPara.AxisIndex)); - resultCode.Add(GTSCardAPI.GT_GetTrapPrm((short)IConfig.CardNum, (short)optionPara.AxisIndex, out trapprm)); + short axisIndex = short.Parse(optionPara.AxisIndexStr); + resultCode.Add(GTSCardAPI.GT_PrfTrap((short)IConfig.CardNum, axisIndex)); + resultCode.Add(GTSCardAPI.GT_GetTrapPrm((short)IConfig.CardNum, axisIndex, out trapprm)); trapprm.smoothTime = 1; trapprm.acc = optionPara.VelocityPara.Acc != 0 ? optionPara.VelocityPara.Acc : 1; trapprm.dec = optionPara.VelocityPara.Dec != 0 ? optionPara.VelocityPara.Dec : 1; - resultCode.Add(GTSCardAPI.GT_SetTrapPrm((short)IConfig.CardNum, (short)optionPara.AxisIndex, ref trapprm)); - resultCode.Add(GTSCardAPI.GT_SetVel((short)IConfig.CardNum, (short)optionPara.AxisIndex, optionPara.VelocityPara.Velocity * IConfig.AxisVelocityRatio)); + resultCode.Add(GTSCardAPI.GT_SetTrapPrm((short)IConfig.CardNum, axisIndex, ref trapprm)); + resultCode.Add(GTSCardAPI.GT_SetVel((short)IConfig.CardNum, axisIndex, optionPara.VelocityPara.Velocity * IConfig.AxisVelocityRatio)); var resultOK = resultCode.All(u => u == (short)GTSRetCode.GRCRunOK); if (!resultOK) @@ -201,60 +382,71 @@ return resultOK; } + TaskFactory taskFactory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.LongRunning); /// <summary> /// 鍗曚釜杞� 杩愬姩(鐐瑰埌鐐� jog 鍥為浂...锛� /// </summary> /// <param name="optionPara">杩愬姩鍙傛暟瀵硅薄</param> - public async Task<bool> SingleAxisMoving(MovingOption optionPara) + public override Task<bool> SingleAxisMoving(MovingOption optionPara) { - return await Task.Run(() => - { - bool isSuccessAndStop = false; - if (IConfig.AxisSettings.FirstOrDefault(a => a.AxisIndex == optionPara.AxisIndex)?.IsAxisEnabled ?? false) - { - string _position = ""; - string motionType = optionPara.MoveMode == EnumHelper.MotorMoveMode.Normal ? (optionPara.IsAbsolute ? "Abs" : "Rel") : optionPara.MoveMode.ToString(); + return new Task<bool>(() => + { + axisImmediatePauseHandleDict[optionPara.AxisIndex].WaitOne(); + bool isSuccessAndStop = false; + try + { + if (IConfig.AxisSettings.FirstOrDefault(a => a.AxisIndex == optionPara.AxisIndex)?.IsAxisEnabled ?? false) + { + string _position = ""; + string motionType = optionPara.MoveMode == EnumHelper.MotionMode.Normal ? (optionPara.IsAbsolute ? "Abs" : "Rel") : optionPara.MoveMode.ToString(); - _position = $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")},{optionPara.AxisIndex},{motionType},{GetPosition(optionPara.AxisIndex).ToString()},{GetPrfPosition(optionPara.AxisIndex).ToString()},{optionPara.Destination},"; + _position = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff},{optionPara.AxisIndex},{motionType},{GetPosition(optionPara.AxisIndex)},{GetPrfPosition(optionPara.AxisIndex)},{optionPara.Destination},"; - switch (optionPara.MoveMode) - { - case MotorMoveMode.Normal: - { - if (_isResetting) - { - LogAsync(DateTime.Now, "澶嶄綅涓惎鍔ㄨ繍鍔ㄥ紓甯�", optionPara.AxisIndex + "鍚姩杩愬姩寮傚父"); - return false; - } + switch (optionPara.MoveMode) + { + case MotionMode.Normal: + { + if (_isResetting) + { + LogAsync(DateTime.Now, "澶嶄綅涓惎鍔ㄨ繍鍔ㄥ紓甯�", optionPara.AxisIndex + "鍚姩杩愬姩寮傚父"); + return false; + } - if (optionPara.IsAbsolute) - { - isSuccessAndStop = P2PMoveAbs(optionPara); - } - else - { - isSuccessAndStop = P2PMoveRel(optionPara); - } + if (optionPara.IsAbsolute) + { + isSuccessAndStop = P2PMoveAbs(optionPara); + } + else + { + isSuccessAndStop = P2PMoveRel(optionPara); + } - } - break; - case MotorMoveMode.FindOri: - { - isSuccessAndStop = GoHome(optionPara); - } - break; - case MotorMoveMode.Jog: - { - isSuccessAndStop = JogMove(optionPara); - } - break; - } - _position += $"{GetPosition(optionPara.AxisIndex)},"; - _position += $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}"; - LogAsync(DateTime.Now, "", _position); - } - return isSuccessAndStop; - }); + } + break; + case MotionMode.FindOri: + { + //isSuccessAndStop = GoHome(optionPara); + isSuccessAndStop = P2PGoHome(optionPara); + } + break; + case MotionMode.Jog: + { + isSuccessAndStop = JogMove(optionPara); + } + break; + } + _position += $"{GetPosition(optionPara.AxisIndex)},"; + _position += $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}"; + LogAsync(DateTime.Now, "", _position); + } + } + catch (Exception ex) + { + isSuccessAndStop = false; + LogAsync(DateTime.Now, $"杞磠optionPara.AxisIndex}杩愬姩寮傚父", ex.GetExceptionMessage()); + } + return isSuccessAndStop; + }); } /// <summary> @@ -271,7 +463,8 @@ { throw new Exception("杞�" + axisNum + "鑾峰彇瑙勫垝浣嶇疆寮傚父锛岄敊璇爜锛�" + ret); } - position = prfpos / IConfig.AxisVelocityRatio; + //var AxisRatio = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum) == null ? 1 : IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum).AxisRatio; + position = prfpos; return position; } @@ -285,15 +478,49 @@ lock (moveLock) { double position = 0; - int pPos = 0; - var ret = GTSCardAPI.GT_GetPos((short)IConfig.CardNum, (short)axisNum, out pPos); + double pPos = 0; + var ret = GTSCardAPI.GT_GetPrfPos((short)IConfig.CardNum, (short)axisNum, out pPos, 1, out uint pclock); if (ret != (short)GTSRetCode.GRCRunOK) { throw new Exception("杞�" + axisNum + "鑾峰彇鐩爣浣嶇疆寮傚父锛岄敊璇爜锛�" + ret); } - position = pPos / IConfig.AxisVelocityRatio; + //var AxisRatio = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum) == null ? 1 : IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == axisNum).AxisRatio; + position = pPos; return position; } + } + + /// <summary> + /// 鑾峰彇瑙勫垝閫熷害 + /// </summary> + /// <param name="axisNum">Axis number</param> + /// <returns>閫熷害鑴夊啿</returns> + public double GetPrfVelocity(int axisNum) + { + double prfVel = 0; + uint pclock = 0; + var ret = GTSCardAPI.GT_GetPrfVel((short)IConfig.CardNum, (short)axisNum, out prfVel, 1, out pclock); + if (ret != (short)GTSRetCode.GRCRunOK) + { + throw new Exception("杞�" + axisNum + "鑾峰彇瑙勫垝閫熷害寮傚父锛岄敊璇爜锛�" + ret); + } + return prfVel; + } + + /// <summary> + /// 鑾峰彇褰撳墠閫熷害 + /// </summary> + /// <param name="axisNum">Axis number</param> + /// <returns>閫熷害鑴夊啿</returns> + public double GetVelocity(int axisNum) + { + double vel = 0; + var ret = GTSCardAPI.GT_GetVel((short)IConfig.CardNum, (short)axisNum, out vel); + if (ret != (short)GTSRetCode.GRCRunOK) + { + throw new Exception("杞�" + axisNum + "鑾峰彇褰撳墠閫熷害寮傚父锛岄敊璇爜锛�" + ret); + } + return vel; } /// <summary> @@ -321,8 +548,8 @@ if (ret != (short)GTSRetCode.GRCRunOK) { - LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "APS_absolute_move寮傚父", "閿欒鐮侊細" + ret + ";" + "閲嶈瘯娆℃暟锛�" + repeatTime); - Thread.Sleep(50); + LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "JogMove寮傚父", "閿欒鐮侊細" + ret + ";" + "閲嶈瘯娆℃暟锛�" + repeatTime); + Thread.Sleep(10); } repeatTime--; } while (ret != (short)GTSRetCode.GRCRunOK && repeatTime > 0); @@ -331,32 +558,9 @@ catch (Exception ex) { AllMoveStop(true); - OnExceptionRaised?.Invoke(ex); + OnExceptionOccured?.Invoke(DateTime.Now, ex); return false; } - - } - - /// <summary> - /// Set Single Axis Do stop Jog Move - /// </summary> - /// <param name="axisNum">AxisNo</param> - /// <returns></returns> - public bool StopJog(int axisNum) - { - //鍋滄杩愬姩 - MoveStop(axisNum, 0); - //杩愬姩寮�濮嬪悗 妫�鏌ヨ繍鍔ㄦ槸鍚﹀仠姝� - bool isStop = false; - int repeatTime = 1000; - do - { - isStop = IsStop((short)IConfig.CardNum, (short)axisNum); - Thread.Sleep(50); - repeatTime--; - } while (!isStop && repeatTime > 0); - - return isStop; } /// <summary> @@ -396,15 +600,16 @@ LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "寮�濮嬭繍鍔�", "鐩爣鍧愭爣锛�" + optionPara.Destination); short ret = 0; - repeatTime = 100; bool isSuccessSetAxisParam = false; int currentPosition = (int)GetPosition(optionPara.AxisIndex); int dPosition = optionPara.Destination + currentPosition; - do + int timeout = optionPara.MovingTimeout; + var AxisRatio = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == optionPara.AxisIndex) == null ? 1 : IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == optionPara.AxisIndex).AxisRatio; + while (CurrentState == DeviceState.DSOpen) { //璁剧疆 杩愬姩鍙傛暟 isSuccessSetAxisParam = SetAxisParam(optionPara); - ret = GTSCardAPI.GT_SetPrfPos((short)IConfig.CardNum, (short)optionPara.AxisIndex, (int)(dPosition * IConfig.AxisVelocityRatio));// 璁剧疆瑙勫垝浣嶇疆 + ret = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)optionPara.AxisIndex, (int)(dPosition));// 璁剧疆鐩殑浣嶇疆 ret = GTSCardAPI.GT_Update((short)IConfig.CardNum, 1 << (optionPara.AxisIndex - 1));//鏇存柊杩愬姩 if (ret != (short)GTSRetCode.GRCRunOK) @@ -412,16 +617,20 @@ LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "APS_absolute_move寮傚父", "閿欒鐮侊細" + ret + ";" + "閲嶈瘯娆℃暟锛�" + repeatTime); Thread.Sleep(50); } - repeatTime--; - } while (ret != (short)GTSRetCode.GRCRunOK && !isSuccessSetAxisParam && repeatTime > 0); + timeout -= 50; + if ((ret == (short)GTSRetCode.GRCRunOK && isSuccessSetAxisParam) || (optionPara.MovingTimeout > 0 && timeout < 0)) + { + break; + } + } //杩愬姩寮�濮嬪悗 妫�鏌ヨ繍鍔ㄦ槸鍚﹀仠姝� bool isStop = false; repeatTime = 1000; do { - isStop = IsStop((short)IConfig.CardNum, (short)optionPara.AxisIndex); Thread.Sleep(50); + isStop = IsStop((short)optionPara.AxisIndex); repeatTime--; } while (!isStop && repeatTime > 0); @@ -430,7 +639,7 @@ catch (Exception ex) { AllMoveStop(true); - OnExceptionRaised?.Invoke(ex); + OnExceptionOccured?.Invoke(DateTime.Now, ex); return false; } } @@ -443,6 +652,8 @@ { try { + axisImmediatePauseHandleDict[optionPara.AxisIndex].WaitOne(); + if (_isResetting) { LogAsync(DateTime.Now, "澶嶄綅杩囩▼寮傚父", "杞�" + optionPara.AxisIndex + "璇曞浘鍦ㄥ浣嶈繃绋嬩腑杩愬姩"); @@ -467,13 +678,14 @@ } LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "寮�濮嬭繍鍔�", "鐩爣鍧愭爣锛�" + optionPara.Destination); short ret = 0; - repeatTime = 100; bool isSuccessSetAxisParam = false; - do + int timeout = optionPara.MovingTimeout; + var AxisRatio = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == optionPara.AxisIndex) == null ? 1 : IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == optionPara.AxisIndex).AxisRatio; + while (CurrentState == DeviceState.DSOpen && !_isPause) { //璁剧疆 杩愬姩鍙傛暟 isSuccessSetAxisParam = SetAxisParam(optionPara); - ret = GTSCardAPI.GT_SetPrfPos((short)IConfig.CardNum, (short)optionPara.AxisIndex, (int)(optionPara.Destination * IConfig.AxisVelocityRatio));// 璁剧疆瑙勫垝浣嶇疆 + ret = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)optionPara.AxisIndex, (int)(optionPara.Destination));// 璁剧疆鐩爣浣嶇疆 ret = GTSCardAPI.GT_Update((short)IConfig.CardNum, 1 << (optionPara.AxisIndex - 1));//鏇存柊杩愬姩 if (ret != (short)GTSRetCode.GRCRunOK) @@ -481,24 +693,28 @@ LogAsync(DateTime.Now, "杞�" + optionPara.AxisIndex + "APS_absolute_move寮傚父", "閿欒鐮侊細" + ret + ";" + "閲嶈瘯娆℃暟锛�" + repeatTime); Thread.Sleep(50); } - repeatTime--; - } while (ret != (short)GTSRetCode.GRCRunOK && !isSuccessSetAxisParam && repeatTime > 0); + timeout -= 50; + if ((ret == (short)GTSRetCode.GRCRunOK && isSuccessSetAxisParam) || (optionPara.MovingTimeout > 0 && timeout < 0)) + { + break; + } + } bool isStop = false; repeatTime = 1000; - do + while (!isStop && repeatTime > 0) { - isStop = IsStop((short)IConfig.CardNum, (short)optionPara.AxisIndex); Thread.Sleep(50); + isStop = IsStop((short)optionPara.AxisIndex); repeatTime--; - } while (!isStop && repeatTime > 0); + } return (ret == (short)GTSRetCode.GRCRunOK) && isStop; } catch (Exception ex) { AllMoveStop(true); - OnExceptionRaised?.Invoke(ex); + OnExceptionOccured?.Invoke(DateTime.Now, ex); return false; } } @@ -509,7 +725,7 @@ /// <param name="axisNum">axisNo</param> /// <param name="option">0琛ㄧず骞虫粦鍋滄锛�1琛ㄧず绱ф�ュ仠姝�</param> /// <returns></returns> - public async Task<bool> MoveStop(int axisNum, int option) + public override async Task<bool> MoveStop(int axisNum, int option) { return await Task.Run(() => { @@ -531,8 +747,8 @@ int repeatTime = 100; do { - isStop = IsStop((short)IConfig.CardNum, (short)axisNum); Thread.Sleep(10); + isStop = IsStop((short)axisNum); repeatTime--; } while (!isStop && repeatTime > 0); @@ -568,10 +784,16 @@ { try { - GTSCardAPI.GT_ZeroPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, 1); + PositionReset(movingOption.AxisIndex, 1); GTSCardAPI.THomePrm thomeprm; GTSCardAPI.THomeStatus homests; - short rtn = GTSCardAPI.GT_GetHomePrm((short)IConfig.CardNum, (short)movingOption.AxisIndex, out thomeprm); + // 鍚姩Home鎹曡幏 + short rtn = GTSCardAPI.GT_SetCaptureMode((short)IConfig.CardNum, (short)movingOption.AxisIndex, GTSCardAPI.CAPTURE_HOME); + // 鍒囨崲鍒扮偣浣嶈繍鍔ㄦā寮� + rtn = GTSCardAPI.GT_PrfTrap((short)IConfig.CardNum, (short)movingOption.AxisIndex); + // 璇诲彇鐐逛綅妯″紡杩愬姩鍙傛暟 + rtn = GTSCardAPI.GT_GetHomePrm((short)IConfig.CardNum, (short)movingOption.AxisIndex, out thomeprm); + thomeprm.mode = movingOption.GoHomePara.HomeMode;//鍥為浂鏂瑰紡 thomeprm.moveDir = movingOption.GoHomePara.HomeDir;//鍥為浂鏂瑰悜 thomeprm.edge = movingOption.GoHomePara.Edge; @@ -579,7 +801,7 @@ thomeprm.velLow = movingOption.GoHomePara.LowVelocity; thomeprm.acc = movingOption.VelocityPara.Acc; thomeprm.dec = movingOption.VelocityPara.Dec; - thomeprm.searchHomeDistance = movingOption.GoHomePara.SearchHomeDistance;//鎼滄悳璺濈 + thomeprm.searchHomeDistance = movingOption.GoHomePara.SearchHomeDistance;//鎼滅储璺濈 thomeprm.homeOffset = movingOption.GoHomePara.HomeOffset; //鍋忕Щ璺濈 thomeprm.escapeStep = movingOption.GoHomePara.EscapeStep; rtn = GTSCardAPI.GT_GoHome((short)IConfig.CardNum, (short)movingOption.AxisIndex, ref thomeprm); //鍚姩鍥為浂 @@ -595,7 +817,7 @@ if (isStop && homests.error == 0) { Thread.Sleep(200); - GTSCardAPI.GT_ZeroPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, 1); + PositionReset(movingOption.AxisIndex, 1); } repeatTime--; } while (!isStop && repeatTime > 0); @@ -605,7 +827,94 @@ catch (Exception ex) { AllMoveStop(true); - OnExceptionRaised?.Invoke(ex); + OnExceptionOccured?.Invoke(DateTime.Now, ex); + return false; + } + } + + /// <summary> + /// P2P鏂瑰紡鍥炲師鐐� + /// </summary> + /// <param name="movingOption">杩愬姩鍙傛暟</param> + public bool P2PGoHome(MovingOption movingOption) + { + try + { + PositionReset(movingOption.AxisIndex, 1); + ClearStatus(movingOption.AxisIndex, 1); + GTSCardAPI.TTrapPrm trapPrm; + bool isStop = false; + //鎼滅储璺濈 闃舵1 + // 鍚姩Home鎹曡幏 + short sRtn = GTSCardAPI.GT_SetCaptureMode((short)IConfig.CardNum, (short)movingOption.AxisIndex, GTSCardAPI.CAPTURE_HOME); + // 鍒囨崲鍒扮偣浣嶈繍鍔ㄦā寮� + sRtn = GTSCardAPI.GT_PrfTrap((short)IConfig.CardNum, (short)movingOption.AxisIndex); + // 璇诲彇鐐逛綅妯″紡杩愬姩鍙傛暟 + sRtn = GTSCardAPI.GT_GetTrapPrm((short)IConfig.CardNum, (short)movingOption.AxisIndex, out trapPrm); + trapPrm.acc = movingOption.VelocityPara.Acc; + trapPrm.dec = movingOption.VelocityPara.Dec; + // 璁剧疆鐐逛綅妯″紡杩愬姩鍙傛暟 + sRtn = GTSCardAPI.GT_SetTrapPrm((short)IConfig.CardNum, (short)movingOption.AxisIndex, ref trapPrm); + // 璁剧疆鐐逛綅妯″紡鐩爣閫熷害锛屽嵆鍥炲師鐐归�熷害 + sRtn = GTSCardAPI.GT_SetVel((short)IConfig.CardNum, (short)movingOption.AxisIndex, movingOption.GoHomePara.HighVelocity); + // 璁剧疆鐐逛綅妯″紡鐩爣浣嶇疆锛屽嵆鍘熺偣鎼滅储璺濈 + sRtn = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, movingOption.GoHomePara.SearchHomeDistance); + // 鍚姩杩愬姩 + sRtn = GTSCardAPI.GT_Update((short)IConfig.CardNum, 1 << (movingOption.AxisIndex - 1)); + + int repeatTime = 1000; + short capture; + int pos; + uint clk;//鏃堕挓鍙傛暟 + do + { + Thread.Sleep(20); + // 璇诲彇鎹曡幏鐘舵�� + GTSCardAPI.GT_GetCaptureStatus((short)IConfig.CardNum, (short)movingOption.AxisIndex, out capture, out pos, 1, out clk); + isStop = IsStop((short)movingOption.AxisIndex); + repeatTime--; + } while (!(isStop || capture == 1 || repeatTime <= 0)); + + if (repeatTime <= 0) + { + MoveStop((short)movingOption.AxisIndex, 0); + throw new Exception($"杩愬姩杞磠movingOption.AxisIndex} 锛屽洖鍘熺偣瓒呮椂寮傚父"); + } + if (isStop && capture != 1) + { + + ClearStatus((short)movingOption.AxisIndex, 1); + throw new Exception($"杩愬姩杞磠movingOption.AxisIndex} 锛屽洖鍘熺偣瓒呮椂寮傚父"); + } + + if (capture == 1) + { + //鍏坰top + MoveStop((short)movingOption.AxisIndex, 0); + ClearStatus((short)movingOption.AxisIndex, 1); + //宸茬粡鎹曡幏鍒癏ome鎵嶅彲浠ュ洖闆� 闃舵2 + // 杩愬姩鍒�"鎹曡幏浣嶇疆+鍋忕Щ閲�" + sRtn = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, pos + movingOption.GoHomePara.HomeOffset); + // 鍦ㄨ繍鍔ㄧ姸鎬佷笅鏇存柊鐩爣浣嶇疆 + sRtn = GTSCardAPI.GT_Update((short)IConfig.CardNum, 1 << (movingOption.AxisIndex - 1)); + isStop = false; + + repeatTime = 1000; + do + { + Thread.Sleep(20); + isStop = IsStop((short)movingOption.AxisIndex); + repeatTime--; + } while (!isStop && repeatTime > 0); + PositionReset(movingOption.AxisIndex, 1); + return (sRtn == (short)GTSRetCode.GRCRunOK) && isStop; + } + return false; + } + catch (Exception ex) + { + AllMoveStop(true); + OnExceptionOccured?.Invoke(DateTime.Now, ex); return false; } } @@ -627,14 +936,13 @@ /// <summary> /// 璇诲彇IO杈撳嚭 /// </summary> - /// <param name="cardNum"></param> - /// <param name="index"></param> + /// <param name="index">io绱㈠紩</param> /// <returns></returns> - public bool GetDoSts(short cardNum, short index) + public bool GetDoSts(short index) { int outSts; short outNum = (short)(index % 100); - GTSCardAPI.GT_GetDo(cardNum, GTSCardAPI.MC_GPO, out outSts); + GTSCardAPI.GT_GetDo((short)IConfig.CardNum, GTSCardAPI.MC_GPO, out outSts); if ((outSts & (1 << outNum)) == 0) return true; else return false; } @@ -642,19 +950,19 @@ /// <summary> /// 鎸変綅璁剧疆鏁板瓧 IO 杈撳嚭鐘舵�� /// </summary> - /// <param name="cardNum">鍗″彿</param> /// <param name="index">杈撳嚭鍙�,杩斿洖1-16</param> - /// <param name="value">false琛ㄧず杈撳嚭锛宼rue琛ㄧず鍏抽棴</param> - public void WriteOut(short cardNum, short index, bool value) + /// <param name="value">false琛ㄧず鍏筹紝true琛ㄧず寮�锛屾澘鍗¤璁剧疆鍙栧弽</param> + public override void WriteOutput(short index, IOValue value) { short outNum = (short)(index % 100 + 1); - if (value) + if ((int)value <= 1) { - GTSCardAPI.GT_SetDoBit(cardNum, GTSCardAPI.MC_GPO, outNum, 0); + GTSCardAPI.GT_SetDoBit((short)IConfig.CardNum, GTSCardAPI.MC_GPO, outNum, (short)value); } else { - GTSCardAPI.GT_SetDoBit(cardNum, GTSCardAPI.MC_GPO, outNum, 1); + var currentValue = (int)MonitorValues.FirstOrDefault(u => u.IONum == outNum && u.IOType == IOType.OUTPUT).Value; + GTSCardAPI.GT_SetDoBit((short)IConfig.CardNum, GTSCardAPI.MC_GPO, outNum, (short)(currentValue == 1 ? 0 : 1)); } } @@ -664,25 +972,74 @@ /// <param name="cardNum">鏉垮崱鍙�</param> /// <param name="axisNum">杞村彿</param> /// <returns></returns> - public bool IsStop(short cardNum, short axisNum) + public bool IsStop(short axisNum) + { + int sts = AxisStatusList.FirstOrDefault(u => u.AxisIndex == axisNum).AxisStatus; + if ((sts & 0x400) == 0) return true;//鍋滄杩斿洖true + else return false; //杩愯涓繑鍥瀎alse + } + + /// <summary> + /// 璇诲彇杞寸姸鎬� + /// </summary> + /// <param name="axisNum">杞村彿</param> + /// <returns></returns> + public override int GetAxisStatus(int axisNum) { lock (moveLock) { int sts = 0; uint pclock = 0; - GTSCardAPI.GT_GetSts(cardNum, axisNum, out sts, 1, out pclock); - if ((sts & 0x400) == 0) return true;//鍋滄杩斿洖true - else return false; //杩愯涓繑鍥瀎alse + GTSCardAPI.GT_GetSts((short)IConfig.CardNum, (short)axisNum, out sts, 1, out pclock); + return sts; + } + } + + public override bool ClearStatus(int startAxisIndex, int count) + { + var rtn = GTSCardAPI.GT_ClrSts((short)IConfig.CardNum, (short)startAxisIndex, (short)count); + return rtn == (short)GTSRetCode.GRCRunOK; + } + + /// <summary> + /// 浣嶇疆鍥為浂 + /// </summary> + /// <param name="startAxisIndex"></param> + /// <param name="count"></param> + /// <returns></returns> + public override bool PositionReset(int startAxisIndex, int count) + { + lock (moveLock) + { + var rtn = GTSCardAPI.GT_ZeroPos((short)IConfig.CardNum, (short)startAxisIndex, (short)count); + return rtn == (short)GTSRetCode.GRCRunOK; } } #endregion #region IMonitor - public event Action<DateTime, string, IDevice, IMonitorSet> OnMonitorInvoke; - public event Action<DateTime, IDevice, IWarningSet> OnMonitorAlarm; - public List<IOItem> MonitorValues { get; set; } = new List<IOItem>(); + public List<AxisMovingStatus> GetAxisMovingStatus() + { + List<AxisMovingStatus> axisMovingStatusesList = new List<AxisMovingStatus>(); + foreach (var axisConfig in IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled)) + { + AxisMovingStatus axisMovingStatus = new AxisMovingStatus(); + axisMovingStatus.AxisIndex = axisConfig.AxisIndex; + axisMovingStatus.AxisName = axisConfig.AxisName; + //axisMovingStatus.CurPosition = Convert.ToInt32(GetPosition(axisMovingStatus.AxisIndex)); + axisMovingStatus.Destination = Convert.ToInt32(GetPrfPosition(axisMovingStatus.AxisIndex)); + //axisMovingStatus.CurVelocity = GetVelocity(axisMovingStatus.AxisIndex); + //axisMovingStatus.PrfVelocity = GetPrfVelocity(axisMovingStatus.AxisIndex); + axisMovingStatus.AxisStatus = GetAxisStatus(axisMovingStatus.AxisIndex); + + axisMovingStatusesList.Add(axisMovingStatus); + + } + + return axisMovingStatusesList; + } public List<IOItem> GetMonitorValues() @@ -696,19 +1053,19 @@ GTSCardAPI.GT_GetDo((short)IConfig.CardNum, GTSCardAPI.MC_GPO, out outValue); //瑙f瀽缁撴灉 - for (var index = 1; index <= 16; index++) + for (var index = 0; index < 16; index++) { IOItem inItem = new IOItem() { IONum = index, - Value = (inValue & (1 << index)) == 0 ? 1 : 0, - Model = IOModel.In + Value = (inValue & (1 << index)) == 0 ? IOValue.TRUE : IOValue.FALSE, + IOType = IOType.INPUT }; IOItem outItem = new IOItem() { IONum = index, - Value = (outValue & (1 << index)) == 0 ? 1 : 0, - Model = IOModel.Out + Value = (outValue & (1 << index)) == 0 ? IOValue.TRUE : IOValue.FALSE, + IOType = IOType.OUTPUT }; result.Add(inItem); result.Add(outItem); @@ -717,7 +1074,7 @@ return result; } - public async void Monitor() + public async override void Monitor() { await Task.Run(() => { @@ -727,18 +1084,32 @@ { if (!IConfig.IsEnableMonitor) return; + var newValues = GetMonitorValues(); - if (newValues == null || newValues.Count == 0) + var newAxisMovingStatus = GetAxisMovingStatus(); + + if (newValues == null || newValues.Count == 0 || newAxisMovingStatus == null || newAxisMovingStatus.Count == 0) continue; Stopwatch sw = new Stopwatch(); sw.Start(); if (MonitorValues.Count == newValues.Count) { - var tempNew = newValues.DeepSerializeClone();//clone - var tempOld = MonitorValues.DeepSerializeClone(); + //var tempNew = newValues.DeepSerializeClone();//clone + //var tempOld = MonitorValues.DeepSerializeClone(); + var tempNew = new List<IOItem>(newValues);//clone + var tempOld = new List<IOItem>(MonitorValues); MonitorCheckAndInvoke(tempNew, tempOld); } + + if (AxisStatusList.Count == newAxisMovingStatus.Count) + { + var tempNew = new List<AxisMovingStatus>(newAxisMovingStatus);//clone + var tempOld = new List<AxisMovingStatus>(AxisStatusList); + AxisStatusCheck(tempNew, tempOld); + } + + AxisStatusList = new List<AxisMovingStatus>(newAxisMovingStatus); MonitorValues = new List<IOItem>(newValues); sw.Stop(); @@ -764,29 +1135,52 @@ }); } - private void OnMethodInvoked(IAsyncResult ar) + private async void AxisStatusCheck(List<AxisMovingStatus> tempNew, List<AxisMovingStatus> tempOld) { - MotionCardMonitorSet monitorSet = ar.AsyncState as MotionCardMonitorSet; - ProcessResponse resValues = monitorSet.Response; - if (resValues.ResultValue == (int)ReplyValue.IGNORE) + await Task.Run(() => { - return; - } - - Stopwatch sw = new Stopwatch(); - sw.Start(); - // 灏嗘寚瀹欼OItem鍐欏叆鏉垮崱 - foreach (var replyIOData in monitorSet.ReplyIODatas) - { - //鍐欏叆IO杈撳嚭 - if (replyIOData.Model == IOModel.Out) + foreach (var newSts in tempNew) { - GTSCardAPI.GT_SetDoBit((short)IConfig.CardNum, GTSCardAPI.MC_GPI, (short)replyIOData.IONum, (short)replyIOData.Value); + var oldSts = tempOld.FirstOrDefault(u => u.AxisIndex == newSts.AxisIndex); + if (oldSts != null) + { + if (oldSts.AxisStatus != newSts.AxisStatus) + { + AxisStatusChanged(newSts.AxisIndex, oldSts.AxisStatus, newSts.AxisStatus); + } + + if (((newSts.AxisStatus >> 1 & 1) == 1) && ((oldSts.AxisStatus >> 1 & 1) == 0)) //鍒濇鎶ヨ + { + AxisAlarmRaised(newSts.AxisStatus, $"杞磠newSts.AxisIndex}:{newSts.AxisName}杞翠己鏈嶆姤璀�"); + } + } } - // in鍙涓嶈兘鍐� - } - sw.Stop(); - LogAsync(DateTime.Now, $"{Name}鍙嶉瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", $"{resValues.GetDisplayText()}"); + }); + } + + public override void OnMethodInvoked(IAsyncResult ar) + { + //MotionCardMonitorSet monitorSet = ar.AsyncState as MotionCardMonitorSet; + //ProcessResponse resValues = monitorSet.Response; + //if (resValues.ResultValue == (int)ReplyValue.IGNORE) + //{ + // return; + //} + + //Stopwatch sw = new Stopwatch(); + //sw.Start(); + //// 灏嗘寚瀹欼OItem鍐欏叆鏉垮崱 + //foreach (var replyIOData in monitorSet.ReplyIODatas) + //{ + // //鍐欏叆IO杈撳嚭 + // if (replyIOData.IOType == IOType.OUTPUT) + // { + // GTSCardAPI.GT_SetDoBit((short)IConfig.CardNum, GTSCardAPI.MC_GPI, (short)replyIOData.IONum, (short)replyIOData.Value); + // } + // // in鍙涓嶈兘鍐� + //} + //sw.Stop(); + //LogAsync(DateTime.Now, $"{Name}鍙嶉瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", $"{resValues.GetDisplayText()}"); } protected void MonitorCheckAndInvoke(List<IOItem> tempNew, List<IOItem> tempOld) @@ -796,15 +1190,14 @@ { MotionCardWarningSet warningSet = wSet as MotionCardWarningSet; - bool isOn = ((tempNew.FirstOrDefault(u => u.IONum == warningSet.TriggerIndex && u.Model == warningSet.WarningIOModel)?.Value >> warningSet.TriggerIndex) & 1) == (warningSet.TriggerValue ? 1 : 0); + bool isOn = (((int)((tempNew.FirstOrDefault(u => u.IONum == warningSet.TriggerIndex && u.IOType == warningSet.WarningIOModel)?.Value)) >> warningSet.TriggerIndex) & 1) == (warningSet.TriggerValue ? 1 : 0); if (warningSet.CurrentStatus != isOn) { warningSet.CurrentStatus = isOn; warningSet.TriggerTime = DateTime.Now; - warningSet.WarningDescription = $"璀︽姤锛歿warningSet.Name}-瑙﹀彂绱㈠紩锛歿warningSet.TriggerIndex}-{warningSet.WarningIOModel.GetEnumDescription()}:{warningSet.WarningCode}"; SaveAlarmCSVAsync(DateTime.Now, this.Name, warningSet); - OnMonitorAlarm?.BeginInvoke(DateTime.Now, this, warningSet, null, null); + ExcuteMonitorAlarm(DateTime.Now, this, warningSet); } }); #endregion @@ -823,40 +1216,40 @@ if (newIOItem?.Value != oldIOItem?.Value) { - if (monitorSet.TriggerValue == -999 || newIOItem.Value == monitorSet.TriggerValue) + if (monitorSet.TriggerValue == -999 || (int)newIOItem.Value == monitorSet.TriggerValue) { if (monitorSet.OpConfig == null) { monitorSet.OpConfig = new OperationConfigBase(); } - //monitorSet.OpConfig.InputPara = monitorSet.InputDataIndex.ConvertAll(index => - //{ - // return tempNew[index].Value; - //}).ToList(); + monitorSet.OpConfig.InputPara = monitorSet.InputDataIndex.ConvertAll(index => + { + return tempNew[index].Value == IOValue.TRUE ? 1 : 0; + }).ToList(); - OnMonitorInvoke?.BeginInvoke(DateTime.Now, monitorSet.InvokeDevice, this, monitorSet, OnMethodInvoked, monitorSet); + ExcuteMonitorInvoke(DateTime.Now, monitorSet.InvokeDevice, this, monitorSet); } } }); #endregion } - public void ResetAlarm() + public override void ResetAlarm() { int axis_sts; - uint clk; var axisSettings = IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled); - GTSCardAPI.GT_ClrSts((short)IConfig.CardNum, 1, (short)axisSettings.Count); + ClearStatus(1, axisSettings.Count); foreach (var axisSetting in axisSettings) { - GTSCardAPI.GT_GetSts((short)IConfig.CardNum, (short)axisSetting.AxisIndex, out axis_sts, 1, out clk); + //axis_sts = GetAxisStatus((short)axisSetting.AxisIndex); + axis_sts = AxisStatusList.FirstOrDefault(u => u.AxisIndex == axisSetting.AxisIndex).AxisStatus; if ((axis_sts & 0x200) == 0) { var rst = GTSCardAPI.GT_AxisOn((short)IConfig.CardNum, (short)axisSetting.AxisIndex); } - // 浣嶇疆璇烽浂 - GTSCardAPI.GT_ZeroPos((short)IConfig.CardNum, 1, (short)axisSettings.Count); + // 鎵�鏈変綅缃闆� + PositionReset(1, axisSettings.Count); // 姝f瀬闄愭姤璀� if ((axis_sts & 0x20) != 0) { @@ -881,7 +1274,7 @@ } // 娓呴櫎鐘舵�� - GTSCardAPI.GT_ClrSts((short)IConfig.CardNum, 1, (short)IConfig.AxisSettings.FindAll(u => u.IsAxisEnabled).Count); + ClearStatus(1, axisSettings.Count); } object _alarmLock = new object(); -- Gitblit v1.8.0