merge origin/master

ModbusDemo/MessageFormat/ModbusComm.cs

@@ -28,11 +28,20 @@ namespace ModbusDemo.MessageFormat
             MB_EMASTERSENT,
             MB_RTUERNOERR
         }
+<<<<<<< HEAD
         public  static ModbusMaster Modbus;
         public  static ushort usCommunFailTimes = 0;
         private static object oLock = new object();
         public static eModbusErrorCode Modbus_ReadHoldingRegistersTask(out ushort[] OutputValue, byte slaveAddress, ushort startAddress, ushort numberOfPoints)
         {
+=======
+        public static ModbusMaster Modbus;
+        public static ushort usCommunFailTimes = 0;
+        static object oLock = new object();
+        public static eModbusErrorCode Modbus_ReadHoldingRegistersTask(out ushort[] OutputValue, byte slaveAddress, ushort startAddress, ushort numberOfPoints)
+        {
+            
+>>>>>>> 5635bdf708c90bb2146f99466d1145dda5dabb37
             lock (oLock)
             {
                 eModbusErrorCode ModbusErrorCode;
@@ -117,6 +126,10 @@ namespace ModbusDemo.MessageFormat
         }
         public static eModbusErrorCode Modbus_ReadCoilsTask(out bool[] OutputValue, byte slaveAddress, ushort startAddress, ushort numberOfPoints)
         {
+<<<<<<< HEAD
+=======
+            //object oLock = new object();
+>>>>>>> 5635bdf708c90bb2146f99466d1145dda5dabb37
             lock (oLock)
             {
                 eModbusErrorCode ModbusErrorCode;
@@ -201,6 +214,10 @@ namespace ModbusDemo.MessageFormat
         }
         public static eModbusErrorCode Modbus_WriteSingleCoil(byte slaveAddress, ushort startAddress, bool value)
         {
+<<<<<<< HEAD
+=======
+            //object oLock = new object();
+>>>>>>> 5635bdf708c90bb2146f99466d1145dda5dabb37
             lock (oLock)
             {
                 eModbusErrorCode ModbusErrorCode;
@@ -283,6 +300,10 @@ namespace ModbusDemo.MessageFormat
         }
         public static eModbusErrorCode Modbus_WriteMultipleCoils(byte slaveAddress, ushort startAddress, bool[] data)
         {
+<<<<<<< HEAD
+=======
+            //object oLock = new object();
+>>>>>>> 5635bdf708c90bb2146f99466d1145dda5dabb37
             lock (oLock)
             {
                 eModbusErrorCode ModbusErrorCode;

ModbusDemo/ModbusDemo.csproj

@@ -181,7 +181,10 @@
   <Import Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.Sql.UnitTesting.targets" Condition="$(VisualStudioVersion) != '15.0' And '$(SQLDBExtensionsRefPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.Sql.UnitTesting.targets" Condition="$(VisualStudioVersion) != '15.0' And '$(SQLDBExtensionsRefPath)' == ''" />
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> 5635bdf708c90bb2146f99466d1145dda5dabb37
   <PropertyGroup>
     <SsdtUnitTestVersion>3.1</SsdtUnitTestVersion>
   </PropertyGroup>

ModbusDemo/windows/Form1.cs

@@ -1069,6 +1069,48 @@ namespace ModbusDemo
 
         private void button2_Click(object sender, EventArgs e)
         {
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+            //AutoControl.Control usEcontrol = new AutoControl.Control();
+            //AutoControl.Control usWcontrol = new AutoControl.Control();
+            //if (ModualControl.cPoolLevelConfig.Count!=0)
+            //{
+            //    for (int i = 0; i < ModualControl.cPoolLevelConfig.Count; i++)
+            //    {
+            //        if (ModualControl.cPoolLevelConfig[i].byModbusID == 6)
+            //        {
+            //            usWcontrol.maxLevel = ModualControl.cPoolLevelConfig[i].dUpLevel;
+            //            usWcontrol.minLevel = ModualControl.cPoolLevelConfig[i].dDownLevel;
+            //            usWcontrol.Name = "西·中转池";
+            //            usWcontrol.Enablation = true;
+            //            AutoControl.CriticalValueMonitoring(true, ModualControl.cPoolLevelConfig[1].dUpLevel,
+            //            ModualControl.cPoolLevelConfig[0].dDownLevel, ModualPoll.cx18x.sX18xDataStruct[1].dNowConvertData[1],
+            //             "西·中转池",
+            //             out usWcontrol
+            //            );
+            //        }
+            //        if (ModualControl.cPoolLevelConfig[i].byModbusID == 3)
+            //        {
+            //            usEcontrol.maxLevel = ModualControl.cPoolLevelConfig[i].dUpLevel;
+            //            usEcontrol.minLevel = ModualControl.cPoolLevelConfig[i].dDownLevel;
+            //            usEcontrol.Name = "东·中转池";
+            //            usEcontrol.Enablation = true;
+            //            AutoControl.CriticalValueMonitoring(true, ModualControl.cPoolLevelConfig[0].dUpLevel,
+            //            ModualControl.cPoolLevelConfig[0].dDownLevel, ModualPoll.cx18x.sX18xDataStruct[0].dNowConvertData[0],
+            //            "东·中转池",
+            //            out usEcontrol
+            //            );
+            //        }
+
+            //    }
+
+
+            //}
+
+>>>>>>> 83d8d9d1b2182210455375f355bb9f6860d45dc2
+>>>>>>> 5635bdf708c90bb2146f99466d1145dda5dabb37
 
         }