diff --git a/ModbusDemo.sln b/ModbusDemo.sln index 1001852..5e8bfc4 100644 --- a/ModbusDemo.sln +++ b/ModbusDemo.sln @@ -1,10 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.14.36301.6 d17.14 +VisualStudioVersion = 17.14.36301.6 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModbusDemo", "ModbusDemo\ModbusDemo.csproj", "{4F00ED24-6BEE-4192-9CA4-656802B78A6D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModbusTest", "ModbusTest\ModbusTest.csproj", "{83697BB7-2138-4D7A-BA1C-6FCAFE5CC37A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {4F00ED24-6BEE-4192-9CA4-656802B78A6D}.Debug|Any CPU.Build.0 = Debug|Any CPU {4F00ED24-6BEE-4192-9CA4-656802B78A6D}.Release|Any CPU.ActiveCfg = Release|Any CPU {4F00ED24-6BEE-4192-9CA4-656802B78A6D}.Release|Any CPU.Build.0 = Release|Any CPU + {83697BB7-2138-4D7A-BA1C-6FCAFE5CC37A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83697BB7-2138-4D7A-BA1C-6FCAFE5CC37A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83697BB7-2138-4D7A-BA1C-6FCAFE5CC37A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83697BB7-2138-4D7A-BA1C-6FCAFE5CC37A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ModbusDemo/Device/IModbusRTU.cs b/ModbusDemo/Device/IModbusRTU.cs index 0a0a0bf..7d5e750 100644 --- a/ModbusDemo/Device/IModbusRTU.cs +++ b/ModbusDemo/Device/IModbusRTU.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace ModbusDemo.Device { - interface IModbusRTU + public interface IModbusRTU { public bool[] ReadCoil(byte slaveAddress, ushort startAddress, ushort numberOfPoints); diff --git a/ModbusDemo/Device/ModbusRTU.cs b/ModbusDemo/Device/ModbusRTU.cs index 5152131..88f5635 100644 --- a/ModbusDemo/Device/ModbusRTU.cs +++ b/ModbusDemo/Device/ModbusRTU.cs @@ -17,6 +17,7 @@ namespace ModbusDemo.Device private SerialPort _serialPort; //用于操作数据库 private ModbusDbContext _modbusDbContext; + public ModbusRTU(SerialPort serialPort, ModbusDbContext modbusDbContext) { _serialPort = serialPort; diff --git a/ModbusDemo/Model/ModbusDbContext.cs b/ModbusDemo/Model/ModbusDbContext.cs index 3c4b97d..e37d7dd 100644 --- a/ModbusDemo/Model/ModbusDbContext.cs +++ b/ModbusDemo/Model/ModbusDbContext.cs @@ -9,7 +9,9 @@ namespace ModbusDemo.Model { public class ModbusDbContext:DbContext { - + protected ModbusDbContext() + { + } public ModbusDbContext(DbContextOptions options) :base(options) { diff --git a/ModbusDemo/VIew/CoilUC.xaml b/ModbusDemo/VIew/CoilUC.xaml index 7d84322..355c37f 100644 --- a/ModbusDemo/VIew/CoilUC.xaml +++ b/ModbusDemo/VIew/CoilUC.xaml @@ -87,8 +87,8 @@