气压不足时报警

DeviceLibrary/DeviceLibrary/weightSensor/OKLE_WeightSensor.cs

@@ -164,7 +164,7 @@ namespace DeviceLibrary
             var crcbyte = BitConverter.GetBytes(checksun);
             var crcbyte = BitConverter.GetBytes(checksun);
             by[by.Length - 2] = crcbyte[0];
             by[by.Length - 2] = crcbyte[0];
             by[by.Length - 1] = crcbyte[1];
             by[by.Length - 1] = crcbyte[1];
-            log(addr.ToString() + "\treaddata: " + BitConverter.ToString(by).Replace("-", " "));
+            debuglog(addr.ToString() + "\treaddata: " + BitConverter.ToString(by).Replace("-", " "));
             return SendAndReceive(by, addr.ToString());
             return SendAndReceive(by, addr.ToString());
         }
         }
         bool WriteUShort(Addr addr, ushort value)
         bool WriteUShort(Addr addr, ushort value)

DeviceLibrary/theMachine/MainMachine _LedProcess.cs

@@ -124,37 +124,49 @@ namespace DeviceLibrary
             StandbyLed.LedState = LedState.off;
             StandbyLed.LedState = LedState.off;
             AlarmLed.LedState = LedState.off;
             AlarmLed.LedState = LedState.off;
             RunningLed.LedState = LedState.off;
             RunningLed.LedState = LedState.off;
+            //系统停止时有报警, 红亮
+            //系统运行时报警, 绿亮,红闪
+            if (runStatus != RunStatus.Stop && hasAlarm)
+            {
+                ProcessLefCfg(MachineLedStateE.Alarm);
+
+            }
             //回原 绿闪
             //回原 绿闪
-            if (runStatus == RunStatus.HomeReset)
+            else if (runStatus == RunStatus.HomeReset)
             {
             {
                 ProcessLefCfg(MachineLedStateE.HomeReset);
                 ProcessLefCfg(MachineLedStateE.HomeReset);
             }
             }
             //正常 绿亮
             //正常 绿亮
             else if (runStatus == RunStatus.Running)
             else if (runStatus == RunStatus.Running)
             {
             {
-                ProcessLefCfg(MachineLedStateE.Running);
-
                 //出入库 绿闪 黄闪
                 //出入库 绿闪 黄闪
-                if (ClampMoveInfo.MoveStep > MoveStep.Wait
-                || StoreMoveInfo.MoveStep > MoveStep.Wait
-                || (StringMoveInfo.MoveStep > MoveStep.Wait && StringMoveInfo.MoveStep != MoveStep.StringReadyPut && StringMoveInfo.MoveStep <= MoveStep.StringOut_01))
+
+                //温度超限 绿亮 黄闪
+
+                //温度超限30分钟 绿亮 黄闪 红闪
+
+                //系统暂停,说明书未定义, 绿闪, 红闪
+                if (!canRunning || UserPause)
                 {
                 {
-                    ProcessLefCfg(MachineLedStateE.InOut);
+                    ProcessLefCfg(MachineLedStateE.SystemPause);
                 }
                 }
-                //温度超限 绿亮 黄闪
-                if (IsTHoutRange())
+                else if (IsTHoutRangeOver30m())
+                {
+                    ProcessLefCfg(MachineLedStateE.THoutRangeOver30m);
+                }
+                else if (IsTHoutRange())
                 {
                 {
                     ProcessLefCfg(MachineLedStateE.THoutRange);
                     ProcessLefCfg(MachineLedStateE.THoutRange);
                 }
                 }
-                //温度超限30分钟 绿亮 黄闪 红闪
-                if (IsTHoutRangeOver30m())
+                else if (ClampMoveInfo.MoveStep > MoveStep.Wait
+                || StoreMoveInfo.MoveStep > MoveStep.Wait
+                || (StringMoveInfo.MoveStep > MoveStep.Wait && StringMoveInfo.MoveStep != MoveStep.StringReadyPut && StringMoveInfo.MoveStep <= MoveStep.StringOut_01))
                 {
                 {
-                    ProcessLefCfg(MachineLedStateE.THoutRangeOver30m);
+                    ProcessLefCfg(MachineLedStateE.InOut);
                 }
                 }
-                //系统暂停,说明书未定义, 绿闪, 红闪
-                if (!canRunning || UserPause)
+                else
                 {
                 {
-                    ProcessLefCfg(MachineLedStateE.SystemPause);
+                    ProcessLefCfg(MachineLedStateE.Running);
                 }
                 }
             }
             }
             else if (runStatus == RunStatus.Stop)
             else if (runStatus == RunStatus.Stop)
@@ -165,25 +177,7 @@ namespace DeviceLibrary
                     ProcessLefCfg(MachineLedStateE.AlarmStop);
                     ProcessLefCfg(MachineLedStateE.AlarmStop);
                 }
                 }
             }
             }
-            //系统运行时报警, 绿亮,红闪
-            if (runStatus != RunStatus.Stop && hasAlarm)
-            {
-                ProcessLefCfg(MachineLedStateE.Alarm);
           
           
-                //if (UserPause) {
-                //    RunningLed.LedState = LedState.blink;
-                //    StandbyLed.LedState = LedState.blink;
-                //}
-
-                //if (ResetMoveInfo.MoveStep >= MoveStep.H13_HomeReset && ResetMoveInfo.MoveStep <= MoveStep.H14_HomeReset)
-                //{
-                //    StandbyLed.LedState = LedState.blink;
-                //}
-                //if (ClampMoveInfo.MoveStep >= MoveStep.NGOUT_02 && ClampMoveInfo.MoveStep <= MoveStep.NGOUT_03)
-                //{
-                //    StandbyLed.LedState = LedState.blink;
-                //}
-            }
             Led.LedGroup.ForEach((x) => { x.run(); });
             Led.LedGroup.ForEach((x) => { x.run(); });
         }
         }
     }
     }

DeviceLibrary/theMachine/MainMachine.cs

@@ -1033,7 +1033,7 @@ namespace DeviceLibrary
                 if (span.TotalSeconds > RobotManage.Config.AirCheckSeconds)
                 if (span.TotalSeconds > RobotManage.Config.AirCheckSeconds)
                 {
                 {
                     ok = false;
                     ok = false;
-                    Msg.add(crc.GetString(L.airpressure_not_enough, "气压不足"), MsgLevel.warning);
+                    Msg.add(crc.GetString(L.airpressure_not_enough, "气压不足"), MsgLevel.alarm);
                 }
                 }
             }
             }
             else
             else