gocator添加int4类型数据，暂时注释

xcd

2020-11-20 fccc60d8897642ef5c39176b8c872b63fe819ae2

 src/Bro.Device.GTSCard/GTSCardDriver.cs

@@ -526,7 +526,7 @@
        /// <returns></returns>
        public double GetPosition(int axisNum)
        {
            lock (moveLock)
            //lock (moveLock)
            {
                double position = 0;
                double pPos = 0;
@@ -891,6 +891,8 @@
        {
            try
            {
                Thread.CurrentThread.Priority = ThreadPriority.AboveNormal;

                var goHomePara = IConfig.AxisSettings.FirstOrDefault(u => u.AxisIndex == movingOption.AxisIndex).GoHomePara;
                bool homeDirection = goHomePara.IsHomeDirPositive;
                bool isRightLimitReached = false;
@@ -914,6 +916,8 @@
                    PositionReset(movingOption.AxisIndex, 1);
                    ClearStatus(movingOption.AxisIndex, 1);

                    //LogAsync(DateTime.Now, $"{Name}位置置零", "");

                    if (goHomePara.IsCaptureMode)
                    {
                        //搜索距离 阶段1
@@ -922,7 +926,7 @@
                    }

                    // 设置点位模式目标位置，即原点搜索距离
                    sRtn = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, homeDirection ? 99999999 : -99999999);
                    sRtn = GTSCardAPI.GT_SetPos((short)IConfig.CardNum, (short)movingOption.AxisIndex, homeDirection ? 999999999 : -999999999);
                    // 启动运动
                    sRtn = GTSCardAPI.GT_Update((short)IConfig.CardNum, 1 << (movingOption.AxisIndex - 1));

@@ -940,7 +944,7 @@

                    do
                    {
                        Thread.Sleep(checkInterval * 2);
                        Thread.Sleep(checkInterval);

                        if (goHomePara.IsCaptureMode)
                        {
@@ -950,11 +954,11 @@
                        else
                        {
                            GTSCardAPI.GT_GetDi((short)IConfig.CardNum, GTSCardAPI.MC_HOME, out int pValue);

                            capture = (short)((pValue & (1 << (movingOption.AxisIndex - 1))) == 0 ? 1 : 0);
                            //LogAsync(DateTime.Now, $"原点状态{pValue}，轴{movingOption.AxisIndex}原点{capture}", "");
                        }
                        isStop = IsStop((short)movingOption.AxisIndex);
                        repeatTime -= checkInterval * 2;
                        repeatTime -= checkInterval;
                    } while (!(isStop || capture == 1 || repeatTime <= 0));

                    if (repeatTime <= 0)
@@ -965,11 +969,16 @@

                    var axisStatus = AxisStatusList.FirstOrDefault(u => u.AxisIndex == movingOption.AxisIndex);

                    //if (isStop)
                    //{
                    //    LogAsync(DateTime.Now, $"轴{movingOption.AxisIndex}复位中停止", $"Capture状态{capture}");
                    //}

                    if (isStop && capture != 1)
                    {
                        if (((axisStatus.AxisStatus & 0x20) != 0) || ((axisStatus.AxisStatus & 0x40) != 0))
                        {
                            //movingOption.GoHomePara.HomeDir = (short)(movingOption.GoHomePara.HomeDir == 1 ? -1 : 1);
                            capture = 0;

                            //正限位
                            if ((axisStatus.AxisStatus & 0x20) != 0 && !goHomePara.IsCaptureDirPositive)
@@ -984,6 +993,8 @@
                            }

                            homeDirection = !homeDirection;

                            LogAsync(DateTime.Now, $"轴{movingOption.AxisIndex}极限位置换向", "");
                        }

                        ClearStatus(movingOption.AxisIndex, 1);
@@ -1018,14 +1029,18 @@
                            repeatTime--;
                        } while (!isStop && repeatTime > 0);
                        PositionReset(movingOption.AxisIndex, 1);
                        LogAsync(DateTime.Now, $"轴{movingOption.AxisIndex}复位完成，位置清零", "");

                        return (sRtn == (short)GTSRetCode.GRCRunOK) && isStop;
                    }

                } while (!(capture == 1 && isRightLimitReached));

                return false;
            }
            catch (Exception ex)
            {
                LogAsync(DateTime.Now, $"{Name}回原点异常", ex.GetExceptionMessage());
                AllMoveStop(true);
                OnExceptionOccured?.Invoke(DateTime.Now, ex);
                return false;
@@ -1099,7 +1114,7 @@
        /// <returns></returns>
        public override int GetAxisStatus(int axisNum)
        {
            lock (moveLock)
            //lock (moveLock)
            {
                int sts = 0;
                uint pclock = 0;
@@ -1122,7 +1137,7 @@
        /// <returns></returns>
        public override bool PositionReset(int startAxisIndex, int count)
        {
            lock (moveLock)
            //lock (moveLock)
            {
                var rtn = GTSCardAPI.GT_ZeroPos((short)IConfig.CardNum, (short)startAxisIndex, (short)count);
                return rtn == (short)GTSRetCode.GRCRunOK;