ciro_xu/iotgateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'iioter:master' into master

Browse Source
This commit is contained in:
AbdalaMask 2023-12-26 07:01:58 +02:00 committed by GitHub
commit 862a6ecacc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 56 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Plugins/Drivers/PLC.ModBusMaster/DeviceModBusMaster.cs
View File

@ -622,25 +622,73 @@ namespace PLC.ModBusMaster
if (method == nameof(HoldingRegisters)) if (method == nameof(HoldingRegisters))
{ {
ushort[] shortArray = new ushort[count]; ushort[] shortArray = new ushort[count];
ushort[] toWriteArray = null;
switch (ioArg.ValueType) switch (ioArg.ValueType)
{ {
case DataTypeEnum.AsciiString: case DataTypeEnum.AsciiString:
ModBusDataConvert.SetString(shortArray, 0, ioArg.Value.ToString()); ModBusDataConvert.SetString(shortArray, 0, ioArg.Value.ToString());
await _master.WriteMultipleRegistersAsync(slaveAddress, address, shortArray); await _master.WriteMultipleRegistersAsync(slaveAddress, address, shortArray);
break; break;
case DataTypeEnum.Float: case DataTypeEnum.Float:
float f = 0; var f = float.Parse(ioArg.Value.ToString());
float.TryParse(ioArg.Value.ToString(), out f);
ModBusDataConvert.SetReal(shortArray, 0, f); ModBusDataConvert.SetReal(shortArray, 0, f);
toWriteArray = ChangeBuffersOrder(shortArray, ioArg.EndianType);
await _master.WriteMultipleRegistersAsync(slaveAddress, address, toWriteArray);
break;
case DataTypeEnum.Int16:
shortArray[0] = (ushort)short.Parse(ioArg.Value.ToString());
toWriteArray = ChangeBuffersOrder(shortArray, ioArg.EndianType);
await _master.WriteMultipleRegistersAsync(slaveAddress, address, toWriteArray);
break;
case DataTypeEnum.Uint16:
shortArray[0] = ushort.Parse(ioArg.Value.ToString());
toWriteArray = ChangeBuffersOrder(shortArray, ioArg.EndianType);
await _master.WriteMultipleRegistersAsync(slaveAddress, address, toWriteArray);
break;
case DataTypeEnum.Int32:
var int32Value = int.Parse(ioArg.Value.ToString());
shortArray[1] = (ushort)(int32Value & 0xffff);
shortArray[0] = (ushort)(int32Value >> 16 & 0xffff);
toWriteArray = ChangeBuffersOrder(shortArray, ioArg.EndianType);
await _master.WriteMultipleRegistersAsync(slaveAddress, address, toWriteArray);
break;
case DataTypeEnum.Uint32:
var uInt32Value = uint.Parse(ioArg.Value.ToString());
shortArray[1] = (ushort)(uInt32Value & 0xffff);
shortArray[0] = (ushort)(uInt32Value >> 16 & 0xffff);
toWriteArray = ChangeBuffersOrder(shortArray, ioArg.EndianType);
await _master.WriteMultipleRegistersAsync(slaveAddress, address, toWriteArray);
break;
case DataTypeEnum.Int64:
var int64Value = long.Parse(ioArg.Value.ToString());
shortArray[3] = (ushort)(int64Value & 0xffff);
shortArray[2] = (ushort)(int64Value >> 16 & 0xffff);
shortArray[1] = (ushort)(int64Value >> 32 & 0xffff);
shortArray[0] = (ushort)(int64Value >> 48 & 0xffff);
toWriteArray = ChangeBuffersOrder(shortArray, ioArg.EndianType);
await _master.WriteMultipleRegistersAsync(slaveAddress, address, shortArray); await _master.WriteMultipleRegistersAsync(slaveAddress, address, shortArray);
break;
case DataTypeEnum.Uint64:
var uInt64Value = ulong.Parse(ioArg.Value.ToString());
shortArray[3] = (ushort)(uInt64Value & 0xffff);
shortArray[2] = (ushort)(uInt64Value >> 16 & 0xffff);
shortArray[1] = (ushort)(uInt64Value >> 32 & 0xffff);
shortArray[0] = (ushort)(uInt64Value >> 48 & 0xffff);
toWriteArray = ChangeBuffersOrder(shortArray, ioArg.EndianType);
await _master.WriteMultipleRegistersAsync(slaveAddress, address, shortArray);
break;
case DataTypeEnum.Double:
double d = double.Parse(ioArg.Value.ToString());
var ulongValue = BitConverter.DoubleToUInt64Bits(d);
shortArray[3] = (ushort)(ulongValue & 0xffff);
shortArray[2] = (ushort)(ulongValue >> 16 & 0xffff);
shortArray[1] = (ushort)(ulongValue >> 32 & 0xffff);
shortArray[0] = (ushort)(ulongValue >> 48 & 0xffff);
toWriteArray = ChangeBuffersOrder(shortArray, ioArg.EndianType);
await _master.WriteMultipleRegistersAsync(slaveAddress, address, toWriteArray.ToArray());
break; break;
default: default:
await _master.WriteSingleRegisterAsync(slaveAddress, address, throw new ArgumentException("数据类型未实现写入");
ushort.Parse(ioArg.Value.ToString()));
break;
} }
rpcResponse.IsSuccess = true; rpcResponse.IsSuccess = true;

BIN
drivers/net6.0/PLC.ModBusMaster.dll
View File

Binary file not shown.

BIN
drivers/net6.0/PLC.ModBusMaster.pdb
View File

Binary file not shown.

BIN
drivers/net6.0/System.IO.Ports.dll
View File

Binary file not shown.