merge origin master

ModbusDemo/windows/Form1.cs

@@ -1039,10 +1039,18 @@ namespace ModbusDemo
                 ModbusComm.Modbus.Transport.WriteTimeout = 1000;
                 ModbusComm.Modbus.Transport.WaitToRetryMilliseconds = 0;
 
+<<<<<<< HEAD
                 t_AutoControl = new Thread(AtuoControl_run);
                 t_AutoControl.IsBackground = true;
                 t_AutoControl.Start();
 
+=======
+                t_AutoControl = new Thread(AtuoControl_run)
+                {
+                    IsBackground = true
+                };
+                t_AutoControl.Start();
+>>>>>>> origin/master
 
                 modbus_Timer.Enabled = true;
                 btOpenCOM.Enabled = false;
@@ -1081,6 +1089,7 @@ namespace ModbusDemo
         }
         private async void run()
         {
+<<<<<<< HEAD
             if (LOCALDEBUG == true)
             {
                 comPort.PortName = "COM6";
@@ -1089,6 +1098,9 @@ namespace ModbusDemo
             {
                 comPort.PortName = "COM6";
             }
+=======
+                comPort.PortName = "COM1";
+>>>>>>> origin/master
                 comPort.BaudRate = 9600;
                 comPort.Parity = Parity.None;
                 comPort.StopBits = StopBits.One;