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

Clean

Browse Source
This commit is contained in:
luosheng
2023-07-16 08:17:03 +08:00
parent 6d655b24d1
commit 2055c10c59
127 changed files with 7414 additions and 7470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Modbus.Net/Modbus.Net.BigEndian3412/Modbus.Net.BigEndian3412ValueHelper.cs
View File

@@ -40,11 +40,11 @@ namespace Modbus.Net
{
Array.Reverse(data, pos, 4);
byte temp;
temp = data[pos]; data[pos] = data[pos+2]; data[pos+2] = temp;
temp = data[pos+1]; data[pos+1] = data[pos+3]; data[pos+3] = temp;
temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp;
temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp;
var t = BitConverter.ToSingle(data, pos);
temp = data[pos]; data[pos] = data[pos+2]; data[pos+2] = temp;
temp = data[pos+1]; data[pos+1] = data[pos+3]; data[pos+3] = temp;
temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp;
temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp;
Array.Reverse(data, pos, 4);
pos += 4;
return t;

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

@@ -21,7 +21,7 @@ namespace Modbus.Net.Modbus
/// <param name="masterAddress">主站号</param>
/// <param name="endian">端格式</param>
public ModbusMachine(TKey id, ModbusType connectionType, string connectionString,
IEnumerable<AddressUnit<TUnitKey, int ,int>> getAddresses, bool keepConnect, byte slaveAddress, byte masterAddress,
IEnumerable<AddressUnit<TUnitKey, int, int>> getAddresses, bool keepConnect, byte slaveAddress, byte masterAddress,
Endian endian)
: base(id, getAddresses, keepConnect, slaveAddress, masterAddress)
{

2
Modbus.Net/Modbus.Net.Opc/OpcConnector.cs
View File

@@ -130,7 +130,7 @@ namespace Modbus.Net.Opc
{
Success = false,
Value = Encoding.ASCII.GetBytes("NoData")
};
};
}
else
{

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

@@ -136,7 +136,7 @@ namespace Modbus.Net
else if (length == 0) return null;
else
{
duplicatedMessages = new List<(byte[],bool)>();
duplicatedMessages = new List<(byte[], bool)>();
var skipLength = 0;
while (receiveMessageCopy.Length >= length)
{
@@ -160,7 +160,7 @@ namespace Modbus.Net
if (length == 0) return null;
}
if (skipLength > 0)
{
{
lock (WaitingMessages)
{
var def = GetMessageFromWaitingList(null);
@@ -175,7 +175,7 @@ namespace Modbus.Net
}
def.ReceiveMutex.Set();
}
}
}
return null;
}
}

5
Modbus.Net/Modbus.Net/Enum/Enum.cs
View File

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

6
Modbus.Net/Modbus.Net/Helper/AssemblyHelper.cs
View File

@@ -1,10 +1,6 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace Modbus.Net
{

6
Modbus.Net/Modbus.Net/Helper/EnumHelper.cs
View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace Modbus.Net
namespace Modbus.Net
{
#if NET462
#pragma warning disable 1591

4
Modbus.Net/Modbus.Net/Helper/ValueHelper.cs
View File

@@ -313,13 +313,13 @@ namespace Modbus.Net
}
foreach (var assembly in AssemblyHelper.GetAllLibraryAssemblies())
{
var valueHelper = assembly.GetType("Modbus.Net."+endian.ToString() + "ValueHelper")?.GetProperty("Instance")?.GetValue(null, null) as ValueHelper;
var valueHelper = assembly.GetType("Modbus.Net." + endian.ToString() + "ValueHelper")?.GetProperty("Instance")?.GetValue(null, null) as ValueHelper;
if (valueHelper != null)
{
EndianInstanceCache[endian.ToString()] = valueHelper;
return valueHelper;
}
}
throw new NotImplementedException("ValueHelper " + endian.ToString() + " doesn't exist.");
}

4
Modbus.Net/Modbus.Net/Job/JobChainingJobLIstenerWithDataMapRepeated.cs
View File

@@ -1,8 +1,6 @@
using Quartz;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -41,7 +39,7 @@ namespace Modbus.Net
if (sj == null)
{
var chainRoot = context.JobDetail.Key;
var chainParent = ChainLinks.FirstOrDefault(p => p.Value == context.JobDetail.Key).Key;
var chainParent = ChainLinks.FirstOrDefault(p => p.Value == context.JobDetail.Key).Key;
while (chainParent != null)
{
chainRoot = chainParent;

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

@@ -90,7 +90,7 @@ namespace Modbus.Net
var jobKeys = await scheduler.GetJobKeys(GroupMatcher<JobKey>.GroupEquals("Modbus.Net.DataQuery.Group." + triggerKey));
await scheduler.DeleteJobs(jobKeys);
return new MachineGetJobScheduler<TMachineMethod, TMachineKey, TReturnUnit>(scheduler, trigger);
return new MachineGetJobScheduler<TMachineMethod, TMachineKey, TReturnUnit>(scheduler, trigger);
}
/// <summary>

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

@@ -1,5 +1,4 @@
using Microsoft.Extensions.Logging;
using Quartz.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -646,7 +645,7 @@ namespace Modbus.Net
ErrorMsg = "Data length mismatch"
};
}
//字节坐标的主地址位置
var localMainPos = 0;
//字节坐标的子地址位置
@@ -720,7 +719,7 @@ namespace Modbus.Net
};
}
}
//如果不保持连接，断开连接
if (!KeepConnect)
BaseUtility.Disconnect();
@@ -873,7 +872,7 @@ namespace Modbus.Net
}
//将要写入的值加入队列
var data = Convert.ChangeType(value.Value / addressUnit.Zoom, dataType);
//写入数据
await
BaseUtility.GetUtilityMethods<IUtilityMethodDatas>().SetDatasAsync(address,