Egalware/cms-core-active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/S7Net' into feature/S7Net

Browse Source
This commit is contained in:
Thermo_SIM
2021-03-19 22:22:48 +01:00
parent a5ada18ced d43f8752f3
commit 0a718cd38d
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_CORE_Library/CMS_CORE_Library.csproj
+2 -2
View File
@@ -103,8 +103,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>libs\CndexLinkDotNet.dll</HintPath>
</Reference>
<Reference Include="S7.Net, Version=0.8.1.0, Culture=neutral, PublicKeyToken=d5812d469e84c693, processorArchitecture=MSIL">
<HintPath>..\packages\S7netplus.0.8.1\lib\net452\S7.Net.dll</HintPath>
<Reference Include="S7.Net, Version=0.4.0.0, Culture=neutral, PublicKeyToken=d5812d469e84c693, processorArchitecture=MSIL">
<HintPath>..\..\cms_thermo_active\packages\S7netplus.0.4.0\lib\net452\S7.Net.dll</HintPath>
</Reference>
<Reference Include="Siemens.Sinumerik.Operate.Services, Version=4.7.3.2, Culture=neutral, PublicKeyToken=bdd90fa02fd1c4ee, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
CMS_CORE_Library/Models/ThermoModels.cs
+6 -6
View File
@@ -556,12 +556,12 @@ namespace CMS_CORE_Library.Models
Buffer.BlockCopy(S7.Net.Types.DInt.ToByteArray(TimeVacuum), 0, answ, 14, 4);
Buffer.BlockCopy(S7.Net.Types.DInt.ToByteArray(TimeCycleGross), 0, answ, 18, 4);
Buffer.BlockCopy(S7.Net.Types.DInt.ToByteArray(TimeCycleNet), 0, answ, 22, 4);
Buffer.BlockCopy(S7.Net.Types.Real.ToByteArray(MaterialTempEndWarm), 0, answ, 26, 4);
Buffer.BlockCopy(S7.Net.Types.Real.ToByteArray(MaterialTempEndVent), 0, answ, 30, 4);
Buffer.BlockCopy(S7.Net.Types.Real.ToByteArray(MoldTemp), 0, answ, 34, 4);
Buffer.BlockCopy(S7.Net.Types.Real.ToByteArray(VacuumReadVal), 0, answ, 38, 4);
Buffer.BlockCopy(S7.Net.Types.Real.ToByteArray(MouldEnergyOUT), 0, answ, 42, 4);
Buffer.BlockCopy(S7.Net.Types.Real.ToByteArray(MouldEnergyIN), 0, answ, 46, 4);
Buffer.BlockCopy(S7.Net.Types.Single.ToByteArray(MaterialTempEndWarm), 0, answ, 26, 4);
Buffer.BlockCopy(S7.Net.Types.Single.ToByteArray(MaterialTempEndVent), 0, answ, 30, 4);
Buffer.BlockCopy(S7.Net.Types.Single.ToByteArray(MoldTemp), 0, answ, 34, 4);
Buffer.BlockCopy(S7.Net.Types.Single.ToByteArray(VacuumReadVal), 0, answ, 38, 4);
Buffer.BlockCopy(S7.Net.Types.Single.ToByteArray(MouldEnergyOUT), 0, answ, 42, 4);
Buffer.BlockCopy(S7.Net.Types.Single.ToByteArray(MouldEnergyIN), 0, answ, 46, 4);
return answ;
}
CMS_CORE_Library/S7Net/Nc_S7Net.cs
+16 -16
View File
@@ -3734,12 +3734,12 @@ namespace CMS_CORE_Library.S7Net
TimeVacuum = S7.Net.Types.DInt.FromByteArray(currMem.Skip(14).Take(4).ToArray()),
TimeCycleGross = S7.Net.Types.DInt.FromByteArray(currMem.Skip(18).Take(4).ToArray()),
TimeCycleNet = S7.Net.Types.DInt.FromByteArray(currMem.Skip(22).Take(4).ToArray()),
MaterialTempEndWarm = S7.Net.Types.Real.FromByteArray(currMem.Skip(26).Take(4).ToArray()),
MaterialTempEndVent = S7.Net.Types.Real.FromByteArray(currMem.Skip(30).Take(4).ToArray()),
MoldTemp = S7.Net.Types.Real.FromByteArray(currMem.Skip(34).Take(4).ToArray()),
VacuumReadVal = S7.Net.Types.Real.FromByteArray(currMem.Skip(38).Take(4).ToArray()),
MouldEnergyOUT = S7.Net.Types.Real.FromByteArray(currMem.Skip(42).Take(4).ToArray()),
MouldEnergyIN = S7.Net.Types.Real.FromByteArray(currMem.Skip(46).Take(4).ToArray()),
MaterialTempEndWarm = S7.Net.Types.Single.FromByteArray(currMem.Skip(26).Take(4).ToArray()),
MaterialTempEndVent = S7.Net.Types.Single.FromByteArray(currMem.Skip(30).Take(4).ToArray()),
MoldTemp = S7.Net.Types.Single.FromByteArray(currMem.Skip(34).Take(4).ToArray()),
VacuumReadVal = S7.Net.Types.Single.FromByteArray(currMem.Skip(38).Take(4).ToArray()),
MouldEnergyOUT = S7.Net.Types.Single.FromByteArray(currMem.Skip(42).Take(4).ToArray()),
MouldEnergyIN = S7.Net.Types.Single.FromByteArray(currMem.Skip(46).Take(4).ToArray()),
NumPreHot = S7.Net.Types.Int.FromByteArray(currMem.Skip(50).Take(2).ToArray())
};
@@ -4541,12 +4541,12 @@ namespace CMS_CORE_Library.S7Net
TimeVacuum = S7.Net.Types.DInt.FromByteArray(currMem.Skip(14).Take(4).ToArray()),
TimeCycleGross = S7.Net.Types.DInt.FromByteArray(currMem.Skip(18).Take(4).ToArray()),
TimeCycleNet = S7.Net.Types.DInt.FromByteArray(currMem.Skip(22).Take(4).ToArray()),
MaterialTempEndWarm = S7.Net.Types.Real.FromByteArray(currMem.Skip(26).Take(4).ToArray()),
MaterialTempEndVent = S7.Net.Types.Real.FromByteArray(currMem.Skip(30).Take(4).ToArray()),
MoldTemp = S7.Net.Types.Real.FromByteArray(currMem.Skip(34).Take(4).ToArray()),
VacuumReadVal = S7.Net.Types.Real.FromByteArray(currMem.Skip(38).Take(4).ToArray()),
MouldEnergyOUT = S7.Net.Types.Real.FromByteArray(currMem.Skip(42).Take(4).ToArray()),
MouldEnergyIN = S7.Net.Types.Real.FromByteArray(currMem.Skip(46).Take(4).ToArray()),
MaterialTempEndWarm = S7.Net.Types.Single.FromByteArray(currMem.Skip(26).Take(4).ToArray()),
MaterialTempEndVent = S7.Net.Types.Single.FromByteArray(currMem.Skip(30).Take(4).ToArray()),
MoldTemp = S7.Net.Types.Single.FromByteArray(currMem.Skip(34).Take(4).ToArray()),
VacuumReadVal = S7.Net.Types.Single.FromByteArray(currMem.Skip(38).Take(4).ToArray()),
MouldEnergyOUT = S7.Net.Types.Single.FromByteArray(currMem.Skip(42).Take(4).ToArray()),
MouldEnergyIN = S7.Net.Types.Single.FromByteArray(currMem.Skip(46).Take(4).ToArray()),
NumPreHot = S7.Net.Types.Int.FromByteArray(currMem.Skip(50).Take(2).ToArray())
};
@@ -4614,7 +4614,7 @@ namespace CMS_CORE_Library.S7Net
int memIndex = 0;
int packSize = 20;
// 2020.09.03: ricevuto da chiamata, dovrebbe essere 5 parametri x scrivere tutto (era 30 prima di 2008.08.07)
// 2020.09.03: ricevuto da chiamata, dovrebbe essere 5 parametri x scrivere tutto (era 30 prima di 2018.08.07)
bool writeSingle = newParameters.Count < nMaxParamWrite;
// leggo da PLC a array di byte di appoggio...
@@ -4688,7 +4688,7 @@ namespace CMS_CORE_Library.S7Net
if (WritePos)
{
MEMORY_CELL caTgtPos = new MEMORY_CELL(AXES_COMMAND.MemType, AXES_COMMAND.Address, AXES_COMMAND.SubAddress + ((AxisNum - 1) * 8), 2);
MEMORY_CELL caTgtPos = new MEMORY_CELL(AXES_COMMAND.MemType, AXES_COMMAND.Address, AXES_COMMAND.SubAddress + ((AxisNum - 1) * 8) + 4, 2);
// in primis scrivo la TargetPos nei 4 byte DWord...
libraryError = MEM_RWDouble(W, 0, caTgtPos.MemType, caTgtPos.Address, caTgtPos.SubAddress, ref TargetPos);
if (libraryError.IsError())
@@ -4696,7 +4696,7 @@ namespace CMS_CORE_Library.S7Net
}
// ...è permesso solo 0..7
if (CommandBit >=1 && CommandBit < 8)
if (CommandBit >= 1 && CommandBit < 8)
{
// posizione: è da array assi 0..n-1, 8byte ogni asse
MEMORY_CELL currAxAck = new MEMORY_CELL(AXES_COMMAND.MemType, AXES_COMMAND.Address, AXES_COMMAND.SubAddress + ((AxisNum - 1) * 8), 2);
@@ -4748,7 +4748,7 @@ namespace CMS_CORE_Library.S7Net
// preparo la word
ushort controlData = 0;
MEMORY_CELL caTgtPos = new MEMORY_CELL(AXES_GEN_STATUS.MemType, AXES_GEN_STATUS.Address, AXES_GEN_STATUS.SubAddress, 2);
// in primis scrivo la TargetPos nei 4 byte DWord...
libraryError = MEM_RWWord(R, 0, caTgtPos.MemType, caTgtPos.Address, caTgtPos.SubAddress, ref controlData);
CMS_CORE_Library/packages.config
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="S7netplus" version="0.8.1" targetFramework="net462" />
<package id="S7netplus" version="0.4.0" targetFramework="net462" />
</packages>