2

GcDevicePc/FormUser.cs

@@ -50,13 +50,7 @@ namespace GcDevicePc
         //自动校准
         private void buttonauto_Click(object sender, EventArgs e)  
         {
-            if (CK_UI.LandIn.Island)
-            {
-               
-            }else
-            {
-               
-            }
+           
 
             DialogResult dr = new CK_UI.LandIn("calibration").ShowDialog();
 

GcDevicePc/MDIBase.cs

@@ -398,7 +398,7 @@ namespace GcDevicePc
          float fDetvalueold = 0.0f;
         private void timer1_Tick(object sender, EventArgs e)
         {
-            this.Text = String.Format("VOCs在线监测-1.1.3.02 {0}",Formstr);
+            this.Text = String.Format("VOCs在线监测-1.1.3.03 {0}",Formstr);
             if (LandIn.Island)
             {
             HmiStatus.Text = String.Format("状态：{0}", statestr);
@@ -1992,6 +1992,8 @@ namespace GcDevicePc
         {
             try
             {
+                //Trace.WriteLine(string.Format("{0},{1}", SharedSpace.MControl.SetOut, SharedSpace.MControl.SetRun), "debug");
+
                 if (SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun == false)  //准备开始校准
                 {
                     SharedSpace.MControl.errstr = null;
@@ -2023,6 +2025,11 @@ namespace GcDevicePc
                         SharedSpace.MControl.SetOut = false;
                     }
                 }
+                //else if (SharedSpace.MControl.SetRun == false)
+                //{
+                //    SharedSpace.MControl.errstr = "系统准备失败";
+                //    SharedSpace.MControl.SetOut = false;
+                //}
                 //等待校准结束
                 if (DateTime.Now >= AutoAdjust && SharedSpace.MControl.SetOut && SharedSpace.MControl.SetRun)
                 {