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

2015-05-26 update 1 extend fix to support project

Browse Source
This commit is contained in:
parallelbgls@outlook.com
2015-05-26 15:24:50 +08:00
parent 3ca9e55ba3
commit a0e1009e4e
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Modbus.Net/ModBus.Net/BaseMachine.cs
View File

@@ -6,7 +6,7 @@ namespace ModBus.Net
{ {
public abstract class BaseMachine : IMachineProperty public abstract class BaseMachine : IMachineProperty
{ {
public string Id { get; set; } public int Id { get; set; }
public string ProjectName { get; set; } public string ProjectName { get; set; }
@@ -21,6 +21,8 @@ namespace ModBus.Net
public AddressCombiner AddressCombiner { get; set; } public AddressCombiner AddressCombiner { get; set; }
public MachineExtend MachineExtend { get; set; }
protected IEnumerable<CommunicationUnit> CommunicateAddresses protected IEnumerable<CommunicationUnit> CommunicateAddresses
{ {
get { return AddressCombiner.Combine(GetAddresses); } get { return AddressCombiner.Combine(GetAddresses); }
@@ -61,7 +63,7 @@ namespace ModBus.Net
p => p.Area == communicateAddress.Area && p.Address == pos + communicateAddress.Address); p => p.Area == communicateAddress.Area && p.Address == pos + communicateAddress.Address);
if (address != null) if (address != null)
{ {
ans.Add(address.CommunicationTag, new ReturnUnit{PlcValue = String.Format("{0:#0.#}", Math.Round(Single.Parse(ValueHelper.Instance.GetValue(datas, ref pos, address.DataType).ToString()) * address.Zoom, 3)),ExtendUnit = address.ExtendUnit}); ans.Add(address.CommunicationTag, new ReturnUnit{PlcValue = String.Format("{0:#0.#}", Math.Round(Single.Parse(ValueHelper.Instance.GetValue(datas, ref pos, address.DataType).ToString()) * address.Zoom, 3)),UnitExtend = address.UnitExtend});
} }
else else
{ {
@@ -108,7 +110,12 @@ namespace ModBus.Net
public Type DataType { get; set; } public Type DataType { get; set; }
} }
public class ExtendUnit public class UnitExtend
{
}
public class MachineExtend
{ {
} }
@@ -116,7 +123,7 @@ namespace ModBus.Net
public class ReturnUnit public class ReturnUnit
{ {
public string PlcValue { get; set; } public string PlcValue { get; set; }
public ExtendUnit ExtendUnit { get; set; } public UnitExtend UnitExtend { get; set; }
} }
public class AddressUnit public class AddressUnit
@@ -139,7 +146,7 @@ namespace ModBus.Net
public string Name { get; set; } public string Name { get; set; }
public string Unit { get; set; } public string Unit { get; set; }
public ExtendUnit ExtendUnit { get; set; } public UnitExtend UnitExtend { get; set; }
} }
public struct AddressUnitEqualityComparer : IEqualityComparer<AddressUnit> public struct AddressUnitEqualityComparer : IEqualityComparer<AddressUnit>
@@ -157,7 +164,7 @@ namespace ModBus.Net
public interface IMachineProperty public interface IMachineProperty
{ {
string Id { get; set; } int Id { get; set; }
string ProjectName { get; set; } string ProjectName { get; set; }
string MachineName { get; set; } string MachineName { get; set; }
string ConnectionToken { get; } string ConnectionToken { get; }

8
Modbus.Net/ModBus.Net/TaskManager.cs
View File

@@ -191,7 +191,7 @@ namespace ModBus.Net
} }
} }
public delegate void ReturnValuesDelegate(KeyValuePair<string, Dictionary<string,ReturnUnit>> returnValue); public delegate void ReturnValuesDelegate(KeyValuePair<int, Dictionary<string,ReturnUnit>> returnValue);
public event ReturnValuesDelegate ReturnValues; public event ReturnValuesDelegate ReturnValues;
@@ -273,7 +273,7 @@ namespace ModBus.Net
} }
} }
public void RemoveMachineWithId(string id) public void RemoveMachineWithId(int id)
{ {
lock (_machines) lock (_machines)
{ {
@@ -335,7 +335,7 @@ namespace ModBus.Net
var ans = _tasks.StartNew(machine.GetDatas).Result; var ans = _tasks.StartNew(machine.GetDatas).Result;
if (ReturnValues != null) if (ReturnValues != null)
{ {
ReturnValues(new KeyValuePair<string, Dictionary<string,ReturnUnit>>(machine.Id, ans)); ReturnValues(new KeyValuePair<int, Dictionary<string,ReturnUnit>>(machine.Id, ans));
} }
} }
catch (Exception e) catch (Exception e)
@@ -343,7 +343,7 @@ namespace ModBus.Net
if (ReturnValues != null) if (ReturnValues != null)
{ {
ReturnValues(new KeyValuePair<string, Dictionary<string,ReturnUnit>>(machine.Id, null)); ReturnValues(new KeyValuePair<int, Dictionary<string,ReturnUnit>>(machine.Id, null));
} }
} }
} }