luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change log system

Browse Source
This commit is contained in:
luosheng
2023-03-01 09:36:07 +08:00
parent 46222348be
commit a8c9fefbce
80 changed files with 2227 additions and 1921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Libraries/h-opc/ClientUtils.cs
View File

@@ -1,7 +1,7 @@
using System.Linq;
using Opc.Ua;
using System;
using Opc.Ua;
using Opc.Ua.Client;
using System;
using System.Linq;
namespace Hylasoft.Opc.Ua
{

4
Libraries/h-opc/Common/Node.cs
View File

@@ -1,6 +1,4 @@
using System.Collections.Generic;
namespace Hylasoft.Opc.Common
namespace Hylasoft.Opc.Common
{
/// <summary>
/// Base class representing a node on the OPC server

4
Libraries/h-opc/Common/ReadEvent.cs
View File

@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Hylasoft.Opc.Common
{

3
Libraries/h-opc/UaClientOptions.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Security.Cryptography.X509Certificates;
using System.Security.Cryptography.X509Certificates;
using OpcUa = Opc.Ua;
namespace Hylasoft.Opc.Ua

226
Modbus.Net/.editorconfig Normal file
View File

@@ -0,0 +1,226 @@
# 如果要从更高级别的目录继承 .editorconfig 设置，请删除以下行
root = true
# c# 文件
[*.cs]
#### Core EditorConfig 选项 ####
# 缩进和间距
indent_size = 4
indent_style = space
tab_width = 4
# 新行首选项
end_of_line = crlf
insert_final_newline = false
#### .NET 编码约定 ####
# 组织 Using
dotnet_separate_import_directive_groups = false
dotnet_sort_system_directives_first = false
file_header_template = unset
# this. 和 Me. 首选项
dotnet_style_qualification_for_event = false
dotnet_style_qualification_for_field = false
dotnet_style_qualification_for_method = false
dotnet_style_qualification_for_property = false
# 语言关键字与 bcl 类型首选项
dotnet_style_predefined_type_for_locals_parameters_members = true
dotnet_style_predefined_type_for_member_access = true
# 括号首选项
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
dotnet_style_parentheses_in_other_operators = never_if_unnecessary
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
# 修饰符首选项
dotnet_style_require_accessibility_modifiers = for_non_interface_members
# 表达式级首选项
dotnet_style_coalesce_expression = true
dotnet_style_collection_initializer = true
dotnet_style_explicit_tuple_names = true
dotnet_style_namespace_match_folder = true
dotnet_style_null_propagation = true
dotnet_style_object_initializer = true
dotnet_style_operator_placement_when_wrapping = beginning_of_line
dotnet_style_prefer_auto_properties = true
dotnet_style_prefer_compound_assignment = true
dotnet_style_prefer_conditional_expression_over_assignment = true
dotnet_style_prefer_conditional_expression_over_return = true
dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
dotnet_style_prefer_inferred_anonymous_type_member_names = true
dotnet_style_prefer_inferred_tuple_names = true
dotnet_style_prefer_is_null_check_over_reference_equality_method = true
dotnet_style_prefer_simplified_boolean_expressions = true
dotnet_style_prefer_simplified_interpolation = true
# 字段首选项
dotnet_style_readonly_field = true
# 参数首选项
dotnet_code_quality_unused_parameters = all
# 禁止显示首选项
dotnet_remove_unnecessary_suppression_exclusions = none
# 新行首选项
dotnet_style_allow_multiple_blank_lines_experimental = true
dotnet_style_allow_statement_immediately_after_block_experimental = true
#### c# 编码约定 ####
# var 首选项
csharp_style_var_elsewhere = false
csharp_style_var_for_built_in_types = false
csharp_style_var_when_type_is_apparent = false
# Expression-bodied 成员
csharp_style_expression_bodied_accessors = true
csharp_style_expression_bodied_constructors = false
csharp_style_expression_bodied_indexers = true
csharp_style_expression_bodied_lambdas = true
csharp_style_expression_bodied_local_functions = false
csharp_style_expression_bodied_methods = false
csharp_style_expression_bodied_operators = false
csharp_style_expression_bodied_properties = true
# 模式匹配首选项
csharp_style_pattern_matching_over_as_with_null_check = true
csharp_style_pattern_matching_over_is_with_cast_check = true
csharp_style_prefer_extended_property_pattern = true
csharp_style_prefer_not_pattern = true
csharp_style_prefer_pattern_matching = true
csharp_style_prefer_switch_expression = true
# Null 检查首选项
csharp_style_conditional_delegate_call = true
# 修饰符首选项
csharp_prefer_static_local_function = true
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
csharp_style_prefer_readonly_struct = true
# 代码块首选项
csharp_prefer_braces = true
csharp_prefer_simple_using_statement = true
csharp_style_namespace_declarations = block_scoped
csharp_style_prefer_method_group_conversion = true
csharp_style_prefer_top_level_statements = true
# 表达式级首选项
csharp_prefer_simple_default_expression = true
csharp_style_deconstructed_variable_declaration = true
csharp_style_implicit_object_creation_when_type_is_apparent = true
csharp_style_inlined_variable_declaration = true
csharp_style_prefer_index_operator = true
csharp_style_prefer_local_over_anonymous_function = true
csharp_style_prefer_null_check_over_type_check = true
csharp_style_prefer_range_operator = true
csharp_style_prefer_tuple_swap = true
csharp_style_prefer_utf8_string_literals = true
csharp_style_throw_expression = true
csharp_style_unused_value_assignment_preference = discard_variable
csharp_style_unused_value_expression_statement_preference = discard_variable
# "using" 指令首选项
csharp_using_directive_placement = outside_namespace
# 新行首选项
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
csharp_style_allow_embedded_statements_on_same_line_experimental = true
#### C# 格式规则 ####
# 新行首选项
csharp_new_line_before_catch = true
csharp_new_line_before_else = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_open_brace = all
csharp_new_line_between_query_expression_clauses = true
# 缩进首选项
csharp_indent_block_contents = true
csharp_indent_braces = false
csharp_indent_case_contents = true
csharp_indent_case_contents_when_block = true
csharp_indent_labels = one_less_than_current
csharp_indent_switch_labels = true
# 空格键首选项
csharp_space_after_cast = false
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_after_comma = true
csharp_space_after_dot = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_semicolon_in_for_statement = true
csharp_space_around_binary_operators = before_and_after
csharp_space_around_declaration_statements = false
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_before_comma = false
csharp_space_before_dot = false
csharp_space_before_open_square_brackets = false
csharp_space_before_semicolon_in_for_statement = false
csharp_space_between_empty_square_brackets = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false
# 包装首选项
csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = true
#### 命名样式 ####
# 命名规则
dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
# 符号规范
dotnet_naming_symbols.interface.applicable_kinds = interface
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.interface.required_modifiers =
dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.types.required_modifiers =
dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.non_field_members.required_modifiers =
# 命名样式
dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case
dotnet_naming_style.begins_with_i.required_prefix = I
dotnet_naming_style.begins_with_i.required_suffix =
dotnet_naming_style.begins_with_i.word_separator =
dotnet_naming_style.begins_with_i.capitalization = pascal_case

6
Modbus.Net/Modbus.Net.Modbus.NA200H/AddressTranslatorNA200H.cs
View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Generic;
namespace Modbus.Net.Modbus.NA200H
{

2
Modbus.Net/Modbus.Net.Modbus.NA200H/Modbus.Net.Modbus.NA200H.csproj
View File

@@ -5,7 +5,7 @@
<AssemblyName>Modbus.Net.Modbus.NA200H</AssemblyName>
<RootNamespace>Modbus.Net.Modbus.NA200H</RootNamespace>
<PackageId>Modbus.Net.Modbus.NA200H</PackageId>
<Version>1.4.0</Version>
<Version>1.4.0-beta03</Version>
<Authors>Chris L.(Luo Sheng)</Authors>
<Company>Hangzhou Delian Science Technology Co.,Ltd.</Company>
<Product>Modbus.Net.Modbus</Product>

2
Modbus.Net/Modbus.Net.Modbus/Modbus.Net.Modbus.csproj
View File

@@ -5,7 +5,7 @@
<AssemblyName>Modbus.Net.Modbus</AssemblyName>
<RootNamespace>Modbus.Net.Modbus</RootNamespace>
<PackageId>Modbus.Net.Modbus</PackageId>
<Version>1.4.0</Version>
<Version>1.4.0-beta03</Version>
<Authors>Chris L.(Luo Sheng)</Authors>
<Company>Hangzhou Delian Science Technology Co.,Ltd.</Company>
<Product>Modbus.Net.Modbus</Product>

2
Modbus.Net/Modbus.Net.Modbus/ModbusAsciiProtocolLinker.cs
View File

@@ -18,7 +18,7 @@ namespace Modbus.Net.Modbus
public ModbusAsciiProtocolLinker(string com, int slaveAddress)
: base(com, 9600, Parity.None, StopBits.One, 8, slaveAddress)
{
((BaseConnector)BaseConnector).AddController(new MatchController(new ICollection<(int,int)>[] { new List<(int,int)> { (1,1), (2,2) }, new List<(int, int)> { (3, 3), (4, 4) }}, int.Parse(new ConfigurationBuilder().AddJsonFile($"appsettings.json").Build().GetSection("Config")["FetchSleepTime"] ?? "0")));
((BaseConnector)BaseConnector).AddController(new MatchController(new ICollection<(int, int)>[] { new List<(int, int)> { (1, 1), (2, 2) }, new List<(int, int)> { (3, 3), (4, 4) } }, int.Parse(new ConfigurationBuilder().AddJsonFile($"appsettings.json").Build().GetSection("Config")["FetchSleepTime"] ?? "0")));
}
/// <summary>

54
Modbus.Net/Modbus.Net.Modbus/ModbusProtocol.cs
View File

@@ -132,10 +132,10 @@ namespace Modbus.Net.Modbus
{
SlaveAddress = slaveAddress;
var translateAddress = addressTranslator.AddressTranslate(startAddress, true);
FunctionCode = (byte) translateAddress.Area;
StartAddress = (ushort) translateAddress.Address;
FunctionCode = (byte)translateAddress.Area;
StartAddress = (ushort)translateAddress.Address;
GetCount =
(ushort) Math.Ceiling(getCount / addressTranslator.GetAreaByteLength(translateAddress.AreaString));
(ushort)Math.Ceiling(getCount / addressTranslator.GetAreaByteLength(translateAddress.AreaString));
}
/// <summary>
@@ -213,7 +213,7 @@ namespace Modbus.Net.Modbus
/// <returns>读取数据的协议核心</returns>
public override byte[] Format(IInputStruct message)
{
var r_message = (ReadDataModbusInputStruct) message;
var r_message = (ReadDataModbusInputStruct)message;
return Format(r_message.SlaveAddress, r_message.FunctionCode,
r_message.StartAddress, r_message.GetCount);
}
@@ -257,12 +257,12 @@ namespace Modbus.Net.Modbus
{
SlaveAddress = slaveAddress;
var translateAddress = addressTranslator.AddressTranslate(startAddress, false);
FunctionCode = (byte) translateAddress.Area;
StartAddress = (ushort) translateAddress.Address;
FunctionCode = (byte)translateAddress.Area;
StartAddress = (ushort)translateAddress.Address;
var writeByteValue = ValueHelper.GetInstance(endian).ObjectArrayToByteArray(writeValue);
WriteCount =
(ushort) (writeByteValue.Length / addressTranslator.GetAreaByteLength(translateAddress.AreaString));
WriteByteCount = (byte) writeByteValue.Length;
(ushort)(writeByteValue.Length / addressTranslator.GetAreaByteLength(translateAddress.AreaString));
WriteByteCount = (byte)writeByteValue.Length;
WriteValue = writeByteValue;
}
@@ -351,7 +351,7 @@ namespace Modbus.Net.Modbus
/// <returns>写寄存器协议核心</returns>
public override byte[] Format(IInputStruct message)
{
var r_message = (WriteDataModbusInputStruct) message;
var r_message = (WriteDataModbusInputStruct)message;
var dataValue = Format(r_message.WriteValue);
var formattingBytes = Format(r_message.SlaveAddress, r_message.FunctionCode,
r_message.StartAddress, r_message.WriteCount, r_message.WriteByteCount, dataValue);
@@ -393,13 +393,13 @@ namespace Modbus.Net.Modbus
{
SlaveAddress = slaveAddress;
var translateAddress = addressTranslator.AddressTranslate(startAddress, false, true);
FunctionCode = (byte) translateAddress.Area;
StartAddress = (ushort) translateAddress.Address;
FunctionCode = (byte)translateAddress.Area;
StartAddress = (ushort)translateAddress.Address;
var writeByteValue =
FunctionCode == (byte) ModbusProtocolWriteDataFunctionCode.WriteSingleCoil
? ((bool) writeValue
? new byte[] {0xFF, 0x00}
: new byte[] {0x00, 0x00})
FunctionCode == (byte)ModbusProtocolWriteDataFunctionCode.WriteSingleCoil
? ((bool)writeValue
? new byte[] { 0xFF, 0x00 }
: new byte[] { 0x00, 0x00 })
: ValueHelper.GetInstance(endian).GetBytes(ushort.Parse(writeValue.ToString()));
WriteValue = writeByteValue;
}
@@ -480,7 +480,7 @@ namespace Modbus.Net.Modbus
/// <returns>写寄存器协议核心</returns>
public override byte[] Format(IInputStruct message)
{
var r_message = (WriteSingleDataModbusInputStruct) message;
var r_message = (WriteSingleDataModbusInputStruct)message;
var dataValue = Format(r_message.WriteValue);
var formattingBytes = Format(r_message.SlaveAddress, r_message.FunctionCode,
r_message.StartAddress, dataValue);
@@ -522,7 +522,7 @@ namespace Modbus.Net.Modbus
public GetSystemTimeModbusInputStruct(byte slaveAddress)
{
SlaveAddress = slaveAddress;
FunctionCode = (byte) ModbusProtocolTimeFunctionCode.GetSystemTime;
FunctionCode = (byte)ModbusProtocolTimeFunctionCode.GetSystemTime;
StartAddress = 30000;
GetCount = 5;
}
@@ -609,7 +609,7 @@ namespace Modbus.Net.Modbus
/// <returns>写系统时间的核心</returns>
public override byte[] Format(IInputStruct message)
{
var r_message = (GetSystemTimeModbusInputStruct) message;
var r_message = (GetSystemTimeModbusInputStruct)message;
return Format(r_message.SlaveAddress, r_message.FunctionCode,
r_message.StartAddress, r_message.GetCount);
}
@@ -654,17 +654,17 @@ namespace Modbus.Net.Modbus
public SetSystemTimeModbusInputStruct(byte slaveAddress, DateTime time)
{
SlaveAddress = slaveAddress;
FunctionCode = (byte) ModbusProtocolTimeFunctionCode.SetSystemTime;
FunctionCode = (byte)ModbusProtocolTimeFunctionCode.SetSystemTime;
StartAddress = 30000;
WriteCount = 5;
WriteByteCount = 10;
Year = (ushort) time.Year;
Day = (byte) time.Day;
Month = (byte) time.Month;
Hour = (ushort) time.Hour;
Second = (byte) time.Second;
Minute = (byte) time.Minute;
Millisecond = (ushort) time.Millisecond;
Year = (ushort)time.Year;
Day = (byte)time.Day;
Month = (byte)time.Month;
Hour = (ushort)time.Hour;
Second = (byte)time.Second;
Minute = (byte)time.Minute;
Millisecond = (ushort)time.Millisecond;
}
/// <summary>
@@ -782,7 +782,7 @@ namespace Modbus.Net.Modbus
/// <returns>写系统时间的核心</returns>
public override byte[] Format(IInputStruct message)
{
var r_message = (SetSystemTimeModbusInputStruct) message;
var r_message = (SetSystemTimeModbusInputStruct)message;
return Format(r_message.SlaveAddress, r_message.FunctionCode,
r_message.StartAddress, r_message.WriteCount, r_message.WriteByteCount, r_message.Year,
r_message.Day,

2
Modbus.Net/Modbus.Net.Modbus/ModbusProtocolLinkerBytesExtend.cs
View File

@@ -60,7 +60,7 @@ namespace Modbus.Net.Modbus
//Modbus/Tcp协议扩张，前面加6个字节，前面4个为0，后面两个为协议整体内容的长度
var newFormat = new byte[6 + content.Length];
var tag = 0;
var leng = (ushort) content.Length;
var leng = (ushort)content.Length;
Array.Copy(BigEndianValueHelper.Instance.GetBytes(tag), 0, newFormat, 0, 4);
Array.Copy(BigEndianValueHelper.Instance.GetBytes(leng), 0, newFormat, 4, 2);
Array.Copy(content, 0, newFormat, 6, content.Length);

2
Modbus.Net/Modbus.Net.Modbus/ModbusRtuProtocolLinker.cs
View File

@@ -17,7 +17,7 @@ namespace Modbus.Net.Modbus
public ModbusRtuProtocolLinker(string com, int slaveAddress)
: base(com, 9600, Parity.None, StopBits.One, 8, slaveAddress)
{
((BaseConnector)BaseConnector).AddController(new MatchController(new ICollection<(int,int)>[]{new List<(int,int)>{(0,0)}, new List<(int, int)>{(1,1)}}, int.Parse(new ConfigurationBuilder().AddJsonFile($"appsettings.json").Build().GetSection("Config")["FetchSleepTime"] ?? "0")));
((BaseConnector)BaseConnector).AddController(new MatchController(new ICollection<(int, int)>[] { new List<(int, int)> { (0, 0) }, new List<(int, int)> { (1, 1) } }, int.Parse(new ConfigurationBuilder().AddJsonFile($"appsettings.json").Build().GetSection("Config")["FetchSleepTime"] ?? "0")));
}
/// <summary>

2
Modbus.Net/Modbus.Net.Modbus/ModbusTcpProtocolLinker.cs
View File

@@ -24,7 +24,7 @@ namespace Modbus.Net.Modbus
/// <param name="port">端口</param>
public ModbusTcpProtocolLinker(string ip, int port) : base(ip, port)
{
((BaseConnector)BaseConnector).AddController(new FifoController(int.Parse(new ConfigurationBuilder().AddJsonFile($"appsettings.json").Build().GetSection("Config")["FetchSleepTime"] ?? "0"), true, DuplicateWithCount.GetDuplcateFunc(new List<int>{4,5}, 6)));
((BaseConnector)BaseConnector).AddController(new FifoController(int.Parse(new ConfigurationBuilder().AddJsonFile($"appsettings.json").Build().GetSection("Config")["FetchSleepTime"] ?? "0"), true, DuplicateWithCount.GetDuplcateFunc(new List<int> { 4, 5 }, 6)));
}
/// <summary>

26
Modbus.Net/Modbus.Net.Modbus/ModbusUtility.cs
View File

@@ -1,6 +1,6 @@
using System;
using Microsoft.Extensions.Logging;
using System;
using System.Threading.Tasks;
using Serilog;
namespace Modbus.Net.Modbus
{
@@ -69,6 +69,8 @@ namespace Modbus.Net.Modbus
/// </summary>
public class ModbusUtility : BaseUtility, IUtilityMethodTime, IUtilityMethodWriteSingle
{
private static readonly ILogger<ModbusUtility> logger = LogProvider.CreateLogger<ModbusUtility>();
/// <summary>
/// Modbus协议类型
/// </summary>
@@ -87,7 +89,7 @@ namespace Modbus.Net.Modbus
{
Endian = endian;
ConnectionString = null;
ModbusType = (ModbusType) connectionType;
ModbusType = (ModbusType)connectionType;
AddressTranslator = new AddressTranslatorModbus();
}
@@ -138,11 +140,11 @@ namespace Modbus.Net.Modbus
var connectionStringSplit = ConnectionString.Split(':');
try
{
return connectionStringSplit.Length < 2 ? (int?) null : int.Parse(connectionStringSplit[1]);
return connectionStringSplit.Length < 2 ? (int?)null : int.Parse(connectionStringSplit[1]);
}
catch (Exception e)
{
Log.Error(e, $"ModbusUtility: {ConnectionString} format error");
logger.LogError(e, $"ModbusUtility: {ConnectionString} format error");
return null;
}
}
@@ -261,7 +263,7 @@ namespace Modbus.Net.Modbus
}
catch (Exception e)
{
Log.Error(e, $"ModbusUtility -> GetTime: {ConnectionString} error");
logger.LogError(e, $"ModbusUtility -> GetTime: {ConnectionString} error");
return DateTime.MinValue;
}
}
@@ -283,7 +285,7 @@ namespace Modbus.Net.Modbus
}
catch (Exception e)
{
Log.Error(e, $"ModbusUtility -> SetTime: {ConnectionString} error");
logger.LogError(e, $"ModbusUtility -> SetTime: {ConnectionString} error");
return false;
}
}
@@ -294,7 +296,7 @@ namespace Modbus.Net.Modbus
/// <param name="connectionType">协议类型</param>
public override void SetConnectionType(int connectionType)
{
ModbusType = (ModbusType) connectionType;
ModbusType = (ModbusType)connectionType;
}
/// <summary>
@@ -308,7 +310,7 @@ namespace Modbus.Net.Modbus
try
{
var inputStruct = new ReadDataModbusInputStruct(SlaveAddress, startAddress,
(ushort) getByteCount, AddressTranslator);
(ushort)getByteCount, AddressTranslator);
var outputStruct = await
Wrapper.SendReceiveAsync<ReadDataModbusOutputStruct>(Wrapper[typeof(ReadDataModbusProtocol)],
inputStruct);
@@ -316,7 +318,7 @@ namespace Modbus.Net.Modbus
}
catch (Exception e)
{
Log.Error(e, $"ModbusUtility -> GetDatas: {ConnectionString} error");
logger.LogError(e, $"ModbusUtility -> GetDatas: {ConnectionString} error");
return null;
}
}
@@ -340,7 +342,7 @@ namespace Modbus.Net.Modbus
}
catch (Exception e)
{
Log.Error(e, $"ModbusUtility -> SetDatas: {ConnectionString} error");
logger.LogError(e, $"ModbusUtility -> SetDatas: {ConnectionString} error");
return false;
}
}
@@ -364,7 +366,7 @@ namespace Modbus.Net.Modbus
}
catch (Exception e)
{
Log.Error(e, $"ModbusUtility -> SetSingleDatas: {ConnectionString} error");
logger.LogError(e, $"ModbusUtility -> SetSingleDatas: {ConnectionString} error");
return false;
}
}

6
Modbus.Net/Modbus.Net.OPC/ClientExtend.cs
View File

@@ -1,8 +1,8 @@
using System;
using Hylasoft.Opc.Common;
using Hylasoft.Opc.Ua;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Hylasoft.Opc.Common;
using Hylasoft.Opc.Ua;
namespace Modbus.Net.OPC
{

2
Modbus.Net/Modbus.Net.OPC/Modbus.Net.OPC.csproj
View File

@@ -5,7 +5,7 @@
<AssemblyName>Modbus.Net.OPC</AssemblyName>
<RootNamespace>Modbus.Net.OPC</RootNamespace>
<PackageId>Modbus.Net.OPC</PackageId>
<Version>1.4.0</Version>
<Version>1.4.0-beta03</Version>
<Authors>Chris L.(Luo Sheng)</Authors>
<Company>Hangzhou Delian Science Technology Co.,Ltd.</Company>
<Product>Modbus.Net.OPC</Product>

25
Modbus.Net/Modbus.Net.OPC/OpcConnector.cs
View File

@@ -1,11 +1,10 @@
using System;
using Hylasoft.Opc.Common;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Hylasoft.Opc.Common;
using Serilog;
namespace Modbus.Net.OPC
{
@@ -14,6 +13,8 @@ namespace Modbus.Net.OPC
/// </summary>
public abstract class OpcConnector : BaseConnector<OpcParamIn, OpcParamOut>
{
private static readonly ILogger<OpcConnector> logger = LogProvider.CreateLogger<OpcConnector>();
/// <summary>
/// 是否正在连接
/// </summary>
@@ -61,12 +62,12 @@ namespace Modbus.Net.OPC
Client?.Dispose();
Client = null;
_connect = false;
Log.Information("opc client {ConnectionToken} disconnected success", ConnectionToken);
logger.LogInformation("opc client {ConnectionToken} disconnected success", ConnectionToken);
return true;
}
catch (Exception ex)
{
Log.Error(ex, "opc client {ConnectionToken} disconnected error", ConnectionToken);
logger.LogError(ex, "opc client {ConnectionToken} disconnected error", ConnectionToken);
_connect = false;
return false;
}
@@ -108,7 +109,7 @@ namespace Modbus.Net.OPC
if (answerTag != null)
{
var result = await Client.ReadAsync<object>(answerTag);
Log.Verbose($"Opc Machine {ConnectionToken} Read opc tag {answerTag} for value {result}");
logger.LogDebug($"Opc Machine {ConnectionToken} Read opc tag {answerTag} for value {result}");
return new OpcParamOut
{
Success = true,
@@ -134,11 +135,11 @@ namespace Modbus.Net.OPC
try
{
await Client.WriteAsync(answerTag, value);
Log.Verbose($"Opc Machine {ConnectionToken} Write opc tag {answerTag} for value {value}");
logger.LogDebug($"Opc Machine {ConnectionToken} Write opc tag {answerTag} for value {value}");
}
catch (Exception e)
{
Log.Error(e, "opc client {ConnectionToken} write exception", ConnectionToken);
logger.LogError(e, "opc client {ConnectionToken} write exception", ConnectionToken);
return new OpcParamOut
{
Success = false
@@ -157,7 +158,7 @@ namespace Modbus.Net.OPC
}
catch (Exception e)
{
Log.Error(e, "opc client {ConnectionToken} read exception", ConnectionToken);
logger.LogError(e, "opc client {ConnectionToken} read exception", ConnectionToken);
return new OpcParamOut
{
Success = false,
@@ -200,12 +201,12 @@ namespace Modbus.Net.OPC
{
await Client.Connect();
_connect = true;
Log.Information("opc client {ConnectionToken} connect success", ConnectionToken);
logger.LogInformation("opc client {ConnectionToken} connect success", ConnectionToken);
return true;
}
catch (Exception ex)
{
Log.Error(ex, "opc client {ConnectionToken} connected failed", ConnectionToken);
logger.LogError(ex, "opc client {ConnectionToken} connected failed", ConnectionToken);
_connect = false;
return false;
}

4
Modbus.Net/Modbus.Net.OPC/OpcProtocol.cs
View File

@@ -77,7 +77,7 @@
/// <returns>格式化后的字节流</returns>
public override OpcParamIn Format(IInputStruct message)
{
var r_message = (ReadRequestOpcInputStruct) message;
var r_message = (ReadRequestOpcInputStruct)message;
return new OpcParamIn
{
IsRead = true,
@@ -169,7 +169,7 @@
/// <returns>格式化后的字节流</returns>
public override OpcParamIn Format(IInputStruct message)
{
var r_message = (WriteRequestOpcInputStruct) message;
var r_message = (WriteRequestOpcInputStruct)message;
return new OpcParamIn
{
IsRead = false,

2
Modbus.Net/Modbus.Net.OPC/OpcProtocolLinker.cs
View File

@@ -34,7 +34,7 @@ namespace Modbus.Net.OPC
//容错处理
var checkRight = CheckRight(receiveBytes);
return checkRight == null
? new OpcParamOut {Success = false, Value = new byte[0]}
? new OpcParamOut { Success = false, Value = new byte[0] }
: (!checkRight.Value ? null : receiveBytes);
//返回字符
}

1
Modbus.Net/Modbus.Net.OPC/OpcUaConnector.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Modbus.Net.OPC
{

8
Modbus.Net/Modbus.Net.OPC/OpcUaMachine.cs
View File

@@ -23,8 +23,8 @@ namespace Modbus.Net.OPC
: base(id, getAddresses, keepConnect)
{
BaseUtility = new OpcUaUtility(connectionString, isRegexOn);
((OpcUtility) BaseUtility).GetSeperator +=
() => ((AddressFormaterOpc<string, string>) AddressFormater).Seperator;
((OpcUtility)BaseUtility).GetSeperator +=
() => ((AddressFormaterOpc<string, string>)AddressFormater).Seperator;
}
/// <summary>
@@ -56,8 +56,8 @@ namespace Modbus.Net.OPC
: base(id, getAddresses, keepConnect)
{
BaseUtility = new OpcUaUtility(connectionString, isRegexOn);
((OpcUtility) BaseUtility).GetSeperator +=
() => ((AddressFormaterOpc<string, string>) AddressFormater).Seperator;
((OpcUtility)BaseUtility).GetSeperator +=
() => ((AddressFormaterOpc<string, string>)AddressFormater).Seperator;
}
/// <summary>

10
Modbus.Net/Modbus.Net.OPC/OpcUtility.cs
View File

@@ -1,6 +1,6 @@
using System;
using Microsoft.Extensions.Logging;
using System;
using System.Threading.Tasks;
using Serilog;
namespace Modbus.Net.OPC
{
@@ -11,6 +11,8 @@ namespace Modbus.Net.OPC
PipeUnit<OpcParamIn, OpcParamOut, IProtocolLinker<OpcParamIn, OpcParamOut>,
ProtocolUnit<OpcParamIn, OpcParamOut>>>
{
private static readonly ILogger<OpcUtility> logger = LogProvider.CreateLogger<OpcUtility>();
/// <summary>
/// 获取分隔符
/// </summary>
@@ -66,7 +68,7 @@ namespace Modbus.Net.OPC
}
catch (Exception e)
{
Log.Error(e, $"OpcUtility -> GetDatas: {ConnectionString} error");
logger.LogError(e, $"OpcUtility -> GetDatas: {ConnectionString} error");
return null;
}
}
@@ -92,7 +94,7 @@ namespace Modbus.Net.OPC
}
catch (Exception e)
{
Log.Error(e, $"OpcUtility -> SetDatas: {ConnectionString} error");
logger.LogError(e, $"OpcUtility -> SetDatas: {ConnectionString} error");
return false;
}
}

1
Modbus.Net/Modbus.Net.Siemens/AddressTranslatorSiemens.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace Modbus.Net.Siemens
{

2
Modbus.Net/Modbus.Net.Siemens/Modbus.Net.Siemens.csproj
View File

@@ -5,7 +5,7 @@
<AssemblyName>Modbus.Net.Siemens</AssemblyName>
<RootNamespace>Modbus.Net.Siemens</RootNamespace>
<PackageId>Modbus.Net.Siemens</PackageId>
<Version>1.4.0</Version>
<Version>1.4.0-beta03</Version>
<Authors>Chris L.(Luo Sheng)</Authors>
<Company>Hangzhou Delian Science Technology Co.,Ltd.</Company>
<Description>Modbus.Net Siemens Profinet Implementation</Description>

4
Modbus.Net/Modbus.Net.Siemens/SiemensPpiProtocol.cs
View File

@@ -1,6 +1,6 @@
using System.Threading.Tasks;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration;
using Nito.AsyncEx;
using System.Threading.Tasks;
namespace Modbus.Net.Siemens
{

50
Modbus.Net/Modbus.Net.Siemens/SiemensProtocol.cs
View File

@@ -151,10 +151,10 @@ namespace Modbus.Net.Siemens
{
public override byte[] Format(IInputStruct message)
{
var r_message = (ComCreateReferenceSiemensInputStruct) message;
var r_message = (ComCreateReferenceSiemensInputStruct)message;
var crc = (r_message.SlaveAddress + r_message.MasterAddress + 0x49) % 256;
return Format((byte) 0x10, r_message.SlaveAddress, r_message.MasterAddress, (byte) 0x49, (byte) crc,
(byte) 0x16);
return Format((byte)0x10, r_message.SlaveAddress, r_message.MasterAddress, (byte)0x49, (byte)crc,
(byte)0x16);
}
public override IOutputStruct Unformat(byte[] messageBytes, ref int pos)
@@ -206,7 +206,7 @@ namespace Modbus.Net.Siemens
{
public override byte[] Format(IInputStruct message)
{
var r_message = (CreateReferenceSiemensInputStruct) message;
var r_message = (CreateReferenceSiemensInputStruct)message;
const ushort head = 0x0300;
const ushort len = 0x0016;
const byte contentLen = 0x11;
@@ -318,10 +318,10 @@ namespace Modbus.Net.Siemens
/// <returns>格式化数据</returns>
public override byte[] Format(IInputStruct message)
{
var r_message = (ComConfirmMessageSiemensInputStruct) message;
var r_message = (ComConfirmMessageSiemensInputStruct)message;
var crc = r_message.SlaveAddress + r_message.MasterAddress + 0x5c % 256;
return Format((byte) 0x10, r_message.SlaveAddress, r_message.MasterAddress, (byte) 0x5c, (byte) crc,
(byte) 0x16);
return Format((byte)0x10, r_message.SlaveAddress, r_message.MasterAddress, (byte)0x5c, (byte)crc,
(byte)0x16);
}
/// <summary>
@@ -378,7 +378,7 @@ namespace Modbus.Net.Siemens
{
public override byte[] Format(IInputStruct message)
{
var r_message = (EstablishAssociationSiemensInputStruct) message;
var r_message = (EstablishAssociationSiemensInputStruct)message;
const byte protoId = 0x32;
const byte rosctr = 0x01;
const ushort redId = 0x0000;
@@ -431,12 +431,12 @@ namespace Modbus.Net.Siemens
SlaveAddress = slaveAddress;
MasterAddress = masterAddress;
PduRef = pduRef;
TypeCode = (byte) getType;
TypeCode = (byte)getType;
var address = addressTranslator.AddressTranslate(startAddress, true);
Offset = address.Address;
var area = address.Area;
Area = (byte) (area % 256);
DbBlock = Area == 0x84 ? (ushort) (area / 256) : (ushort) 0;
Area = (byte)(area % 256);
DbBlock = Area == 0x84 ? (ushort)(area / 256) : (ushort)0;
NumberOfElements = getCount;
}
@@ -542,7 +542,7 @@ namespace Modbus.Net.Siemens
/// <returns>格式化数据</returns>
public override byte[] Format(IInputStruct message)
{
var r_message = (ReadRequestSiemensInputStruct) message;
var r_message = (ReadRequestSiemensInputStruct)message;
var slaveAddress = r_message.SlaveAddress;
var masterAddress = r_message.MasterAddress;
const byte protoId = 0x32;
@@ -562,7 +562,7 @@ namespace Modbus.Net.Siemens
var area = r_message.Area;
var offsetBit = r_message.Offset * 8;
var offsetBitBytes = BigEndianValueHelper.Instance.GetBytes(offsetBit);
return Format(new byte[4], slaveAddress, masterAddress, (byte) 0x6c, protoId, rosctr, redId, pduRef, parLg,
return Format(new byte[4], slaveAddress, masterAddress, (byte)0x6c, protoId, rosctr, redId, pduRef, parLg,
datLg, serviceId, numberOfVariables
, variableSpec, vAddrLg, syntaxId, type, numberOfElements, dbBlock, area,
offsetBitBytes.Skip(1).ToArray());
@@ -585,8 +585,8 @@ namespace Modbus.Net.Siemens
var byteLength = length / 8;
var values = new byte[byteLength];
Array.Copy(messageBytes, pos, values, 0, byteLength);
return new ReadRequestSiemensOutputStruct(pduRef, (SiemensAccessResult) accessResult,
(SiemensDataType) dataType, length, values);
return new ReadRequestSiemensOutputStruct(pduRef, (SiemensAccessResult)accessResult,
(SiemensDataType)dataType, length, values);
}
}
@@ -617,8 +617,8 @@ namespace Modbus.Net.Siemens
var address = addressTranslator.AddressTranslate(startAddress, true);
Offset = address.Address;
var area = address.Area;
Area = (byte) (area % 256);
DbBlock = Area == 0x84 ? (ushort) (area / 256) : (ushort) 0;
Area = (byte)(area % 256);
DbBlock = Area == 0x84 ? (ushort)(area / 256) : (ushort)0;
WriteValue = writeValue;
}
@@ -697,7 +697,7 @@ namespace Modbus.Net.Siemens
/// <returns>格式化数据</returns>
public override byte[] Format(IInputStruct message)
{
var r_message = (WriteRequestSiemensInputStruct) message;
var r_message = (WriteRequestSiemensInputStruct)message;
var valueBytes = BigEndianValueHelper.Instance.ObjectArrayToByteArray(r_message.WriteValue);
var slaveAddress = r_message.SlaveAddress;
var masterAddress = r_message.MasterAddress;
@@ -706,22 +706,22 @@ namespace Modbus.Net.Siemens
const ushort redId = 0x0000;
var pduRef = r_message.PduRef;
const ushort parLg = 14; // 参数字节数（2+12的倍数），目前仅为14
var datLg = (ushort) (4 + valueBytes.Length); // 数据字节数
var datLg = (ushort)(4 + valueBytes.Length); // 数据字节数
const byte serviceId = 0x05;
const byte numberOfVariables = 1;
const byte variableSpec = 0x12;
const byte vAddrLg = 0x0A;
const byte syntaxId = 0x10;
const byte typeR = (byte) SiemensTypeCode.Byte;
var numberOfElements = (ushort) valueBytes.Length;
const byte typeR = (byte)SiemensTypeCode.Byte;
var numberOfElements = (ushort)valueBytes.Length;
var dbBlock = r_message.DbBlock;
var area = r_message.Area;
var offsetBit = r_message.Offset * 8;
var offsetBitBytes = BigEndianValueHelper.Instance.GetBytes(offsetBit);
const byte reserved = 0x00;
const byte type = (byte) SiemensDataType.OtherAccess;
var numberOfWriteBits = (ushort) (valueBytes.Length * 8);
return Format(new byte[4], slaveAddress, masterAddress, (byte) 0x7c, protoId, rosctr, redId, pduRef, parLg,
const byte type = (byte)SiemensDataType.OtherAccess;
var numberOfWriteBits = (ushort)(valueBytes.Length * 8);
return Format(new byte[4], slaveAddress, masterAddress, (byte)0x7c, protoId, rosctr, redId, pduRef, parLg,
datLg, serviceId, numberOfVariables
, variableSpec, vAddrLg, syntaxId, typeR, numberOfElements, dbBlock, area,
offsetBitBytes.Skip(1).ToArray(), reserved, type, numberOfWriteBits, valueBytes);
@@ -747,7 +747,7 @@ namespace Modbus.Net.Siemens
var pduRef = BigEndianValueHelper.Instance.GetUShort(messageBytes, ref pos);
pos = 14;
var accessResult = BigEndianValueHelper.Instance.GetByte(messageBytes, ref pos);
return new WriteRequestSiemensOutputStruct(pduRef, (SiemensAccessResult) accessResult);
return new WriteRequestSiemensOutputStruct(pduRef, (SiemensAccessResult)accessResult);
}
}
}

8
Modbus.Net/Modbus.Net.Siemens/SiemensProtocolLinkerBytesExtend.cs
View File

@@ -14,8 +14,8 @@ namespace Modbus.Net.Siemens
/// <returns>扩展后的协议内容</returns>
public byte[] BytesExtend(byte[] content)
{
Array.Copy(new byte[] {0x03, 0x00, 0x00, 0x00, 0x02, 0xf0, 0x80}, 0, content, 0, 7);
Array.Copy(BigEndianValueHelper.Instance.GetBytes((ushort) content.Length), 0, content, 2, 2);
Array.Copy(new byte[] { 0x03, 0x00, 0x00, 0x00, 0x02, 0xf0, 0x80 }, 0, content, 0, 7);
Array.Copy(BigEndianValueHelper.Instance.GetBytes((ushort)content.Length), 0, content, 2, 2);
return content;
}
@@ -46,13 +46,13 @@ namespace Modbus.Net.Siemens
{
var newContent = new byte[content.Length + 2];
Array.Copy(content, 0, newContent, 0, content.Length);
Array.Copy(new byte[] {0x68, (byte) (content.Length - 4), (byte) (content.Length - 4), 0x68}, 0, newContent,
Array.Copy(new byte[] { 0x68, (byte)(content.Length - 4), (byte)(content.Length - 4), 0x68 }, 0, newContent,
0, 4);
var check = 0;
for (var i = 4; i < newContent.Length - 2; i++)
check += newContent[i];
check = check % 256;
newContent[newContent.Length - 2] = (byte) check;
newContent[newContent.Length - 2] = (byte)check;
newContent[newContent.Length - 1] = 0x16;
return newContent;
}

4
Modbus.Net/Modbus.Net.Siemens/SiemensTcpProtocol.cs
View File

@@ -1,6 +1,6 @@
using System.Threading.Tasks;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration;
using Nito.AsyncEx;
using System.Threading.Tasks;
namespace Modbus.Net.Siemens
{

2
Modbus.Net/Modbus.Net.Siemens/SiemensTcpProtocolLinker.cs
View File

@@ -26,7 +26,7 @@ namespace Modbus.Net.Siemens
public SiemensTcpProtocolLinker(string ip, int port)
: base(ip, port)
{
((BaseConnector)BaseConnector).AddController(new MatchDirectlySendController(new ICollection<(int,int)>[] { new List<(int,int)> { (11,11), (12,12) } }, DuplicateWithCount.GetDuplcateFunc(new List<int>{2, 3}, 0), 100));
((BaseConnector)BaseConnector).AddController(new MatchDirectlySendController(new ICollection<(int, int)>[] { new List<(int, int)> { (11, 11), (12, 12) } }, DuplicateWithCount.GetDuplcateFunc(new List<int> { 2, 3 }, 0), 100));
}
/// <summary>

16
Modbus.Net/Modbus.Net.Siemens/SiemensUtility.cs
View File

@@ -1,6 +1,6 @@
using System;
using Microsoft.Extensions.Logging;
using System;
using System.Threading.Tasks;
using Serilog;
namespace Modbus.Net.Siemens
{
@@ -59,6 +59,8 @@ namespace Modbus.Net.Siemens
/// </summary>
public class SiemensUtility : BaseUtility
{
private static readonly ILogger<SiemensUtility> logger = LogProvider.CreateLogger<SiemensUtility>();
private readonly ushort _maxCalled;
private readonly ushort _maxCalling;
private readonly ushort _maxPdu;
@@ -169,11 +171,11 @@ namespace Modbus.Net.Siemens
var connectionStringSplit = ConnectionString.Split(':');
try
{
return connectionStringSplit.Length < 2 ? (int?) null : int.Parse(connectionStringSplit[1]);
return connectionStringSplit.Length < 2 ? (int?)null : int.Parse(connectionStringSplit[1]);
}
catch (Exception e)
{
Log.Error(e, $"SiemensUtility: {ConnectionString} format error");
logger.LogError(e, $"SiemensUtility: {ConnectionString} format error");
return null;
}
}
@@ -225,7 +227,7 @@ namespace Modbus.Net.Siemens
/// <param name="connectionType">需要设置的连接类型</param>
public override void SetConnectionType(int connectionType)
{
ConnectionType = (SiemensType) connectionType;
ConnectionType = (SiemensType)connectionType;
}
/// <summary>
@@ -254,7 +256,7 @@ namespace Modbus.Net.Siemens
}
catch (Exception e)
{
Log.Error(e, $"SiemensUtility -> GetDatas: {ConnectionString} error");
logger.LogError(e, $"SiemensUtility -> GetDatas: {ConnectionString} error");
return null;
}
}
@@ -285,7 +287,7 @@ namespace Modbus.Net.Siemens
}
catch (Exception e)
{
Log.Error(e, $"ModbusUtility -> SetDatas: {ConnectionString} error");
logger.LogError(e, $"ModbusUtility -> SetDatas: {ConnectionString} error");
return false;
}
}

14
Modbus.Net/Modbus.Net/Connector/BaseConnector.cs
View File

@@ -1,13 +1,15 @@
using System;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Nito.AsyncEx;
using Serilog;
using System;
using System.Threading.Tasks;
namespace Modbus.Net
{
/// <inheritdoc />
public abstract class BaseConnector : BaseConnector<byte[], byte[]>
{
private static readonly ILogger<BaseConnector> logger = LogProvider.CreateLogger<BaseConnector>();
/// <summary>
/// 发送锁
/// </summary>
@@ -71,12 +73,12 @@ namespace Modbus.Net
}
Controller.ForceRemoveWaitingMessage(messageSendingdef);
}
Log.Information("Message is waiting in {0}. Cancel!", ConnectionToken);
logger.LogInformation("Message is waiting in {0}. Cancel!", ConnectionToken);
return null;
}
catch (Exception e)
{
Log.Error(e, "Connector {0} Send Error.", ConnectionToken);
logger.LogError(e, "Connector {0} Send Error.", ConnectionToken);
return null;
}
finally
@@ -156,7 +158,7 @@ namespace Modbus.Net
/// <returns></returns>
protected TParamIn InvokeReturnMessage(TParamOut receiveMessage)
{
return MessageReturn?.Invoke(this, new MessageReturnArgs<TParamOut>{ReturnMessage = receiveMessage})?.SendMessage;
return MessageReturn?.Invoke(this, new MessageReturnArgs<TParamOut> { ReturnMessage = receiveMessage })?.SendMessage;
}
}
}

55
Modbus.Net/Modbus.Net/Connector/ComConnector.cs
View File

@@ -1,11 +1,11 @@
using System;
using Microsoft.Extensions.Logging;
using Nito.AsyncEx;
using System;
using System.Collections.Generic;
using System.IO.Ports;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Nito.AsyncEx;
using Serilog;
namespace Modbus.Net
{
@@ -25,6 +25,8 @@ namespace Modbus.Net
/// </summary>
public class ComConnector : BaseConnector, IDisposable
{
private static readonly ILogger<ComConnector> logger = LogProvider.CreateLogger<ComConnector>();
/// <summary>
/// 波特率
/// </summary>
@@ -124,7 +126,8 @@ namespace Modbus.Net
;
/// <inheritdoc />
protected override IController Controller {
protected override IController Controller
{
get
{
if (Controllers.ContainsKey(_com))
@@ -198,7 +201,7 @@ namespace Modbus.Net
while (SerialPort.BytesToRead > 0)
{
readBuf[nBytelen] = (byte) SerialPort.ReadByte();
readBuf[nBytelen] = (byte)SerialPort.ReadByte();
var bTmp = new byte[bufRoom];
Array.Clear(bTmp, 0, bTmp.Length);
@@ -235,7 +238,7 @@ namespace Modbus.Net
while (nBytelen < readRoom - 1 && SerialPort.BytesToRead > 0)
{
readBuf[nBytelen] = (byte) SerialPort.ReadByte();
readBuf[nBytelen] = (byte)SerialPort.ReadByte();
nBytelen++; // add one
}
readBuf[nBytelen] = 0x00;
@@ -265,13 +268,13 @@ namespace Modbus.Net
SerialPort.Close();
}
SerialPort.Dispose();
Log.Information("Com interface {Com} Disposed", _com);
logger.LogInformation("Com interface {Com} Disposed", _com);
Connectors[_com] = null;
Connectors.Remove(_com);
ReceiveMsgThreadStop();
}
Linkers.Remove(_slave);
Log.Information("Com connector {ConnectionToken} Removed", ConnectionToken);
logger.LogInformation("Com connector {ConnectionToken} Removed", ConnectionToken);
}
m_disposed = true;
}
@@ -289,19 +292,19 @@ namespace Modbus.Net
private void RefreshSendCount()
{
_sendCount++;
Log.Verbose("Com client {ConnectionToken} send count: {SendCount}", ConnectionToken, _sendCount);
logger.LogDebug("Com client {ConnectionToken} send count: {SendCount}", ConnectionToken, _sendCount);
}
private void RefreshReceiveCount()
{
_receiveCount++;
Log.Verbose("Com client {ConnectionToken} receive count: {SendCount}", ConnectionToken, _receiveCount);
logger.LogDebug("Com client {ConnectionToken} receive count: {SendCount}", ConnectionToken, _receiveCount);
}
private void RefreshErrorCount()
{
_errorCount++;
Log.Verbose("Com client {ConnectionToken} error count: {ErrorCount}", ConnectionToken, _errorCount);
logger.LogDebug("Com client {ConnectionToken} error count: {ErrorCount}", ConnectionToken, _errorCount);
}
/// <inheritdoc />
@@ -353,13 +356,13 @@ namespace Modbus.Net
}
}
Log.Information("Com client {ConnectionToken} connect success", ConnectionToken);
logger.LogInformation("Com client {ConnectionToken} connect success", ConnectionToken);
return true;
}
catch (Exception e)
{
Log.Error(e, "Com client {ConnectionToken} connect error", ConnectionToken);
logger.LogError(e, "Com client {ConnectionToken} connect error", ConnectionToken);
Dispose();
return false;
}
@@ -378,15 +381,15 @@ namespace Modbus.Net
try
{
Dispose();
Log.Information("Com client {ConnectionToken} disconnect success", ConnectionToken);
logger.LogInformation("Com client {ConnectionToken} disconnect success", ConnectionToken);
return true;
}
catch (Exception e)
{
Log.Error(e, "Com client {ConnectionToken} disconnect error", ConnectionToken);
logger.LogError(e, "Com client {ConnectionToken} disconnect error", ConnectionToken);
return false;
}
Log.Error(new Exception("Linkers or Connectors Dictionary not found"),
logger.LogError(new Exception("Linkers or Connectors Dictionary not found"),
"Com client {ConnectionToken} disconnect error", ConnectionToken);
return false;
}
@@ -420,7 +423,7 @@ namespace Modbus.Net
}
catch (Exception err)
{
Log.Error(err, "Com client {ConnectionToken} open error", ConnectionToken);
logger.LogError(err, "Com client {ConnectionToken} open error", ConnectionToken);
Dispose();
try
{
@@ -428,7 +431,7 @@ namespace Modbus.Net
}
catch (Exception err2)
{
Log.Error(err2, "Com client {ConnectionToken} open error", ConnectionToken);
logger.LogError(err2, "Com client {ConnectionToken} open error", ConnectionToken);
Dispose();
}
}
@@ -447,15 +450,15 @@ namespace Modbus.Net
{
try
{
Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken,
logger.LogDebug("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken,
message.Length);
Log.Verbose(
logger.LogDebug(
$"Com client {ConnectionToken} send msg: {String.Concat(message.Select(p => " " + p.ToString("X2")))}");
await Task.Run(() => SerialPort.Write(message, 0, message.Length));
}
catch (Exception err)
{
Log.Error(err, "Com client {ConnectionToken} send msg error", ConnectionToken);
logger.LogError(err, "Com client {ConnectionToken} send msg error", ConnectionToken);
Dispose();
}
RefreshSendCount();
@@ -464,7 +467,7 @@ namespace Modbus.Net
/// <inheritdoc />
protected override void ReceiveMsgThreadStart()
{
_receiveThread = Task.Run(()=>ReceiveMessage());
_receiveThread = Task.Run(() => ReceiveMessage());
}
/// <inheritdoc />
@@ -483,9 +486,9 @@ namespace Modbus.Net
var returnBytes = ReadMsg();
if (returnBytes != null)
{
Log.Verbose("Com client {ConnectionToken} receive msg length: {Length}", ConnectionToken,
logger.LogDebug("Com client {ConnectionToken} receive msg length: {Length}", ConnectionToken,
returnBytes.Length);
Log.Verbose(
logger.LogDebug(
$"Com client {ConnectionToken} receive msg: {String.Concat(returnBytes.Select(p => " " + p.ToString("X2")))}");
var isMessageConfirmed = Controller.ConfirmMessage(returnBytes);
@@ -502,7 +505,7 @@ namespace Modbus.Net
}
catch (Exception e)
{
Log.Error(e, "Com client {ConnectionToken} read msg error", ConnectionToken);
logger.LogError(e, "Com client {ConnectionToken} read msg error", ConnectionToken);
}
}
}
@@ -524,7 +527,7 @@ namespace Modbus.Net
}
catch (Exception e)
{
Log.Error(e, "Com client {ConnectionToken} read error", ConnectionToken);
logger.LogError(e, "Com client {ConnectionToken} read error", ConnectionToken);
RefreshErrorCount();
Dispose();
return null;

40
Modbus.Net/Modbus.Net/Connector/TcpConnector.cs
View File

@@ -1,10 +1,10 @@
using System;
using Microsoft.Extensions.Logging;
using Nito.AsyncEx;
using System;
using System.Linq;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
using Nito.AsyncEx;
using Serilog;
namespace Modbus.Net
{
@@ -14,6 +14,8 @@ namespace Modbus.Net
/// </summary>
public class TcpConnector : BaseConnector, IDisposable
{
private static readonly ILogger<TcpConnector> logger = LogProvider.CreateLogger<TcpConnector>();
private readonly string _host;
private readonly int _port;
@@ -94,7 +96,7 @@ namespace Modbus.Net
{
CloseClientSocket();
_socketClient = null;
Log.Debug("Tcp client {ConnectionToken} Disposed", ConnectionToken);
logger.LogDebug("Tcp client {ConnectionToken} Disposed", ConnectionToken);
}
}
@@ -134,16 +136,16 @@ namespace Modbus.Net
_taskCancel = false;
Controller.SendStart();
ReceiveMsgThreadStart();
Log.Information("Tcp client {ConnectionToken} connected", ConnectionToken);
logger.LogInformation("Tcp client {ConnectionToken} connected", ConnectionToken);
return true;
}
Log.Error("Tcp client {ConnectionToken} connect failed.", ConnectionToken);
logger.LogError("Tcp client {ConnectionToken} connect failed.", ConnectionToken);
Dispose();
return false;
}
catch (Exception err)
{
Log.Error(err, "Tcp client {ConnectionToken} connect exception", ConnectionToken);
logger.LogError(err, "Tcp client {ConnectionToken} connect exception", ConnectionToken);
Dispose();
return false;
}
@@ -159,12 +161,12 @@ namespace Modbus.Net
try
{
Dispose();
Log.Information("Tcp client {ConnectionToken} disconnected successfully", ConnectionToken);
logger.LogInformation("Tcp client {ConnectionToken} disconnected successfully", ConnectionToken);
return true;
}
catch (Exception err)
{
Log.Error(err, "Tcp client {ConnectionToken} disconnected exception", ConnectionToken);
logger.LogError(err, "Tcp client {ConnectionToken} disconnected exception", ConnectionToken);
return false;
}
finally
@@ -187,13 +189,13 @@ namespace Modbus.Net
RefreshSendCount();
Log.Verbose("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length);
Log.Verbose($"Tcp client {ConnectionToken} send: {String.Concat(datagram.Select(p => " " + p.ToString("X2")))}");
logger.LogDebug("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length);
logger.LogDebug($"Tcp client {ConnectionToken} send: {String.Concat(datagram.Select(p => " " + p.ToString("X2")))}");
await stream.WriteAsync(datagram, 0, datagram.Length);
}
catch (Exception err)
{
Log.Error(err, "Tcp client {ConnectionToken} send exception", ConnectionToken);
logger.LogError(err, "Tcp client {ConnectionToken} send exception", ConnectionToken);
Dispose();
}
}
@@ -229,9 +231,9 @@ namespace Modbus.Net
if (len > 0)
{
byte[] receiveBytes = CheckReplyDatagram(len);
Log.Verbose("Tcp client {ConnectionToken} receive text len = {Length}", ConnectionToken,
logger.LogDebug("Tcp client {ConnectionToken} receive text len = {Length}", ConnectionToken,
receiveBytes.Length);
Log.Verbose(
logger.LogDebug(
$"Tcp client {ConnectionToken} receive: {String.Concat(receiveBytes.Select(p => " " + p.ToString("X2")))}");
var isMessageConfirmed = Controller.ConfirmMessage(receiveBytes);
foreach (var confirmed in isMessageConfirmed)
@@ -257,7 +259,7 @@ namespace Modbus.Net
}
catch (Exception err)
{
Log.Error(err, "Tcp client {ConnectionToken} receive exception", ConnectionToken);
logger.LogError(err, "Tcp client {ConnectionToken} receive exception", ConnectionToken);
//CloseClientSocket();
}
}
@@ -280,19 +282,19 @@ namespace Modbus.Net
private void RefreshSendCount()
{
_sendCount++;
Log.Verbose("Tcp client {ConnectionToken} send count: {SendCount}", ConnectionToken, _sendCount);
logger.LogDebug("Tcp client {ConnectionToken} send count: {SendCount}", ConnectionToken, _sendCount);
}
private void RefreshReceiveCount()
{
_receiveCount++;
Log.Verbose("Tcp client {ConnectionToken} receive count: {SendCount}", ConnectionToken, _receiveCount);
logger.LogDebug("Tcp client {ConnectionToken} receive count: {SendCount}", ConnectionToken, _receiveCount);
}
private void RefreshErrorCount()
{
_errorCount++;
Log.Verbose("Tcp client {ConnectionToken} error count: {ErrorCount}", ConnectionToken, _errorCount);
logger.LogDebug("Tcp client {ConnectionToken} error count: {ErrorCount}", ConnectionToken, _errorCount);
}
private void CloseClientSocket()
@@ -312,7 +314,7 @@ namespace Modbus.Net
}
catch (Exception ex)
{
Log.Error(ex, "Tcp client {ConnectionToken} client close exception", ConnectionToken);
logger.LogError(ex, "Tcp client {ConnectionToken} client close exception", ConnectionToken);
}
}
}

40
Modbus.Net/Modbus.Net/Connector/UdpConnector.cs
View File

@@ -1,10 +1,10 @@
using System;
using Microsoft.Extensions.Logging;
using Nito.AsyncEx;
using System;
using System.Linq;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
using Nito.AsyncEx;
using Serilog;
namespace Modbus.Net
{
@@ -13,6 +13,8 @@ namespace Modbus.Net
/// </summary>
public class UdpConnector : BaseConnector, IDisposable
{
private static readonly ILogger<UdpConnector> logger = LogProvider.CreateLogger<UdpConnector>();
private readonly string _host;
private readonly int _port;
@@ -81,7 +83,7 @@ namespace Modbus.Net
{
CloseClientSocket();
_socketClient = null;
Log.Debug("Udp client {ConnectionToken} Disposed", ConnectionToken);
logger.LogDebug("Udp client {ConnectionToken} Disposed", ConnectionToken);
}
}
@@ -116,17 +118,17 @@ namespace Modbus.Net
_taskCancel = false;
Controller.SendStart();
ReceiveMsgThreadStart();
Log.Information("Udp client {ConnectionToken} connected", ConnectionToken);
logger.LogInformation("Udp client {ConnectionToken} connected", ConnectionToken);
return true;
}
Log.Error("Udp client {ConnectionToken} connect failed.", ConnectionToken);
logger.LogError("Udp client {ConnectionToken} connect failed.", ConnectionToken);
Dispose();
return false;
}
catch (Exception err)
{
Log.Error(err, "Udp client {ConnectionToken} connect exception", ConnectionToken);
logger.LogError(err, "Udp client {ConnectionToken} connect exception", ConnectionToken);
Dispose();
return false;
}
@@ -142,12 +144,12 @@ namespace Modbus.Net
try
{
Dispose();
Log.Information("Udp client {ConnectionToken} disconnected successfully", ConnectionToken);
logger.LogInformation("Udp client {ConnectionToken} disconnected successfully", ConnectionToken);
return true;
}
catch (Exception err)
{
Log.Error(err, "Udp client {ConnectionToken} disconnected exception", ConnectionToken);
logger.LogError(err, "Udp client {ConnectionToken} disconnected exception", ConnectionToken);
return false;
}
finally
@@ -168,13 +170,13 @@ namespace Modbus.Net
RefreshSendCount();
Log.Verbose("Udp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length);
Log.Verbose($"Udp client {ConnectionToken} send: {String.Concat(datagram.Select(p => " " + p.ToString("X2")))}");
logger.LogDebug("Udp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length);
logger.LogDebug($"Udp client {ConnectionToken} send: {String.Concat(datagram.Select(p => " " + p.ToString("X2")))}");
await _socketClient.SendAsync(datagram, datagram.Length);
}
catch (Exception err)
{
Log.Error(err, "Udp client {ConnectionToken} send exception", ConnectionToken);
logger.LogError(err, "Udp client {ConnectionToken} send exception", ConnectionToken);
Dispose();
}
}
@@ -210,9 +212,9 @@ namespace Modbus.Net
{
if (receive.Buffer.Clone() is byte[] receiveBytes)
{
Log.Verbose("Udp client {ConnectionToken} receive text len = {Length}", ConnectionToken,
logger.LogDebug("Udp client {ConnectionToken} receive text len = {Length}", ConnectionToken,
receiveBytes.Length);
Log.Verbose(
logger.LogDebug(
$"Udp client {ConnectionToken} receive: {String.Concat(receiveBytes.Select(p => " " + p.ToString("X2")))}");
var isMessageConfirmed = Controller.ConfirmMessage(receiveBytes);
foreach (var confirmed in isMessageConfirmed)
@@ -239,7 +241,7 @@ namespace Modbus.Net
}
catch (Exception err)
{
Log.Error(err, "Udp client {ConnectionToken} receive exception", ConnectionToken);
logger.LogError(err, "Udp client {ConnectionToken} receive exception", ConnectionToken);
//CloseClientSocket();
}
}
@@ -247,19 +249,19 @@ namespace Modbus.Net
private void RefreshSendCount()
{
_sendCount++;
Log.Verbose("Udp client {ConnectionToken} send count: {SendCount}", ConnectionToken, _sendCount);
logger.LogDebug("Udp client {ConnectionToken} send count: {SendCount}", ConnectionToken, _sendCount);
}
private void RefreshReceiveCount()
{
_receiveCount++;
Log.Verbose("Udp client {ConnectionToken} receive count: {SendCount}", ConnectionToken, _receiveCount);
logger.LogDebug("Udp client {ConnectionToken} receive count: {SendCount}", ConnectionToken, _receiveCount);
}
private void RefreshErrorCount()
{
_errorCount++;
Log.Verbose("Udp client {ConnectionToken} error count: {ErrorCount}", ConnectionToken, _errorCount);
logger.LogDebug("Udp client {ConnectionToken} error count: {ErrorCount}", ConnectionToken, _errorCount);
}
private void CloseClientSocket()
@@ -280,7 +282,7 @@ namespace Modbus.Net
}
catch (Exception ex)
{
Log.Error(ex, "Udp client {ConnectionToken} client close exception", ConnectionToken);
logger.LogError(ex, "Udp client {ConnectionToken} client close exception", ConnectionToken);
}
}
}

6
Modbus.Net/Modbus.Net/Controller/BaseController.cs
View File

@@ -66,7 +66,7 @@ namespace Modbus.Net
{
if (SendingThread == null)
{
SendingThread = Task.Run(()=>SendingMessageControlInner());
SendingThread = Task.Run(() => SendingMessageControlInner());
}
}
@@ -101,14 +101,14 @@ namespace Modbus.Net
/// </summary>
/// <param name="message">待确认的信息</param>
/// <returns>信息的检索关键字</returns>
protected abstract (string,string)? GetKeyFromMessage(byte[] message);
protected abstract (string, string)? GetKeyFromMessage(byte[] message);
/// <inheritdoc />
public ICollection<(byte[], bool)> ConfirmMessage(byte[] receiveMessage)
{
var ans = new List<(byte[], bool)>();
var duplicatedMessages = DuplicateFunc?.Invoke(receiveMessage);
duplicatedMessages = duplicatedMessages ?? new List<byte[]> {receiveMessage};
duplicatedMessages = duplicatedMessages ?? new List<byte[]> { receiveMessage };
foreach (var message in duplicatedMessages)
{
var def = GetMessageFromWaitingList(message);

10
Modbus.Net/Modbus.Net/Controller/FifoController.cs
View File

@@ -1,8 +1,8 @@
using System;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Serilog;
namespace Modbus.Net
{
@@ -11,6 +11,8 @@ namespace Modbus.Net
/// </summary>
public class FifoController : BaseController
{
private static readonly ILogger<FifoController> logger = LogProvider.CreateLogger<FifoController>();
private MessageWaitingDef _currentSendingPos;
private bool _taskCancel = false;
@@ -94,7 +96,7 @@ namespace Modbus.Net
}
catch (Exception e)
{
Log.Error(e, "Controller throws exception");
logger.LogError(e, "Controller throws exception");
}
}
@@ -113,7 +115,7 @@ namespace Modbus.Net
}
/// <inheritdoc />
protected override (string,string)? GetKeyFromMessage(byte[] message)
protected override (string, string)? GetKeyFromMessage(byte[] message)
{
return null;
}

4
Modbus.Net/Modbus.Net/Controller/MatchController.cs
View File

@@ -12,7 +12,7 @@ namespace Modbus.Net
/// <summary>
/// 匹配字典
/// </summary>
protected ICollection<(int,int)>[] KeyMatches { get; }
protected ICollection<(int, int)>[] KeyMatches { get; }
/// <summary>
/// 构造器
@@ -29,7 +29,7 @@ namespace Modbus.Net
}
/// <inheritdoc />
protected override (string,string)? GetKeyFromMessage(byte[] message)
protected override (string, string)? GetKeyFromMessage(byte[] message)
{
string ans1 = "";
string ans2 = "";

10
Modbus.Net/Modbus.Net/Job/JobChainingJobListenerWithDataMap.cs
View File

@@ -1,6 +1,6 @@
using Quartz.Listener;
using Microsoft.Extensions.Logging;
using Quartz;
using Serilog;
using Quartz.Listener;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
@@ -12,6 +12,8 @@ namespace Modbus.Net
/// </summary>
public class JobChainingJobListenerWithDataMap : JobListenerSupport
{
private static readonly ILogger<JobChainingJobListenerWithDataMap> logger = LogProvider.CreateLogger<JobChainingJobListenerWithDataMap>();
/// <summary>
/// JobChaningJobListener with DataMap passing from parent job to next job
/// </summary>
@@ -58,7 +60,7 @@ namespace Modbus.Net
return;
}
Log.Information("Job '{JobKey}' will now chain to Job '{Job}'", context.JobDetail.Key, sj);
logger.LogInformation("Job '{JobKey}' will now chain to Job '{Job}'", context.JobDetail.Key, sj);
try
{
@@ -78,7 +80,7 @@ namespace Modbus.Net
}
catch (SchedulerException se)
{
Log.Error(se, "Error encountered during chaining to Job '{Job}'", sj);
logger.LogError(se, "Error encountered during chaining to Job '{Job}'", sj);
}
}
#nullable disable

7
Modbus.Net/Modbus.Net/Job/MachineJobScheduler.cs
View File

@@ -3,7 +3,6 @@ using Quartz.Impl;
using Quartz.Impl.Matchers;
using System;
using System.Collections.Generic;
using System.Reflection.PortableExecutable;
using System.Threading.Tasks;
namespace Modbus.Net
@@ -67,13 +66,13 @@ namespace Modbus.Net
ITrigger trigger;
if (count >= 0)
trigger = TriggerBuilder.Create()
.WithIdentity(triggerKey, "Modbus.Net.DataQuery.Group."+ triggerKey)
.WithIdentity(triggerKey, "Modbus.Net.DataQuery.Group." + triggerKey)
.StartNow()
.WithSimpleSchedule(b => b.WithInterval(TimeSpan.FromSeconds(interval)).WithRepeatCount(count))
.Build();
else
trigger = TriggerBuilder.Create()
.WithIdentity(triggerKey, "Modbus.Net.DataQuery.Group."+ triggerKey)
.WithIdentity(triggerKey, "Modbus.Net.DataQuery.Group." + triggerKey)
.StartNow()
.WithSimpleSchedule(b => b.WithInterval(TimeSpan.FromSeconds(interval)).RepeatForever())
.Build();
@@ -544,7 +543,7 @@ namespace Modbus.Net
/// <summary>
/// 处理写返回任务
/// </summary>
public class MachineDealDataJob<TMachineKey> : IJob where TMachineKey: IEquatable<TMachineKey>
public class MachineDealDataJob<TMachineKey> : IJob where TMachineKey : IEquatable<TMachineKey>
{
/// <inheritdoc />
public async Task Execute(IJobExecutionContext context)

4
Modbus.Net/Modbus.Net/Linker/ComProtocolLinker.cs
View File

@@ -55,12 +55,12 @@ namespace Modbus.Net
{
if (connectionTimeout == -1)
{
BaseConnector = new ComConnector(com + ":" + slaveAddress, baudRate, parity, stopBits, dataBits, isFullDuplex:isFullDuplex);
BaseConnector = new ComConnector(com + ":" + slaveAddress, baudRate, parity, stopBits, dataBits, isFullDuplex: isFullDuplex);
}
else
{
BaseConnector = new ComConnector(com + ":" + slaveAddress, baudRate, parity, stopBits, dataBits,
connectionTimeout, isFullDuplex:isFullDuplex);
connectionTimeout, isFullDuplex: isFullDuplex);
}
}

4
Modbus.Net/Modbus.Net/Linker/TcpProtocolLinker.cs
View File

@@ -39,12 +39,12 @@ namespace Modbus.Net
if (connectionTimeout == -1)
{
//初始化连接对象
BaseConnector = new TcpConnector(ip, port, isFullDuplex:isFullDuplex);
BaseConnector = new TcpConnector(ip, port, isFullDuplex: isFullDuplex);
}
else
{
//初始化连接对象
BaseConnector = new TcpConnector(ip, port, connectionTimeout, isFullDuplex:isFullDuplex);
BaseConnector = new TcpConnector(ip, port, connectionTimeout, isFullDuplex: isFullDuplex);
}
}
}

4
Modbus.Net/Modbus.Net/Linker/UdpProtocolLinker.cs
View File

@@ -39,12 +39,12 @@ namespace Modbus.Net
if (connectionTimeout == -1)
{
//初始化连接对象
BaseConnector = new UdpConnector(ip, port, isFullDuplex:isFullDuplex);
BaseConnector = new UdpConnector(ip, port, isFullDuplex: isFullDuplex);
}
else
{
//初始化连接对象
BaseConnector = new UdpConnector(ip, port, connectionTimeout, isFullDuplex:isFullDuplex);
BaseConnector = new UdpConnector(ip, port, connectionTimeout, isFullDuplex: isFullDuplex);
}
}
}

43
Modbus.Net/Modbus.Net/Log/LogProvider.cs Normal file
View File

@@ -0,0 +1,43 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
namespace Modbus.Net
{
/// <summary>
///
/// </summary>
public static class LogProvider
{
private static ILoggerFactory _loggerFactory = null;
/// <summary>
/// Sets the current log provider based on logger factory.
/// </summary>
/// <param name="loggerFactory">The logger factory.</param>
public static void SetLogProvider(ILoggerFactory loggerFactory)
{
_loggerFactory = loggerFactory;
}
/// <summary>
///
/// </summary>
/// <param name="category"></param>
/// <returns></returns>
public static ILogger CreateLogger(string category) => _loggerFactory != null ? _loggerFactory.CreateLogger(category) : NullLogger.Instance;
/// <summary>
///
/// </summary>
/// <typeparam name="T"></typeparam>
/// <returns></returns>
public static ILogger<T> CreateLogger<T>() => _loggerFactory != null ? _loggerFactory.CreateLogger<T>() : NullLogger<T>.Instance;
#if DIAGNOSTICS_SOURCE
internal static class Cached
{
internal static readonly System.Lazy<System.Diagnostics.DiagnosticListener> Default =
new(() => new System.Diagnostics.DiagnosticListener(DiagnosticHeaders.DefaultListenerName));
}
#endif
}
}

14
Modbus.Net/Modbus.Net/Machine/AddressCombiner.cs
View File

@@ -140,12 +140,12 @@ namespace Modbus.Net
ans.Add(new CommunicationUnit<TKey>
{
Area = area,
Address = (int) Math.Floor(initNum),
Address = (int)Math.Floor(initNum),
GetCount =
(int)
Math.Ceiling(
AddressHelper.MapProtocolGetCountToAbstractByteCount(
preNum - (int) Math.Floor(initNum),
preNum - (int)Math.Floor(initNum),
AddressTranslator.GetAreaByteLength(address.Area),
BigEndianValueHelper.Instance.ByteLength[preType.FullName])),
DataType = typeof(byte),
@@ -170,12 +170,12 @@ namespace Modbus.Net
ans.Add(new CommunicationUnit<TKey>
{
Area = area,
Address = (int) Math.Floor(initNum),
Address = (int)Math.Floor(initNum),
GetCount =
(int)
Math.Ceiling(
AddressHelper.MapProtocolGetCountToAbstractByteCount(
preNum - (int) Math.Floor(initNum), AddressTranslator.GetAreaByteLength(area),
preNum - (int)Math.Floor(initNum), AddressTranslator.GetAreaByteLength(area),
BigEndianValueHelper.Instance.ByteLength[preType.FullName])),
DataType = typeof(byte),
OriginalAddresses = originalAddresses.ToList()
@@ -255,7 +255,7 @@ namespace Modbus.Net
SubAddress = address.SubAddress,
DataType = address.DataType,
GetCount = 1,
OriginalAddresses = new List<AddressUnit<TKey>> {address}
OriginalAddresses = new List<AddressUnit<TKey>> { address }
}).ToList();
}
}
@@ -351,7 +351,7 @@ namespace Modbus.Net
{
if (orderedGap.GapNumber <= 0) continue;
var nowAddress = orderedGap.EndUnit;
var index = continusAddresses.FindIndex(p=>p.Area == nowAddress.Area && p.Address == nowAddress.Address && p.SubAddress == nowAddress.SubAddress);
var index = continusAddresses.FindIndex(p => p.Area == nowAddress.Area && p.Address == nowAddress.Address && p.SubAddress == nowAddress.SubAddress);
nowAddress = continusAddresses[index];
index--;
var preAddress = continusAddresses[index];
@@ -432,7 +432,7 @@ namespace Modbus.Net
var addressUnits = addresses as IList<AddressUnit<TKey>> ?? addresses.ToList();
var count = addressUnits.Sum(address => BigEndianValueHelper.Instance.ByteLength[address.DataType.FullName]);
return
new AddressCombinerNumericJump<TKey>((int) (count * Percentage / 100.0), MaxLength, AddressTranslator)
new AddressCombinerNumericJump<TKey>((int)(count * Percentage / 100.0), MaxLength, AddressTranslator)
.Combine(
addressUnits);
}

32
Modbus.Net/Modbus.Net/Machine/BaseMachine.cs
View File

@@ -1,8 +1,8 @@
using System;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Serilog;
namespace Modbus.Net
{
@@ -80,6 +80,8 @@ namespace Modbus.Net
where TKey : IEquatable<TKey>
where TUnitKey : IEquatable<TUnitKey>
{
private static readonly ILogger<BaseMachine<TKey, TUnitKey>> logger = LogProvider.CreateLogger<BaseMachine<TKey, TUnitKey>>();
private readonly int _maxErrorCount = 3;
/// <summary>
@@ -243,9 +245,9 @@ namespace Modbus.Net
AddressTranslator.GetAreaByteLength(communicateAddress.Area)) +
address.SubAddress * 0.125;
//字节坐标的主地址位置
var localMainPos = (int) localPos;
var localMainPos = (int)localPos;
//字节坐标的子地址位置
var localSubPos = (int) ((localPos - localMainPos) * 8);
var localSubPos = (int)((localPos - localMainPos) * 8);
//根据类型选择返回结果的键是通讯标识还是地址
string key;
@@ -302,7 +304,7 @@ namespace Modbus.Net
catch (Exception e)
{
ErrorCount++;
Log.Error(e, $"BaseMachine -> GetDatas, Id:{Id} Connection:{ConnectionToken} key {key} existing. ErrorCount {ErrorCount}.");
logger.LogError(e, $"BaseMachine -> GetDatas, Id:{Id} Connection:{ConnectionToken} key {key} existing. ErrorCount {ErrorCount}.");
if (ErrorCount >= _maxErrorCount)
Disconnect();
@@ -321,7 +323,7 @@ namespace Modbus.Net
catch (Exception e)
{
ErrorCount++;
Log.Error(e, $"BaseMachine -> GetDatas, Id:{Id} Connection:{ConnectionToken} error. ErrorCount {ErrorCount}.");
logger.LogError(e, $"BaseMachine -> GetDatas, Id:{Id} Connection:{ConnectionToken} error. ErrorCount {ErrorCount}.");
if (ErrorCount >= _maxErrorCount)
Disconnect();
@@ -399,13 +401,13 @@ namespace Modbus.Net
//地址为空报错
if (address == null)
{
Log.Error($"Machine {ConnectionToken} Address {value.Key} doesn't exist.");
logger.LogError($"Machine {ConnectionToken} Address {value.Key} doesn't exist.");
continue;
}
//不能写报错
if (!address.CanWrite)
{
Log.Error($"Machine {ConnectionToken} Address {value.Key} cannot write.");
logger.LogError($"Machine {ConnectionToken} Address {value.Key} cannot write.");
continue;
}
addresses.Add(address);
@@ -449,25 +451,25 @@ namespace Modbus.Net
AddressTranslator.GetAreaByteLength(communicateAddress.Area),
AddressTranslator.GetAreaByteLength(communicateAddress.Area), 0);
//字节坐标主地址
var mainByteCount = (int) byteCount;
var mainByteCount = (int)byteCount;
//字节坐标自地址
var localByteCount = (int) ((byteCount - (int) byteCount) * 8);
var localByteCount = (int)((byteCount - (int)byteCount) * 8);
//协议坐标地址
var localPos = byteCount / AddressTranslator.GetAreaByteLength(communicateAddress.Area);
//协议坐标子地址
var subPos =
(int)
((localPos - (int) localPos) /
((localPos - (int)localPos) /
(0.125 / AddressTranslator.GetAreaByteLength(communicateAddress.Area)));
//协议主地址字符串
var address = AddressFormater.FormatAddress(communicateAddress.Area,
communicateAddress.Address + (int) localPos, subPos);
communicateAddress.Address + (int)localPos, subPos);
//协议完整地址字符串
var address2 = subPos != 0
? null
: AddressFormater.FormatAddress(communicateAddress.Area,
communicateAddress.Address + (int) localPos);
communicateAddress.Address + (int)localPos);
//获取写入类型
var dataType = addressUnit.DataType;
KeyValuePair<string, double> value;
@@ -521,7 +523,7 @@ namespace Modbus.Net
catch (Exception e)
{
ErrorCount++;
Log.Error(e, $"BaseMachine -> SetDatas, Id:{Id} Connection:{ConnectionToken} error. ErrorCount {ErrorCount}.");
logger.LogError(e, $"BaseMachine -> SetDatas, Id:{Id} Connection:{ConnectionToken} error. ErrorCount {ErrorCount}.");
if (ErrorCount >= _maxErrorCount)
Disconnect();
@@ -619,7 +621,7 @@ namespace Modbus.Net
}
catch (Exception e)
{
Log.Error(e, $"BaseMachine -> GetAddressUnitById Id:{Id} ConnectionToken:{ConnectionToken} addressUnitId:{addressUnitId} Repeated");
logger.LogError(e, $"BaseMachine -> GetAddressUnitById Id:{Id} ConnectionToken:{ConnectionToken} addressUnitId:{addressUnitId} Repeated");
return null;
}
}

6
Modbus.Net/Modbus.Net/Modbus.Net.csproj
View File

@@ -5,7 +5,7 @@
<AssemblyName>Modbus.Net</AssemblyName>
<RootNamespace>Modbus.Net</RootNamespace>
<PackageId>Modbus.Net</PackageId>
<Version>1.4.0</Version>
<Version>1.4.0-beta03</Version>
<Product>Modbus.Net</Product>
<Authors>Chris L.(Luo Sheng)</Authors>
<Company>Hangzhou Delian Science Technology Co.,Ltd.</Company>
@@ -28,10 +28,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
<PackageReference Include="Quartz" Version="3.6.0" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Quartz" Version="3.6.2" />
<PackageReference Include="System.IO.Ports" Version="7.0.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>

16
Modbus.Net/Modbus.Net/Utility/BaseUtility.cs
View File

@@ -1,8 +1,8 @@
using System;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Serilog;
/// <summary>
/// 端格式
@@ -47,6 +47,8 @@ namespace Modbus.Net
where TProtocolUnit : class, IProtocolFormatting<TParamIn, TParamOut> where TParamOut : class
where TPipeUnit : PipeUnit<TParamIn, TParamOut, IProtocolLinker<TParamIn, TParamOut>, TProtocolUnit>
{
private static readonly ILogger<BaseUtility<TParamIn, TParamOut, TProtocolUnit, TPipeUnit>> logger = LogProvider.CreateLogger<BaseUtility<TParamIn, TParamOut, TProtocolUnit, TPipeUnit>>();
/// <summary>
/// 协议收发主体
/// </summary>
@@ -122,13 +124,13 @@ namespace Modbus.Net
var typeName = getTypeAndCount.Key.FullName;
var bCount = BigEndianValueHelper.Instance.ByteLength[typeName];
var getReturnValue = await GetDatasAsync(startAddress,
(int) Math.Ceiling(bCount * getTypeAndCount.Value));
(int)Math.Ceiling(bCount * getTypeAndCount.Value));
var getBytes = getReturnValue;
return ValueHelper.GetInstance(Endian).ByteArrayToObjectArray(getBytes, getTypeAndCount);
}
catch (Exception e)
{
Log.Error(e, $"ModbusUtility -> GetDatas: {ConnectionString} error");
logger.LogError(e, $"ModbusUtility -> GetDatas: {ConnectionString} error");
return null;
}
}
@@ -164,7 +166,7 @@ namespace Modbus.Net
}
catch (Exception e)
{
Log.Error(e, $"ModbusUtility -> GetDatas Generic: {ConnectionString} error");
logger.LogError(e, $"ModbusUtility -> GetDatas Generic: {ConnectionString} error");
return null;
}
}
@@ -198,14 +200,14 @@ namespace Modbus.Net
from getTypeAndCount in translateTypeAndCount
let typeName = getTypeAndCount.Key.FullName
let bCount = BigEndianValueHelper.Instance.ByteLength[typeName]
select (int) Math.Ceiling(bCount * getTypeAndCount.Value)).Sum();
select (int)Math.Ceiling(bCount * getTypeAndCount.Value)).Sum();
var getReturnValue = await GetDatasAsync(startAddress, bAllCount);
var getBytes = getReturnValue;
return ValueHelper.GetInstance(Endian).ByteArrayToObjectArray(getBytes, translateTypeAndCount);
}
catch (Exception e)
{
Log.Error(e, $"ModbusUtility -> GetDatas pair: {ConnectionString} error");
logger.LogError(e, $"ModbusUtility -> GetDatas pair: {ConnectionString} error");
return null;
}
}

8
Modbus.Net/Modbus.Net/Value/CRC16.cs
View File

@@ -64,11 +64,11 @@ namespace Modbus.Net
CRC = CRC >> 1;
}
}
Rcvbuf[1] = (byte) ((CRC & 0xff00) >> 8); //高位置
Rcvbuf[0] = (byte) (CRC & 0x00ff); //低位置
Rcvbuf[1] = (byte)((CRC & 0xff00) >> 8); //高位置
Rcvbuf[0] = (byte)(CRC & 0x00ff); //低位置
CRC = Rcvbuf[0] << 8;
CRC += Rcvbuf[1];
return (short) CRC;
return (short)CRC;
}
#endregion
@@ -195,7 +195,7 @@ namespace Modbus.Net
byte sum = 0;
foreach (var b in code)
sum += b;
sum = (byte) (~sum + 1); //取反+1
sum = (byte)(~sum + 1); //取反+1
var lrc = sum.ToString("X2");
return lrc;
}

84
Modbus.Net/Modbus.Net/Value/ValueHelper.cs
View File

@@ -1,9 +1,9 @@
using System;
using Microsoft.Extensions.Logging;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Serilog;
namespace Modbus.Net
{
@@ -12,6 +12,8 @@ namespace Modbus.Net
/// </summary>
public class ValueHelper
{
private static readonly ILogger<ValueHelper> logger = LogProvider.CreateLogger<ValueHelper>();
/// <summary>
/// 兼容数据类型对应的字节长度
/// </summary>
@@ -53,7 +55,7 @@ namespace Modbus.Net
/// <returns>byte数组</returns>
public byte[] GetBytes(byte value)
{
return new[] {value};
return new[] { value };
}
/// <summary>
@@ -148,47 +150,47 @@ namespace Modbus.Net
{
case "System.Int16":
{
var bytes = _Instance.GetBytes((short) value);
var bytes = _Instance.GetBytes((short)value);
return bytes;
}
case "System.Int32":
{
var bytes = _Instance.GetBytes((int) value);
var bytes = _Instance.GetBytes((int)value);
return bytes;
}
case "System.Int64":
{
var bytes = _Instance.GetBytes((long) value);
var bytes = _Instance.GetBytes((long)value);
return bytes;
}
case "System.UInt16":
{
var bytes = _Instance.GetBytes((ushort) value);
var bytes = _Instance.GetBytes((ushort)value);
return bytes;
}
case "System.UInt32":
{
var bytes = _Instance.GetBytes((uint) value);
var bytes = _Instance.GetBytes((uint)value);
return bytes;
}
case "System.UInt64":
{
var bytes = _Instance.GetBytes((ulong) value);
var bytes = _Instance.GetBytes((ulong)value);
return bytes;
}
case "System.Single":
{
var bytes = _Instance.GetBytes((float) value);
var bytes = _Instance.GetBytes((float)value);
return bytes;
}
case "System.Double":
{
var bytes = _Instance.GetBytes((double) value);
var bytes = _Instance.GetBytes((double)value);
return bytes;
}
case "System.Byte":
{
var bytes = _Instance.GetBytes((byte) value);
var bytes = _Instance.GetBytes((byte)value);
return bytes;
}
default:
@@ -468,7 +470,7 @@ namespace Modbus.Net
for (var i = 0; i < 8; i++)
{
result <<= 1;
result |= (byte) (originalByte & 1);
result |= (byte)(originalByte & 1);
originalByte >>= 1;
}
return result;
@@ -492,7 +494,7 @@ namespace Modbus.Net
b = true;
//自动将目标数组中内含的子数组展开，是所有包含在子数组拼接为一个数组
var contentArray =
ArrayList.Adapter((Array) content).ToArray(typeof(object)).OfType<object>();
ArrayList.Adapter((Array)content).ToArray(typeof(object)).OfType<object>();
newContentsList.AddRange(contentArray);
}
else
@@ -521,9 +523,9 @@ namespace Modbus.Net
}
lastIsBool = true;
if (!LittleEndianBit)
boolToByteTemp = (byte) (boolToByteTemp * 2 + ((bool) content ? 1 : 0));
boolToByteTemp = (byte)(boolToByteTemp * 2 + ((bool)content ? 1 : 0));
else
boolToByteTemp += (byte) ((bool) content ? Math.Pow(2, boolToByteCount) : 0);
boolToByteTemp += (byte)((bool)content ? Math.Pow(2, boolToByteCount) : 0);
boolToByteCount++;
}
else
@@ -539,47 +541,47 @@ namespace Modbus.Net
{
case "System.Int16":
{
translateTarget.AddRange(_Instance.GetBytes((short) content));
translateTarget.AddRange(_Instance.GetBytes((short)content));
break;
}
case "System.Int32":
{
translateTarget.AddRange(_Instance.GetBytes((int) content));
translateTarget.AddRange(_Instance.GetBytes((int)content));
break;
}
case "System.Int64":
{
translateTarget.AddRange(_Instance.GetBytes((long) content));
translateTarget.AddRange(_Instance.GetBytes((long)content));
break;
}
case "System.UInt16":
{
translateTarget.AddRange(_Instance.GetBytes((ushort) content));
translateTarget.AddRange(_Instance.GetBytes((ushort)content));
break;
}
case "System.UInt32":
{
translateTarget.AddRange(_Instance.GetBytes((uint) content));
translateTarget.AddRange(_Instance.GetBytes((uint)content));
break;
}
case "System.UInt64":
{
translateTarget.AddRange(_Instance.GetBytes((ulong) content));
translateTarget.AddRange(_Instance.GetBytes((ulong)content));
break;
}
case "System.Single":
{
translateTarget.AddRange(_Instance.GetBytes((float) content));
translateTarget.AddRange(_Instance.GetBytes((float)content));
break;
}
case "System.Double":
{
translateTarget.AddRange(_Instance.GetBytes((double) content));
translateTarget.AddRange(_Instance.GetBytes((double)content));
break;
}
case "System.Byte":
{
translateTarget.AddRange(_Instance.GetBytes((byte) content));
translateTarget.AddRange(_Instance.GetBytes((byte)content));
break;
}
default:
@@ -604,7 +606,7 @@ namespace Modbus.Net
/// <returns>object数组</returns>
public virtual object[] ByteArrayToObjectArray(byte[] contents, KeyValuePair<Type, int> translateTypeAndCount)
{
return ByteArrayToObjectArray(contents, new List<KeyValuePair<Type, int>> {translateTypeAndCount});
return ByteArrayToObjectArray(contents, new List<KeyValuePair<Type, int>> { translateTypeAndCount });
}
/// <summary>
@@ -714,7 +716,7 @@ namespace Modbus.Net
}
catch (Exception e)
{
Log.Error(e, "ValueHelper -> ByteArrayToObjectArray error");
logger.LogError(e, "ValueHelper -> ByteArrayToObjectArray error");
count = contents.Length;
}
}
@@ -750,52 +752,52 @@ namespace Modbus.Net
{
case "System.Int16":
{
var success = _Instance.SetValue(contents, setPos, (short) setValue);
var success = _Instance.SetValue(contents, setPos, (short)setValue);
return success;
}
case "System.Int32":
{
var success = _Instance.SetValue(contents, setPos, (int) setValue);
var success = _Instance.SetValue(contents, setPos, (int)setValue);
return success;
}
case "System.Int64":
{
var success = _Instance.SetValue(contents, setPos, (long) setValue);
var success = _Instance.SetValue(contents, setPos, (long)setValue);
return success;
}
case "System.UInt16":
{
var success = _Instance.SetValue(contents, setPos, (ushort) setValue);
var success = _Instance.SetValue(contents, setPos, (ushort)setValue);
return success;
}
case "System.UInt32":
{
var success = _Instance.SetValue(contents, setPos, (uint) setValue);
var success = _Instance.SetValue(contents, setPos, (uint)setValue);
return success;
}
case "System.UInt64":
{
var success = _Instance.SetValue(contents, setPos, (ulong) setValue);
var success = _Instance.SetValue(contents, setPos, (ulong)setValue);
return success;
}
case "System.Single":
{
var success = _Instance.SetValue(contents, setPos, (float) setValue);
var success = _Instance.SetValue(contents, setPos, (float)setValue);
return success;
}
case "System.Double":
{
var success = _Instance.SetValue(contents, setPos, (double) setValue);
var success = _Instance.SetValue(contents, setPos, (double)setValue);
return success;
}
case "System.Byte":
{
var success = _Instance.SetValue(contents, setPos, (byte) setValue);
var success = _Instance.SetValue(contents, setPos, (byte)setValue);
return success;
}
case "System.Boolean":
{
var success = _Instance.SetBit(contents, setPos, subPos, (bool) setValue);
var success = _Instance.SetBit(contents, setPos, subPos, (bool)setValue);
return success;
}
default:
@@ -822,7 +824,7 @@ namespace Modbus.Net
}
catch (Exception e)
{
Log.Error(e, "ValueHelper -> SetValue set value failed");
logger.LogError(e, "ValueHelper -> SetValue set value failed");
return false;
}
}
@@ -844,14 +846,14 @@ namespace Modbus.Net
creation *= 2;
if (i == subPos) creation++;
}
return (byte) (number | creation);
return (byte)(number | creation);
}
for (var i = 7; i >= 0; i--)
{
creation *= 2;
if (i != subPos) creation++;
}
return (byte) (number & creation);
return (byte)(number & creation);
}
/// <summary>
@@ -871,7 +873,7 @@ namespace Modbus.Net
}
catch (Exception e)
{
Log.Error(e, "ValueHelper -> SetBit set bit failed");
logger.LogError(e, "ValueHelper -> SetBit set bit failed");
return false;
}
}

7
Samples/AnyType/Models/TaskViewModel.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace AnyType.Models
namespace AnyType.Models
{
public class TaskViewModel
{

7
Samples/CrossLamp/Models/Lamp.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
public enum LightLamp{Red,Yellow,Green}
public enum LightLamp { Red, Yellow, Green }
namespace CrossLampControl.WebApi.Models
{
public class Lamp

30
Samples/MachineJob/ConsoleLogProvider.cs Normal file
View File

@@ -0,0 +1,30 @@
using Quartz.Logging;
namespace MachineJob
{
// simple log provider to get something to the console
public class ConsoleLogProvider : ILogProvider
{
public Logger GetLogger(string name)
{
return (level, func, exception, parameters) =>
{
if (level >= Quartz.Logging.LogLevel.Info && func != null)
{
Console.WriteLine("[" + DateTime.Now.ToLongTimeString() + "] [" + level + "] " + func(), parameters);
}
return true;
};
}
public IDisposable OpenNestedContext(string message)
{
throw new NotImplementedException();
}
public IDisposable OpenMappedContext(string key, object value, bool destructure = false)
{
throw new NotImplementedException();
}
}
}

1
Samples/MachineJob/DatabaseWrite.cs
View File

@@ -1,5 +1,4 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using System.ComponentModel.DataAnnotations;

3
Samples/MachineJob/MachineJob.csproj
View File

@@ -15,6 +15,9 @@
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
</ItemGroup>
<ItemGroup>

3
Samples/MachineJob/Migrations/20230212103438_InitialCreate.cs
View File

@@ -1,5 +1,4 @@
using System;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

21
Samples/MachineJob/Program.cs
View File

@@ -1,10 +1,31 @@
using MachineJob;
using MachineJob.Service;
using Serilog;
var configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())
.AddJsonFile("appsettings.json")
.AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production"}.json", true)
.Build();
Log.Logger = new LoggerConfiguration()
.ReadFrom.Configuration(configuration)
.WriteTo.Console()
.CreateLogger();
var loggerFactory = new LoggerFactory().AddSerilog(Log.Logger);
Quartz.Logging.LogProvider.SetCurrentLogProvider(new ConsoleLogProvider());
Modbus.Net.LogProvider.SetLogProvider(loggerFactory);
IHost host = Host.CreateDefaultBuilder(args)
.ConfigureServices(services =>
{
services.AddHostedService<Worker>();
services.AddLogging(loggingBuilder => loggingBuilder.AddSerilog(Log.Logger, true));
})
.Build();
await host.RunAsync();

19
Samples/MachineJob/Worker.cs
View File

@@ -30,7 +30,6 @@ namespace MachineJob.Service
new AddressUnit() { Area = "4X", Address = 10, DataType = typeof(short), Id = "10", Name = "Test10" }
};
/*
List<AddressUnit> _addresses2 = new List<AddressUnit>
{
new AddressUnit() { Area = "DB1", Address = 0, DataType = typeof(short), Id = "1", Name = "Test1" },
@@ -44,28 +43,30 @@ namespace MachineJob.Service
new AddressUnit() { Area = "DB1", Address = 16, DataType = typeof(short), Id = "9", Name = "Test9" },
new AddressUnit() { Area = "DB1", Address = 18, DataType = typeof(short), Id = "10", Name = "Test10" }
};
*/
IMachine<string> machine = new ModbusMachine<string, string>("ModbusMachine1", ModbusType.Tcp, "192.168.0.161", _addresses, true, 1, 2, Endian.BigEndianLsb);
//IMachine<string> machine2 = new SiemensMachine<string, string>("SiemensMachine1", SiemensType.Tcp, "192.168.0.161", SiemensMachineModel.S7_1200, _addresses2, true, 1, 2);
await MachineJobSchedulerCreator.CreateScheduler("Trigger1", -1, 5).Result.From(machine.Id, machine, MachineDataType.Name).Result.Query(machine.Id + ".ConsoleQuery", QueryConsole).Result.To(machine.Id + ".To", machine).Result.Deal(machine.Id+".Deal", OnSuccess, OnFailure).Result.Run();
//await MachineJobSchedulerCreator.CreateScheduler("Trigger2", -1, 5).Result.From(machine2.Id, machine2, MachineDataType.Name).Result.Query(machine2.Id + ".ConsoleQuery", QueryConsole).Result.To(machine2.Id + ".To", machine2).Result.Deal(machine2.Id + ".Deal", OnSuccess, OnFailure).Result.Run();
IMachine<string> machine = new ModbusMachine<string, string>("ModbusMachine1", ModbusType.Tcp, "192.168.0.161", _addresses, true, 1, 2, Endian.BigEndianLsb);
IMachine<string> machine2 = new SiemensMachine<string, string>("SiemensMachine1", SiemensType.Tcp, "192.168.0.161", SiemensMachineModel.S7_1200, _addresses2, true, 1, 2);
await MachineJobSchedulerCreator.CreateScheduler("Trigger1", -1, 10).Result.From(machine.Id, machine, MachineDataType.Name).Result.Query(machine.Id + ".ConsoleQuery", QueryConsole).Result.To(machine.Id + ".To", machine).Result.Deal(machine.Id + ".Deal", OnSuccess, OnFailure).Result.Run();
Thread.Sleep(5000);
await MachineJobSchedulerCreator.CreateScheduler("Trigger2", -1, 10).Result.From(machine2.Id, machine2, MachineDataType.Name).Result.Query(machine2.Id + ".ConsoleQuery", QueryConsole).Result.To(machine2.Id + ".To", machine2).Result.Deal(machine2.Id + ".Deal", OnSuccess, OnFailure).Result.Run();
}
public override async Task StopAsync(CancellationToken cancellationToken)
{
await MachineJobSchedulerCreator.CancelJob("Trigger1");
await MachineJobSchedulerCreator.CancelJob("Trigger2");
}
public Task OnSuccess(string machineId)
{
Console.WriteLine("Machine {0} set success", machineId);
_logger.LogInformation("Machine {0} set success", machineId);
return Task.CompletedTask;
}
public Task OnFailure(string machineId)
{
Console.WriteLine("Machine {0} set failure", machineId);
_logger.LogError("Machine {0} set failure", machineId);
return Task.CompletedTask;
}
@@ -74,7 +75,7 @@ namespace MachineJob.Service
var values = dataReturnDef.ReturnValues;
foreach (var value in values)
{
Console.WriteLine(dataReturnDef.MachineId + " " + value.Key + " " + value.Value.DeviceValue);
_logger.LogInformation(dataReturnDef.MachineId + " " + value.Key + " " + value.Value.DeviceValue);
}
try

7
Samples/MachineJob/appsettings.json
View File

@@ -1,9 +1,12 @@
{
"Logging": {
"LogLevel": {
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
}
},
"ConnectionStrings": {
"DatabaseWriteConnectionString": "Server=localhost; User ID=root; Password=123456; Database=modbusnettest;"

7
Samples/TripleAdd/Models/TripleAddViewModel.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace TripleAdd.Models
namespace TripleAdd.Models
{
public class TripleAddViewModel
{

4
Tests/Modbus.Net.PersistedTests/Modbus.Net.PersistedTests.csproj
View File

@@ -6,7 +6,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
</ItemGroup>
<ItemGroup>

15
Tests/Modbus.Net.PersistedTests/Program.cs
View File

@@ -1,11 +1,18 @@
using System;
using System.Collections.Generic;
using Microsoft.Extensions.Logging;
using Modbus.Net;
using Modbus.Net.Modbus;
using Serilog;
using System;
using System.Collections.Generic;
Log.Logger = new LoggerConfiguration()
.MinimumLevel.Information()
.WriteTo.Console()
.CreateLogger();
Log.Logger = new LoggerConfiguration().MinimumLevel.Verbose().WriteTo.Console().CreateLogger();
var loggerFactory = new LoggerFactory()
.AddSerilog(Log.Logger);
LogProvider.SetLogProvider(loggerFactory);
ModbusMachine<int, string> machine = new ModbusMachine<int, string>(1, ModbusType.Rtu, "COM1",
new List<AddressUnit>()
@@ -92,7 +99,7 @@ ModbusMachine<int, string> machine3 = new ModbusMachine<int, string>(3, ModbusTy
},
}, true, 4, 1);
Random r = new Random();
await MachineJobSchedulerCreator.CreateScheduler("Trigger1", -1, 10).Result.ApplyTo(machine.Id+".Apply", new Dictionary<string, double>() {{
await MachineJobSchedulerCreator.CreateScheduler("Trigger1", -1, 10).Result.ApplyTo(machine.Id + ".Apply", new Dictionary<string, double>() {{
"4X 1.0", r.Next() % 65536
},
{

5
Tests/Modbus.Net.Tests/BaseTest.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Modbus.Net.Modbus;
using Modbus.Net.Siemens;

7
Tests/Modbus.Net.Tests/EndianTest.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Modbus.Net.Modbus;
namespace Modbus.Net.Tests

8
Tests/Modbus.Net.Tests/MachineMethodTest.cs
View File

@@ -1,10 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Modbus.Net.Modbus;
using System.Reflection;
namespace Modbus.Net.Tests
{

6
Tests/Modbus.Net.Tests/ModbusMultiStationTest.cs
View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Modbus.Net.Modbus;
namespace Modbus.Net.Tests

5
Tests/Modbus.Net.Tests/ModbusTest.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Modbus.Net.Modbus;
namespace Modbus.Net.Tests

6
Tests/Modbus.Net.Tests/SiemensTest.cs
View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Modbus.Net.Modbus;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Modbus.Net.Siemens;
namespace Modbus.Net.Tests