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

2015-10-26 type recode

Browse Source
This commit is contained in:
parallelbgls@outlook.com
2015-10-26 14:52:56 +08:00
parent 118a5919ae
commit 13f13ffe4d
1 changed files with 88 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
Modbus.Net/ModBus.Net/FBox/SignalRConnector.cs
View File

@@ -166,76 +166,96 @@ namespace ModBus.Net.FBox
} }
foreach (var dMonEntry in dataGroup.DMonEntries) foreach (var dMonEntry in dataGroup.DMonEntries)
{ {
switch (dMonEntry.DataType) Type type;
switch (dMonEntry.DataType)
{
//位
case 0:
{ {
case 1: type = typeof (bool);
{ break;
Type type = typeof(ushort);
if (!_machineDataType[groupName].ContainsKey(dMonEntry.Desc))
{
_machineDataType[groupName].Add(dMonEntry.Desc, type);
}
else
{
_machineDataType[groupName][dMonEntry.Desc] = type;
}
break;
}
case 2:
{
Type type = typeof (short);
if (!_machineDataType[groupName].ContainsKey(dMonEntry.Desc))
{
_machineDataType[groupName].Add(dMonEntry.Desc, type);
}
else
{
_machineDataType[groupName][dMonEntry.Desc] = type;
}
break;
}
case 3:
{
Type type = typeof (uint);
if (!_machineDataType[groupName].ContainsKey(dMonEntry.Desc))
{
_machineDataType[groupName].Add(dMonEntry.Desc, type);
}
else
{
_machineDataType[groupName][dMonEntry.Desc] = type;
}
break;
}
case 4:
{
Type type = typeof (int);
if (!_machineDataType[groupName].ContainsKey(dMonEntry.Desc))
{
_machineDataType[groupName].Add(dMonEntry.Desc, type);
}
else
{
_machineDataType[groupName][dMonEntry.Desc] = type;
}
break;
}
case 7:
{
Type type = typeof (float);
if (!_machineDataType[groupName].ContainsKey(dMonEntry.Desc))
{
_machineDataType[groupName].Add(dMonEntry.Desc, type);
}
else
{
_machineDataType[groupName][dMonEntry.Desc] = type;
}
break;
}
} }
//16位无符号
case 1:
{
type = typeof (ushort);
break;
}
//16位有符号
case 2:
{
type = typeof (short);
break;
}
//32位无符号
case 11:
{
type = typeof (uint);
break;
}
//32位有符号
case 12:
{
type = typeof (int);
break;
}
//16位BCD
case 3:
{
type = typeof (short);
break;
}
//32位BCD
case 13:
{
type = typeof (int);
break;
}
//浮点数
case 16:
{
type = typeof (float);
break;
}
//16位16进制
case 4:
{
type = typeof (short);
break;
}
//32位16进制
case 14:
{
type = typeof (int);
break;
}
//16位2进制
case 5:
{
type = typeof (short);
break;
}
//32位2进制
case 15:
{
type = typeof (int);
break;
}
default:
{
type = typeof (short);
break;
}
}
if (!_machineDataType[groupName].ContainsKey(dMonEntry.Desc))
{
_machineDataType[groupName].Add(dMonEntry.Desc, type);
}
else
{
_machineDataType[groupName][dMonEntry.Desc] = type;
}
} }
hubConnection.Headers.Add("Authorization", "Bearer " + token); hubConnection.Headers.Add("Authorization", "Bearer " + token);