Merge branch 'master' of http://106.15.194.121:8083/liutao/1069_MIMO_PlUS

DeviceLibrary/theMachine/MainMachine.cs

@@ -724,7 +724,7 @@ namespace DeviceLibrary
                     {
                         if (AxisManager.GetAlarmStatus(configMoveAxis.DeviceName, configMoveAxis.GetAxisValue()) == 1)
                         {
-                            Task.Delay(1000).Wait();
+                            Task.Delay(100).Wait();
                             if (!SafetyLightStop && lastSafeCheckStatus)
                             {
                                 Msg.add(crc.GetString(configMoveAxis.ProName, configMoveAxis.Explain) + $"[{configMoveAxis.GetAxisValue()}]:"