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

Merge branch 'release/FixTrevisanFluitek02'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-09-30 11:51:11 +02:00
parent 64f6827a58 61fbea5c84
commit 687ce285a8
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/IobMTC.cs
+7 -5
View File
@@ -358,11 +358,6 @@ namespace IOB_WIN_NEXT
B_input += (1 << 1);
}
}
// emergenza armata = 1
else if (!hasEStopTriggered && mtcParams.emergencyArmedTrue)
{
B_input += (1 << 5);
}
// emergenza premuta = 1
else if (hasEStopTriggered && !mtcParams.emergencyArmedTrue)
{
@@ -379,6 +374,13 @@ namespace IOB_WIN_NEXT
B_input += (1 << 4);
}
// emergenza armata = 1
if (!hasEStopTriggered && mtcParams.emergencyArmedTrue)
{
B_input += (1 << 5);
}
DateTime adesso = DateTime.Now;
int vFactor = 1;
// controllo SE HO dati per fare verifiche...
IOB-WIN/IOB-WIN.csproj
+2 -2
View File
@@ -107,8 +107,8 @@
<Reference Include="OmronFinsTCP.Net, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\OmronFinsTCP.Net.3.0.0.0\lib\net40\OmronFinsTCP.Net.dll</HintPath>
</Reference>
<Reference Include="RestSharp, Version=116.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll</HintPath>
<Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
</Reference>
<Reference Include="S7.Net, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d5812d469e84c693, processorArchitecture=MSIL">
<HintPath>..\packages\S7netplus.0.1.9\lib\net40\S7.Net.dll</HintPath>
IOB-WIN/packages.config
+1 -1
View File
@@ -16,7 +16,7 @@
<package id="NLog" version="4.6.8" targetFramework="net40-client" />
<package id="OmronFinsTCP.Net" version="3.0.0.0" targetFramework="net40-client" />
<package id="PrettyBin" version="1.1.0" targetFramework="net461" />
<package id="RestSharp" version="116.12.0" targetFramework="net40-client" />
<package id="RestSharp" version="105.2.3" targetFramework="net462" />
<package id="S7netplus" version="0.1.9" targetFramework="net40-client" />
<package id="Selenium.Firefox.WebDriver" version="0.26.0" targetFramework="net40-client" />
<package id="Selenium.WebDriver" version="3.141.0" targetFramework="net40-client" />