maier_st/Sharp7Reactive
1
0
Fork 0
mirror of https://github.com/evopro-ag/Sharp7Reactive.git synced 2025-12-16 11:42:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed byte conversion for float and long

Browse Source
This commit is contained in:
Federico Barresi
2019-11-21 14:42:59 +01:00
parent dcac7002f9
commit 0f3125fe20
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Sharp7.Rx/Sharp7Plc.cs
View File

@@ -1,4 +1,5 @@
using System; using System;
using System.Linq;
using System.Reactive; using System.Reactive;
using System.Reactive.Linq; using System.Reactive.Linq;
using System.Reactive.Subjects; using System.Reactive.Subjects;
@@ -84,19 +85,27 @@ namespace Sharp7.Rx
if (address.Length == 4) if (address.Length == 4)
{ {
Array.Reverse(b); Array.Reverse(b);
return (TValue)(object)Convert.ToInt32(b); return (TValue)(object)BitConverter.ToInt32(b,0);
} }
throw new InvalidOperationException($"length must be 2 or 4 but is {address.Length}"); throw new InvalidOperationException($"length must be 2 or 4 but is {address.Length}");
} }
if (typeof(TValue) == typeof(long))
{
var b = await s7Connector.ReadBytes(address.Operand, address.Start, address.Length, address.DbNr, token);
token.ThrowIfCancellationRequested();
Array.Reverse(b);
return (TValue)(object)BitConverter.ToInt64(b,0);
}
if (typeof(TValue) == typeof(ulong)) if (typeof(TValue) == typeof(ulong))
{ {
var b = await s7Connector.ReadBytes(address.Operand, address.Start, address.Length, address.DbNr, token); var b = await s7Connector.ReadBytes(address.Operand, address.Start, address.Length, address.DbNr, token);
token.ThrowIfCancellationRequested(); token.ThrowIfCancellationRequested();
Array.Reverse(b); Array.Reverse(b);
return (TValue)(object)Convert.ToUInt64(b); return (TValue)(object)BitConverter.ToUInt64(b, 0);
} }
if (typeof(TValue) == typeof(short)) if (typeof(TValue) == typeof(short))
@@ -125,7 +134,7 @@ namespace Sharp7.Rx
{ {
var bytes = await s7Connector.ReadBytes(address.Operand, address.Start, 4, address.DbNr, token); var bytes = await s7Connector.ReadBytes(address.Operand, address.Start, 4, address.DbNr, token);
token.ThrowIfCancellationRequested(); token.ThrowIfCancellationRequested();
var d = Convert.ToSingle(bytes); var d = BitConverter.ToSingle(bytes.Reverse().ToArray(),0);
return (TValue)(object)d; return (TValue)(object)d;
} }