添加624X输出限制开关

GcDevicePc/GCBuffer/PCBuffer.cs

@@ -91,7 +91,7 @@ namespace GcDevicePc.GCBuffer
             gcpcinfo.pcworkinfo.system_Statue = false;
             gcpcinfo.pcworkinfo.work_Statue = 0;
 
-            gcpcinfo.moduleinfo.ip = "192.168.1.54";
+            gcpcinfo.moduleinfo.ip = "";
 
             string file = System.Windows.Forms.Application.StartupPath + "\\startup.ini";
 

GcDevicePc/MDIBase.cs

@@ -369,7 +369,7 @@ namespace GcDevicePc
                     if (i != 99)
                     {
                         worker.ReportProgress(i);
-                        break;
+                        //break;
                     }
                         
                 }
@@ -585,7 +585,8 @@ namespace GcDevicePc
             dataVOC.CKvocUpdataStart();
             mytcptest.DataRcvStart();
 
-            wtd624xOutput.DataOutStart();
+            if (!String.IsNullOrEmpty(globaldata.m_pcbuffer.gcpcinfo.moduleinfo.ip))
+                wtd624xOutput.DataOutStart();
         }
 
         private void Stop_Thread()
@@ -601,7 +602,8 @@ namespace GcDevicePc
                 mymodbus.ChannelDataStop();
             }
 
-            wtd624xOutput.DataOutStop();
+            if (!String.IsNullOrEmpty(globaldata.m_pcbuffer.gcpcinfo.moduleinfo.ip))
+                wtd624xOutput.DataOutStop();
         }
 
        /// <summary>
@@ -998,7 +1000,7 @@ namespace GcDevicePc
 
                     conmre.Set();
                     globaldata.m_pcbuffer.gcpcinfo.pcthreadinfo.HMI_Monitor_TH = 1;
-                    Thread.Sleep(1500);
+                    Thread.Sleep(1000);
 
 
                     count = 0;

GcDevicePc/ProThread/DataOutput.cs

@@ -15,7 +15,7 @@ namespace GcDevicePc.ProThread
         ManualResetEvent outputmre = new ManualResetEvent(false);
         Thread t_DataOut;
 
-        private WTD624X wtd624x = new WTD624X(globaldata.m_pcbuffer.gcpcinfo.moduleinfo.ip, 502);
+        private WTD624X wtd624x;
 
         private bool c6h6 = false;
         private bool c7h8 = false;
@@ -157,28 +157,41 @@ namespace GcDevicePc.ProThread
 
         public void DataOutStart()
         {
-            if (outputmre != null)
+            if (!String.IsNullOrEmpty(globaldata.m_pcbuffer.gcpcinfo.moduleinfo.ip))
             {
-                outputmre.Reset();
+                wtd624x = new WTD624X(globaldata.m_pcbuffer.gcpcinfo.moduleinfo.ip, 502);
             }
 
-            t_DataOut = new Thread(OutPut_DataList);
-            t_DataOut.IsBackground = true;
-            t_DataOut.Start();
-
-            if (!wtd624x.GetWorkFlag())
+            if (wtd624x!= null)
             {
-                wtd624x.WTD624X_Open();
+                if (outputmre != null)
+                {
+                    outputmre.Reset();
+                }
+
+                t_DataOut = new Thread(OutPut_DataList);
+                t_DataOut.IsBackground = true;
+                t_DataOut.Start();
+
+                if (!wtd624x.GetWorkFlag())
+                {
+                    wtd624x.WTD624X_Open();
+                }
             }
+            
         }
 
         public void DataOutStop()
         {
-            outputmre.Set();
-            if (wtd624x.GetWorkFlag())
+            if (wtd624x != null)
             {
-                wtd624x.WTD624X_Open();
+                outputmre.Set();
+                if (wtd624x.GetWorkFlag())
+                {
+                    wtd624x.WTD624X_Open();
+                }
             }
+                
 
         }
     }