注释 自动控制

ModbusDemo/windows/Form1.cs

@@ -289,11 +289,11 @@ namespace ModbusDemo
             //Reconnecting
             if (isReconnect)
             {
-                Invoke((new Action(() =>
+                Invoke((new Action(async () =>
                 {
                     txtReceiveMessage.AppendText("正在尝试重新连接" + Environment.NewLine);
                     totxt.Log("正在尝试重新连接" + Environment.NewLine);
-
+                    await Subscribe();
                     //Console.WriteLine("正在尝试重新连接" + Environment.NewLine);
 
                 })));
@@ -1061,17 +1061,12 @@ namespace ModbusDemo
                 ModbusComm.Modbus.Transport.ReadTimeout = 1000;
                 ModbusComm.Modbus.Transport.WriteTimeout = 1000;
                 ModbusComm.Modbus.Transport.WaitToRetryMilliseconds = 0;
-<<<<<<< HEAD
-                //t_AutoControl = new Thread(T_AutoControl);
-                //t_AutoControl.IsBackground = true;
-                //t_AutoControl.Start();
-=======
 
-                //t_AutoControl = new Thread(T_AutoControl)
-                //{
-                //    IsBackground = true
-                //};
-                //t_AutoControl.Start();
+                t_AutoControl = new Thread(AtuoControl_run)
+                {
+                    IsBackground = true
+                };
+                t_AutoControl.Start();
 
                 modbus_Timer.Enabled = true;
                 btOpenCOM.Enabled = false;
@@ -1110,7 +1105,7 @@ namespace ModbusDemo
         }
         private async void run()
         {
-                comPort.PortName = "COM6";
+                comPort.PortName = "COM1";
                 comPort.BaudRate = 9600;
                 comPort.Parity = Parity.None;
                 comPort.StopBits = StopBits.One;
@@ -1130,7 +1125,7 @@ namespace ModbusDemo
                 ModbusComm.Modbus.Transport.WriteTimeout = 1000;
                 ModbusComm.Modbus.Transport.WaitToRetryMilliseconds = 0;
 
-                //t_AutoControl = new Thread(T_AutoControl)
+                //t_AutoControl = new Thread(AtuoControl_run)
                 //{
                 //    IsBackground = true
                 //};