Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/TestModbusArrayReverse'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-06-21 16:11:17 +02:00
parent 3cb33197e6 9269c8db4f
commit 33055fc66f
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+2 -2
View File
@@ -112,8 +112,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>ExtLib\krcc.dll</HintPath>
</Reference>
<Reference Include="MapoSDK, Version=6.14.2205.3011, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2205.3011\lib\MapoSDK.dll</HintPath>
<Reference Include="MapoSDK, Version=6.14.2206.2116, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2206.2116\lib\MapoSDK.dll</HintPath>
</Reference>
<Reference Include="MathNet.Numerics, Version=4.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MathNet.Numerics.4.15.0\lib\net461\MathNet.Numerics.dll</HintPath>
IOB-WIN-NEXT/IobModbusTCP.cs
+16
View File
@@ -1050,6 +1050,7 @@ namespace IOB_WIN_NEXT
switch (tipoMem)
{
case plcDataType.Real:
case plcDataType.FloatABCD:
if (size == 4)
{
valore = ModbusClient.ConvertRegistersToDouble(listInt);
@@ -1060,6 +1061,21 @@ namespace IOB_WIN_NEXT
}
break;
case plcDataType.FloatCDAB:
if (size == 4)
{
// invero array...
Array.Reverse(listInt);
valore = ModbusClient.ConvertRegistersToDouble(listInt);
}
else if (size == 2)
{
// non serve cambaire nulla...
valore = ModbusClient.ConvertRegistersToFloat(listInt);
}
break;
// caso speciale x Cedax, che usa HighVal moltiplicato x 32768...
case plcDataType.HLPInt:
if (size == 4)
IOB-WIN-NEXT/packages.config
+1 -1
View File
@@ -6,7 +6,7 @@
<package id="EgwProxy.MultiCncLib" version="3.6.2205.2319" targetFramework="net462" />
<package id="EgwProxy.OsaiCncLib" version="3.6.2205.2015" targetFramework="net462" />
<package id="EntityFramework" version="6.4.4" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2205.3011" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2206.2116" targetFramework="net462" />
<package id="MathNet.Numerics" version="4.15.0" targetFramework="net462" />
<package id="Microsoft.CodeAnalysis.NetAnalyzers" version="6.0.0" targetFramework="net462" developmentDependency="true" />
<package id="Microsoft.VisualStudio.SlowCheetah" version="4.0.8" targetFramework="net462" developmentDependency="true" />