test/iotgateway
1
0
Fork 0
mirror of https://gitee.com/iioter/iotgateway.git synced 2024-11-29 18:28:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/iioter/iotgateway

Browse Source
This commit is contained in:
iioter 2024-01-02 16:52:52 +08:00
commit a531ae3359
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -631,7 +631,9 @@ namespace PLC.ModBusMaster
break; break;
case DataTypeEnum.Float: case DataTypeEnum.Float:
var f = float.Parse(ioArg.Value.ToString()); var f = float.Parse(ioArg.Value.ToString());
ModBusDataConvert.SetReal(shortArray, 0, f); var fValue = BitConverter.SingleToUInt32Bits(f);
shortArray[1] = (ushort)(fValue & 0xffff);
shortArray[0] = (ushort)(fValue >> 16 & 0xffff);
toWriteArray = ChangeBuffersOrder(shortArray, ioArg.EndianType); toWriteArray = ChangeBuffersOrder(shortArray, ioArg.EndianType);
await _master.WriteMultipleRegistersAsync(slaveAddress, address, toWriteArray); await _master.WriteMultipleRegistersAsync(slaveAddress, address, toWriteArray);
break; break;

3
Plugins/Plugin/DeviceThread.cs
View File

@ -289,7 +289,8 @@ namespace Plugin
{ {
Address = deviceVariable.DeviceAddress, Address = deviceVariable.DeviceAddress,
Value = para.Value, Value = para.Value,
ValueType = deviceVariable.DataType ValueType = deviceVariable.DataType,
EndianType = deviceVariable.EndianType
}; };
var writeResponse = Driver var writeResponse = Driver
.WriteAsync(e.RequestId, deviceVariable.Method, ioArgModel).Result; .WriteAsync(e.RequestId, deviceVariable.Method, ioArgModel).Result;