add all poll return control

ModbusDemo/Modular/ModualPoll.cs

@@ -700,7 +700,6 @@ namespace ModbusDemo.Modular
             return bGetStatus;
 
         }
-
         public static bool bSet_All_Channel_Value(byte byModbusID, bool[] bControlData)
         {
             bool bControlStatus = true;

ModbusDemo/windows/Form1.cs

@@ -1039,18 +1039,11 @@ 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;
@@ -1089,7 +1082,6 @@ namespace ModbusDemo
         }
         private async void run()
         {
-<<<<<<< HEAD
             if (LOCALDEBUG == true)
             {
                 comPort.PortName = "COM6";
@@ -1098,9 +1090,6 @@ namespace ModbusDemo
             {
                 comPort.PortName = "COM6";
             }
-=======
-                comPort.PortName = "COM1";
->>>>>>> origin/master
                 comPort.BaudRate = 9600;
                 comPort.Parity = Parity.None;
                 comPort.StopBits = StopBits.One;