From b1e09a0961f1c15defcfed4da5ee69d664e80c0f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 30 Sep 2021 11:47:48 +0200 Subject: [PATCH 1/2] Fix RestSharp x IOB-WIN base --- IOB-WIN/IOB-WIN.csproj | 4 ++-- IOB-WIN/packages.config | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj index 25a6b0b4..b0919be9 100644 --- a/IOB-WIN/IOB-WIN.csproj +++ b/IOB-WIN/IOB-WIN.csproj @@ -107,8 +107,8 @@ ..\packages\OmronFinsTCP.Net.3.0.0.0\lib\net40\OmronFinsTCP.Net.dll - - ..\packages\RestSharp.106.12.0\lib\net452\RestSharp.dll + + ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll ..\packages\S7netplus.0.1.9\lib\net40\S7.Net.dll diff --git a/IOB-WIN/packages.config b/IOB-WIN/packages.config index 71208887..ff8ee4fe 100644 --- a/IOB-WIN/packages.config +++ b/IOB-WIN/packages.config @@ -16,7 +16,7 @@ - + From 61fbea5c841a949e5b95e4a83ad145eea5a8e284 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 30 Sep 2021 11:50:54 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Fix=20modalit=C3=A0=20emergenza=20su=20manu?= =?UTF-8?q?ale=20x=20trevisan=20(=C3=A8=20SEMPRE=20da=20riportare=20se=20a?= =?UTF-8?q?rmed=20=3D=20true)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IOB-WIN-NEXT/IobMTC.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/IOB-WIN-NEXT/IobMTC.cs b/IOB-WIN-NEXT/IobMTC.cs index 3da44c4d..7e5e189b 100644 --- a/IOB-WIN-NEXT/IobMTC.cs +++ b/IOB-WIN-NEXT/IobMTC.cs @@ -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...