diff --git a/Document/部署流程.doc b/Document/部署流程.doc index 2ef73c4..99c2234 100644 Binary files a/Document/部署流程.doc and b/Document/部署流程.doc differ diff --git a/SCADA/DataConfig/host.ini b/SCADA/DataConfig/host.ini new file mode 100644 index 0000000..b802d79 --- /dev/null +++ b/SCADA/DataConfig/host.ini @@ -0,0 +1,6 @@ +[HOST] +SERVER=lochost + +[DATABASE] +CONNSTRING=Data Source=.\SQLEXPRESS;Initial Catalog=SCADA;Integrated Security=True +ARCHIVE=D:\HDA diff --git a/SCADA/Example/DataHelper.dll b/SCADA/Example/DataHelper.dll index 8d81d74..8938dbb 100644 Binary files a/SCADA/Example/DataHelper.dll and b/SCADA/Example/DataHelper.dll differ diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.exe b/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.exe index 3aa9e7e..69cec58 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/BatchCoreTest.vshost.exe.manifest b/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.vshost.exe.manifest deleted file mode 100644 index 061c9ca..0000000 --- a/SCADA/Program/BatchCoreTest/bin/Debug/BatchCoreTest.vshost.exe.manifest +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.dll b/SCADA/Program/BatchCoreTest/bin/Debug/ClientDriver.dll index 1b01df7..9fe08fb 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 edab45e..47d1122 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 58b43e9..8a751e0 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.exe b/SCADA/Program/BatchCoreTest/obj/x86/Debug/BatchCoreTest.exe index 3aa9e7e..69cec58 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/ClientDriver/bin/Debug/ClientDriver.dll b/SCADA/Program/ClientDriver/bin/Debug/ClientDriver.dll index ec707a0..27fd4d8 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 5448fee..c158fd8 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 89e3660..8e9afbd 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 4b7753f..8d43eaf 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.dll b/SCADA/Program/ClientDriver/obj/Debug/ClientDriver.dll index ec707a0..27fd4d8 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.dll b/SCADA/Program/ClientDriver/obj/Release/ClientDriver.dll index 89e3660..8e9afbd 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/obj/x86/Debug/CoreTest_MarkupCompile.i.lref b/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.lref deleted file mode 100644 index 5e01469..0000000 --- a/SCADA/Program/CoreTest/obj/x86/Debug/CoreTest_MarkupCompile.i.lref +++ /dev/null @@ -1,8 +0,0 @@ -C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\CoreTest\obj\x86\Debug\GeneratedInternalTypeHelper.g.i.cs - -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/ClientDriver/obj/Debug/build.force b/SCADA/Program/CoreTest/obj/x86/Release/build.force similarity index 100% rename from SCADA/Program/ClientDriver/obj/Debug/build.force rename to SCADA/Program/CoreTest/obj/x86/Release/build.force diff --git a/SCADA/Program/DataHelper/DataHelper.cs b/SCADA/Program/DataHelper/DataHelper.cs index 46e8428..3416206 100644 --- a/SCADA/Program/DataHelper/DataHelper.cs +++ b/SCADA/Program/DataHelper/DataHelper.cs @@ -4,6 +4,8 @@ using System.Data.SqlClient; using System.Diagnostics; using System.IO; using System.Net; +using System.Runtime.InteropServices; +using System.Text; namespace DatabaseLib { @@ -29,8 +31,12 @@ namespace DatabaseLib get { return m_Path; } } + const string CFGPATH = @"C:\DataConfig\host.cfg"; + const string INIPATH = @"C:\DataConfig\host.ini"; const string DATALOGSOURCE = "Data Operations"; const string DATALOGNAME = "Data Log"; + const int STRINGMAX = 255; + static EventLog Log; static DataHelper() @@ -40,17 +46,30 @@ namespace DatabaseLib Log = new EventLog(DATALOGNAME); try { - using (StreamReader objReader = new StreamReader(@"C:\DataConfig\host.cfg")) + if (File.Exists(CFGPATH)) { - m_host = objReader.ReadLine(); - m_ConnStr = objReader.ReadLine(); - m_Path = objReader.ReadLine(); - IPAddress addr; - if (string.IsNullOrEmpty(m_host) || !IPAddress.TryParse(m_host, out addr)) + using (StreamReader objReader = new StreamReader(CFGPATH)) { - m_host = Environment.MachineName; + m_host = objReader.ReadLine(); + m_ConnStr = objReader.ReadLine(); + m_Path = objReader.ReadLine(); } } + else if (File.Exists(INIPATH)) + { + StringBuilder sb = new StringBuilder(STRINGMAX); + WinAPI.GetPrivateProfileString("HOST", "SERVER", m_host, sb, STRINGMAX, INIPATH); + m_host = sb.ToString(); + WinAPI.GetPrivateProfileString("DATABASE", "CONNSTRING", m_ConnStr, sb, STRINGMAX, INIPATH); + m_ConnStr = sb.ToString(); + WinAPI.GetPrivateProfileString("DATABASE", "ARCHIVE", m_Path, sb, STRINGMAX, INIPATH); + m_Path = sb.ToString(); + } + IPAddress addr; + if (string.IsNullOrEmpty(m_host) || !IPAddress.TryParse(m_host, out addr)) + { + m_host = Environment.MachineName; + } } catch (Exception e) { @@ -729,4 +748,16 @@ namespace DatabaseLib #endregion ExecuteStoredProcedure } + + public static class WinAPI + { + + //参数说明：section：INI文件中的段落；key：INI文件中的关键字；val：INI文件中关键字的数值；filePath：INI文件的完整的路径和名称。 + [DllImport("kernel32")] + public static extern long WritePrivateProfileString(string section, string key, string val, string filepath); + + //参数说明：section：INI文件中的段落名称；key：INI文件中的关键字；def：无法读取时候时候的缺省数值；retVal：读取数值；size：数值的大小；filePath：INI文件的完整路径和名称。 + [DllImport("kernel32")] + public static extern int GetPrivateProfileString(string section, string key, string def, StringBuilder retval, int size, string filePath); + } } diff --git a/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll b/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll index a3209be..ff80a6f 100644 Binary files a/SCADA/Program/DataHelper/bin/Debug/DataHelper.dll 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 index 5448fee..c158fd8 100644 Binary files a/SCADA/Program/DataHelper/bin/Debug/DataService.dll 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 index b4fba23..8938dbb 100644 Binary files a/SCADA/Program/DataHelper/bin/Release/DataHelper.dll 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 index 4b7753f..8d43eaf 100644 Binary files a/SCADA/Program/DataHelper/bin/Release/DataService.dll 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 deleted file mode 100644 index c1a5905..0000000 Binary files a/SCADA/Program/DataHelper/bin/x86/Debug/DataHelper.dll and /dev/null differ diff --git a/SCADA/Program/DataHelper/bin/x86/Debug/DataService.dll b/SCADA/Program/DataHelper/bin/x86/Debug/DataService.dll deleted file mode 100644 index 1408689..0000000 Binary files a/SCADA/Program/DataHelper/bin/x86/Debug/DataService.dll and /dev/null differ diff --git a/SCADA/Program/DataHelper/bin/x86/Release/DataHelper.dll b/SCADA/Program/DataHelper/bin/x86/Release/DataHelper.dll deleted file mode 100644 index 4d6a26a..0000000 Binary files a/SCADA/Program/DataHelper/bin/x86/Release/DataHelper.dll and /dev/null differ diff --git a/SCADA/Program/DataHelper/bin/x86/Release/DataService.dll b/SCADA/Program/DataHelper/bin/x86/Release/DataService.dll deleted file mode 100644 index 9b150f2..0000000 Binary files a/SCADA/Program/DataHelper/bin/x86/Release/DataService.dll and /dev/null differ diff --git a/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll b/SCADA/Program/DataHelper/obj/Debug/DataHelper.dll index a3209be..ff80a6f 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/Debug/build.force b/SCADA/Program/DataHelper/obj/Debug/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/SCADA/Program/DataHelper/obj/Release/DataHelper.dll b/SCADA/Program/DataHelper/obj/Release/DataHelper.dll index b4fba23..8938dbb 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/DataService/bin/Debug/DataService.dll b/SCADA/Program/DataService/bin/Debug/DataService.dll index 5448fee..c158fd8 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/Itanium/Debug/DataService.dll b/SCADA/Program/DataService/bin/Itanium/Debug/DataService.dll deleted file mode 100644 index 0f00f59..0000000 Binary files a/SCADA/Program/DataService/bin/Itanium/Debug/DataService.dll and /dev/null differ diff --git a/SCADA/Program/DataService/bin/Itanium/Release/DataService.dll b/SCADA/Program/DataService/bin/Itanium/Release/DataService.dll deleted file mode 100644 index d730bcd..0000000 Binary files a/SCADA/Program/DataService/bin/Itanium/Release/DataService.dll and /dev/null differ diff --git a/SCADA/Program/DataService/bin/Release/DataService.dll b/SCADA/Program/DataService/bin/Release/DataService.dll index 4b7753f..8d43eaf 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 b499287..00493a7 100644 --- a/SCADA/Program/DataService/obj/Debug/DataService.csproj.FileListAbsolute.txt +++ b/SCADA/Program/DataService/obj/Debug/DataService.csproj.FileListAbsolute.txt @@ -22,4 +22,3 @@ C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\bin\Debug\D 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.dll C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.pdb -C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\DataService\obj\Debug\DataService.csprojResolveAssemblyReference.cache diff --git a/SCADA/Program/DataService/obj/Debug/DataService.dll b/SCADA/Program/DataService/obj/Debug/DataService.dll index 5448fee..c158fd8 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.dll b/SCADA/Program/DataService/obj/Release/DataService.dll index 4b7753f..8d43eaf 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/FileDriver/bin/Debug/DataService.dll b/SCADA/Program/FileDriver/bin/Debug/DataService.dll index e6b1419..c158fd8 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 cb8b395..1c4839b 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/Release/DataService.dll b/SCADA/Program/FileDriver/bin/Release/DataService.dll index 92a15c1..8d43eaf 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 4a887a3..fc857a8 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.dll b/SCADA/Program/FileDriver/obj/Debug/FileDriver.dll index cb8b395..1c4839b 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/Debug/build.force b/SCADA/Program/FileDriver/obj/Debug/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/SCADA/Program/FileDriver/obj/Release/FileDriver.dll b/SCADA/Program/FileDriver/obj/Release/FileDriver.dll index 4a887a3..fc857a8 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/FileDriver/obj/Release/build.force b/SCADA/Program/FileDriver/obj/Release/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.dll b/SCADA/Program/HMIControl/bin/Debug/HMIControl.VisualStudio.Design.dll index 925e12a..e12f821 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 925f724..05389a2 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 b1f38f1..8b8e523 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 50438a3..a9c362f 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 c00a3a0..25edf30 100644 --- a/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt +++ b/SCADA/Program/HMIControl/obj/Debug/HMIControl.csproj.FileListAbsolute.txt @@ -340,4 +340,3 @@ C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HM 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 -C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Debug\HMIControl.csprojResolveAssemblyReference.cache diff --git a/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll b/SCADA/Program/HMIControl/obj/Debug/HMIControl.dll index 925f724..05389a2 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/Release/HMIControl.csproj.FileListAbsolute.txt b/SCADA/Program/HMIControl/obj/Release/HMIControl.csproj.FileListAbsolute.txt index 5aa6ae8..fbbd4d1 100644 --- a/SCADA/Program/HMIControl/obj/Release/HMIControl.csproj.FileListAbsolute.txt +++ b/SCADA/Program/HMIControl/obj/Release/HMIControl.csproj.FileListAbsolute.txt @@ -443,3 +443,4 @@ C:\Users\Yinan\Documents\Github\SharpSCADA\SCADA\Program\HMIControl\obj\Release\ 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 50438a3..a9c362f 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/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.dll b/SCADA/Program/LinkableControlDesignTime/obj/Debug/HMIControl.VisualStudio.Design.dll index 925e12a..e12f821 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/build.force b/SCADA/Program/LinkableControlDesignTime/obj/Debug/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/SCADA/Program/LinkableControlDesignTime/obj/Release/HMIControl.VisualStudio.Design.dll b/SCADA/Program/LinkableControlDesignTime/obj/Release/HMIControl.VisualStudio.Design.dll index b1f38f1..8b8e523 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/build.force b/SCADA/Program/LinkableControlDesignTime/obj/Release/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/SCADA/Program/ModbusDriver/bin/Debug/DataService.dll b/SCADA/Program/ModbusDriver/bin/Debug/DataService.dll index e6b1419..c158fd8 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 f54c582..4848de0 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/Release/DataService.dll b/SCADA/Program/ModbusDriver/bin/Release/DataService.dll index 92a15c1..8d43eaf 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 8e262a4..57bb7ee 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.dll b/SCADA/Program/ModbusDriver/obj/Debug/ModbusDriver.dll index f54c582..4848de0 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/Debug/build.force b/SCADA/Program/ModbusDriver/obj/Debug/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/SCADA/Program/ModbusDriver/obj/Release/ModbusDriver.dll b/SCADA/Program/ModbusDriver/obj/Release/ModbusDriver.dll index 8e262a4..57bb7ee 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/ModbusDriver/obj/Release/build.force b/SCADA/Program/ModbusDriver/obj/Release/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/SCADA/Program/OPCDriver/bin/Debug/DataService.dll b/SCADA/Program/OPCDriver/bin/Debug/DataService.dll index e6b1419..c158fd8 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 00b3f8c..6505cd7 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 b69bec2..7cb5f05 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 92a15c1..8d43eaf 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 60a6351..9f8583e 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 1f16321..88a5e54 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.dll b/SCADA/Program/OPCDriver/obj/Debug/OPCDriver.dll index 00b3f8c..6505cd7 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/Debug/build.force b/SCADA/Program/OPCDriver/obj/Debug/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/SCADA/Program/OPCDriver/obj/Release/OPCDriver.dll b/SCADA/Program/OPCDriver/obj/Release/OPCDriver.dll index 60a6351..9f8583e 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/OPCDriver/obj/Release/build.force b/SCADA/Program/OPCDriver/obj/Release/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/SCADA/Program/OPCLib/bin/Debug/OPCLib.dll b/SCADA/Program/OPCLib/bin/Debug/OPCLib.dll index b69bec2..7cb5f05 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 1f16321..88a5e54 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/obj/Debug/OPCLib.csproj.FileListAbsolute.txt b/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.FileListAbsolute.txt index b6bdc59..8a89e86 100644 --- a/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.FileListAbsolute.txt +++ b/SCADA/Program/OPCLib/obj/Debug/OPCLib.csproj.FileListAbsolute.txt @@ -39,6 +39,5 @@ 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 b69bec2..7cb5f05 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 d3084fe..db07389 100644 --- a/SCADA/Program/OPCLib/obj/Release/OPCLib.csproj.FileListAbsolute.txt +++ b/SCADA/Program/OPCLib/obj/Release/OPCLib.csproj.FileListAbsolute.txt @@ -39,6 +39,5 @@ 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 1f16321..88a5e54 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/SiemensPLCDriver/bin/Debug/DataService.dll b/SCADA/Program/SiemensPLCDriver/bin/Debug/DataService.dll index e6b1419..c158fd8 100644 Binary files a/SCADA/Program/SiemensPLCDriver/bin/Debug/DataService.dll 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 index 5bbd6ad..6509ba3 100644 Binary files a/SCADA/Program/SiemensPLCDriver/bin/Debug/SiemensPLCDriver.dll and b/SCADA/Program/SiemensPLCDriver/bin/Debug/SiemensPLCDriver.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/bin/Release/DataService.dll b/SCADA/Program/SiemensPLCDriver/bin/Release/DataService.dll index 92a15c1..8d43eaf 100644 Binary files a/SCADA/Program/SiemensPLCDriver/bin/Release/DataService.dll 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 index abb0816..864c352 100644 Binary files a/SCADA/Program/SiemensPLCDriver/bin/Release/SiemensPLCDriver.dll and b/SCADA/Program/SiemensPLCDriver/bin/Release/SiemensPLCDriver.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.dll b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.dll index 5bbd6ad..6509ba3 100644 Binary files a/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.dll and b/SCADA/Program/SiemensPLCDriver/obj/Debug/SiemensPLCDriver.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/obj/Debug/build.force b/SCADA/Program/SiemensPLCDriver/obj/Debug/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/SCADA/Program/SiemensPLCDriver/obj/Release/SiemensPLCDriver.dll b/SCADA/Program/SiemensPLCDriver/obj/Release/SiemensPLCDriver.dll index abb0816..864c352 100644 Binary files a/SCADA/Program/SiemensPLCDriver/obj/Release/SiemensPLCDriver.dll and b/SCADA/Program/SiemensPLCDriver/obj/Release/SiemensPLCDriver.dll differ diff --git a/SCADA/Program/SiemensPLCDriver/obj/Release/build.force b/SCADA/Program/SiemensPLCDriver/obj/Release/build.force deleted file mode 100644 index e69de29..0000000