颜色调整

DeviceLibrary/theMachine/MainMachine _LedRGBProcess.cs

@@ -73,10 +73,15 @@ namespace DeviceLibrary
                 {
                     return;
                 }
-                if (lastColor != "" && lastColor.Equals(color.Name.ToString()))
-                {
-                    return;
-                }
+                //if (lastColor != "" && lastColor.Equals(color.Name.ToString()))
+                //{
+                //    return;
+                //}
+                //if (lastColor.Equals("yellowL")||lastColor.Equals("greenL"))
+                //{
+                //    rGB_Controller.CloseLed();
+                //    Thread.Sleep(50);
+                //}
                 lastS = lastState;
                 //rGB_Controller.CloseLed();
                 rGB_Controller.ShowColor(color);
@@ -154,7 +159,11 @@ namespace DeviceLibrary
                 {
                     scanCode = true;
                 }
-                if (h != null && h.Value )
+                if(StoreMoveInfo.IsStep(MoveStep.Wait)&&ClampMoveInfo.IsStep(MoveStep.Wait)&& StringMoveInfo.IsStep(MoveStep.Wait))
+                {
+
+                }
+                else  if (h != null && h.Value )
                 {
                     waitTake = true;
                 }
@@ -188,13 +197,14 @@ namespace DeviceLibrary
             {
                 ////流动黄: 出库,  
                 ShowYellowLight();
-                lastS = "storeOut";
-
+                lastS = "storeOut"; 
+                LogUtil.info(Name + " ShowColor " + lastS + "=" + lastColor);
             }
             else if (inPut)
             {
                 ShowGreenLight();
                 lastS = "storeIn";
+                LogUtil.info(Name + " ShowColor " + lastS + "=" + lastColor);
             }
             else if (waitTake)
             {
@@ -225,7 +235,7 @@ namespace DeviceLibrary
             else
             {
                 //待机 蓝绿
-                ShowColor(Color.FromArgb(0, 128, 128), "waiting"); 
+                ShowColor(Color.FromArgb(0, 255, 64), "waiting"); 
             }
         }
     }

DeviceLibrary/theMachine/MainMachine.cs

@@ -325,8 +325,10 @@ namespace DeviceLibrary
                         currnetstoreStatus = isInSuddenDown ? StoreStatus.SuddenStop : StoreStatus.Warning;
                     }
                     //ProcessMoveinfoEvent?.Invoke(MoveInfo.List);
-                    if (!UserPause&&(!mstart))
+                    if (!UserPause && mstart)
+                    {
                         Msg.clear();
+                    }
                     //else
                     //    currnetstoreStatus = StoreStatus.Debugging;
 
@@ -496,16 +498,21 @@ namespace DeviceLibrary
                     {
                         ResetMoveInfo.NextMoveStep(MoveStep.H12_HomeReset);
                         ResetMoveInfo.log("反转托盘上有料盘,送到NG口");
-                    }
+                    } 
                     else
                     {
-                        if (RobotManage.NeedSensorPro())
+                        if (IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
+                        {
+                            ResetMoveInfo.NextMoveStep(MoveStep.HEND_HomeReset);
+                            ResetMoveInfo.log("叉子上有料，不去进行超声感应器检测");
+                        }
+                       else  if (RobotManage.NeedSensorPro())
                         {
                             ResetMoveInfo.NextMoveStep(MoveStep.H21_HomeStartCheck);
                             ResetMoveInfo.log("夹爪上没有料盘，开始去进行超声感应器检测");
                         }
                         else
-                        { 
+                        {
                             ResetMoveInfo.NextMoveStep(MoveStep.HEND_HomeReset);
                             ResetMoveInfo.log("夹爪上上没有料盘");
                         }

DeviceLibrary/theMachine/MainMachine_Clamp.cs

@@ -299,7 +299,7 @@ namespace DeviceLibrary
                     else
                     if (h.Value)
                     {
-                        Msg.add(crc.GetString(L.please_take_ngdoor_reel, "等待取走单料口料盘"), MsgLevel.alarm);
+                        Msg.add(crc.GetString(L.please_take_ngdoor_reel, "等待取走单料口料盘"), MsgLevel.warning);
                         ShowColor(Color.White, "waitTask");
                         if (Setting_Init.CamTestReel_Ability)
                         {