diff --git a/Document/FAQ.doc b/Document/FAQ.doc new file mode 100644 index 0000000..1959152 Binary files /dev/null and b/Document/FAQ.doc differ diff --git a/Document/设计流程.doc b/Document/设计流程.doc index 1607fcb..583a778 100644 Binary files a/Document/设计流程.doc and b/Document/设计流程.doc differ diff --git a/SCADA/Example/BatchCommon.dll b/SCADA/Example/BatchCommon.dll deleted file mode 100644 index 6a3ca6d..0000000 Binary files a/SCADA/Example/BatchCommon.dll and /dev/null differ diff --git a/SCADA/Example/CoreTest.exe b/SCADA/Example/CoreTest.exe index c8d662a..849a0d2 100644 Binary files a/SCADA/Example/CoreTest.exe and b/SCADA/Example/CoreTest.exe differ diff --git a/SCADA/Program/BatchCoreService/bin/Debug/BatchCoreService.exe b/SCADA/Program/BatchCoreService/bin/Debug/BatchCoreService.exe index 80c648e..20e76e6 100644 Binary files a/SCADA/Program/BatchCoreService/bin/Debug/BatchCoreService.exe and b/SCADA/Program/BatchCoreService/bin/Debug/BatchCoreService.exe differ diff --git a/SCADA/Program/BatchCoreService/bin/Debug/ClientDriver.dll b/SCADA/Program/BatchCoreService/bin/Debug/ClientDriver.dll index 0078ad8..1b01df7 100644 Binary files a/SCADA/Program/BatchCoreService/bin/Debug/ClientDriver.dll and b/SCADA/Program/BatchCoreService/bin/Debug/ClientDriver.dll differ diff --git a/SCADA/Program/BatchCoreService/bin/Debug/DataHelper.dll b/SCADA/Program/BatchCoreService/bin/Debug/DataHelper.dll index 21bf117..edab45e 100644 Binary files a/SCADA/Program/BatchCoreService/bin/Debug/DataHelper.dll and b/SCADA/Program/BatchCoreService/bin/Debug/DataHelper.dll differ diff --git a/SCADA/Program/BatchCoreService/bin/Debug/DataService.dll b/SCADA/Program/BatchCoreService/bin/Debug/DataService.dll index e84e58d..58b43e9 100644 Binary files a/SCADA/Program/BatchCoreService/bin/Debug/DataService.dll and b/SCADA/Program/BatchCoreService/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csproj.FileListAbsolute.txt b/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csproj.FileListAbsolute.txt index 0566a3b..ad76f90 100644 --- a/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csproj.FileListAbsolute.txt +++ b/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.csproj.FileListAbsolute.txt @@ -132,3 +132,19 @@ E:\新建文件夹\SCADA\Program\BatchCoreService\obj\x86\Debug\BatchCoreService E:\新建文件夹\SCADA\Program\BatchCoreService\obj\x86\Debug\BatchCoreService.csproj.GenerateResource.Cache E:\新建文件夹\SCADA\Program\BatchCoreService\obj\x86\Debug\BatchCoreService.exe E:\新建文件夹\SCADA\Program\BatchCoreService\obj\x86\Debug\BatchCoreService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\bin\Debug\App.config +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\bin\Debug\BatchCoreService.exe.config +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\bin\Debug\BatchCoreService.exe +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\bin\Debug\BatchCoreService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\bin\Debug\ClientDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\bin\Debug\DataHelper.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\bin\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\bin\Debug\ClientDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\bin\Debug\DataHelper.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\bin\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\obj\x86\Debug\BatchCoreService.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\obj\x86\Debug\BatchCoreService.BatchCoreService.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\obj\x86\Debug\BatchCoreService.ProjectInstaller.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\obj\x86\Debug\BatchCoreService.csproj.GenerateResource.Cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\obj\x86\Debug\BatchCoreService.exe +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreService\obj\x86\Debug\BatchCoreService.pdb diff --git a/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.exe b/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.exe index 80c648e..20e76e6 100644 Binary files a/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.exe and b/SCADA/Program/BatchCoreService/obj/x86/Debug/BatchCoreService.exe differ diff --git a/SCADA/Program/FileDriver/obj/Release/build.force b/SCADA/Program/BatchCoreService/obj/x86/Debug/build.force similarity index 100% rename from SCADA/Program/FileDriver/obj/Release/build.force rename to SCADA/Program/BatchCoreService/obj/x86/Debug/build.force diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.exe b/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.exe index 515f469..3aa9e7e 100644 Binary files a/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.exe and b/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.exe differ diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.dll b/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.dll index 0078ad8..1b01df7 100644 Binary files a/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.dll and b/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.dll differ diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/DataHelper.dll b/SCADA/Program/BatchCoreTest/bin/Debug/DataHelper.dll index 21bf117..edab45e 100644 Binary files a/SCADA/Program/BatchCoreTest/bin/Debug/DataHelper.dll and b/SCADA/Program/BatchCoreTest/bin/Debug/DataHelper.dll differ diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/DataService.dll b/SCADA/Program/BatchCoreTest/bin/Debug/DataService.dll index e84e58d..58b43e9 100644 Binary files a/SCADA/Program/BatchCoreTest/bin/Debug/DataService.dll and b/SCADA/Program/BatchCoreTest/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.FileListAbsolute.txt b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.FileListAbsolute.txt index 0551944..d4d27b4 100644 --- a/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.FileListAbsolute.txt +++ b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.csproj.FileListAbsolute.txt @@ -121,3 +121,17 @@ E:\新建文件夹\SCADA\Program\BatchCoreTest\bin\Debug\DataService.pdb E:\新建文件夹\SCADA\Program\BatchCoreTest\obj\x86\Debug\BatchCoreTest.csprojResolveAssemblyReference.cache E:\新建文件夹\SCADA\Program\BatchCoreTest\obj\x86\Debug\BatchCoreService.Properties.Resources.resources E:\新建文件夹\SCADA\Program\BatchCoreTest\obj\x86\Debug\BatchCoreTest.csproj.GenerateResource.Cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\bin\Debug\BatchCoreTest.exe.config +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\obj\x86\Debug\BatchCoreTest.exe +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\obj\x86\Debug\BatchCoreTest.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\bin\Debug\BatchCoreTest.exe +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\bin\Debug\BatchCoreTest.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\bin\Debug\ClientDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\bin\Debug\DataHelper.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\bin\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\bin\Debug\ClientDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\bin\Debug\DataHelper.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\bin\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\obj\x86\Debug\BatchCoreTest.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\obj\x86\Debug\BatchCoreService.Properties.Resources.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\obj\x86\Debug\BatchCoreTest.csproj.GenerateResource.Cache diff --git a/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.exe b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.exe index 515f469..3aa9e7e 100644 Binary files a/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.exe and b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.exe differ diff --git a/SCADA/Program/LinkableControlDesignTime/obj/Release/build.force b/SCADA/Program/BatchCoreTest/obj/x86/Debug/build.force similarity index 100% rename from SCADA/Program/LinkableControlDesignTime/obj/Release/build.force rename to SCADA/Program/BatchCoreTest/obj/x86/Debug/build.force diff --git a/SCADA/Program/BatchCoreTest/obj/x86/Release/BatchCoreTest.csproj.FileListAbsolute.txt b/SCADA/Program/BatchCoreTest/obj/x86/Release/BatchCoreTest.csproj.FileListAbsolute.txt index 36b8947..71e7ee1 100644 --- a/SCADA/Program/BatchCoreTest/obj/x86/Release/BatchCoreTest.csproj.FileListAbsolute.txt +++ b/SCADA/Program/BatchCoreTest/obj/x86/Release/BatchCoreTest.csproj.FileListAbsolute.txt @@ -148,3 +148,6 @@ E:\SCADA\Program\BatchCoreTest\bin\Release\DataService.pdb E:\SCADA\Program\BatchCoreTest\obj\x86\Release\BatchCoreTest.csprojResolveAssemblyReference.cache E:\SCADA\Program\BatchCoreTest\obj\x86\Release\BatchCoreService.Properties.Resources.resources E:\SCADA\Program\BatchCoreTest\obj\x86\Release\BatchCoreTest.csproj.GenerateResource.Cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\bin\Release\BatchCoreTest.exe.config +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\obj\x86\Release\BatchCoreTest.exe +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\BatchCoreTest\obj\x86\Release\BatchCoreTest.pdb diff --git a/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.dll b/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.dll index 0078ad8..9597c45 100644 Binary files a/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.dll and b/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.dll differ diff --git a/SCADA/Program/ClientDriver/bin/Debug/DataService.dll b/SCADA/Program/ClientDriver/bin/Debug/DataService.dll index e84e58d..e6b1419 100644 Binary files a/SCADA/Program/ClientDriver/bin/Debug/DataService.dll and b/SCADA/Program/ClientDriver/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/ClientDriver/bin/Release/ClientDriver.dll b/SCADA/Program/ClientDriver/bin/Release/ClientDriver.dll index bc1aff4..cfc4d0b 100644 Binary files a/SCADA/Program/ClientDriver/bin/Release/ClientDriver.dll and b/SCADA/Program/ClientDriver/bin/Release/ClientDriver.dll differ diff --git a/SCADA/Program/ClientDriver/bin/Release/DataService.dll b/SCADA/Program/ClientDriver/bin/Release/DataService.dll index afed82c..92a15c1 100644 Binary files a/SCADA/Program/ClientDriver/bin/Release/DataService.dll and b/SCADA/Program/ClientDriver/bin/Release/DataService.dll differ diff --git a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csproj.FileListAbsolute.txt b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csproj.FileListAbsolute.txt index ee040c4..f3bfbb5 100644 --- a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csproj.FileListAbsolute.txt +++ b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.csproj.FileListAbsolute.txt @@ -66,3 +66,10 @@ E:\新建文件夹\SCADA\Program\ClientDriver\bin\Debug\DataService.pdb E:\新建文件夹\SCADA\Program\ClientDriver\obj\Debug\ClientDriver.csprojResolveAssemblyReference.cache E:\新建文件夹\SCADA\Program\ClientDriver\obj\Debug\ClientDriver.dll E:\新建文件夹\SCADA\Program\ClientDriver\obj\Debug\ClientDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\bin\Debug\ClientDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\bin\Debug\ClientDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\bin\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\bin\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\obj\Debug\ClientDriver.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\obj\Debug\ClientDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\obj\Debug\ClientDriver.pdb diff --git a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.dll b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.dll index 0078ad8..9597c45 100644 Binary files a/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.dll and b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.dll differ diff --git a/SCADA/Program/ClientDriver/obj/Release/ClientDriver.csproj.FileListAbsolute.txt b/SCADA/Program/ClientDriver/obj/Release/ClientDriver.csproj.FileListAbsolute.txt index 78f3c60..371e6fc 100644 --- a/SCADA/Program/ClientDriver/obj/Release/ClientDriver.csproj.FileListAbsolute.txt +++ b/SCADA/Program/ClientDriver/obj/Release/ClientDriver.csproj.FileListAbsolute.txt @@ -103,3 +103,10 @@ E:\SCADA\Program\ClientDriver\bin\Release\DataService.pdb E:\SCADA\Program\ClientDriver\obj\Release\ClientDriver.csprojResolveAssemblyReference.cache E:\SCADA\Program\ClientDriver\obj\Release\ClientDriver.dll E:\SCADA\Program\ClientDriver\obj\Release\ClientDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\bin\Release\ClientDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\bin\Release\ClientDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\bin\Release\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\bin\Release\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\obj\Release\ClientDriver.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\obj\Release\ClientDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ClientDriver\obj\Release\ClientDriver.pdb diff --git a/SCADA/Program/ClientDriver/obj/Release/ClientDriver.dll b/SCADA/Program/ClientDriver/obj/Release/ClientDriver.dll index bc1aff4..cfc4d0b 100644 Binary files a/SCADA/Program/ClientDriver/obj/Release/ClientDriver.dll and b/SCADA/Program/ClientDriver/obj/Release/ClientDriver.dll differ diff --git a/SCADA/Program/CoreTest/MainWindow.xaml.cs b/SCADA/Program/CoreTest/MainWindow.xaml.cs index 1ea059a..600dfa0 100644 --- a/SCADA/Program/CoreTest/MainWindow.xaml.cs +++ b/SCADA/Program/CoreTest/MainWindow.xaml.cs @@ -19,9 +19,14 @@ namespace CoreTest /// public partial class MainWindow : Window { + double x1 = SystemParameters.PrimaryScreenWidth;//得到屏幕整体宽度 + double y1 = SystemParameters.PrimaryScreenHeight;//得到屏幕整体高度 + public MainWindow() { InitializeComponent(); + this.Width = x1;//设置窗体宽度 + this.Height = y1;//设置窗体高度 } List _valueChangedList; @@ -41,13 +46,14 @@ namespace CoreTest if (Tag != null && !string.IsNullOrEmpty(Tag.ToString())) { var Wintypes = Tag.ToString().TrimEnd(';'); - ContentControl Ctrl = Activator.CreateInstance(Type.GetType(Wintypes)) as ContentControl; - if (Ctrl != null) + ContentControl ctrl = Activator.CreateInstance(Type.GetType(Wintypes)) as ContentControl; + if (ctrl != null) { - Ctrl.Loaded += new RoutedEventHandler(ctrl_Loaded); - Ctrl.Unloaded += new RoutedEventHandler(ctrl_Unloaded); - dict[Wintypes] = Ctrl; - cvs1.Child = Ctrl; + ScaleControl(ctrl); + ctrl.Loaded += new RoutedEventHandler(ctrl_Loaded); + ctrl.Unloaded += new RoutedEventHandler(ctrl_Unloaded); + dict[Wintypes] = ctrl; + cvs1.Child = ctrl; this.Title = Wintypes; } } @@ -157,6 +163,7 @@ namespace CoreTest ContentControl ctrl = Activator.CreateInstance(Type.GetType(txt)) as ContentControl; if (ctrl != null) { + ScaleControl(ctrl); ctrl.Loaded += new RoutedEventHandler(ctrl_Loaded); ctrl.Unloaded += new RoutedEventHandler(ctrl_Unloaded); var win = ctrl as Window; @@ -181,11 +188,25 @@ namespace CoreTest { App.AddErrorLog(e); } - lab1: + lab1: continue; } } + void ScaleControl(ContentControl ctrl) + { + var transform = ctrl.RenderTransform as MatrixTransform; + if (transform != null && !double.IsNaN(ctrl.Width) && !double.IsNaN(ctrl.Height)) + { + var matrix = transform.Matrix; + matrix.Scale(x1 / ctrl.Width, y1 / ctrl.Height); + ctrl.RenderTransform = new MatrixTransform(matrix); + ctrl.Width = x1; + ctrl.Height = y1; + this.Background = ctrl.Background; + } + } + void ctrl_Unloaded(object sender, RoutedEventArgs e) { ContentControl uie = sender as ContentControl; diff --git a/SCADA/Program/CoreTest/MaterialRecivingLine.xaml b/SCADA/Program/CoreTest/MaterialRecivingLine.xaml index e9670e0..dfe0a75 100644 --- a/SCADA/Program/CoreTest/MaterialRecivingLine.xaml +++ b/SCADA/Program/CoreTest/MaterialRecivingLine.xaml @@ -4,9 +4,9 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:my="clr-namespace:HMIControl;assembly=HMIControl" - mc:Ignorable="d" Name="MaterialRecivingLine1" d:DesignHeight="1072" d:DesignWidth="1912" Loaded="HMI_Loaded" Unloaded="HMI_Unloaded"> - - + mc:Ignorable="d" Name="MaterialRecivingLine1" Width="1920" Height="1080" d:DesignHeight="1072" d:DesignWidth="1912" Background="#FF2B5F5B" + Loaded="HMI_Loaded" Unloaded="HMI_Unloaded"> + diff --git a/SCADA/Program/CoreTest/SiloProductLine.xaml b/SCADA/Program/CoreTest/SiloProductLine.xaml index 6a92627..be0235a 100644 --- a/SCADA/Program/CoreTest/SiloProductLine.xaml +++ b/SCADA/Program/CoreTest/SiloProductLine.xaml @@ -4,8 +4,9 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:my="clr-namespace:HMIControl;assembly=HMIControl" - mc:Ignorable="d" Name="SiloProductLine1" d:DesignHeight="1072" d:DesignWidth="1912" Loaded="HMI_Loaded" Unloaded="HMI_Unloaded"> - + mc:Ignorable="d" Name="SiloProductLine1" Width="1920" Height="1080" d:DesignHeight="1072" d:DesignWidth="1912" Background="#FF2B5F5B" + Loaded="HMI_Loaded" Unloaded="HMI_Unloaded"> + diff --git a/SCADA/Program/CoreTest/bin/Debug/ClientDriver.dll b/SCADA/Program/CoreTest/bin/Debug/ClientDriver.dll index 0078ad8..fb79ea2 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/ClientDriver.dll and b/SCADA/Program/CoreTest/bin/Debug/ClientDriver.dll differ diff --git a/SCADA/Program/CoreTest/bin/Debug/CoreTest.exe b/SCADA/Program/CoreTest/bin/Debug/CoreTest.exe index 4912de6..34446ce 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/CoreTest.exe and b/SCADA/Program/CoreTest/bin/Debug/CoreTest.exe differ diff --git a/SCADA/Program/CoreTest/bin/Debug/DataHelper.dll b/SCADA/Program/CoreTest/bin/Debug/DataHelper.dll index 21bf117..c1a5905 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/DataHelper.dll and b/SCADA/Program/CoreTest/bin/Debug/DataHelper.dll differ diff --git a/SCADA/Program/CoreTest/bin/Debug/DataService.dll b/SCADA/Program/CoreTest/bin/Debug/DataService.dll index e84e58d..1408689 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/DataService.dll and b/SCADA/Program/CoreTest/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/CoreTest/bin/Debug/HMIControl.dll b/SCADA/Program/CoreTest/bin/Debug/HMIControl.dll index cd64886..638a805 100644 Binary files a/SCADA/Program/CoreTest/bin/Debug/HMIControl.dll and b/SCADA/Program/CoreTest/bin/Debug/HMIControl.dll differ diff --git a/SCADA/Program/CoreTest/bin/Release/ClientDriver.dll b/SCADA/Program/CoreTest/bin/Release/ClientDriver.dll index bc1aff4..4b62ae8 100644 Binary files a/SCADA/Program/CoreTest/bin/Release/ClientDriver.dll and b/SCADA/Program/CoreTest/bin/Release/ClientDriver.dll differ diff --git a/SCADA/Program/CoreTest/bin/Release/CoreTest.exe b/SCADA/Program/CoreTest/bin/Release/CoreTest.exe index 11edca4..849a0d2 100644 Binary files a/SCADA/Program/CoreTest/bin/Release/CoreTest.exe and b/SCADA/Program/CoreTest/bin/Release/CoreTest.exe differ diff --git a/SCADA/Program/CoreTest/bin/Release/DataHelper.dll b/SCADA/Program/CoreTest/bin/Release/DataHelper.dll index 5f610d3..4d6a26a 100644 Binary files a/SCADA/Program/CoreTest/bin/Release/DataHelper.dll and b/SCADA/Program/CoreTest/bin/Release/DataHelper.dll differ diff --git a/SCADA/Program/CoreTest/bin/Release/DataService.dll b/SCADA/Program/CoreTest/bin/Release/DataService.dll index afed82c..9b150f2 100644 Binary files a/SCADA/Program/CoreTest/bin/Release/DataService.dll and b/SCADA/Program/CoreTest/bin/Release/DataService.dll differ diff --git a/SCADA/Program/CoreTest/bin/Release/HMIControl.dll b/SCADA/Program/CoreTest/bin/Release/HMIControl.dll index 66402cb..be6ff9d 100644 Binary files a/SCADA/Program/CoreTest/bin/Release/HMIControl.dll and b/SCADA/Program/CoreTest/bin/Release/HMIControl.dll differ diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.exe b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.exe index 4912de6..34446ce 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.exe and b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.exe differ diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.g.resources b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.g.resources index eeb6e72..e65a914 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.g.resources and b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest.g.resources differ diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.lref b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.lref index b23b0b4..5e01469 100644 --- a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.lref +++ b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.lref @@ -1,8 +1,8 @@ -E:\新建文件夹\SCADA\Program\CoreTest\obj\x86\Debug\GeneratedInternalTypeHelper.g.i.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\GeneratedInternalTypeHelper.g.i.cs -FE:\新建文件夹\SCADA\Program\CoreTest\AlarmSet.xaml;; -FE:\新建文件夹\SCADA\Program\CoreTest\Guage.xaml;; -FE:\新建文件夹\SCADA\Program\CoreTest\MainWindow.xaml;; -FE:\新建文件夹\SCADA\Program\CoreTest\TagMonitor.xaml;; -FE:\新建文件夹\SCADA\Program\CoreTest\Trend.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\AlarmSet.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\Guage.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\MainWindow.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\TagMonitor.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\Trend.xaml;; diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.lref b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.lref index c3bd80b..bea0710 100644 --- a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.lref +++ b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.lref @@ -1,8 +1,8 @@ -E:\新建文件夹\SCADA\Program\CoreTest\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs -FE:\新建文件夹\SCADA\Program\CoreTest\AlarmSet.xaml;; -FE:\新建文件夹\SCADA\Program\CoreTest\Guage.xaml;; -FE:\新建文件夹\SCADA\Program\CoreTest\MainWindow.xaml;; -FE:\新建文件夹\SCADA\Program\CoreTest\TagMonitor.xaml;; -FE:\新建文件夹\SCADA\Program\CoreTest\Trend.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\AlarmSet.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\Guage.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\MainWindow.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\TagMonitor.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\Trend.xaml;; diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/Example.csproj.FileListAbsolute.txt b/SCADA/Program/CoreTest/obj/x86/Debug/Example.csproj.FileListAbsolute.txt index 510674b..57d5009 100644 --- a/SCADA/Program/CoreTest/obj/x86/Debug/Example.csproj.FileListAbsolute.txt +++ b/SCADA/Program/CoreTest/obj/x86/Debug/Example.csproj.FileListAbsolute.txt @@ -352,3 +352,72 @@ E:\新建文件夹\SCADA\Program\CoreTest\obj\x86\Debug\CoreTest.Properties.Reso E:\新建文件夹\SCADA\Program\CoreTest\obj\x86\Debug\Example.csproj.GenerateResource.Cache E:\新建文件夹\SCADA\Program\CoreTest\obj\x86\Debug\CoreTest.exe E:\新建文件夹\SCADA\Program\CoreTest\obj\x86\Debug\CoreTest.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\CoreTest.exe +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\CoreTest.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\ClientDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\DataHelper.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\DynamicDataDisplay.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\HMIControl.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\Microsoft.Expression.Controls.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\Microsoft.Expression.Drawing.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\Microsoft.Expression.Interactions.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\System.Windows.Interactivity.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\WPFToolkit.Extended.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\ClientDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\HMIControl.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\DataHelper.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\Microsoft.Expression.Controls.xml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\Microsoft.Expression.Drawing.xml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\Microsoft.Expression.Interactions.xml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\System.Windows.Interactivity.xml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\de\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\en\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\es\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\fr\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\it\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\ja\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\ko\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\zh-Hans\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\zh-Hant\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\de\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\en\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\es\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\fr\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\it\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\ja\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\ko\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\zh-Hans\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Debug\zh-Hant\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\Example.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\Login.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\MaterialRecivingLine.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\RuntimeChart.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\SiloProductLine.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\StartDevice.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\App.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\AlarmSet.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\Guage.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\Login.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\MainWindow.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\MaterialRecivingLine.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\RuntimeChart.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\SiloProductLine.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\StartDevice.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\TagMonitor.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\Trend.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\App.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\CoreTest_MarkupCompile.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\CoreTest_MarkupCompile.lref +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\AlarmSet.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\Guage.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\MainWindow.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\TagMonitor.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\Trend.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\CoreTest.g.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\CoreTest.Properties.Resources.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\Example.csproj.GenerateResource.Cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\CoreTest.exe +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\CoreTest.pdb diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/MaterialRecivingLine.baml b/SCADA/Program/CoreTest/obj/x86/Debug/MaterialRecivingLine.baml index 38cc02e..0ef184f 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Debug/MaterialRecivingLine.baml and b/SCADA/Program/CoreTest/obj/x86/Debug/MaterialRecivingLine.baml differ diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/MaterialRecivingLine.g.cs b/SCADA/Program/CoreTest/obj/x86/Debug/MaterialRecivingLine.g.cs index a441edb..226d00d 100644 --- a/SCADA/Program/CoreTest/obj/x86/Debug/MaterialRecivingLine.g.cs +++ b/SCADA/Program/CoreTest/obj/x86/Debug/MaterialRecivingLine.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\MaterialRecivingLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "409D6E8EE2DD52A445F7BB85E57020D0" +#pragma checksum "..\..\..\MaterialRecivingLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "CE67AEE956DAC38D8ED6BB721B8FC695" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -50,7 +50,7 @@ namespace CoreTest { #line hidden - #line 8 "..\..\..\MaterialRecivingLine.xaml" + #line 9 "..\..\..\MaterialRecivingLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas cvs1; @@ -858,13 +858,13 @@ namespace CoreTest { case 1: this.MaterialRecivingLine1 = ((CoreTest.MaterialRecivingLine)(target)); - #line 7 "..\..\..\MaterialRecivingLine.xaml" + #line 8 "..\..\..\MaterialRecivingLine.xaml" this.MaterialRecivingLine1.Loaded += new System.Windows.RoutedEventHandler(this.HMI_Loaded); #line default #line hidden - #line 7 "..\..\..\MaterialRecivingLine.xaml" + #line 8 "..\..\..\MaterialRecivingLine.xaml" this.MaterialRecivingLine1.Unloaded += new System.Windows.RoutedEventHandler(this.HMI_Unloaded); #line default diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/MaterialRecivingLine.g.i.cs b/SCADA/Program/CoreTest/obj/x86/Debug/MaterialRecivingLine.g.i.cs index a441edb..226d00d 100644 --- a/SCADA/Program/CoreTest/obj/x86/Debug/MaterialRecivingLine.g.i.cs +++ b/SCADA/Program/CoreTest/obj/x86/Debug/MaterialRecivingLine.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\MaterialRecivingLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "409D6E8EE2DD52A445F7BB85E57020D0" +#pragma checksum "..\..\..\MaterialRecivingLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "CE67AEE956DAC38D8ED6BB721B8FC695" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -50,7 +50,7 @@ namespace CoreTest { #line hidden - #line 8 "..\..\..\MaterialRecivingLine.xaml" + #line 9 "..\..\..\MaterialRecivingLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas cvs1; @@ -858,13 +858,13 @@ namespace CoreTest { case 1: this.MaterialRecivingLine1 = ((CoreTest.MaterialRecivingLine)(target)); - #line 7 "..\..\..\MaterialRecivingLine.xaml" + #line 8 "..\..\..\MaterialRecivingLine.xaml" this.MaterialRecivingLine1.Loaded += new System.Windows.RoutedEventHandler(this.HMI_Loaded); #line default #line hidden - #line 7 "..\..\..\MaterialRecivingLine.xaml" + #line 8 "..\..\..\MaterialRecivingLine.xaml" this.MaterialRecivingLine1.Unloaded += new System.Windows.RoutedEventHandler(this.HMI_Unloaded); #line default diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/SiloProductLine.baml b/SCADA/Program/CoreTest/obj/x86/Debug/SiloProductLine.baml index c33ef0b..681faf7 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Debug/SiloProductLine.baml and b/SCADA/Program/CoreTest/obj/x86/Debug/SiloProductLine.baml differ diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/SiloProductLine.g.cs b/SCADA/Program/CoreTest/obj/x86/Debug/SiloProductLine.g.cs index 52755ce..07494ed 100644 --- a/SCADA/Program/CoreTest/obj/x86/Debug/SiloProductLine.g.cs +++ b/SCADA/Program/CoreTest/obj/x86/Debug/SiloProductLine.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\SiloProductLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "049CD3A9B849F0AC7069CDA64A53AA36" +#pragma checksum "..\..\..\SiloProductLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A5AB0964D726C00F3D396892042986D6" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -50,7 +50,7 @@ namespace CoreTest { #line hidden - #line 8 "..\..\..\SiloProductLine.xaml" + #line 9 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas cvs1; @@ -58,7 +58,7 @@ namespace CoreTest { #line hidden - #line 9 "..\..\..\SiloProductLine.xaml" + #line 10 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Silo silo1; @@ -66,7 +66,7 @@ namespace CoreTest { #line hidden - #line 10 "..\..\..\SiloProductLine.xaml" + #line 11 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Silo silo2; @@ -74,7 +74,7 @@ namespace CoreTest { #line hidden - #line 11 "..\..\..\SiloProductLine.xaml" + #line 12 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Elevator elevator1; @@ -82,7 +82,7 @@ namespace CoreTest { #line hidden - #line 12 "..\..\..\SiloProductLine.xaml" + #line 13 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Elevator elevator2; @@ -90,7 +90,7 @@ namespace CoreTest { #line hidden - #line 13 "..\..\..\SiloProductLine.xaml" + #line 14 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.PreCleaner preCleaner1; @@ -98,7 +98,7 @@ namespace CoreTest { #line hidden - #line 14 "..\..\..\SiloProductLine.xaml" + #line 15 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Bucket bucket1; @@ -106,7 +106,7 @@ namespace CoreTest { #line hidden - #line 15 "..\..\..\SiloProductLine.xaml" + #line 16 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Truck truck1; @@ -114,7 +114,7 @@ namespace CoreTest { #line hidden - #line 16 "..\..\..\SiloProductLine.xaml" + #line 17 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor1; @@ -122,7 +122,7 @@ namespace CoreTest { #line hidden - #line 17 "..\..\..\SiloProductLine.xaml" + #line 18 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.MagnetCleaner magnetCleaner1; @@ -130,7 +130,7 @@ namespace CoreTest { #line hidden - #line 18 "..\..\..\SiloProductLine.xaml" + #line 19 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor2; @@ -138,7 +138,7 @@ namespace CoreTest { #line hidden - #line 19 "..\..\..\SiloProductLine.xaml" + #line 20 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor3; @@ -146,7 +146,7 @@ namespace CoreTest { #line hidden - #line 20 "..\..\..\SiloProductLine.xaml" + #line 21 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor4; @@ -154,7 +154,7 @@ namespace CoreTest { #line hidden - #line 21 "..\..\..\SiloProductLine.xaml" + #line 22 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Cyclone cyclone1; @@ -162,7 +162,7 @@ namespace CoreTest { #line hidden - #line 29 "..\..\..\SiloProductLine.xaml" + #line 30 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock productline; @@ -170,7 +170,7 @@ namespace CoreTest { #line hidden - #line 30 "..\..\..\SiloProductLine.xaml" + #line 31 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo12; @@ -178,7 +178,7 @@ namespace CoreTest { #line hidden - #line 32 "..\..\..\SiloProductLine.xaml" + #line 33 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SelectSwitch selectSwitch1; @@ -186,7 +186,7 @@ namespace CoreTest { #line hidden - #line 33 "..\..\..\SiloProductLine.xaml" + #line 34 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SelectSwitch selectSwitch3; @@ -194,7 +194,7 @@ namespace CoreTest { #line hidden - #line 34 "..\..\..\SiloProductLine.xaml" + #line 35 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo1; @@ -202,7 +202,7 @@ namespace CoreTest { #line hidden - #line 35 "..\..\..\SiloProductLine.xaml" + #line 36 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo2; @@ -210,7 +210,7 @@ namespace CoreTest { #line hidden - #line 37 "..\..\..\SiloProductLine.xaml" + #line 38 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo3; @@ -218,7 +218,7 @@ namespace CoreTest { #line hidden - #line 40 "..\..\..\SiloProductLine.xaml" + #line 41 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SlideGate slideGate1; @@ -226,7 +226,7 @@ namespace CoreTest { #line hidden - #line 41 "..\..\..\SiloProductLine.xaml" + #line 42 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SlideGate slideGate2; @@ -234,7 +234,7 @@ namespace CoreTest { #line hidden - #line 42 "..\..\..\SiloProductLine.xaml" + #line 43 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo4; @@ -242,7 +242,7 @@ namespace CoreTest { #line hidden - #line 44 "..\..\..\SiloProductLine.xaml" + #line 45 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo5; @@ -250,7 +250,7 @@ namespace CoreTest { #line hidden - #line 46 "..\..\..\SiloProductLine.xaml" + #line 47 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SlideGate slideGate3; @@ -258,7 +258,7 @@ namespace CoreTest { #line hidden - #line 47 "..\..\..\SiloProductLine.xaml" + #line 48 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Cyclone cyclone2; @@ -266,7 +266,7 @@ namespace CoreTest { #line hidden - #line 49 "..\..\..\SiloProductLine.xaml" + #line 50 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo6; @@ -306,13 +306,13 @@ namespace CoreTest { case 1: this.SiloProductLine1 = ((CoreTest.SiloProductLine)(target)); - #line 7 "..\..\..\SiloProductLine.xaml" + #line 8 "..\..\..\SiloProductLine.xaml" this.SiloProductLine1.Loaded += new System.Windows.RoutedEventHandler(this.HMI_Loaded); #line default #line hidden - #line 7 "..\..\..\SiloProductLine.xaml" + #line 8 "..\..\..\SiloProductLine.xaml" this.SiloProductLine1.Unloaded += new System.Windows.RoutedEventHandler(this.HMI_Unloaded); #line default diff --git a/SCADA/Program/CoreTest/obj/x86/Debug/SiloProductLine.g.i.cs b/SCADA/Program/CoreTest/obj/x86/Debug/SiloProductLine.g.i.cs index 52755ce..07494ed 100644 --- a/SCADA/Program/CoreTest/obj/x86/Debug/SiloProductLine.g.i.cs +++ b/SCADA/Program/CoreTest/obj/x86/Debug/SiloProductLine.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\SiloProductLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "049CD3A9B849F0AC7069CDA64A53AA36" +#pragma checksum "..\..\..\SiloProductLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A5AB0964D726C00F3D396892042986D6" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -50,7 +50,7 @@ namespace CoreTest { #line hidden - #line 8 "..\..\..\SiloProductLine.xaml" + #line 9 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas cvs1; @@ -58,7 +58,7 @@ namespace CoreTest { #line hidden - #line 9 "..\..\..\SiloProductLine.xaml" + #line 10 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Silo silo1; @@ -66,7 +66,7 @@ namespace CoreTest { #line hidden - #line 10 "..\..\..\SiloProductLine.xaml" + #line 11 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Silo silo2; @@ -74,7 +74,7 @@ namespace CoreTest { #line hidden - #line 11 "..\..\..\SiloProductLine.xaml" + #line 12 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Elevator elevator1; @@ -82,7 +82,7 @@ namespace CoreTest { #line hidden - #line 12 "..\..\..\SiloProductLine.xaml" + #line 13 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Elevator elevator2; @@ -90,7 +90,7 @@ namespace CoreTest { #line hidden - #line 13 "..\..\..\SiloProductLine.xaml" + #line 14 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.PreCleaner preCleaner1; @@ -98,7 +98,7 @@ namespace CoreTest { #line hidden - #line 14 "..\..\..\SiloProductLine.xaml" + #line 15 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Bucket bucket1; @@ -106,7 +106,7 @@ namespace CoreTest { #line hidden - #line 15 "..\..\..\SiloProductLine.xaml" + #line 16 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Truck truck1; @@ -114,7 +114,7 @@ namespace CoreTest { #line hidden - #line 16 "..\..\..\SiloProductLine.xaml" + #line 17 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor1; @@ -122,7 +122,7 @@ namespace CoreTest { #line hidden - #line 17 "..\..\..\SiloProductLine.xaml" + #line 18 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.MagnetCleaner magnetCleaner1; @@ -130,7 +130,7 @@ namespace CoreTest { #line hidden - #line 18 "..\..\..\SiloProductLine.xaml" + #line 19 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor2; @@ -138,7 +138,7 @@ namespace CoreTest { #line hidden - #line 19 "..\..\..\SiloProductLine.xaml" + #line 20 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor3; @@ -146,7 +146,7 @@ namespace CoreTest { #line hidden - #line 20 "..\..\..\SiloProductLine.xaml" + #line 21 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor4; @@ -154,7 +154,7 @@ namespace CoreTest { #line hidden - #line 21 "..\..\..\SiloProductLine.xaml" + #line 22 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Cyclone cyclone1; @@ -162,7 +162,7 @@ namespace CoreTest { #line hidden - #line 29 "..\..\..\SiloProductLine.xaml" + #line 30 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock productline; @@ -170,7 +170,7 @@ namespace CoreTest { #line hidden - #line 30 "..\..\..\SiloProductLine.xaml" + #line 31 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo12; @@ -178,7 +178,7 @@ namespace CoreTest { #line hidden - #line 32 "..\..\..\SiloProductLine.xaml" + #line 33 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SelectSwitch selectSwitch1; @@ -186,7 +186,7 @@ namespace CoreTest { #line hidden - #line 33 "..\..\..\SiloProductLine.xaml" + #line 34 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SelectSwitch selectSwitch3; @@ -194,7 +194,7 @@ namespace CoreTest { #line hidden - #line 34 "..\..\..\SiloProductLine.xaml" + #line 35 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo1; @@ -202,7 +202,7 @@ namespace CoreTest { #line hidden - #line 35 "..\..\..\SiloProductLine.xaml" + #line 36 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo2; @@ -210,7 +210,7 @@ namespace CoreTest { #line hidden - #line 37 "..\..\..\SiloProductLine.xaml" + #line 38 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo3; @@ -218,7 +218,7 @@ namespace CoreTest { #line hidden - #line 40 "..\..\..\SiloProductLine.xaml" + #line 41 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SlideGate slideGate1; @@ -226,7 +226,7 @@ namespace CoreTest { #line hidden - #line 41 "..\..\..\SiloProductLine.xaml" + #line 42 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SlideGate slideGate2; @@ -234,7 +234,7 @@ namespace CoreTest { #line hidden - #line 42 "..\..\..\SiloProductLine.xaml" + #line 43 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo4; @@ -242,7 +242,7 @@ namespace CoreTest { #line hidden - #line 44 "..\..\..\SiloProductLine.xaml" + #line 45 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo5; @@ -250,7 +250,7 @@ namespace CoreTest { #line hidden - #line 46 "..\..\..\SiloProductLine.xaml" + #line 47 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SlideGate slideGate3; @@ -258,7 +258,7 @@ namespace CoreTest { #line hidden - #line 47 "..\..\..\SiloProductLine.xaml" + #line 48 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Cyclone cyclone2; @@ -266,7 +266,7 @@ namespace CoreTest { #line hidden - #line 49 "..\..\..\SiloProductLine.xaml" + #line 50 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo6; @@ -306,13 +306,13 @@ namespace CoreTest { case 1: this.SiloProductLine1 = ((CoreTest.SiloProductLine)(target)); - #line 7 "..\..\..\SiloProductLine.xaml" + #line 8 "..\..\..\SiloProductLine.xaml" this.SiloProductLine1.Loaded += new System.Windows.RoutedEventHandler(this.HMI_Loaded); #line default #line hidden - #line 7 "..\..\..\SiloProductLine.xaml" + #line 8 "..\..\..\SiloProductLine.xaml" this.SiloProductLine1.Unloaded += new System.Windows.RoutedEventHandler(this.HMI_Unloaded); #line default diff --git a/SCADA/Program/ModbusDriver/obj/Release/build.force b/SCADA/Program/CoreTest/obj/x86/Debug/build.force similarity index 100% rename from SCADA/Program/ModbusDriver/obj/Release/build.force rename to SCADA/Program/CoreTest/obj/x86/Debug/build.force diff --git a/SCADA/Program/CoreTest/obj/x86/Release/CoreTest.exe b/SCADA/Program/CoreTest/obj/x86/Release/CoreTest.exe index 11edca4..849a0d2 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Release/CoreTest.exe and b/SCADA/Program/CoreTest/obj/x86/Release/CoreTest.exe differ diff --git a/SCADA/Program/CoreTest/obj/x86/Release/CoreTest.g.resources b/SCADA/Program/CoreTest/obj/x86/Release/CoreTest.g.resources index f831696..487541c 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Release/CoreTest.g.resources and b/SCADA/Program/CoreTest/obj/x86/Release/CoreTest.g.resources differ diff --git a/SCADA/Program/CoreTest/obj/x86/Release/CoreTest_MarkupCompile.i.lref b/SCADA/Program/CoreTest/obj/x86/Release/CoreTest_MarkupCompile.i.lref index c08ba34..89fab30 100644 --- a/SCADA/Program/CoreTest/obj/x86/Release/CoreTest_MarkupCompile.i.lref +++ b/SCADA/Program/CoreTest/obj/x86/Release/CoreTest_MarkupCompile.i.lref @@ -1,8 +1,8 @@ -E:\SCADA\Program\CoreTest\obj\x86\Release\GeneratedInternalTypeHelper.g.i.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\GeneratedInternalTypeHelper.g.i.cs -FE:\SCADA\Program\CoreTest\AlarmSet.xaml;; -FE:\SCADA\Program\CoreTest\Guage.xaml;; -FE:\SCADA\Program\CoreTest\MainWindow.xaml;; -FE:\SCADA\Program\CoreTest\TagMonitor.xaml;; -FE:\SCADA\Program\CoreTest\Trend.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\AlarmSet.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\Guage.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\MainWindow.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\TagMonitor.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\Trend.xaml;; diff --git a/SCADA/Program/CoreTest/obj/x86/Release/CoreTest_MarkupCompile.lref b/SCADA/Program/CoreTest/obj/x86/Release/CoreTest_MarkupCompile.lref index d7c963c..a21c6a0 100644 --- a/SCADA/Program/CoreTest/obj/x86/Release/CoreTest_MarkupCompile.lref +++ b/SCADA/Program/CoreTest/obj/x86/Release/CoreTest_MarkupCompile.lref @@ -1,8 +1,8 @@ -E:\SCADA\Program\CoreTest\obj\x86\Release\GeneratedInternalTypeHelper.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\GeneratedInternalTypeHelper.g.cs -FE:\SCADA\Program\CoreTest\AlarmSet.xaml;; -FE:\SCADA\Program\CoreTest\Guage.xaml;; -FE:\SCADA\Program\CoreTest\MainWindow.xaml;; -FE:\SCADA\Program\CoreTest\TagMonitor.xaml;; -FE:\SCADA\Program\CoreTest\Trend.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\AlarmSet.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\Guage.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\MainWindow.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\TagMonitor.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\Trend.xaml;; diff --git a/SCADA/Program/CoreTest/obj/x86/Release/Example.csproj.FileListAbsolute.txt b/SCADA/Program/CoreTest/obj/x86/Release/Example.csproj.FileListAbsolute.txt index b31fa8a..def0a24 100644 --- a/SCADA/Program/CoreTest/obj/x86/Release/Example.csproj.FileListAbsolute.txt +++ b/SCADA/Program/CoreTest/obj/x86/Release/Example.csproj.FileListAbsolute.txt @@ -67,3 +67,72 @@ E:\SCADA\Program\CoreTest\obj\x86\Release\CoreTest.exe E:\SCADA\Program\CoreTest\obj\x86\Release\CoreTest.pdb E:\SCADA\Program\CoreTest\obj\x86\Release\Guage.g.cs E:\SCADA\Program\CoreTest\obj\x86\Release\Guage.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\CoreTest.exe +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\CoreTest.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\ClientDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\DataHelper.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\DynamicDataDisplay.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\HMIControl.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\Microsoft.Expression.Controls.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\Microsoft.Expression.Drawing.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\Microsoft.Expression.Interactions.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\System.Windows.Interactivity.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\WPFToolkit.Extended.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\ClientDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\HMIControl.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\DataHelper.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\Microsoft.Expression.Controls.xml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\Microsoft.Expression.Drawing.xml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\Microsoft.Expression.Interactions.xml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\System.Windows.Interactivity.xml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\de\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\en\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\es\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\fr\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\it\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\ja\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\ko\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\zh-Hans\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\zh-Hant\Microsoft.Expression.Interactions.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\de\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\en\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\es\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\fr\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\it\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\ja\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\ko\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\zh-Hans\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\bin\Release\zh-Hant\System.Windows.Interactivity.resources.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\Example.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\Login.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\MaterialRecivingLine.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\RuntimeChart.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\SiloProductLine.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\StartDevice.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\App.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\AlarmSet.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\Guage.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\Login.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\MainWindow.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\MaterialRecivingLine.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\RuntimeChart.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\SiloProductLine.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\StartDevice.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\TagMonitor.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\Trend.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\App.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\GeneratedInternalTypeHelper.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\CoreTest_MarkupCompile.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\CoreTest_MarkupCompile.lref +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\AlarmSet.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\Guage.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\MainWindow.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\TagMonitor.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\Trend.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\CoreTest.g.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\CoreTest.Properties.Resources.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\Example.csproj.GenerateResource.Cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\CoreTest.exe +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Release\CoreTest.pdb diff --git a/SCADA/Program/CoreTest/obj/x86/Release/MaterialRecivingLine.baml b/SCADA/Program/CoreTest/obj/x86/Release/MaterialRecivingLine.baml index b46e7fc..5103219 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Release/MaterialRecivingLine.baml and b/SCADA/Program/CoreTest/obj/x86/Release/MaterialRecivingLine.baml differ diff --git a/SCADA/Program/CoreTest/obj/x86/Release/MaterialRecivingLine.g.cs b/SCADA/Program/CoreTest/obj/x86/Release/MaterialRecivingLine.g.cs index a441edb..226d00d 100644 --- a/SCADA/Program/CoreTest/obj/x86/Release/MaterialRecivingLine.g.cs +++ b/SCADA/Program/CoreTest/obj/x86/Release/MaterialRecivingLine.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\MaterialRecivingLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "409D6E8EE2DD52A445F7BB85E57020D0" +#pragma checksum "..\..\..\MaterialRecivingLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "CE67AEE956DAC38D8ED6BB721B8FC695" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -50,7 +50,7 @@ namespace CoreTest { #line hidden - #line 8 "..\..\..\MaterialRecivingLine.xaml" + #line 9 "..\..\..\MaterialRecivingLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas cvs1; @@ -858,13 +858,13 @@ namespace CoreTest { case 1: this.MaterialRecivingLine1 = ((CoreTest.MaterialRecivingLine)(target)); - #line 7 "..\..\..\MaterialRecivingLine.xaml" + #line 8 "..\..\..\MaterialRecivingLine.xaml" this.MaterialRecivingLine1.Loaded += new System.Windows.RoutedEventHandler(this.HMI_Loaded); #line default #line hidden - #line 7 "..\..\..\MaterialRecivingLine.xaml" + #line 8 "..\..\..\MaterialRecivingLine.xaml" this.MaterialRecivingLine1.Unloaded += new System.Windows.RoutedEventHandler(this.HMI_Unloaded); #line default diff --git a/SCADA/Program/CoreTest/obj/x86/Release/MaterialRecivingLine.g.i.cs b/SCADA/Program/CoreTest/obj/x86/Release/MaterialRecivingLine.g.i.cs index a441edb..226d00d 100644 --- a/SCADA/Program/CoreTest/obj/x86/Release/MaterialRecivingLine.g.i.cs +++ b/SCADA/Program/CoreTest/obj/x86/Release/MaterialRecivingLine.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\MaterialRecivingLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "409D6E8EE2DD52A445F7BB85E57020D0" +#pragma checksum "..\..\..\MaterialRecivingLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "CE67AEE956DAC38D8ED6BB721B8FC695" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -50,7 +50,7 @@ namespace CoreTest { #line hidden - #line 8 "..\..\..\MaterialRecivingLine.xaml" + #line 9 "..\..\..\MaterialRecivingLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas cvs1; @@ -858,13 +858,13 @@ namespace CoreTest { case 1: this.MaterialRecivingLine1 = ((CoreTest.MaterialRecivingLine)(target)); - #line 7 "..\..\..\MaterialRecivingLine.xaml" + #line 8 "..\..\..\MaterialRecivingLine.xaml" this.MaterialRecivingLine1.Loaded += new System.Windows.RoutedEventHandler(this.HMI_Loaded); #line default #line hidden - #line 7 "..\..\..\MaterialRecivingLine.xaml" + #line 8 "..\..\..\MaterialRecivingLine.xaml" this.MaterialRecivingLine1.Unloaded += new System.Windows.RoutedEventHandler(this.HMI_Unloaded); #line default diff --git a/SCADA/Program/CoreTest/obj/x86/Release/SiloProductLine.baml b/SCADA/Program/CoreTest/obj/x86/Release/SiloProductLine.baml index f19b091..421acd8 100644 Binary files a/SCADA/Program/CoreTest/obj/x86/Release/SiloProductLine.baml and b/SCADA/Program/CoreTest/obj/x86/Release/SiloProductLine.baml differ diff --git a/SCADA/Program/CoreTest/obj/x86/Release/SiloProductLine.g.cs b/SCADA/Program/CoreTest/obj/x86/Release/SiloProductLine.g.cs index 52755ce..07494ed 100644 --- a/SCADA/Program/CoreTest/obj/x86/Release/SiloProductLine.g.cs +++ b/SCADA/Program/CoreTest/obj/x86/Release/SiloProductLine.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\SiloProductLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "049CD3A9B849F0AC7069CDA64A53AA36" +#pragma checksum "..\..\..\SiloProductLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A5AB0964D726C00F3D396892042986D6" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -50,7 +50,7 @@ namespace CoreTest { #line hidden - #line 8 "..\..\..\SiloProductLine.xaml" + #line 9 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas cvs1; @@ -58,7 +58,7 @@ namespace CoreTest { #line hidden - #line 9 "..\..\..\SiloProductLine.xaml" + #line 10 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Silo silo1; @@ -66,7 +66,7 @@ namespace CoreTest { #line hidden - #line 10 "..\..\..\SiloProductLine.xaml" + #line 11 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Silo silo2; @@ -74,7 +74,7 @@ namespace CoreTest { #line hidden - #line 11 "..\..\..\SiloProductLine.xaml" + #line 12 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Elevator elevator1; @@ -82,7 +82,7 @@ namespace CoreTest { #line hidden - #line 12 "..\..\..\SiloProductLine.xaml" + #line 13 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Elevator elevator2; @@ -90,7 +90,7 @@ namespace CoreTest { #line hidden - #line 13 "..\..\..\SiloProductLine.xaml" + #line 14 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.PreCleaner preCleaner1; @@ -98,7 +98,7 @@ namespace CoreTest { #line hidden - #line 14 "..\..\..\SiloProductLine.xaml" + #line 15 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Bucket bucket1; @@ -106,7 +106,7 @@ namespace CoreTest { #line hidden - #line 15 "..\..\..\SiloProductLine.xaml" + #line 16 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Truck truck1; @@ -114,7 +114,7 @@ namespace CoreTest { #line hidden - #line 16 "..\..\..\SiloProductLine.xaml" + #line 17 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor1; @@ -122,7 +122,7 @@ namespace CoreTest { #line hidden - #line 17 "..\..\..\SiloProductLine.xaml" + #line 18 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.MagnetCleaner magnetCleaner1; @@ -130,7 +130,7 @@ namespace CoreTest { #line hidden - #line 18 "..\..\..\SiloProductLine.xaml" + #line 19 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor2; @@ -138,7 +138,7 @@ namespace CoreTest { #line hidden - #line 19 "..\..\..\SiloProductLine.xaml" + #line 20 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor3; @@ -146,7 +146,7 @@ namespace CoreTest { #line hidden - #line 20 "..\..\..\SiloProductLine.xaml" + #line 21 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor4; @@ -154,7 +154,7 @@ namespace CoreTest { #line hidden - #line 21 "..\..\..\SiloProductLine.xaml" + #line 22 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Cyclone cyclone1; @@ -162,7 +162,7 @@ namespace CoreTest { #line hidden - #line 29 "..\..\..\SiloProductLine.xaml" + #line 30 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock productline; @@ -170,7 +170,7 @@ namespace CoreTest { #line hidden - #line 30 "..\..\..\SiloProductLine.xaml" + #line 31 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo12; @@ -178,7 +178,7 @@ namespace CoreTest { #line hidden - #line 32 "..\..\..\SiloProductLine.xaml" + #line 33 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SelectSwitch selectSwitch1; @@ -186,7 +186,7 @@ namespace CoreTest { #line hidden - #line 33 "..\..\..\SiloProductLine.xaml" + #line 34 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SelectSwitch selectSwitch3; @@ -194,7 +194,7 @@ namespace CoreTest { #line hidden - #line 34 "..\..\..\SiloProductLine.xaml" + #line 35 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo1; @@ -202,7 +202,7 @@ namespace CoreTest { #line hidden - #line 35 "..\..\..\SiloProductLine.xaml" + #line 36 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo2; @@ -210,7 +210,7 @@ namespace CoreTest { #line hidden - #line 37 "..\..\..\SiloProductLine.xaml" + #line 38 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo3; @@ -218,7 +218,7 @@ namespace CoreTest { #line hidden - #line 40 "..\..\..\SiloProductLine.xaml" + #line 41 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SlideGate slideGate1; @@ -226,7 +226,7 @@ namespace CoreTest { #line hidden - #line 41 "..\..\..\SiloProductLine.xaml" + #line 42 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SlideGate slideGate2; @@ -234,7 +234,7 @@ namespace CoreTest { #line hidden - #line 42 "..\..\..\SiloProductLine.xaml" + #line 43 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo4; @@ -242,7 +242,7 @@ namespace CoreTest { #line hidden - #line 44 "..\..\..\SiloProductLine.xaml" + #line 45 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo5; @@ -250,7 +250,7 @@ namespace CoreTest { #line hidden - #line 46 "..\..\..\SiloProductLine.xaml" + #line 47 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SlideGate slideGate3; @@ -258,7 +258,7 @@ namespace CoreTest { #line hidden - #line 47 "..\..\..\SiloProductLine.xaml" + #line 48 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Cyclone cyclone2; @@ -266,7 +266,7 @@ namespace CoreTest { #line hidden - #line 49 "..\..\..\SiloProductLine.xaml" + #line 50 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo6; @@ -306,13 +306,13 @@ namespace CoreTest { case 1: this.SiloProductLine1 = ((CoreTest.SiloProductLine)(target)); - #line 7 "..\..\..\SiloProductLine.xaml" + #line 8 "..\..\..\SiloProductLine.xaml" this.SiloProductLine1.Loaded += new System.Windows.RoutedEventHandler(this.HMI_Loaded); #line default #line hidden - #line 7 "..\..\..\SiloProductLine.xaml" + #line 8 "..\..\..\SiloProductLine.xaml" this.SiloProductLine1.Unloaded += new System.Windows.RoutedEventHandler(this.HMI_Unloaded); #line default diff --git a/SCADA/Program/CoreTest/obj/x86/Release/SiloProductLine.g.i.cs b/SCADA/Program/CoreTest/obj/x86/Release/SiloProductLine.g.i.cs index 52755ce..07494ed 100644 --- a/SCADA/Program/CoreTest/obj/x86/Release/SiloProductLine.g.i.cs +++ b/SCADA/Program/CoreTest/obj/x86/Release/SiloProductLine.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\SiloProductLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "049CD3A9B849F0AC7069CDA64A53AA36" +#pragma checksum "..\..\..\SiloProductLine.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A5AB0964D726C00F3D396892042986D6" //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -50,7 +50,7 @@ namespace CoreTest { #line hidden - #line 8 "..\..\..\SiloProductLine.xaml" + #line 9 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Canvas cvs1; @@ -58,7 +58,7 @@ namespace CoreTest { #line hidden - #line 9 "..\..\..\SiloProductLine.xaml" + #line 10 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Silo silo1; @@ -66,7 +66,7 @@ namespace CoreTest { #line hidden - #line 10 "..\..\..\SiloProductLine.xaml" + #line 11 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Silo silo2; @@ -74,7 +74,7 @@ namespace CoreTest { #line hidden - #line 11 "..\..\..\SiloProductLine.xaml" + #line 12 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Elevator elevator1; @@ -82,7 +82,7 @@ namespace CoreTest { #line hidden - #line 12 "..\..\..\SiloProductLine.xaml" + #line 13 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Elevator elevator2; @@ -90,7 +90,7 @@ namespace CoreTest { #line hidden - #line 13 "..\..\..\SiloProductLine.xaml" + #line 14 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.PreCleaner preCleaner1; @@ -98,7 +98,7 @@ namespace CoreTest { #line hidden - #line 14 "..\..\..\SiloProductLine.xaml" + #line 15 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Bucket bucket1; @@ -106,7 +106,7 @@ namespace CoreTest { #line hidden - #line 15 "..\..\..\SiloProductLine.xaml" + #line 16 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Truck truck1; @@ -114,7 +114,7 @@ namespace CoreTest { #line hidden - #line 16 "..\..\..\SiloProductLine.xaml" + #line 17 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor1; @@ -122,7 +122,7 @@ namespace CoreTest { #line hidden - #line 17 "..\..\..\SiloProductLine.xaml" + #line 18 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.MagnetCleaner magnetCleaner1; @@ -130,7 +130,7 @@ namespace CoreTest { #line hidden - #line 18 "..\..\..\SiloProductLine.xaml" + #line 19 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor2; @@ -138,7 +138,7 @@ namespace CoreTest { #line hidden - #line 19 "..\..\..\SiloProductLine.xaml" + #line 20 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor3; @@ -146,7 +146,7 @@ namespace CoreTest { #line hidden - #line 20 "..\..\..\SiloProductLine.xaml" + #line 21 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.ChainConveyor chainConveyor4; @@ -154,7 +154,7 @@ namespace CoreTest { #line hidden - #line 21 "..\..\..\SiloProductLine.xaml" + #line 22 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Cyclone cyclone1; @@ -162,7 +162,7 @@ namespace CoreTest { #line hidden - #line 29 "..\..\..\SiloProductLine.xaml" + #line 30 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock productline; @@ -170,7 +170,7 @@ namespace CoreTest { #line hidden - #line 30 "..\..\..\SiloProductLine.xaml" + #line 31 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo12; @@ -178,7 +178,7 @@ namespace CoreTest { #line hidden - #line 32 "..\..\..\SiloProductLine.xaml" + #line 33 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SelectSwitch selectSwitch1; @@ -186,7 +186,7 @@ namespace CoreTest { #line hidden - #line 33 "..\..\..\SiloProductLine.xaml" + #line 34 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SelectSwitch selectSwitch3; @@ -194,7 +194,7 @@ namespace CoreTest { #line hidden - #line 34 "..\..\..\SiloProductLine.xaml" + #line 35 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo1; @@ -202,7 +202,7 @@ namespace CoreTest { #line hidden - #line 35 "..\..\..\SiloProductLine.xaml" + #line 36 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo2; @@ -210,7 +210,7 @@ namespace CoreTest { #line hidden - #line 37 "..\..\..\SiloProductLine.xaml" + #line 38 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo3; @@ -218,7 +218,7 @@ namespace CoreTest { #line hidden - #line 40 "..\..\..\SiloProductLine.xaml" + #line 41 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SlideGate slideGate1; @@ -226,7 +226,7 @@ namespace CoreTest { #line hidden - #line 41 "..\..\..\SiloProductLine.xaml" + #line 42 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SlideGate slideGate2; @@ -234,7 +234,7 @@ namespace CoreTest { #line hidden - #line 42 "..\..\..\SiloProductLine.xaml" + #line 43 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo4; @@ -242,7 +242,7 @@ namespace CoreTest { #line hidden - #line 44 "..\..\..\SiloProductLine.xaml" + #line 45 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo5; @@ -250,7 +250,7 @@ namespace CoreTest { #line hidden - #line 46 "..\..\..\SiloProductLine.xaml" + #line 47 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.SlideGate slideGate3; @@ -258,7 +258,7 @@ namespace CoreTest { #line hidden - #line 47 "..\..\..\SiloProductLine.xaml" + #line 48 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.Cyclone cyclone2; @@ -266,7 +266,7 @@ namespace CoreTest { #line hidden - #line 49 "..\..\..\SiloProductLine.xaml" + #line 50 "..\..\..\SiloProductLine.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal HMIControl.FromTo fromTo6; @@ -306,13 +306,13 @@ namespace CoreTest { case 1: this.SiloProductLine1 = ((CoreTest.SiloProductLine)(target)); - #line 7 "..\..\..\SiloProductLine.xaml" + #line 8 "..\..\..\SiloProductLine.xaml" this.SiloProductLine1.Loaded += new System.Windows.RoutedEventHandler(this.HMI_Loaded); #line default #line hidden - #line 7 "..\..\..\SiloProductLine.xaml" + #line 8 "..\..\..\SiloProductLine.xaml" this.SiloProductLine1.Unloaded += new System.Windows.RoutedEventHandler(this.HMI_Unloaded); #line default diff --git a/SCADA/Program/OPCDriver/obj/Release/build.force b/SCADA/Program/CoreTest/obj/x86/Release/build.force similarity index 100% rename from SCADA/Program/OPCDriver/obj/Release/build.force rename to SCADA/Program/CoreTest/obj/x86/Release/build.force diff --git a/SCADA/Program/DataExchange.sln b/SCADA/Program/DataExchange.sln index 2aeabed..4b160fa 100644 --- a/SCADA/Program/DataExchange.sln +++ b/SCADA/Program/DataExchange.sln @@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileDriver", "FileDriver\Fi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModbusDriver", "ModbusDriver\ModbusDriver.csproj", "{AEA44301-6A29-4AF7-91E8-E6D755B618F1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SiemensPLCDriver", "SiemensPLCDriver\SiemensPLCDriver.csproj", "{9CEBFDA4-CF05-44D1-881B-13775AA46B27}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -239,6 +241,26 @@ Global {AEA44301-6A29-4AF7-91E8-E6D755B618F1}.Release|x64.Build.0 = Release|x64 {AEA44301-6A29-4AF7-91E8-E6D755B618F1}.Release|x86.ActiveCfg = Release|Any CPU {AEA44301-6A29-4AF7-91E8-E6D755B618F1}.Release|x86.Build.0 = Release|Any CPU + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Debug|Itanium.ActiveCfg = Debug|Itanium + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Debug|Itanium.Build.0 = Debug|Itanium + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Debug|x64.ActiveCfg = Debug|x64 + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Debug|x64.Build.0 = Debug|x64 + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Debug|x86.ActiveCfg = Debug|Any CPU + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Debug|x86.Build.0 = Debug|Any CPU + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Release|Any CPU.Build.0 = Release|Any CPU + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Release|Itanium.ActiveCfg = Release|Itanium + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Release|Itanium.Build.0 = Release|Itanium + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Release|x64.ActiveCfg = Release|x64 + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Release|x64.Build.0 = Release|x64 + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Release|x86.ActiveCfg = Release|Any CPU + {9CEBFDA4-CF05-44D1-881B-13775AA46B27}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll b/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll new file mode 100644 index 0000000..93aaf89 Binary files /dev/null and b/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/bin/Debug/DataService.dll b/SCADA/Program/DataHelper/bin/Debug/DataService.dll new file mode 100644 index 0000000..e6b1419 Binary files /dev/null and b/SCADA/Program/DataHelper/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/DataHelper/bin/Release/DataHelper.dll b/SCADA/Program/DataHelper/bin/Release/DataHelper.dll new file mode 100644 index 0000000..39f7d88 Binary files /dev/null and b/SCADA/Program/DataHelper/bin/Release/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/bin/Release/DataService.dll b/SCADA/Program/DataHelper/bin/Release/DataService.dll new file mode 100644 index 0000000..92a15c1 Binary files /dev/null and b/SCADA/Program/DataHelper/bin/Release/DataService.dll differ diff --git a/SCADA/Program/DataHelper/bin/x86/Debug/DataHelper.dll b/SCADA/Program/DataHelper/bin/x86/Debug/DataHelper.dll index 21bf117..c1a5905 100644 Binary files a/SCADA/Program/DataHelper/bin/x86/Debug/DataHelper.dll and b/SCADA/Program/DataHelper/bin/x86/Debug/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/bin/x86/Debug/DataService.dll b/SCADA/Program/DataHelper/bin/x86/Debug/DataService.dll index e84e58d..1408689 100644 Binary files a/SCADA/Program/DataHelper/bin/x86/Debug/DataService.dll and b/SCADA/Program/DataHelper/bin/x86/Debug/DataService.dll differ diff --git a/SCADA/Program/DataHelper/bin/x86/Release/DataHelper.dll b/SCADA/Program/DataHelper/bin/x86/Release/DataHelper.dll index 5f610d3..4d6a26a 100644 Binary files a/SCADA/Program/DataHelper/bin/x86/Release/DataHelper.dll and b/SCADA/Program/DataHelper/bin/x86/Release/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/bin/x86/Release/DataService.dll b/SCADA/Program/DataHelper/bin/x86/Release/DataService.dll index afed82c..9b150f2 100644 Binary files a/SCADA/Program/DataHelper/bin/x86/Release/DataService.dll and b/SCADA/Program/DataHelper/bin/x86/Release/DataService.dll differ diff --git a/SCADA/Program/DataHelper/obj/Debug/DataHelper.csproj.FileListAbsolute.txt b/SCADA/Program/DataHelper/obj/Debug/DataHelper.csproj.FileListAbsolute.txt index 42363be..e7d4ad5 100644 --- a/SCADA/Program/DataHelper/obj/Debug/DataHelper.csproj.FileListAbsolute.txt +++ b/SCADA/Program/DataHelper/obj/Debug/DataHelper.csproj.FileListAbsolute.txt @@ -8,3 +8,10 @@ E:\双胞胎项目\服务器\SkewButtonLibrary\DataHelper\bin\Debug\DataHelper.p E:\双胞胎项目\服务器\SkewButtonLibrary\DataHelper\obj\Debug\DataHelper.csprojResolveAssemblyReference.cache E:\双胞胎项目\服务器\SkewButtonLibrary\DataHelper\obj\Debug\DataHelper.dll E:\双胞胎项目\服务器\SkewButtonLibrary\DataHelper\obj\Debug\DataHelper.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\Debug\DataHelper.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\Debug\DataHelper.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\obj\Debug\DataHelper.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\obj\Debug\DataHelper.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\obj\Debug\DataHelper.pdb diff --git a/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll b/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll index 8af1ccc..93aaf89 100644 Binary files a/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll and b/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/obj/Release/DataHelper.csproj.FileListAbsolute.txt b/SCADA/Program/DataHelper/obj/Release/DataHelper.csproj.FileListAbsolute.txt index 5c28b69..e4bbaae 100644 --- a/SCADA/Program/DataHelper/obj/Release/DataHelper.csproj.FileListAbsolute.txt +++ b/SCADA/Program/DataHelper/obj/Release/DataHelper.csproj.FileListAbsolute.txt @@ -43,3 +43,10 @@ E:\双胞胎项目\sbt\Service - Copy (2)\SkewButtonLibrary\DataHelper\bin\Relea E:\双胞胎项目\sbt\Service - Copy (2)\SkewButtonLibrary\DataHelper\obj\Release\DataHelper.csprojResolveAssemblyReference.cache E:\双胞胎项目\sbt\Service - Copy (2)\SkewButtonLibrary\DataHelper\obj\Release\DataHelper.dll E:\双胞胎项目\sbt\Service - Copy (2)\SkewButtonLibrary\DataHelper\obj\Release\DataHelper.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\Release\DataHelper.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\Release\DataHelper.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\Release\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\Release\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\obj\Release\DataHelper.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\obj\Release\DataHelper.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\obj\Release\DataHelper.pdb diff --git a/SCADA/Program/DataHelper/obj/Release/DataHelper.dll b/SCADA/Program/DataHelper/obj/Release/DataHelper.dll index e7e4b61..39f7d88 100644 Binary files a/SCADA/Program/DataHelper/obj/Release/DataHelper.dll and b/SCADA/Program/DataHelper/obj/Release/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csproj.FileListAbsolute.txt b/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csproj.FileListAbsolute.txt index db6ff20..d2e7085 100644 --- a/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csproj.FileListAbsolute.txt +++ b/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.csproj.FileListAbsolute.txt @@ -49,3 +49,10 @@ E:\新建文件夹\SCADA\Program\DataHelper\bin\x86\Debug\DataService.pdb E:\新建文件夹\SCADA\Program\DataHelper\obj\x86\Debug\DataHelper.csprojResolveAssemblyReference.cache E:\新建文件夹\SCADA\Program\DataHelper\obj\x86\Debug\DataHelper.dll E:\新建文件夹\SCADA\Program\DataHelper\obj\x86\Debug\DataHelper.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\x86\Debug\DataHelper.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\x86\Debug\DataHelper.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\x86\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\x86\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\obj\x86\Debug\DataHelper.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\obj\x86\Debug\DataHelper.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\obj\x86\Debug\DataHelper.pdb diff --git a/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.dll b/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.dll index 21bf117..c1a5905 100644 Binary files a/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.dll and b/SCADA/Program/DataHelper/obj/x86/Debug/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/obj/x86/Release/DataHelper.csproj.FileListAbsolute.txt b/SCADA/Program/DataHelper/obj/x86/Release/DataHelper.csproj.FileListAbsolute.txt index 458c812..5d9a3d6 100644 --- a/SCADA/Program/DataHelper/obj/x86/Release/DataHelper.csproj.FileListAbsolute.txt +++ b/SCADA/Program/DataHelper/obj/x86/Release/DataHelper.csproj.FileListAbsolute.txt @@ -35,3 +35,10 @@ E:\SCADA\Program\DataHelper\bin\x86\Release\DataService.pdb E:\SCADA\Program\DataHelper\obj\x86\Release\DataHelper.csprojResolveAssemblyReference.cache E:\SCADA\Program\DataHelper\obj\x86\Release\DataHelper.dll E:\SCADA\Program\DataHelper\obj\x86\Release\DataHelper.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\x86\Release\DataHelper.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\x86\Release\DataHelper.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\x86\Release\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\bin\x86\Release\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\obj\x86\Release\DataHelper.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\obj\x86\Release\DataHelper.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataHelper\obj\x86\Release\DataHelper.pdb diff --git a/SCADA/Program/DataHelper/obj/x86/Release/DataHelper.dll b/SCADA/Program/DataHelper/obj/x86/Release/DataHelper.dll index 5f610d3..4d6a26a 100644 Binary files a/SCADA/Program/DataHelper/obj/x86/Release/DataHelper.dll and b/SCADA/Program/DataHelper/obj/x86/Release/DataHelper.dll differ diff --git a/SCADA/Program/DataHelper/obj/x86/Release/build.force b/SCADA/Program/DataHelper/obj/x86/Release/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/DataService/bin/Debug/DataService.dll b/SCADA/Program/DataService/bin/Debug/DataService.dll index e84e58d..e6b1419 100644 Binary files a/SCADA/Program/DataService/bin/Debug/DataService.dll and b/SCADA/Program/DataService/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/DataService/bin/Release/DataService.dll b/SCADA/Program/DataService/bin/Release/DataService.dll index afed82c..92a15c1 100644 Binary files a/SCADA/Program/DataService/bin/Release/DataService.dll and b/SCADA/Program/DataService/bin/Release/DataService.dll differ diff --git a/SCADA/Program/DataService/obj/Debug/DataService.csproj.FileListAbsolute.txt b/SCADA/Program/DataService/obj/Debug/DataService.csproj.FileListAbsolute.txt index 68312da..b9907a5 100644 --- a/SCADA/Program/DataService/obj/Debug/DataService.csproj.FileListAbsolute.txt +++ b/SCADA/Program/DataService/obj/Debug/DataService.csproj.FileListAbsolute.txt @@ -18,3 +18,8 @@ E:\Project\牧羊上位机\WpfApplication1\bin\Debug\DataService.dll E:\Project\牧羊上位机\WpfApplication1\bin\Debug\DataService.pdb E:\Project\牧羊上位机\WpfApplication1\obj\Debug\DataService.dll E:\Project\牧羊上位机\WpfApplication1\obj\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.pdb diff --git a/SCADA/Program/DataService/obj/Debug/DataService.dll b/SCADA/Program/DataService/obj/Debug/DataService.dll index da40f88..e6b1419 100644 Binary files a/SCADA/Program/DataService/obj/Debug/DataService.dll and b/SCADA/Program/DataService/obj/Debug/DataService.dll differ diff --git a/SCADA/Program/DataService/obj/Release/DataService.csproj.FileListAbsolute.txt b/SCADA/Program/DataService/obj/Release/DataService.csproj.FileListAbsolute.txt index 197d04c..c9dd33d 100644 --- a/SCADA/Program/DataService/obj/Release/DataService.csproj.FileListAbsolute.txt +++ b/SCADA/Program/DataService/obj/Release/DataService.csproj.FileListAbsolute.txt @@ -96,3 +96,8 @@ F:\牧羊上位机\WpfApplication1\bin\Release\DataService.dll F:\牧羊上位机\WpfApplication1\bin\Release\DataService.pdb F:\牧羊上位机\WpfApplication1\obj\Release\DataService.dll F:\牧羊上位机\WpfApplication1\obj\Release\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Release\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Release\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Release\DataService.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Release\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Release\DataService.pdb diff --git a/SCADA/Program/DataService/obj/Release/DataService.dll b/SCADA/Program/DataService/obj/Release/DataService.dll index 002e2c8..92a15c1 100644 Binary files a/SCADA/Program/DataService/obj/Release/DataService.dll and b/SCADA/Program/DataService/obj/Release/DataService.dll differ diff --git a/SCADA/Program/DataService/obj/x86/Debug/DataService.csproj.FileListAbsolute.txt b/SCADA/Program/DataService/obj/x86/Debug/DataService.csproj.FileListAbsolute.txt index eda89f6..a74ba6d 100644 --- a/SCADA/Program/DataService/obj/x86/Debug/DataService.csproj.FileListAbsolute.txt +++ b/SCADA/Program/DataService/obj/x86/Debug/DataService.csproj.FileListAbsolute.txt @@ -127,3 +127,8 @@ E:\新建文件夹\SCADA\Program\DataService\bin\Debug\DataService.pdb E:\新建文件夹\SCADA\Program\DataService\obj\x86\Debug\DataService.csprojResolveAssemblyReference.cache E:\新建文件夹\SCADA\Program\DataService\obj\x86\Debug\DataService.dll E:\新建文件夹\SCADA\Program\DataService\obj\x86\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\x86\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\x86\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\x86\Debug\DataService.csprojResolveAssemblyReference.cache diff --git a/SCADA/Program/DataService/obj/x86/Debug/DataService.dll b/SCADA/Program/DataService/obj/x86/Debug/DataService.dll index e84e58d..1408689 100644 Binary files a/SCADA/Program/DataService/obj/x86/Debug/DataService.dll and b/SCADA/Program/DataService/obj/x86/Debug/DataService.dll differ diff --git a/SCADA/Program/DataService/obj/x86/Release/DataService.csproj.FileListAbsolute.txt b/SCADA/Program/DataService/obj/x86/Release/DataService.csproj.FileListAbsolute.txt index 29a65da..a309c8b 100644 --- a/SCADA/Program/DataService/obj/x86/Release/DataService.csproj.FileListAbsolute.txt +++ b/SCADA/Program/DataService/obj/x86/Release/DataService.csproj.FileListAbsolute.txt @@ -90,3 +90,7 @@ E:\SCADA\Program\DataService\bin\Release\DataService.dll E:\SCADA\Program\DataService\bin\Release\DataService.pdb E:\SCADA\Program\DataService\obj\x86\Release\DataService.dll E:\SCADA\Program\DataService\obj\x86\Release\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Release\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Release\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\x86\Release\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\x86\Release\DataService.pdb diff --git a/SCADA/Program/DataService/obj/x86/Release/DataService.dll b/SCADA/Program/DataService/obj/x86/Release/DataService.dll index afed82c..9b150f2 100644 Binary files a/SCADA/Program/DataService/obj/x86/Release/DataService.dll and b/SCADA/Program/DataService/obj/x86/Release/DataService.dll differ diff --git a/SCADA/Program/FileDriver/bin/Debug/DataService.dll b/SCADA/Program/FileDriver/bin/Debug/DataService.dll index e84e58d..e6b1419 100644 Binary files a/SCADA/Program/FileDriver/bin/Debug/DataService.dll and b/SCADA/Program/FileDriver/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/FileDriver/bin/Debug/FileDriver.dll b/SCADA/Program/FileDriver/bin/Debug/FileDriver.dll index be83036..cb8b395 100644 Binary files a/SCADA/Program/FileDriver/bin/Debug/FileDriver.dll and b/SCADA/Program/FileDriver/bin/Debug/FileDriver.dll differ diff --git a/SCADA/Program/FileDriver/bin/Itanium/Debug/DataService.dll b/SCADA/Program/FileDriver/bin/Itanium/Debug/DataService.dll deleted file mode 100644 index 0f00f59..0000000 Binary files a/SCADA/Program/FileDriver/bin/Itanium/Debug/DataService.dll and /dev/null differ diff --git a/SCADA/Program/FileDriver/bin/Itanium/Debug/FileDriver.dll b/SCADA/Program/FileDriver/bin/Itanium/Debug/FileDriver.dll deleted file mode 100644 index 9a14843..0000000 Binary files a/SCADA/Program/FileDriver/bin/Itanium/Debug/FileDriver.dll and /dev/null differ diff --git a/SCADA/Program/FileDriver/bin/Itanium/Release/DataService.dll b/SCADA/Program/FileDriver/bin/Itanium/Release/DataService.dll deleted file mode 100644 index 5789fc1..0000000 Binary files a/SCADA/Program/FileDriver/bin/Itanium/Release/DataService.dll and /dev/null differ diff --git a/SCADA/Program/FileDriver/bin/Itanium/Release/FileDriver.dll b/SCADA/Program/FileDriver/bin/Itanium/Release/FileDriver.dll deleted file mode 100644 index 3384a37..0000000 Binary files a/SCADA/Program/FileDriver/bin/Itanium/Release/FileDriver.dll and /dev/null differ diff --git a/SCADA/Program/FileDriver/bin/Release/DataService.dll b/SCADA/Program/FileDriver/bin/Release/DataService.dll index 599d223..92a15c1 100644 Binary files a/SCADA/Program/FileDriver/bin/Release/DataService.dll and b/SCADA/Program/FileDriver/bin/Release/DataService.dll differ diff --git a/SCADA/Program/FileDriver/bin/Release/FileDriver.dll b/SCADA/Program/FileDriver/bin/Release/FileDriver.dll index 00851ad..4a887a3 100644 Binary files a/SCADA/Program/FileDriver/bin/Release/FileDriver.dll and b/SCADA/Program/FileDriver/bin/Release/FileDriver.dll differ diff --git a/SCADA/Program/FileDriver/obj/Debug/FileDriver.csproj.FileListAbsolute.txt b/SCADA/Program/FileDriver/obj/Debug/FileDriver.csproj.FileListAbsolute.txt index 3f38154..8eb6406 100644 --- a/SCADA/Program/FileDriver/obj/Debug/FileDriver.csproj.FileListAbsolute.txt +++ b/SCADA/Program/FileDriver/obj/Debug/FileDriver.csproj.FileListAbsolute.txt @@ -68,3 +68,10 @@ E:\新建文件夹\SCADA\Program\FileDriver\bin\Debug\DataService.pdb E:\新建文件夹\SCADA\Program\FileDriver\obj\Debug\FileDriver.csprojResolveAssemblyReference.cache E:\新建文件夹\SCADA\Program\FileDriver\obj\Debug\FileDriver.dll E:\新建文件夹\SCADA\Program\FileDriver\obj\Debug\FileDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\bin\Debug\FileDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\bin\Debug\FileDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\bin\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\bin\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\obj\Debug\FileDriver.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\obj\Debug\FileDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\obj\Debug\FileDriver.pdb diff --git a/SCADA/Program/FileDriver/obj/Debug/FileDriver.dll b/SCADA/Program/FileDriver/obj/Debug/FileDriver.dll index be83036..cb8b395 100644 Binary files a/SCADA/Program/FileDriver/obj/Debug/FileDriver.dll and b/SCADA/Program/FileDriver/obj/Debug/FileDriver.dll differ diff --git a/SCADA/Program/FileDriver/obj/Itanium/Release/build.force b/SCADA/Program/FileDriver/obj/Itanium/Release/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/FileDriver/obj/Release/FileDriver.csproj.FileListAbsolute.txt b/SCADA/Program/FileDriver/obj/Release/FileDriver.csproj.FileListAbsolute.txt index 1bb301e..fdfc9c1 100644 --- a/SCADA/Program/FileDriver/obj/Release/FileDriver.csproj.FileListAbsolute.txt +++ b/SCADA/Program/FileDriver/obj/Release/FileDriver.csproj.FileListAbsolute.txt @@ -134,3 +134,10 @@ E:\SCADA\Program\FileDriver\bin\Release\DataService.pdb E:\SCADA\Program\FileDriver\obj\Release\FileDriver.csprojResolveAssemblyReference.cache E:\SCADA\Program\FileDriver\obj\Release\FileDriver.dll E:\SCADA\Program\FileDriver\obj\Release\FileDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\bin\Release\FileDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\bin\Release\FileDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\bin\Release\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\bin\Release\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\obj\Release\FileDriver.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\obj\Release\FileDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\FileDriver\obj\Release\FileDriver.pdb diff --git a/SCADA/Program/FileDriver/obj/Release/FileDriver.dll b/SCADA/Program/FileDriver/obj/Release/FileDriver.dll index 00851ad..4a887a3 100644 Binary files a/SCADA/Program/FileDriver/obj/Release/FileDriver.dll and b/SCADA/Program/FileDriver/obj/Release/FileDriver.dll differ diff --git a/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.dll b/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.dll index 8e3ae2a..925e12a 100644 Binary files a/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.dll and b/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.dll differ diff --git a/SCADA/Program/HMIControl/bin/Debug/HMIControl.dll b/SCADA/Program/HMIControl/bin/Debug/HMIControl.dll index cd64886..6a2e443 100644 Binary files a/SCADA/Program/HMIControl/bin/Debug/HMIControl.dll and b/SCADA/Program/HMIControl/bin/Debug/HMIControl.dll differ diff --git a/SCADA/Program/HMIControl/bin/Release/HMIControl.VisualStudio.Design.dll b/SCADA/Program/HMIControl/bin/Release/HMIControl.VisualStudio.Design.dll index 880daf6..b1f38f1 100644 Binary files a/SCADA/Program/HMIControl/bin/Release/HMIControl.VisualStudio.Design.dll and b/SCADA/Program/HMIControl/bin/Release/HMIControl.VisualStudio.Design.dll differ diff --git a/SCADA/Program/HMIControl/bin/Release/HMIControl.dll b/SCADA/Program/HMIControl/bin/Release/HMIControl.dll index 66402cb..9120fe9 100644 Binary files a/SCADA/Program/HMIControl/bin/Release/HMIControl.dll and b/SCADA/Program/HMIControl/bin/Release/HMIControl.dll differ diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt b/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt index edfd55e..0ef08ea 100644 --- a/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt +++ b/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt @@ -325,3 +325,19 @@ E:\新建文件夹\SCADA\Program\HMIControl\obj\Debug\HMIControl.Properties.Reso E:\新建文件夹\SCADA\Program\HMIControl\obj\Debug\HMIControl.csproj.GenerateResource.Cache E:\新建文件夹\SCADA\Program\HMIControl\obj\Debug\HMIControl.dll E:\新建文件夹\SCADA\Program\HMIControl\obj\Debug\HMIControl.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\HMIControl.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\HMIControl.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Microsoft.Expression.Controls.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Microsoft.Expression.Drawing.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Microsoft.Expression.Controls.xml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\Microsoft.Expression.Drawing.xml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\GeneratedInternalTypeHelper.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl_MarkupCompile.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl_MarkupCompile.lref +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\Themes\Generic.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.g.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.Properties.Resources.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csproj.GenerateResource.Cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.pdb diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll b/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll index cd64886..6a2e443 100644 Binary files a/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll and b/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll differ diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.i.lref b/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.i.lref deleted file mode 100644 index 1c5310a..0000000 --- a/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.i.lref +++ /dev/null @@ -1,4 +0,0 @@ -E:\新建文件夹\SCADA\Program\HMIControl\obj\Debug\GeneratedInternalTypeHelper.g.i.cs - -FE:\新建文件夹\SCADA\Program\HMIControl\Themes\Generic.xaml;; - diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.lref b/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.lref index e8cc76d..6d8d1f3 100644 --- a/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.lref +++ b/SCADA/Program/HMIControl/obj/Debug/HMIControl_MarkupCompile.lref @@ -1,4 +1,4 @@ -E:\新建文件夹\SCADA\Program\HMIControl\obj\Debug\GeneratedInternalTypeHelper.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\GeneratedInternalTypeHelper.g.cs -FE:\新建文件夹\SCADA\Program\HMIControl\Themes\Generic.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\Themes\Generic.xaml;; diff --git a/SCADA/Program/HMIControl/obj/Release/HMIControl.csproj.FileListAbsolute.txt b/SCADA/Program/HMIControl/obj/Release/HMIControl.csproj.FileListAbsolute.txt index 837ae07..fbbd4d1 100644 --- a/SCADA/Program/HMIControl/obj/Release/HMIControl.csproj.FileListAbsolute.txt +++ b/SCADA/Program/HMIControl/obj/Release/HMIControl.csproj.FileListAbsolute.txt @@ -428,3 +428,19 @@ E:\SCADA\Program\HMIControl\obj\Release\HMIControl.Properties.Resources.resource E:\SCADA\Program\HMIControl\obj\Release\HMIControl.csproj.GenerateResource.Cache E:\SCADA\Program\HMIControl\obj\Release\HMIControl.dll E:\SCADA\Program\HMIControl\obj\Release\HMIControl.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Release\HMIControl.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Release\HMIControl.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Release\Microsoft.Expression.Controls.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Release\Microsoft.Expression.Drawing.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Release\Microsoft.Expression.Controls.xml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Release\Microsoft.Expression.Drawing.xml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\GeneratedInternalTypeHelper.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl_MarkupCompile.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl_MarkupCompile.lref +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\Themes\Generic.baml +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.g.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.Properties.Resources.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.csproj.GenerateResource.Cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\HMIControl.csprojResolveAssemblyReference.cache diff --git a/SCADA/Program/HMIControl/obj/Release/HMIControl.dll b/SCADA/Program/HMIControl/obj/Release/HMIControl.dll index 66402cb..9120fe9 100644 Binary files a/SCADA/Program/HMIControl/obj/Release/HMIControl.dll and b/SCADA/Program/HMIControl/obj/Release/HMIControl.dll differ diff --git a/SCADA/Program/HMIControl/obj/Release/HMIControl_MarkupCompile.lref b/SCADA/Program/HMIControl/obj/Release/HMIControl_MarkupCompile.lref index d31ab46..137e654 100644 --- a/SCADA/Program/HMIControl/obj/Release/HMIControl_MarkupCompile.lref +++ b/SCADA/Program/HMIControl/obj/Release/HMIControl_MarkupCompile.lref @@ -1,4 +1,4 @@ -E:\SCADA\Program\HMIControl\obj\Release\GeneratedInternalTypeHelper.g.cs +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\GeneratedInternalTypeHelper.g.cs -FE:\SCADA\Program\HMIControl\Themes\Generic.xaml;; +FC:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\Themes\Generic.xaml;; diff --git a/SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.dll b/SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.dll index 8e3ae2a..925e12a 100644 Binary files a/SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.dll and b/SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.dll differ diff --git a/SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.FileListAbsolute.txt b/SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.FileListAbsolute.txt index 311f23c..c6a4f09 100644 --- a/SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.FileListAbsolute.txt +++ b/SCADA/Program/LinkableControlDesignTime/obj/Debug/LinkableControlDesign.csproj.FileListAbsolute.txt @@ -182,3 +182,14 @@ E:\新建文件夹\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl. E:\新建文件夹\SCADA\Program\LinkableControlDesignTime\obj\Debug\LinkableControlDesign.csproj.GenerateResource.Cache E:\新建文件夹\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.dll E:\新建文件夹\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\HMIControl.VisualStudio.Design.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Debug\HMIControl.VisualStudio.Design.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\LinkableControlDesign.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.Properties.Resources.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.TagComplexEditor.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.TagList.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.TagWindowEditor.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.TagWriteEditor.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\LinkableControlDesign.csproj.GenerateResource.Cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Debug\HMIControl.VisualStudio.Design.pdb diff --git a/SCADA/Program/LinkableControlDesignTime/obj/Release/HMIControl.VisualStudio.Design.dll b/SCADA/Program/LinkableControlDesignTime/obj/Release/HMIControl.VisualStudio.Design.dll index 880daf6..b1f38f1 100644 Binary files a/SCADA/Program/LinkableControlDesignTime/obj/Release/HMIControl.VisualStudio.Design.dll and b/SCADA/Program/LinkableControlDesignTime/obj/Release/HMIControl.VisualStudio.Design.dll differ diff --git a/SCADA/Program/LinkableControlDesignTime/obj/Release/LinkableControlDesign.csproj.FileListAbsolute.txt b/SCADA/Program/LinkableControlDesignTime/obj/Release/LinkableControlDesign.csproj.FileListAbsolute.txt index b26d944..429907e 100644 --- a/SCADA/Program/LinkableControlDesignTime/obj/Release/LinkableControlDesign.csproj.FileListAbsolute.txt +++ b/SCADA/Program/LinkableControlDesignTime/obj/Release/LinkableControlDesign.csproj.FileListAbsolute.txt @@ -329,3 +329,14 @@ E:\SCADA\Program\LinkableControlDesignTime\obj\Release\HMIControl.VisualStudio.D E:\SCADA\Program\LinkableControlDesignTime\obj\Release\LinkableControlDesign.csproj.GenerateResource.Cache E:\SCADA\Program\LinkableControlDesignTime\obj\Release\HMIControl.VisualStudio.Design.dll E:\SCADA\Program\LinkableControlDesignTime\obj\Release\HMIControl.VisualStudio.Design.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Release\HMIControl.VisualStudio.Design.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\bin\Release\HMIControl.VisualStudio.Design.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Release\LinkableControlDesign.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Release\HMIControl.VisualStudio.Design.Properties.Resources.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Release\HMIControl.VisualStudio.Design.TagComplexEditor.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Release\HMIControl.VisualStudio.Design.TagList.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Release\HMIControl.VisualStudio.Design.TagWindowEditor.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Release\HMIControl.VisualStudio.Design.TagWriteEditor.resources +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Release\LinkableControlDesign.csproj.GenerateResource.Cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Release\HMIControl.VisualStudio.Design.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\LinkableControlDesignTime\obj\Release\HMIControl.VisualStudio.Design.pdb diff --git a/SCADA/Program/ModbusDriver/bin/Debug/DataService.dll b/SCADA/Program/ModbusDriver/bin/Debug/DataService.dll index e84e58d..e6b1419 100644 Binary files a/SCADA/Program/ModbusDriver/bin/Debug/DataService.dll and b/SCADA/Program/ModbusDriver/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/ModbusDriver/bin/Debug/ModbusDriver.dll b/SCADA/Program/ModbusDriver/bin/Debug/ModbusDriver.dll index 9e23334..f54c582 100644 Binary files a/SCADA/Program/ModbusDriver/bin/Debug/ModbusDriver.dll and b/SCADA/Program/ModbusDriver/bin/Debug/ModbusDriver.dll differ diff --git a/SCADA/Program/ModbusDriver/bin/Itanium/Debug/DataService.dll b/SCADA/Program/ModbusDriver/bin/Itanium/Debug/DataService.dll deleted file mode 100644 index 0f00f59..0000000 Binary files a/SCADA/Program/ModbusDriver/bin/Itanium/Debug/DataService.dll and /dev/null differ diff --git a/SCADA/Program/ModbusDriver/bin/Itanium/Debug/ModbusDriver.dll b/SCADA/Program/ModbusDriver/bin/Itanium/Debug/ModbusDriver.dll deleted file mode 100644 index 41d25d4..0000000 Binary files a/SCADA/Program/ModbusDriver/bin/Itanium/Debug/ModbusDriver.dll and /dev/null differ diff --git a/SCADA/Program/ModbusDriver/bin/Itanium/Release/DataService.dll b/SCADA/Program/ModbusDriver/bin/Itanium/Release/DataService.dll deleted file mode 100644 index 5789fc1..0000000 Binary files a/SCADA/Program/ModbusDriver/bin/Itanium/Release/DataService.dll and /dev/null differ diff --git a/SCADA/Program/ModbusDriver/bin/Itanium/Release/ModbusDriver.dll b/SCADA/Program/ModbusDriver/bin/Itanium/Release/ModbusDriver.dll deleted file mode 100644 index fbe4051..0000000 Binary files a/SCADA/Program/ModbusDriver/bin/Itanium/Release/ModbusDriver.dll and /dev/null differ diff --git a/SCADA/Program/ModbusDriver/bin/Release/DataService.dll b/SCADA/Program/ModbusDriver/bin/Release/DataService.dll index 830b8a4..92a15c1 100644 Binary files a/SCADA/Program/ModbusDriver/bin/Release/DataService.dll and b/SCADA/Program/ModbusDriver/bin/Release/DataService.dll differ diff --git a/SCADA/Program/ModbusDriver/bin/Release/ModbusDriver.dll b/SCADA/Program/ModbusDriver/bin/Release/ModbusDriver.dll index ae0bdac..8e262a4 100644 Binary files a/SCADA/Program/ModbusDriver/bin/Release/ModbusDriver.dll and b/SCADA/Program/ModbusDriver/bin/Release/ModbusDriver.dll differ diff --git a/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csproj.FileListAbsolute.txt b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csproj.FileListAbsolute.txt index ba40dca..1ba6d91 100644 --- a/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csproj.FileListAbsolute.txt +++ b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.csproj.FileListAbsolute.txt @@ -74,3 +74,10 @@ E:\新建文件夹\SCADA\Program\ModbusDriver\bin\Debug\DataService.pdb E:\新建文件夹\SCADA\Program\ModbusDriver\obj\Debug\ModbusDriver.csprojResolveAssemblyReference.cache E:\新建文件夹\SCADA\Program\ModbusDriver\obj\Debug\ModbusDriver.dll E:\新建文件夹\SCADA\Program\ModbusDriver\obj\Debug\ModbusDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\bin\Debug\ModbusDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\bin\Debug\ModbusDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\bin\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\bin\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\obj\Debug\ModbusDriver.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\obj\Debug\ModbusDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\obj\Debug\ModbusDriver.pdb diff --git a/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.dll b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.dll index 9e23334..f54c582 100644 Binary files a/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.dll and b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.dll differ diff --git a/SCADA/Program/ModbusDriver/obj/Itanium/Release/build.force b/SCADA/Program/ModbusDriver/obj/Itanium/Release/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/ModbusDriver/obj/Release/ModbusDriver.csproj.FileListAbsolute.txt b/SCADA/Program/ModbusDriver/obj/Release/ModbusDriver.csproj.FileListAbsolute.txt index c751ed1..482a995 100644 --- a/SCADA/Program/ModbusDriver/obj/Release/ModbusDriver.csproj.FileListAbsolute.txt +++ b/SCADA/Program/ModbusDriver/obj/Release/ModbusDriver.csproj.FileListAbsolute.txt @@ -99,3 +99,10 @@ E:\SCADA\Program\ModbusDriver\bin\Release\DataService.pdb E:\SCADA\Program\ModbusDriver\obj\Release\ModbusDriver.csprojResolveAssemblyReference.cache E:\SCADA\Program\ModbusDriver\obj\Release\ModbusDriver.dll E:\SCADA\Program\ModbusDriver\obj\Release\ModbusDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\bin\Release\ModbusDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\bin\Release\ModbusDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\bin\Release\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\bin\Release\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\obj\Release\ModbusDriver.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\obj\Release\ModbusDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\ModbusDriver\obj\Release\ModbusDriver.pdb diff --git a/SCADA/Program/ModbusDriver/obj/Release/ModbusDriver.dll b/SCADA/Program/ModbusDriver/obj/Release/ModbusDriver.dll index ae0bdac..8e262a4 100644 Binary files a/SCADA/Program/ModbusDriver/obj/Release/ModbusDriver.dll and b/SCADA/Program/ModbusDriver/obj/Release/ModbusDriver.dll differ diff --git a/SCADA/Program/OPCDriver/OPCDriver.cs b/SCADA/Program/OPCDriver/OPCDriver.cs index 3e9d811..d3e7ed7 100644 --- a/SCADA/Program/OPCDriver/OPCDriver.cs +++ b/SCADA/Program/OPCDriver/OPCDriver.cs @@ -820,7 +820,9 @@ namespace OPCDriver { if (_opcServerObj != null) Dispose(); - Type svrComponenttype = Type.GetTypeFromCLSID(new Guid(_clsidOPCserver), _serverIP, false); + Guid cid; + Type svrComponenttype = Guid.TryParse(_clsidOPCserver, out cid) ? Type.GetTypeFromCLSID(cid, _serverIP, false) + : Type.GetTypeFromProgID(_clsidOPCserver, _serverIP, false); if (svrComponenttype == null) return false; try diff --git a/SCADA/Program/OPCDriver/bin/Debug/DataService.dll b/SCADA/Program/OPCDriver/bin/Debug/DataService.dll index e84e58d..e6b1419 100644 Binary files a/SCADA/Program/OPCDriver/bin/Debug/DataService.dll and b/SCADA/Program/OPCDriver/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/OPCDriver/bin/Debug/OPCDriver.dll b/SCADA/Program/OPCDriver/bin/Debug/OPCDriver.dll index cd62e29..00b3f8c 100644 Binary files a/SCADA/Program/OPCDriver/bin/Debug/OPCDriver.dll and b/SCADA/Program/OPCDriver/bin/Debug/OPCDriver.dll differ diff --git a/SCADA/Program/OPCDriver/bin/Debug/OPCLib.dll b/SCADA/Program/OPCDriver/bin/Debug/OPCLib.dll index 1f4957c..b69bec2 100644 Binary files a/SCADA/Program/OPCDriver/bin/Debug/OPCLib.dll and b/SCADA/Program/OPCDriver/bin/Debug/OPCLib.dll differ diff --git a/SCADA/Program/OPCDriver/bin/Release/DataService.dll b/SCADA/Program/OPCDriver/bin/Release/DataService.dll index 8ba6970..92a15c1 100644 Binary files a/SCADA/Program/OPCDriver/bin/Release/DataService.dll and b/SCADA/Program/OPCDriver/bin/Release/DataService.dll differ diff --git a/SCADA/Program/OPCDriver/bin/Release/OPCDriver.dll b/SCADA/Program/OPCDriver/bin/Release/OPCDriver.dll index dd2c4d2..60a6351 100644 Binary files a/SCADA/Program/OPCDriver/bin/Release/OPCDriver.dll and b/SCADA/Program/OPCDriver/bin/Release/OPCDriver.dll differ diff --git a/SCADA/Program/OPCDriver/bin/Release/OPCLib.dll b/SCADA/Program/OPCDriver/bin/Release/OPCLib.dll index 0475e15..1f16321 100644 Binary files a/SCADA/Program/OPCDriver/bin/Release/OPCLib.dll and b/SCADA/Program/OPCDriver/bin/Release/OPCLib.dll differ diff --git a/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csproj.FileListAbsolute.txt b/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csproj.FileListAbsolute.txt index b9d9e8c..d7b9b88 100644 --- a/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csproj.FileListAbsolute.txt +++ b/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.csproj.FileListAbsolute.txt @@ -86,3 +86,12 @@ E:\新建文件夹\SCADA\Program\OPCDriver\bin\Debug\OPCLib.pdb E:\新建文件夹\SCADA\Program\OPCDriver\obj\Debug\OPCDriver.csprojResolveAssemblyReference.cache E:\新建文件夹\SCADA\Program\OPCDriver\obj\Debug\OPCDriver.dll E:\新建文件夹\SCADA\Program\OPCDriver\obj\Debug\OPCDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\bin\Debug\OPCDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\bin\Debug\OPCDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\bin\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\bin\Debug\OPCLib.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\bin\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\bin\Debug\OPCLib.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\obj\Debug\OPCDriver.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\obj\Debug\OPCDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\obj\Debug\OPCDriver.pdb diff --git a/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.dll b/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.dll index cd62e29..00b3f8c 100644 Binary files a/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.dll and b/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.dll differ diff --git a/SCADA/Program/OPCDriver/obj/Release/OPCDriver.csproj.FileListAbsolute.txt b/SCADA/Program/OPCDriver/obj/Release/OPCDriver.csproj.FileListAbsolute.txt index a0b1618..20aade4 100644 --- a/SCADA/Program/OPCDriver/obj/Release/OPCDriver.csproj.FileListAbsolute.txt +++ b/SCADA/Program/OPCDriver/obj/Release/OPCDriver.csproj.FileListAbsolute.txt @@ -136,3 +136,12 @@ E:\SCADA\Program\OPCDriver\bin\Release\OPCLib.pdb E:\SCADA\Program\OPCDriver\obj\Release\OPCDriver.csprojResolveAssemblyReference.cache E:\SCADA\Program\OPCDriver\obj\Release\OPCDriver.dll E:\SCADA\Program\OPCDriver\obj\Release\OPCDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\bin\Release\OPCDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\bin\Release\OPCDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\bin\Release\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\bin\Release\OPCLib.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\bin\Release\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\bin\Release\OPCLib.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\obj\Release\OPCDriver.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\obj\Release\OPCDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCDriver\obj\Release\OPCDriver.pdb diff --git a/SCADA/Program/OPCDriver/obj/Release/OPCDriver.dll b/SCADA/Program/OPCDriver/obj/Release/OPCDriver.dll index dd2c4d2..60a6351 100644 Binary files a/SCADA/Program/OPCDriver/obj/Release/OPCDriver.dll and b/SCADA/Program/OPCDriver/obj/Release/OPCDriver.dll differ diff --git a/SCADA/Program/OPCLib/bin/Debug/OPCLib.dll b/SCADA/Program/OPCLib/bin/Debug/OPCLib.dll index 7242311..b69bec2 100644 Binary files a/SCADA/Program/OPCLib/bin/Debug/OPCLib.dll and b/SCADA/Program/OPCLib/bin/Debug/OPCLib.dll differ diff --git a/SCADA/Program/OPCLib/bin/Release/OPCLib.dll b/SCADA/Program/OPCLib/bin/Release/OPCLib.dll index 07b1396..1f16321 100644 Binary files a/SCADA/Program/OPCLib/bin/Release/OPCLib.dll and b/SCADA/Program/OPCLib/bin/Release/OPCLib.dll differ diff --git a/SCADA/Program/OPCLib/bin/x86/Debug/OPCLib.dll b/SCADA/Program/OPCLib/bin/x86/Debug/OPCLib.dll index 1f4957c..4a066a0 100644 Binary files a/SCADA/Program/OPCLib/bin/x86/Debug/OPCLib.dll and b/SCADA/Program/OPCLib/bin/x86/Debug/OPCLib.dll differ diff --git a/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.FileListAbsolute.txt b/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.FileListAbsolute.txt index 2649a96..b6bdc59 100644 --- a/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.FileListAbsolute.txt +++ b/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.FileListAbsolute.txt @@ -37,3 +37,8 @@ D:\Muyang\武汉伊利\SkewButtonLibrary\OPCLib\bin\Debug\OPCLib.dll D:\Muyang\武汉伊利\SkewButtonLibrary\OPCLib\bin\Debug\OPCLib.pdb D:\Muyang\武汉伊利\SkewButtonLibrary\OPCLib\obj\Debug\OPCLib.dll D:\Muyang\武汉伊利\SkewButtonLibrary\OPCLib\obj\Debug\OPCLib.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\bin\Debug\OPCLib.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\bin\Debug\OPCLib.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\Debug\OPCLib.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\Debug\OPCLib.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\Debug\OPCLib.pdb diff --git a/SCADA/Program/OPCLib/obj/Debug/OPCLib.dll b/SCADA/Program/OPCLib/obj/Debug/OPCLib.dll index 7242311..b69bec2 100644 Binary files a/SCADA/Program/OPCLib/obj/Debug/OPCLib.dll and b/SCADA/Program/OPCLib/obj/Debug/OPCLib.dll differ diff --git a/SCADA/Program/OPCLib/obj/Release/OPCLib.csproj.FileListAbsolute.txt b/SCADA/Program/OPCLib/obj/Release/OPCLib.csproj.FileListAbsolute.txt index 3a48771..d3084fe 100644 --- a/SCADA/Program/OPCLib/obj/Release/OPCLib.csproj.FileListAbsolute.txt +++ b/SCADA/Program/OPCLib/obj/Release/OPCLib.csproj.FileListAbsolute.txt @@ -37,3 +37,8 @@ D:\Muyang\武汉伊利\SkewButtonLibrary\OPCLib\bin\Release\OPCLib.dll D:\Muyang\武汉伊利\SkewButtonLibrary\OPCLib\bin\Release\OPCLib.pdb D:\Muyang\武汉伊利\SkewButtonLibrary\OPCLib\obj\Release\OPCLib.dll D:\Muyang\武汉伊利\SkewButtonLibrary\OPCLib\obj\Release\OPCLib.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\bin\Release\OPCLib.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\bin\Release\OPCLib.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\Release\OPCLib.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\Release\OPCLib.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\Release\OPCLib.pdb diff --git a/SCADA/Program/OPCLib/obj/Release/OPCLib.dll b/SCADA/Program/OPCLib/obj/Release/OPCLib.dll index 07b1396..1f16321 100644 Binary files a/SCADA/Program/OPCLib/obj/Release/OPCLib.dll and b/SCADA/Program/OPCLib/obj/Release/OPCLib.dll differ diff --git a/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.csproj.FileListAbsolute.txt b/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.csproj.FileListAbsolute.txt index 5d31811..942b0dc 100644 --- a/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.csproj.FileListAbsolute.txt +++ b/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.csproj.FileListAbsolute.txt @@ -39,3 +39,9 @@ E:\新建文件夹\SCADA\Program\OPCLib\bin\x86\Debug\OPCLib.tlb E:\新建文件夹\SCADA\Program\OPCLib\obj\x86\Debug\OPCLib.csprojResolveAssemblyReference.cache E:\新建文件夹\SCADA\Program\OPCLib\obj\x86\Debug\OPCLib.dll E:\新建文件夹\SCADA\Program\OPCLib\obj\x86\Debug\OPCLib.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\bin\x86\Debug\OPCLib.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\bin\x86\Debug\OPCLib.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\bin\x86\Debug\OPCLib.tlb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\x86\Debug\OPCLib.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\x86\Debug\OPCLib.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\OPCLib\obj\x86\Debug\OPCLib.pdb diff --git a/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.dll b/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.dll index 1f4957c..4a066a0 100644 Binary files a/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.dll and b/SCADA/Program/OPCLib/obj/x86/Debug/OPCLib.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/Properties/AssemblyInfo.cs b/SCADA/Program/SiemensPLCDriver/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..85622b9 --- /dev/null +++ b/SCADA/Program/SiemensPLCDriver/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("SiemensPLCDriver")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SiemensPLCDriver")] +[assembly: AssemblyCopyright("Copyright © 2012")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("3dd96f0a-a54c-4898-bb9a-70a6184232d9")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.cs b/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.cs new file mode 100644 index 0000000..36e2509 --- /dev/null +++ b/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.cs @@ -0,0 +1,804 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Text; +using System.Timers; +using DataService; + +namespace SiemensPLCDriver +{ + [Description("S7 以太网协议")] + public sealed class SiemensTCPReader : IPLCDriver, IMultiReadWrite + { + libnodave.daveOSserialType fds; + libnodave.daveInterface di; + internal libnodave.daveConnection dc; + int _rack; + int _slot; + string _IP; + object _async = new object(); + DateTime _closeTime = DateTime.Now; + + short _id; + public short ID + { + get + { + return _id; + } + } + + bool _closed = true; + public bool IsClosed + { + get + { + return _closed; + } + } + + public int PDU + { + get + { + return 220;//240 + } + } + + int _timeOut; + public int TimeOut + { + get + { + return _timeOut; + } + set + { + _timeOut = value; + } + } + + string _name; + public string Name + { + get + { + return _name; + } + } + + public string ServerName + { + get + { + return _IP; + } + set + { + _IP = value; + } + } + + public SiemensTCPReader(IDataServer server, short id, string name, string IP, int timeOut = 10000, string rack = "0", string slot = "0") + { + _id = id; + int.TryParse(rack, out _rack); + int.TryParse(slot, out _slot); + _IP = IP; + _timeOut = timeOut; + _server = server; + _name = name; + } + + List _groups = new List(); + public IEnumerable Groups + { + get { return _groups; } + } + + IDataServer _server; + public IDataServer Parent + { + get { return _server; } + } + + public IGroup AddGroup(string name, short id, int updateRate, float deadBand, bool active) + { + NetBytePLCGroup grp = new NetBytePLCGroup(id, name, updateRate, active, this); + _groups.Add(grp); + return grp; + } + + public bool RemoveGroup(IGroup grp) + { + grp.IsActive = false; + return _groups.Remove(grp); + } + + private static readonly Dictionary dict = new Dictionary(){ {'M',libnodave.daveFlags}, + {'I',libnodave.daveInputs},{'Q',libnodave.daveOutputs}}; + + public string GetAddress(DeviceAddress address) + { + string addr = (address.Area == libnodave.daveDB ? string.Concat("DB", address.DBNumber, ",D") : + address.Area == libnodave.daveFlags ? "M" : + address.Area == libnodave.daveInputs ? "I" : "Q"); + switch (address.VarType) + { + case DataType.BOOL: + return string.Concat(addr, address.Start, ".", address.Bit); + case DataType.BYTE: + return string.Concat(addr, "BB", address.Start); + case DataType.WORD: + case DataType.SHORT: + return string.Concat(addr, "W", address.Start); + case DataType.FLOAT: + case DataType.INT: + return string.Concat(addr, "D", address.Start); + default: + return string.Concat(addr, "BB", address.Start); + } + } + + public DeviceAddress GetDeviceAddress(string address) + { + DeviceAddress plcAddr = new DeviceAddress(); + if (string.IsNullOrEmpty(address) || address.Length < 2) return plcAddr; + if (address.Substring(0, 2) == "DB") + { + int index = 2; + for (int i = index; i < address.Length; i++) + { + if (!char.IsDigit(address[i])) + { + index = i; break; + } + } + plcAddr.Area = libnodave.daveDB; + plcAddr.DBNumber = ushort.Parse(address.Substring(2, index - 2)); + string str = address.Substring(index + 1); + if (!char.IsDigit(str[0])) + { + for (int i = 1; i < str.Length; i++) + { + if (char.IsDigit(str[i])) + { + index = i; break; + } + } + if (str[2] == 'W') + { + int index1 = str.IndexOf('.'); + if (index1 > 0) + { + int start = int.Parse(str.Substring(3, index1 - 3)); + byte bit = byte.Parse(str.RightFrom(index1)); + plcAddr.Start = bit > 8 ? start : start + 1; + plcAddr.Bit = (byte)(bit > 7 ? bit - 8 : bit); + return plcAddr; + } + } + str = str.Substring(index); + } + index = str.IndexOf('.'); + if (index < 0) + plcAddr.Start = int.Parse(str); + else + { + plcAddr.Start = int.Parse(str.Substring(0, index)); + plcAddr.Bit = byte.Parse(str.RightFrom(index)); + } + } + else + { + plcAddr.DBNumber = 0; + char chr = address[0]; + if (dict.ContainsKey(chr)) + { + plcAddr.Area = dict[chr]; + int index = address.IndexOf('.'); + if (address[1] == 'W') + { + if (index > 0) + { + int start = int.Parse(address.Substring(2, index - 2)); + byte bit = byte.Parse(address.RightFrom(index)); + plcAddr.Start = bit > 8 ? start : start + 1; + plcAddr.Bit = (byte)(bit > 7 ? bit - 8 : bit); + } + else + { + plcAddr.Start = int.Parse(address.Substring(2)); + } + } + else + { + if (index > 0) + { + plcAddr.Start = int.Parse(address.Substring(1, index - 1)); + plcAddr.Bit = byte.Parse(address.RightFrom(index)); + } + else + { + plcAddr.Start = int.Parse(address.Substring(1)); + } + } + } + } + return plcAddr; + } + + public bool Connect() + { + lock (_async) + { + if (!_closed) return true; + double sec = (DateTime.Now - _closeTime).TotalMilliseconds; + if (sec < 6000) + System.Threading.Thread.Sleep(6000 - (int)sec); + fds.rfd = libnodave.openSocket(102, _IP); + fds.wfd = fds.rfd; + if (fds.rfd > 0) + { + di = new libnodave.daveInterface(fds, "IF1", 0, libnodave.daveProtoISOTCP, libnodave.daveSpeed187k); + di.setTimeout(TimeOut); + // res=di.initAdapter(); // does nothing in ISO_TCP. But call it to keep your programs indpendent of protocols + // if(res==0) { + dc = new libnodave.daveConnection(di, 0, _rack, _slot); + if (0 == dc.connectPLC()) + { + _closed = false; + return true; + } + } + if (dc != null) dc.disconnectPLC(); + libnodave.closeSocket(fds.rfd); + } + _closed = true; + return false; + } + + public void Dispose() + { + lock (_async) + { + if (dc != null) dc.disconnectPLC(); + libnodave.closeSocket(102); + foreach (IGroup grp in _groups) + { + grp.Dispose(); + } + _closed = true; + } + } + + string daveStrerror(int code) + { + switch (code) + { + case 0: return "ok"; + case 6: return "the CPU does not support reading a bit block of length<>1"; + case 10: return "the desired item is not available in the PLC"; + case 3: return "the desired item is not available in the PLC (200 family)"; + case 5: return "the desired address is beyond limit for this PLC"; + case -124: return "the PLC returned a packet with no result data"; + case -125: return "the PLC returned an error code not understood by this library"; + case -126: return "this result contains no data"; + case -127: return "cannot work with an undefined result set"; + case -123: return "cannot evaluate the received PDU"; + case 7: return "Write data size error"; + case 1: return "No data from I/O module"; + case -128: return "Unexpected function code in answer"; + case -129: return "PLC responds with an unknown data type"; + case -1024: return "Short packet from PLC"; + case -1025: return "Timeout when waiting for PLC response"; + case 0x8000: return "function already occupied."; + case 0x8001: return "not allowed in current operating status."; + case 0x8101: return "hardware fault."; + case 0x8103: return "object access not allowed."; + case 0x8104: return "context is not supported. Step7 says:Function not implemented or error in telgram."; + case 0x8105: return "invalid address."; + case 0x8106: return "data type not supported."; + case 0x8107: return "data type not consistent."; + case 0x810A: return "object does not exist."; + case 0x8301: return "insufficient CPU memory ?"; + case 0x8402: return "CPU already in RUN or already in STOP ?"; + case 0x8404: return "severe error ?"; + case 0x8500: return "incorrect PDU size."; + case 0x8702: return "address invalid."; ; + case 0xd002: return "Step7:variant of command is illegal."; + case 0xd004: return "Step7:status for this command is illegal."; + case 0xd0A1: return "Step7:function is not allowed in the current protection level."; + case 0xd201: return "block name syntax error."; + case 0xd202: return "syntax error function parameter."; + case 0xd203: return "syntax error block type."; + case 0xd204: return "no linked block in storage medium."; + case 0xd205: return "object already exists."; + case 0xd206: return "object already exists."; + case 0xd207: return "block exists in EPROM."; + case 0xd209: return "block does not exist/could not be found."; + case 0xd20e: return "no block present."; + case 0xd210: return "block number too big."; + // case 0xd240: return "unfinished block transfer in progress?"; // my guess + case 0xd240: return "Coordination rules were violated."; + /* Multiple functions tried to manipulate the same object. + Example: a block could not be copied,because it is already present in the target system + and + */ + case 0xd241: return "Operation not permitted in current protection level."; + /**/ + case 0xd242: return "protection violation while processing F-blocks. F-blocks can only be processed after password input."; + case 0xd401: return "invalid SZL ID."; + case 0xd402: return "invalid SZL index."; + case 0xd406: return "diagnosis: info not available."; + case 0xd409: return "diagnosis: DP error."; + case 0xdc01: return "invalid BCD code or Invalid time format?"; + default: return "no message defined!"; + } + } + + public byte[] ReadBytes(DeviceAddress address, ushort len)//从PLC中读取自己数组 + { + if (dc != null) + { + byte[] buffer = new byte[len]; + int res = -1; + lock (_async) + { + res = dc == null ? -1 : dc.readBytes(address.Area, address.DBNumber, address.Start, len, buffer); + } + if (res == 0) + return buffer; + _closed = true; dc = null; _closeTime = DateTime.Now; + if (OnClose != null) + { + OnClose(this, new ShutdownRequestEventArgs(daveStrerror(res))); _closeTime = DateTime.Now; + } + } + return null; + } + + public ItemData ReadString(DeviceAddress address, ushort size = 0xFF) + { + if (dc != null) + { + byte[] buffer = new byte[size]; + int res = -1; + lock (_async) + { + res = dc.readBytes(address.Area, address.DBNumber, address.Start, size, buffer); + } + if (res == 0) + return new ItemData(Utility.ConvertToString(buffer), 0, QUALITIES.QUALITY_GOOD); + _closed = true; dc = null; _closeTime = DateTime.Now; + if (OnClose != null) + { + OnClose(this, new ShutdownRequestEventArgs(daveStrerror(res))); + } + } + return new ItemData(string.Empty, 0, QUALITIES.QUALITY_NOT_CONNECTED); + } + + public ItemData ReadInt32(DeviceAddress address) + { + if (dc != null) + { + int res = -1; + lock (_async) + { + res = dc.readBytes(address.Area, address.DBNumber, address.Start, 4, null); + if (res == 0) return new ItemData(dc.getS32(), 0, QUALITIES.QUALITY_GOOD); + } + _closed = true; dc = null; _closeTime = DateTime.Now; + if (OnClose != null) + { + OnClose(this, new ShutdownRequestEventArgs(daveStrerror(res))); + } + } + return new ItemData(0, 0, QUALITIES.QUALITY_NOT_CONNECTED); ; + } + + public ItemData ReadInt16(DeviceAddress address) + { + if (dc != null) + { + int res = -1; + lock (_async) + { + res = dc.readBytes(address.Area, address.DBNumber, address.Start, 2, null); + if (res == 0) return new ItemData((short)dc.getS16(), 0, QUALITIES.QUALITY_GOOD); + } + _closed = true; dc = null; _closeTime = DateTime.Now; + if (OnClose != null) + { + OnClose(this, new ShutdownRequestEventArgs(daveStrerror(res))); + } + } + return new ItemData(0, 0, QUALITIES.QUALITY_NOT_CONNECTED); ; + } + + public ItemData ReadByte(DeviceAddress address) + { + if (dc != null) + { + int res = -1; + lock (_async) + { + res = dc.readBytes(address.Area, address.DBNumber, address.Start, 1, null); + if (res == 0) + return new ItemData((byte)dc.getS8(), 0, QUALITIES.QUALITY_GOOD); + } + _closed = true; dc = null; _closeTime = DateTime.Now; + if (OnClose != null) + { + OnClose(this, new ShutdownRequestEventArgs(daveStrerror(res))); + } + } + return new ItemData(0, 0, QUALITIES.QUALITY_NOT_CONNECTED); ; + } + + public ItemData ReadBit(DeviceAddress address) + { + int res = -1; + if (dc != null) + { + lock (_async) + { + res = dc.readBits(address.Area, address.DBNumber, address.Start * 8 + address.Bit, 1, null);//修改了原地址上的Bug + if (res == 0) return new ItemData(dc.getS8() != 0, 0, QUALITIES.QUALITY_GOOD); + } + _closed = true; dc = null; _closeTime = DateTime.Now; + if (OnClose != null) { OnClose(this, new ShutdownRequestEventArgs(daveStrerror(res))); } + } + return new ItemData(false, 0, QUALITIES.QUALITY_NOT_CONNECTED); + } + + public ItemData ReadFloat(DeviceAddress address) + { + if (dc != null) + { + int res = -1; + lock (_async) + { + res = dc.readBytes(address.Area, address.DBNumber, address.Start, 4, null); + if (res == 0) return new ItemData(dc.getFloat(), 0, QUALITIES.QUALITY_GOOD); + } + _closed = true; dc = null; _closeTime = DateTime.Now; + if (OnClose != null) + { + OnClose(this, new ShutdownRequestEventArgs(daveStrerror(res))); _closeTime = DateTime.Now; + } + } + return new ItemData(0, 0, QUALITIES.QUALITY_NOT_CONNECTED); ; + } + + + public ItemData ReadValue(DeviceAddress address) + { + return this.ReadValueEx(address); + } + + public int WriteBit(DeviceAddress address, bool bit) + { + lock (_async) + { + return dc == null ? -1 : dc.writeBits(address.Area, address.DBNumber, address.Start * 8 + address.Bit, 1, bit ? new byte[] { 0x1 } : new byte[] { 0x00 }); + } + } + + public int WriteBits(DeviceAddress address, byte value) + { + lock (_async) + { + return dc == null ? -1 : dc.writeBits(address.Area, address.DBNumber, address.Start, 1, new byte[] { value }); + } + } + + public int WriteInt16(DeviceAddress address, short value) + { + byte[] b = BitConverter.GetBytes(value); Array.Reverse(b); + lock (_async) + { + return dc == null ? -1 : dc.writeBytes(address.Area, address.DBNumber, address.Start, 2, b); + } + } + + public int WriteInt32(DeviceAddress address, int value) + { + byte[] b = BitConverter.GetBytes(value); Array.Reverse(b); + lock (_async) + { + return dc == null ? -1 : dc.writeBytes(address.Area, address.DBNumber, address.Start, 4, b); + } + } + + public int WriteFloat(DeviceAddress address, float value) + { + byte[] b = BitConverter.GetBytes(value); Array.Reverse(b); + lock (_async) + { + return dc == null ? -1 : dc.writeBytes(address.Area, address.DBNumber, address.Start, 4, b); + } + } + + public int WriteString(DeviceAddress address, string str) + { + lock (_async) + { + if (str.Length > address.DataSize) + str.Remove(address.DataSize - 1); + var textArr = Encoding.ASCII.GetBytes(str); + var buffer = new byte[2 + textArr.Length]; + buffer[0] = (byte)address.DataSize; + buffer[1] = (byte)textArr.Length; + textArr.CopyTo(buffer, 2); + return dc == null ? -1 : dc.writeManyBytes(address.Area, address.DBNumber, address.Start, + buffer.Length, buffer); //1200前置空格 + } + } + + public int WriteValue(DeviceAddress address, object value) + { + return this.WriteValueEx(address, value); + } + + public int WriteBytes(DeviceAddress address, byte[] bit) + { + lock (_async) + { + return dc == null ? -1 : dc.writeBytes(address.Area, address.DBNumber, address.Start, bit.Length, bit); + } + } + public ItemData[] ReadMultiple(DeviceAddress[] addrsArr) + { + int len = addrsArr.Length; + if (len > Limit) + { + List> itemArr = new List>(len); + int i = 0; + while (i < len) + { + int cnt = len - i > Limit ? Limit : len - i; + DeviceAddress[] addr = new DeviceAddress[cnt]; + addrsArr.CopyTo(addr, i); + itemArr.AddRange(ReadMultipleInternal(addrsArr)); + i += Limit; + } + return itemArr.ToArray(); + } + else + return ReadMultipleInternal(addrsArr); + } + + ItemData[] ReadMultipleInternal(DeviceAddress[] addrsArr) + { + int len = addrsArr.Length; + if (len <= Limit) + { + lock (_async) + { + if (dc == null) return null; + libnodave.PDU p = dc.prepareReadRequest(); + for (int i = 0; i < len; i++) + { + DeviceAddress addr = addrsArr[i]; + if (addr.VarType == DataType.BOOL) + p.addBitVarToReadRequest(addr.Area, addr.DBNumber, addr.Start, addr.DataSize); + else + p.addVarToReadRequest(addr.Area, addr.DBNumber, addr.Start, addr.DataSize); + } + libnodave.resultSet rs = new libnodave.resultSet(); + int res = dc.execReadRequest(p, rs); + ItemData[] itemArr = new ItemData[len]; + for (int i = 0; i < len; i++) + { + res = dc.useResult(rs, i); + if (res > 0) + { + itemArr[i].Quality = QUALITIES.QUALITY_GOOD; + switch (addrsArr[i].VarType) + { + case DataType.BOOL: + itemArr[i].Value.Boolean = dc.getU8() > 0;//需测试 + break; + case DataType.BYTE: + itemArr[i].Value.Byte = (byte)dc.getU8(); + break; + case DataType.WORD: + case DataType.SHORT: + itemArr[i].Value.Int16 = (short)dc.getS16(); + break; + case DataType.INT: + itemArr[i].Value.Int32 = dc.getS32(); + break; + case DataType.FLOAT: + itemArr[i].Value.Single = dc.getFloat(); + break; + } + } + } + return itemArr; + } + } + else + return this.PLCReadMultiple(new NetByteCacheReader(), addrsArr); + } + + public int WriteMultiple(DeviceAddress[] addrArr, object[] buffer) + { + int len = addrArr.Length; + if (len > Limit) + { + int ret = 0; + int i = 0; + while (i < len) + { + int cnt = len - i > Limit ? Limit : len - i; + DeviceAddress[] addr = new DeviceAddress[cnt]; + Array.Copy(addrArr, i, addr, 0, cnt); + //addrArr.CopyTo(addr, i); + object[] values = new object[cnt]; + Array.Copy(buffer, i, values, 0, cnt); + //buffer.CopyTo(values, i); + var res = WriteMultipleInternal(addr, values); + if (res < 0) ret = res; + i += Limit; + } + return ret; + } + return WriteMultipleInternal(addrArr, buffer); + } + + int WriteMultipleInternal(DeviceAddress[] addrArr, object[] buffer) + { + lock (_async) + { + if (dc == null) return -1; + int len = addrArr.Length; + libnodave.PDU p2 = dc.prepareWriteRequest(); + for (int i = 0; i < len; i++) + { + try + { + DeviceAddress addr = addrArr[i]; + byte[] b; + switch (addr.VarType) + { + case DataType.BOOL: + bool bl = Convert.ToBoolean(buffer[i]); + b = new byte[] { (byte)(bl ? 1 : 0) }; + p2.addBitVarToWriteRequest(addr.Area, addr.DBNumber, addr.Start * 8 + addr.Bit, 1, b); + break; + case DataType.BYTE: + b = BitConverter.GetBytes(Convert.ToByte(buffer[i])); + p2.addVarToWriteRequest(addr.Area, addr.DBNumber, addr.Start, 1, b); + break; + case DataType.WORD: + b = BitConverter.GetBytes(Convert.ToUInt16(buffer[i])); Array.Reverse(b); + p2.addVarToWriteRequest(addr.Area, addr.DBNumber, addr.Start, 2, b); + break; + case DataType.SHORT: + b = BitConverter.GetBytes(Convert.ToInt16(buffer[i])); Array.Reverse(b); + p2.addVarToWriteRequest(addr.Area, addr.DBNumber, addr.Start, 2, b); + break; + case DataType.INT: + b = BitConverter.GetBytes((int)Convert.ToDouble(buffer[i])); Array.Reverse(b); + p2.addVarToWriteRequest(addr.Area, addr.DBNumber, addr.Start, 4, b); + break; + case DataType.FLOAT: + b = BitConverter.GetBytes(Convert.ToSingle(buffer[i])); Array.Reverse(b); + p2.addVarToWriteRequest(addr.Area, addr.DBNumber, addr.Start, 4, b); + break; + case DataType.STR: + { + b = Encoding.ASCII.GetBytes(buffer[i].ToString()); + var b1 = new byte[2 + b.Length]; + b1[0] = (byte)addrArr[i].DataSize; + b1[1] = (byte)b.Length; + b.CopyTo(b1, 2); + p2.addVarToWriteRequest(addr.Area, addr.DBNumber, addr.Start, addr.DataSize, b1); + } + break; + } + } + catch (Exception err) + { + if (OnClose != null) OnClose(this, new ShutdownRequestEventArgs(err.Message));//可考虑把相应地址和数值加入 + } + } + libnodave.resultSet rs = new libnodave.resultSet(); + return dc.execWriteRequest(p2, rs); + } + } + + public int Limit + { + get { return 10; } + } + + public event ShutdownRequestEventHandler OnClose; + } + + public sealed class NetBytePLCGroup : PLCGroup + { + public NetBytePLCGroup(short id, string name, int updateRate, bool active, IPLCDriver plcReader) + { + this._id = id; + this._name = name; + this._updateRate = updateRate; + this._isActive = active; + this._plcReader = plcReader; + this._server = _plcReader.Parent; + this._timer = new Timer(); + this._changedList = new List(); + this._cacheReader = new NetByteCacheReader(); + } + + protected override int Poll() + { + if (_items == null || _items.Count == 0) return -1; + byte[] cache = (byte[])_cacheReader.Cache; + int offset = 0; + foreach (PDUArea area in _rangeList) + { + byte[] rcvBytes = _plcReader.ReadBytes(area.Start, (ushort)area.Len);//从PLC读取数据 + if (rcvBytes == null) + { + //_plcReader.Connect(); + return -1; + } + else + { + int index = area.StartIndex;//index指向_items中的Tag元数据 + int count = index + area.Count; + while (index < count) + { + DeviceAddress addr = _items[index].Address; + int iByte = addr.CacheIndex; + int iByte1 = iByte - offset; + if (addr.VarType == DataType.BOOL) + { + int tmp = rcvBytes[iByte1] ^ cache[iByte]; + DeviceAddress next = addr; + if (tmp != 0) + { + while (addr.Start == next.Start) + { + if ((tmp & (1 << next.Bit)) > 0) _changedList.Add(index); + if (++index < count) + next = _items[index].Address; + else + break; + } + } + else + { + while (addr.Start == next.Start && ++index < count) + { + next = _items[index].Address; + } + } + } + else + { + ushort size = addr.DataSize; + for (int i = 0; i < size; i++) + { + if (rcvBytes[iByte1 + i] != cache[iByte + i]) + { + _changedList.Add(index); + break; + } + } + index++; + } + } + for (int j = 0; j < rcvBytes.Length; j++) + cache[j + offset] = rcvBytes[j];//将PLC读取的数据写入到CacheReader中 + } + offset += rcvBytes.Length; + } + return 1; + } + } +} diff --git a/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.csproj b/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.csproj new file mode 100644 index 0000000..59142e1 --- /dev/null +++ b/SCADA/Program/SiemensPLCDriver/SiemensPLCDriver.csproj @@ -0,0 +1,123 @@ + + + + Debug + AnyCPU + 8.0.30703 + 2.0 + {9CEBFDA4-CF05-44D1-881B-13775AA46B27} + Library + Properties + SiemensPLCDriver + SiemensPLCDriver + v4.0 + 512 + Client + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + bin\Debug\SiemensPLCDriver.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + true + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + true + false + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + bin\Release\SiemensPLCDriver.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + true + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + + + true + bin\Itanium\Debug\ + DEBUG;TRACE + full + Itanium + bin\Debug\SiemensPLCDriver.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + + + bin\Release\ + TRACE + true + pdbonly + AnyCPU + bin\Release\SiemensPLCDriver.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + + + + .\libnodave.net.dll + + + + + + + + + + {8965e389-6466-4b30-bd43-83c909044637} + DataService + + + + + \ No newline at end of file diff --git a/SCADA/Program/SiemensPLCDriver/bin/Debug/DataService.dll b/SCADA/Program/SiemensPLCDriver/bin/Debug/DataService.dll new file mode 100644 index 0000000..e6b1419 Binary files /dev/null and b/SCADA/Program/SiemensPLCDriver/bin/Debug/DataService.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/bin/Debug/SiemensPLCDriver.dll b/SCADA/Program/SiemensPLCDriver/bin/Debug/SiemensPLCDriver.dll new file mode 100644 index 0000000..5bbd6ad Binary files /dev/null and b/SCADA/Program/SiemensPLCDriver/bin/Debug/SiemensPLCDriver.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/bin/Debug/libnodave.net.dll b/SCADA/Program/SiemensPLCDriver/bin/Debug/libnodave.net.dll new file mode 100644 index 0000000..0e21031 Binary files /dev/null and b/SCADA/Program/SiemensPLCDriver/bin/Debug/libnodave.net.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/bin/Release/DataService.dll b/SCADA/Program/SiemensPLCDriver/bin/Release/DataService.dll new file mode 100644 index 0000000..92a15c1 Binary files /dev/null and b/SCADA/Program/SiemensPLCDriver/bin/Release/DataService.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/bin/Release/SiemensPLCDriver.dll b/SCADA/Program/SiemensPLCDriver/bin/Release/SiemensPLCDriver.dll new file mode 100644 index 0000000..abb0816 Binary files /dev/null and b/SCADA/Program/SiemensPLCDriver/bin/Release/SiemensPLCDriver.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/bin/Release/libnodave.net.dll b/SCADA/Program/SiemensPLCDriver/bin/Release/libnodave.net.dll new file mode 100644 index 0000000..0e21031 Binary files /dev/null and b/SCADA/Program/SiemensPLCDriver/bin/Release/libnodave.net.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/libnodave.net.dll b/SCADA/Program/SiemensPLCDriver/libnodave.net.dll new file mode 100644 index 0000000..0e21031 Binary files /dev/null and b/SCADA/Program/SiemensPLCDriver/libnodave.net.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.csproj.FileListAbsolute.txt b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..039d558 --- /dev/null +++ b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.csproj.FileListAbsolute.txt @@ -0,0 +1,52 @@ +D:\Muyang\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.dll +D:\Muyang\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.pdb +D:\Muyang\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\bin\Debug\libnodave.net.dll +D:\Muyang\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.dll +D:\Muyang\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.pdb +D:\Muyang\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.csprojResolveAssemblyReference.cache +E:\双胞胎项目\服务器\SkewButtonLibrary\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.csprojResolveAssemblyReference.cache +E:\双胞胎项目\服务器\SkewButtonLibrary\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.dll +E:\双胞胎项目\服务器\SkewButtonLibrary\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.pdb +E:\双胞胎项目\服务器\SkewButtonLibrary\SiemensPLCDriver\bin\Debug\libnodave.net.dll +E:\双胞胎项目\服务器\SkewButtonLibrary\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.dll +E:\双胞胎项目\服务器\SkewButtonLibrary\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.pdb +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.pdb +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Debug\DataService.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Debug\libnodave.net.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Debug\DataService.pdb +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.csprojResolveAssemblyReference.cache +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.pdb +E:\双胞胎项目\大成0211\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.dll +E:\双胞胎项目\大成0211\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.pdb +E:\双胞胎项目\大成0211\SiemensPLCDriver\bin\Debug\DataService.dll +E:\双胞胎项目\大成0211\SiemensPLCDriver\bin\Debug\libnodave.net.dll +E:\双胞胎项目\大成0211\SiemensPLCDriver\bin\Debug\DataService.pdb +E:\双胞胎项目\大成0211\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.csprojResolveAssemblyReference.cache +E:\双胞胎项目\大成0211\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.dll +E:\双胞胎项目\大成0211\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.pdb +F:\牧羊上位机\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.dll +F:\牧羊上位机\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.pdb +F:\牧羊上位机\SiemensPLCDriver\bin\Debug\DataService.dll +F:\牧羊上位机\SiemensPLCDriver\bin\Debug\libnodave.net.dll +F:\牧羊上位机\SiemensPLCDriver\bin\Debug\DataService.pdb +F:\牧羊上位机\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.csprojResolveAssemblyReference.cache +F:\牧羊上位机\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.dll +F:\牧羊上位机\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.pdb +E:\南宁华港\牧羊上位机\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.dll +E:\南宁华港\牧羊上位机\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.pdb +E:\南宁华港\牧羊上位机\SiemensPLCDriver\bin\Debug\DataService.dll +E:\南宁华港\牧羊上位机\SiemensPLCDriver\bin\Debug\libnodave.net.dll +E:\南宁华港\牧羊上位机\SiemensPLCDriver\bin\Debug\DataService.pdb +E:\南宁华港\牧羊上位机\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.csprojResolveAssemblyReference.cache +E:\南宁华港\牧羊上位机\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.dll +E:\南宁华港\牧羊上位机\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\bin\Debug\SiemensPLCDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\bin\Debug\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\bin\Debug\libnodave.net.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\bin\Debug\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\obj\Debug\SiemensPLCDriver.pdb diff --git a/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.dll b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.dll new file mode 100644 index 0000000..5bbd6ad Binary files /dev/null and b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/obj/Itanium/Debug/SiemensPLCDriver.csproj.FileListAbsolute.txt b/SCADA/Program/SiemensPLCDriver/obj/Itanium/Debug/SiemensPLCDriver.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..0cb96cd --- /dev/null +++ b/SCADA/Program/SiemensPLCDriver/obj/Itanium/Debug/SiemensPLCDriver.csproj.FileListAbsolute.txt @@ -0,0 +1,8 @@ +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Itanium\Debug\SiemensPLCDriver.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Itanium\Debug\SiemensPLCDriver.pdb +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Itanium\Debug\DataService.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Itanium\Debug\libnodave.net.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Itanium\Debug\DataService.pdb +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Itanium\Debug\SiemensPLCDriver.csprojResolveAssemblyReference.cache +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Itanium\Debug\SiemensPLCDriver.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Itanium\Debug\SiemensPLCDriver.pdb diff --git a/SCADA/Program/SiemensPLCDriver/obj/Itanium/Debug/SiemensPLCDriver.dll b/SCADA/Program/SiemensPLCDriver/obj/Itanium/Debug/SiemensPLCDriver.dll new file mode 100644 index 0000000..d6e17d9 Binary files /dev/null and b/SCADA/Program/SiemensPLCDriver/obj/Itanium/Debug/SiemensPLCDriver.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/obj/Itanium/Release/SiemensPLCDriver.csproj.FileListAbsolute.txt b/SCADA/Program/SiemensPLCDriver/obj/Itanium/Release/SiemensPLCDriver.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..7a715bd --- /dev/null +++ b/SCADA/Program/SiemensPLCDriver/obj/Itanium/Release/SiemensPLCDriver.csproj.FileListAbsolute.txt @@ -0,0 +1,18 @@ +E:\大成0211new\大成0211\SiemensPLCDriver\bin\Itanium\Release\SiemensPLCDriver.dll +E:\大成0211new\大成0211\SiemensPLCDriver\bin\Itanium\Release\SiemensPLCDriver.pdb +E:\大成0211new\大成0211\SiemensPLCDriver\bin\Itanium\Release\DataService.dll +E:\大成0211new\大成0211\SiemensPLCDriver\bin\Itanium\Release\libnodave.net.dll +E:\大成0211new\大成0211\SiemensPLCDriver\obj\Itanium\Release\ResolveAssemblyReference.cache +E:\大成0211new\大成0211\SiemensPLCDriver\obj\Itanium\Release\SiemensPLCDriver.dll +E:\大成0211new\大成0211\SiemensPLCDriver\obj\Itanium\Release\SiemensPLCDriver.pdb +E:\大成0211new\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +E:\大成0211new\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +E:\大成0211new\大成0211\SiemensPLCDriver\bin\Release\DataService.dll +E:\大成0211new\大成0211\SiemensPLCDriver\bin\Release\libnodave.net.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\DataService.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\libnodave.net.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Itanium\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Itanium\Release\SiemensPLCDriver.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Itanium\Release\SiemensPLCDriver.pdb diff --git a/SCADA/Program/SiemensPLCDriver/obj/Itanium/Release/SiemensPLCDriver.dll b/SCADA/Program/SiemensPLCDriver/obj/Itanium/Release/SiemensPLCDriver.dll new file mode 100644 index 0000000..95c365c Binary files /dev/null and b/SCADA/Program/SiemensPLCDriver/obj/Itanium/Release/SiemensPLCDriver.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/obj/Itanium/Release/build.force b/SCADA/Program/SiemensPLCDriver/obj/Itanium/Release/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/Program/SiemensPLCDriver/obj/Release/SiemensPLCDriver.csproj.FileListAbsolute.txt b/SCADA/Program/SiemensPLCDriver/obj/Release/SiemensPLCDriver.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..d686ddd --- /dev/null +++ b/SCADA/Program/SiemensPLCDriver/obj/Release/SiemensPLCDriver.csproj.FileListAbsolute.txt @@ -0,0 +1,158 @@ +D:\Muyang\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +D:\Muyang\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +D:\Muyang\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\bin\Release\libnodave.net.dll +D:\Muyang\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +D:\Muyang\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +D:\Muyang\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +D:\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +D:\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +D:\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\bin\Release\libnodave.net.dll +D:\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\obj\Release\ResolveAssemblyReference.cache +D:\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +D:\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +E:\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +E:\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +E:\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\bin\Release\libnodave.net.dll +E:\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\obj\Release\ResolveAssemblyReference.cache +E:\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +E:\武汉伊利\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +E:\双胞胎项目\服务器\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +E:\双胞胎项目\服务器\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +E:\双胞胎项目\服务器\SkewButtonLibrary\SiemensPLCDriver\bin\Release\libnodave.net.dll +E:\双胞胎项目\服务器\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +E:\双胞胎项目\服务器\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +E:\双胞胎项目\服务器\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +E:\服务器\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +E:\服务器\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +E:\服务器\SkewButtonLibrary\SiemensPLCDriver\bin\Release\libnodave.net.dll +E:\服务器\SkewButtonLibrary\SiemensPLCDriver\obj\Release\ResolveAssemblyReference.cache +E:\服务器\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +E:\服务器\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +E:\Temp\sbtbackup\Service\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +E:\Temp\sbtbackup\Service\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +E:\Temp\sbtbackup\Service\SkewButtonLibrary\SiemensPLCDriver\bin\Release\libnodave.net.dll +E:\Temp\sbtbackup\Service\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +E:\Temp\sbtbackup\Service\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +E:\Temp\sbtbackup\Service\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +E:\sbt\Service\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +E:\sbt\Service\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +E:\sbt\Service\SkewButtonLibrary\SiemensPLCDriver\bin\Release\libnodave.net.dll +E:\sbt\Service\SkewButtonLibrary\SiemensPLCDriver\obj\Release\ResolveAssemblyReference.cache +E:\sbt\Service\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +E:\sbt\Service\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +E:\双胞胎项目\sbt\Service\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +E:\双胞胎项目\sbt\Service\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +E:\双胞胎项目\sbt\Service\SkewButtonLibrary\SiemensPLCDriver\bin\Release\libnodave.net.dll +E:\双胞胎项目\sbt\Service\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +E:\双胞胎项目\sbt\Service\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +E:\双胞胎项目\sbt\Service\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +E:\双胞胎项目\sbt\Service - Copy (2)\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +E:\双胞胎项目\sbt\Service - Copy (2)\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +E:\双胞胎项目\sbt\Service - Copy (2)\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +E:\双胞胎项目\sbt\Service - Copy (2)\SkewButtonLibrary\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +E:\双胞胎项目\sbt\Service - Copy (2)\SkewButtonLibrary\SiemensPLCDriver\bin\Release\libnodave.net.dll +E:\双胞胎项目\sbt\Service - Copy (2)\SkewButtonLibrary\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\DataService.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\libnodave.net.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +D:\大成\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\DataService.pdb +D:\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +D:\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +D:\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\DataService.dll +D:\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\libnodave.net.dll +D:\大成0211new_20140302\大成0211\SiemensPLCDriver\bin\Release\DataService.pdb +D:\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +D:\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +D:\大成0211new_20140302\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +D:\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +D:\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +D:\大成0211\SiemensPLCDriver\bin\Release\DataService.dll +D:\大成0211\SiemensPLCDriver\bin\Release\libnodave.net.dll +D:\大成0211\SiemensPLCDriver\bin\Release\DataService.pdb +D:\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +D:\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +D:\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +G:\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +G:\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +G:\大成0211\SiemensPLCDriver\bin\Release\DataService.dll +G:\大成0211\SiemensPLCDriver\bin\Release\libnodave.net.dll +G:\大成0211\SiemensPLCDriver\bin\Release\DataService.pdb +G:\大成0211\SiemensPLCDriver\obj\Release\ResolveAssemblyReference.cache +G:\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +G:\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +J:\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +J:\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +J:\大成0211\SiemensPLCDriver\bin\Release\DataService.dll +J:\大成0211\SiemensPLCDriver\bin\Release\libnodave.net.dll +J:\大成0211\SiemensPLCDriver\bin\Release\DataService.pdb +J:\大成0211\SiemensPLCDriver\obj\Release\ResolveAssemblyReference.cache +J:\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +J:\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +E:\双胞胎项目\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +E:\双胞胎项目\大成0211\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +E:\双胞胎项目\大成0211\SiemensPLCDriver\bin\Release\DataService.dll +E:\双胞胎项目\大成0211\SiemensPLCDriver\bin\Release\libnodave.net.dll +E:\双胞胎项目\大成0211\SiemensPLCDriver\bin\Release\DataService.pdb +E:\双胞胎项目\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +E:\双胞胎项目\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +E:\双胞胎项目\大成0211\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +E:\牧羊上位机\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +E:\牧羊上位机\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +E:\牧羊上位机\SiemensPLCDriver\bin\Release\DataService.dll +E:\牧羊上位机\SiemensPLCDriver\bin\Release\libnodave.net.dll +E:\牧羊上位机\SiemensPLCDriver\bin\Release\DataService.pdb +E:\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +E:\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +D:\牧羊上位机\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +D:\牧羊上位机\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +D:\牧羊上位机\SiemensPLCDriver\bin\Release\DataService.dll +D:\牧羊上位机\SiemensPLCDriver\bin\Release\libnodave.net.dll +D:\牧羊上位机\SiemensPLCDriver\bin\Release\DataService.pdb +D:\牧羊上位机\SiemensPLCDriver\obj\Release\ResolveAssemblyReference.cache +D:\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +D:\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +E:\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +E:\双胞胎项目\长沙\牧羊上位机\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +E:\双胞胎项目\长沙\牧羊上位机\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +E:\双胞胎项目\长沙\牧羊上位机\SiemensPLCDriver\bin\Release\DataService.dll +E:\双胞胎项目\长沙\牧羊上位机\SiemensPLCDriver\bin\Release\libnodave.net.dll +E:\双胞胎项目\长沙\牧羊上位机\SiemensPLCDriver\bin\Release\DataService.pdb +E:\双胞胎项目\长沙\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +E:\双胞胎项目\长沙\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +E:\双胞胎项目\长沙\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +E:\南宁华港\华港\牧羊上位机\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +E:\南宁华港\华港\牧羊上位机\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +E:\南宁华港\华港\牧羊上位机\SiemensPLCDriver\bin\Release\DataService.dll +E:\南宁华港\华港\牧羊上位机\SiemensPLCDriver\bin\Release\libnodave.net.dll +E:\南宁华港\华港\牧羊上位机\SiemensPLCDriver\bin\Release\DataService.pdb +E:\南宁华港\华港\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +E:\南宁华港\华港\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +E:\南宁华港\华港\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +E:\南宁华港\牧羊上位机\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +E:\南宁华港\牧羊上位机\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +E:\南宁华港\牧羊上位机\SiemensPLCDriver\bin\Release\DataService.dll +E:\南宁华港\牧羊上位机\SiemensPLCDriver\bin\Release\libnodave.net.dll +E:\南宁华港\牧羊上位机\SiemensPLCDriver\bin\Release\DataService.pdb +E:\南宁华港\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +E:\南宁华港\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +E:\南宁华港\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +F:\牧羊上位机\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +F:\牧羊上位机\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +F:\牧羊上位机\SiemensPLCDriver\bin\Release\DataService.dll +F:\牧羊上位机\SiemensPLCDriver\bin\Release\libnodave.net.dll +F:\牧羊上位机\SiemensPLCDriver\bin\Release\DataService.pdb +F:\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +F:\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +F:\牧羊上位机\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\bin\Release\SiemensPLCDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\bin\Release\SiemensPLCDriver.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\bin\Release\DataService.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\bin\Release\libnodave.net.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\bin\Release\DataService.pdb +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\obj\Release\SiemensPLCDriver.csprojResolveAssemblyReference.cache +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\obj\Release\SiemensPLCDriver.dll +C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\SiemensPLCDriver\obj\Release\SiemensPLCDriver.pdb diff --git a/SCADA/Program/SiemensPLCDriver/obj/Release/SiemensPLCDriver.dll b/SCADA/Program/SiemensPLCDriver/obj/Release/SiemensPLCDriver.dll new file mode 100644 index 0000000..abb0816 Binary files /dev/null and b/SCADA/Program/SiemensPLCDriver/obj/Release/SiemensPLCDriver.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/obj/x64/Release/build.force b/SCADA/Program/SiemensPLCDriver/obj/x64/Release/build.force new file mode 100644 index 0000000..e69de29 diff --git a/SCADA/TagConfig/DataService.dll b/SCADA/TagConfig/DataService.dll new file mode 100644 index 0000000..edc32cc Binary files /dev/null and b/SCADA/TagConfig/DataService.dll differ diff --git a/SCADA/TagConfig/TagConfig/bin/Debug/DataService.dll b/SCADA/TagConfig/TagConfig/bin/Debug/DataService.dll new file mode 100644 index 0000000..edc32cc Binary files /dev/null and b/SCADA/TagConfig/TagConfig/bin/Debug/DataService.dll differ diff --git a/SCADA/dll/OPCDriver.dll b/SCADA/dll/OPCDriver.dll index 1c04ad5..31c8dbf 100644 Binary files a/SCADA/dll/OPCDriver.dll and b/SCADA/dll/OPCDriver.dll differ diff --git a/SCADA/dll/SiemensPLCDriver.dll b/SCADA/dll/SiemensPLCDriver.dll new file mode 100644 index 0000000..456766b Binary files /dev/null and b/SCADA/dll/SiemensPLCDriver.dll differ diff --git a/SCADA/dll/libnodave.dll b/SCADA/dll/libnodave.dll new file mode 100644 index 0000000..4598c9e Binary files /dev/null and b/SCADA/dll/libnodave.dll differ diff --git a/SCADA/dll/libnodave.net.dll b/SCADA/dll/libnodave.net.dll new file mode 100644 index 0000000..0e21031 Binary files /dev/null and b/SCADA/dll/libnodave.net.dll differ