From 39cd777e4c39d6d9193e997325cb1afc44947691 Mon Sep 17 00:00:00 2001 From: "parallelbgls@outlook.com" Date: Thu, 16 Apr 2015 09:03:19 +0800 Subject: [PATCH] 2015-04-16 update 1 --- Modbus.Net/ModBus.Net/AddressCombiner.cs | 58 +++++++++ Modbus.Net/ModBus.Net/AsyncHelper.cs | 36 ++++++ Modbus.Net/ModBus.Net/ModbusMachine.cs | 25 ++++ Modbus.Net/ModBus.Net/SimenseMachine.cs | 25 ++++ .../Simense_S7_200.UI.WPF.TaskTest/App.config | 6 + .../Simense_S7_200.UI.WPF.TaskTest/App.xaml | 8 ++ .../App.xaml.cs | 17 +++ .../MainWindow.xaml | 8 ++ .../MainWindow.xaml.cs | 53 ++++++++ .../Properties/AssemblyInfo.cs | 55 ++++++++ .../Properties/Resources.Designer.cs | 71 +++++++++++ .../Properties/Resources.resx | 117 ++++++++++++++++++ .../Properties/Settings.Designer.cs | 30 +++++ .../Properties/Settings.settings | 7 ++ .../Simense_S7_200.UI.WPF.TaskTest.csproj | 110 ++++++++++++++++ 15 files changed, 626 insertions(+) create mode 100644 Modbus.Net/ModBus.Net/AddressCombiner.cs create mode 100644 Modbus.Net/ModBus.Net/AsyncHelper.cs create mode 100644 Modbus.Net/ModBus.Net/ModbusMachine.cs create mode 100644 Modbus.Net/ModBus.Net/SimenseMachine.cs create mode 100644 Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/App.config create mode 100644 Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/App.xaml create mode 100644 Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/App.xaml.cs create mode 100644 Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/MainWindow.xaml create mode 100644 Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/MainWindow.xaml.cs create mode 100644 Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/AssemblyInfo.cs create mode 100644 Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Resources.Designer.cs create mode 100644 Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Resources.resx create mode 100644 Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Settings.Designer.cs create mode 100644 Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Settings.settings create mode 100644 Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Simense_S7_200.UI.WPF.TaskTest.csproj diff --git a/Modbus.Net/ModBus.Net/AddressCombiner.cs b/Modbus.Net/ModBus.Net/AddressCombiner.cs new file mode 100644 index 0000000..5a7588f --- /dev/null +++ b/Modbus.Net/ModBus.Net/AddressCombiner.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ModBus.Net +{ + public abstract class AddressCombiner + { + public abstract IEnumerable Combine(IEnumerable addresses); + } + + public class AddressCombinerContinus : AddressCombiner + { + public override IEnumerable Combine(IEnumerable addresses) + { + var groupedAddresses = from address in addresses + group address by address.Area + into grouped + select grouped; + var ans = new List(); + foreach (var groupedAddress in groupedAddresses) + { + string area = groupedAddress.Key; + int initNum = -1; + int preNum = -1; + Type preType = null; + int getCount = 0; + foreach (var address in groupedAddress.OrderBy(address=>address.Address)) + { + if (initNum < 0) + { + initNum = address.Address; + getCount = (int)ValueHelper.Instance.ByteLength[address.DataType.FullName]; + } + else + { + if (address.Address > preNum + ValueHelper.Instance.ByteLength[preType.FullName]) + { + ans.Add(new CommunicationUnit(){Area = area, Address = initNum, GetCount = getCount, DataType = typeof(byte)}); + initNum = address.Address; + getCount = (int)ValueHelper.Instance.ByteLength[address.DataType.FullName]; + } + else + { + getCount += (int)ValueHelper.Instance.ByteLength[address.DataType.FullName]; + } + } + preNum = address.Address; + preType = address.DataType; + } + ans.Add(new CommunicationUnit() { Area = area, Address = initNum, GetCount = getCount, DataType = typeof(byte) }); + } + return ans; + } + } +} diff --git a/Modbus.Net/ModBus.Net/AsyncHelper.cs b/Modbus.Net/ModBus.Net/AsyncHelper.cs new file mode 100644 index 0000000..f9b4512 --- /dev/null +++ b/Modbus.Net/ModBus.Net/AsyncHelper.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +namespace ModBus.Net +{ + public static class AsyncHelper + { + private static readonly TaskFactory _myTaskFactory = new + TaskFactory(CancellationToken.None, + TaskCreationOptions.None, + TaskContinuationOptions.None, + TaskScheduler.Default); + + public static TResult RunSync(Func> func) + { + return AsyncHelper._myTaskFactory + .StartNew>(func) + .Unwrap() + .GetAwaiter() + .GetResult(); + } + + public static void RunSync(Func func) + { + AsyncHelper._myTaskFactory + .StartNew(func) + .Unwrap() + .GetAwaiter() + .GetResult(); + } + } +} diff --git a/Modbus.Net/ModBus.Net/ModbusMachine.cs b/Modbus.Net/ModBus.Net/ModbusMachine.cs new file mode 100644 index 0000000..c30eadf --- /dev/null +++ b/Modbus.Net/ModBus.Net/ModbusMachine.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ModBus.Net +{ + public class ModbusMachine : BaseMachine + { + public ModbusMachine(ModbusType connectionType, string connectionString, + IEnumerable getAddresses, bool keepConnect) : base(getAddresses, keepConnect) + { + BaseUtility = new ModbusUtility(connectionType, connectionString); + AddressFormater = new AddressFormaterBase(); + AddressCombiner = new AddressCombinerContinus(); + } + + public ModbusMachine(ModbusType connectionType, string connectionString, + IEnumerable getAddresses) + : this(connectionType, connectionString, getAddresses, false) + { + } + } +} diff --git a/Modbus.Net/ModBus.Net/SimenseMachine.cs b/Modbus.Net/ModBus.Net/SimenseMachine.cs new file mode 100644 index 0000000..ad9df97 --- /dev/null +++ b/Modbus.Net/ModBus.Net/SimenseMachine.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ModBus.Net +{ + public class SimenseMachine : BaseMachine + { + public SimenseMachine(SimenseType connectionType, string connectionString, + IEnumerable getAddresses, bool keepConnect) : base(getAddresses, keepConnect) + { + BaseUtility = new SimenseUtility(connectionType, connectionString); + AddressFormater = new AddressFormaterSimense(); + AddressCombiner = new AddressCombinerContinus(); + } + + public SimenseMachine(SimenseType connectionType, string connectionString, + IEnumerable getAddresses) + : this(connectionType, connectionString, getAddresses, false) + { + } + } +} diff --git a/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/App.config b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/App.config new file mode 100644 index 0000000..8e15646 --- /dev/null +++ b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/App.xaml b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/App.xaml new file mode 100644 index 0000000..74f9e55 --- /dev/null +++ b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/App.xaml @@ -0,0 +1,8 @@ + + + + + diff --git a/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/App.xaml.cs b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/App.xaml.cs new file mode 100644 index 0000000..d960128 --- /dev/null +++ b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace Simense_S7_200.UI.WPF.TaskTest +{ + /// + /// App.xaml 的交互逻辑 + /// + public partial class App : Application + { + } +} diff --git a/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/MainWindow.xaml b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/MainWindow.xaml new file mode 100644 index 0000000..c09b00c --- /dev/null +++ b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/MainWindow.xaml @@ -0,0 +1,8 @@ + + + + + diff --git a/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/MainWindow.xaml.cs b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/MainWindow.xaml.cs new file mode 100644 index 0000000..4a03da6 --- /dev/null +++ b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/MainWindow.xaml.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; +using ModBus.Net; + +namespace Simense_S7_200.UI.WPF.TaskTest +{ + /// + /// MainWindow.xaml 的交互逻辑 + /// + public partial class MainWindow : Window + { + private IEnumerable value = new List(); + + public MainWindow() + { + InitializeComponent(); + List addressUnits = new List + { + new AddressUnit() {Id = 0, Area = "V", Address = 0, CommunicationTag = "D1", DataType = typeof (ushort), Zoom = 1}, + new AddressUnit() {Id = 1, Area = "V", Address = 2, CommunicationTag = "D2", DataType = typeof (float), Zoom = 1} + }; + TaskManager task = new TaskManager(20, 300, true); + task.AddMachine(new SimenseMachine(SimenseType.Tcp, "192.168.3.191,200", addressUnits, + true)); + task.ReturnValues += (returnValues) => + { + value = new List(); + if (returnValues.Value != null) + { + value = from val in returnValues.Value select val.Key + val.Value; + simenseItems.Dispatcher.Invoke(() => simenseItems.ItemsSource = value); + } + else + { + Console.WriteLine(String.Format("ip {0} not return value", returnValues.Key)); + } + }; + task.TaskStart(); + } + } +} diff --git a/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/AssemblyInfo.cs b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..530da70 --- /dev/null +++ b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// 有关程序集的常规信息通过以下 +// 特性集控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("Simense_S7_200.UI.WPF.TaskTest")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Simense_S7_200.UI.WPF.TaskTest")] +[assembly: AssemblyCopyright("Copyright © 2015")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 使此程序集中的类型 +// 对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型, +// 则将该类型上的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +//若要开始生成可本地化的应用程序,请在 +// 中的 .csproj 文件中 +//设置 CultureYouAreCodingWith。 例如,如果您在源文件中 +//使用的是美国英语,请将 设置为 en-US。 然后取消 +//对以下 NeutralResourceLanguage 特性的注释。 更新 +//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。 + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //主题特定资源词典所处位置 + //(在页面或应用程序资源词典中 + // 未找到某个资源的情况下使用) + ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置 + //(在页面、应用程序或任何主题特定资源词典中 + // 未找到某个资源的情况下使用) +)] + + +// 程序集的版本信息由下面四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值, +// 方法是按如下所示使用“*”: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Resources.Designer.cs b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Resources.Designer.cs new file mode 100644 index 0000000..985cc49 --- /dev/null +++ b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本: 4.0.30319.34209 +// +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace Simense_S7_200.UI.WPF.TaskTest.Properties +{ + + + /// + /// 一个强类型的资源类,用于查找本地化的字符串等。 + /// + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen + // (以 /str 作为命令选项),或重新生成 VS 项目。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// 返回此类使用的、缓存的 ResourceManager 实例。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Simense_S7_200.UI.WPF.TaskTest.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// 为所有资源查找重写当前线程的 CurrentUICulture 属性, + /// 方法是使用此强类型资源类。 + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Resources.resx b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Resources.resx new file mode 100644 index 0000000..af7dbeb --- /dev/null +++ b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Settings.Designer.cs b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Settings.Designer.cs new file mode 100644 index 0000000..789b335 --- /dev/null +++ b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.34209 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Simense_S7_200.UI.WPF.TaskTest.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Settings.settings b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Settings.settings new file mode 100644 index 0000000..033d7a5 --- /dev/null +++ b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Simense_S7_200.UI.WPF.TaskTest.csproj b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Simense_S7_200.UI.WPF.TaskTest.csproj new file mode 100644 index 0000000..e4df207 --- /dev/null +++ b/Modbus.Net/Simense_S7_200.UI.WPF.TaskTest/Simense_S7_200.UI.WPF.TaskTest.csproj @@ -0,0 +1,110 @@ + + + + + Debug + AnyCPU + {02CE1787-291A-47CB-A7F7-929DA1D920A2} + WinExe + Properties + Simense_S7_200.UI.WPF.TaskTest + Simense_S7_200.UI.WPF.TaskTest + v4.5 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + 4.0 + + + + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + App.xaml + Code + + + MainWindow.xaml + Code + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + + + + {124ebef2-8960-4447-84cf-1d683b1ef7cc} + ModBus.Net + + + + + \ No newline at end of file