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

DLL/ConfigHelper.xml

@@ -155,6 +155,13 @@
             保存设置
             </summary>
         </member>
+        <member name="M:ConfigHelper.Config.FileSave(System.String,System.String)">
+            <summary>
+            不通过系统缓存立刻写入磁盘
+            </summary>
+            <param name="content"></param>
+            <param name="destfilename"></param>
+        </member>
         <member name="M:ConfigHelper.Config.PropertyBind(System.Object,System.Object,System.String,System.String,System.String)">
             <summary>
             绑定UI属性

DeviceLibrary/DeviceLibrary/LiftMonitor.cs

@@ -92,7 +92,7 @@ namespace DeviceLibrary
                         Pause();
                         return;
                     }
-                    if (!string.IsNullOrEmpty(saftylight) && IOManager.IOValue(saftylight).Equals(IO_VALUE.LOW)) {
+                    if (!string.IsNullOrEmpty(saftylight) && IOManager.IOValue(saftylight).Equals(IO_VALUE.LOW) && IOManager.IOValue(down.ToString()).Equals(IO_VALUE.LOW)) {
                         moveInfo.log("安全光栅触发停止");
                         Pause();
                         return;

TheMachine/Form1.cs

@@ -351,7 +351,7 @@ namespace TheMachine
                 {
                     btn_IgnoreX09.Visible = false;
                 }
-                else if (msg.errInfo == ErrInfo.RunBtn)
+                else if (msg.errInfo == ErrInfo.RunBtn||msg.errInfo == ErrInfo.ResetBtn)
                 {
                     Task.Run(()=> {
                         if (!RobotManage.isRunning)