From bb1b75aa8b630cae888dcf21ca9f21453cabe85b Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 12 Mar 2019 21:30:20 +0100
Subject: [PATCH] Vers 1903 x fix poweron delle macchine TORRI

---
 CVCncLib/testSam.dll       | Bin 967680 -> 967680 bytes
 IOB-WIN/App.config         |   2 ++
 IOB-WIN/IobSiemensTorri.cs |  14 +++++++++++++-
 Jenkinsfile                |   2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll
index bac9f0f69746c9fd21f03fd49b7800299220d9c8..67856c44c51f3a691da9eec5fcf0697a598ab485 100644
GIT binary patch
delta 150
zcmV;H0BQe#h&zCYJCKM2N*0KLi-n5;g^L1(ivxv=1ci$Qg^LD-iwA{^2!)FYg^LP>
ziwm`j3^Ab)kYCZpQ4486g1#xg_iijThs>c2hs>c3x6Gjq{0;+27KoS2unrj{MZOQ*
zr?_86kBhrauDNx%0RR91Lpoelb7gXKTytS<b!BX2mk+TH9szTgEwK*IkuV0g{IL!M
E64!}5CjbBd

delta 152
zcmZqZux{wEp3uR}JJX@DyS1CKwVSE6o4K`{rL~*2wVSQAo4vK0qqUo}wVSK8n|o_F
zkKsar)oJ@2kIQ^=+}xcV%^53uuKmnH9w6r3er6%xA3l&#(@$^Ulhm#gWIW;Av%{m!
z(&ty%?n}yy3=9m;RxzQ)sYS&x#fiD4sX3{7#U-hUx#iP2HuA|$SKr8Ye*2$|d@Mo$
D79>1Q

diff --git a/IOB-WIN/App.config b/IOB-WIN/App.config
index da9d9574..f2ebe325 100644
--- a/IOB-WIN/App.config
+++ b/IOB-WIN/App.config
@@ -74,6 +74,8 @@
     <!--conf x FANUC-->
     <add key="ClientSettingsProvider.ServiceUri" value=""/>
     <add key="pzCountDelay" value="2000"/>
+    <!--conf x SIEMENS-->
+    <add key="powerOnByConn" value="true"/>
   </appSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/IOB-WIN/IobSiemensTorri.cs b/IOB-WIN/IobSiemensTorri.cs
index 298276e6..31d47fe6 100644
--- a/IOB-WIN/IobSiemensTorri.cs
+++ b/IOB-WIN/IobSiemensTorri.cs
@@ -71,6 +71,18 @@ namespace IOB_WIN
       B_input = 0;
       // TORRI: leggo i primi 8 bit hard coded...
       int byteSem = RawInput[0];
+      // Verifico se usare powerOn by connessione... SE funziona diventerà SENZA CONF di default...
+      if (utils.CRB("powerOnByConn"))
+      {
+        // azzero powerOn...      
+        byteSem &= ~(1 << 0);
+        // bit 0 (powerOn) imposto a 1 SE connected...
+        if (currPLC.IsConnected)
+        {
+          byteSem += (1 << 0);
+        }
+      }
+
       // azzero i bit NON gestiti (2-5-6-7)    
       byteSem &= ~(1 << 2);
       byteSem &= ~(1 << 5);
@@ -78,7 +90,7 @@ namespace IOB_WIN
       byteSem &= ~(1 << 7);
       // leggo bit 701.4 e lo porto al bit 5 --> ciclo test/accensione/spegnimento
       if ((RawInput[1] & (1 << 4)) != 0) //se RawInput[1] & 16-- > 5° bit-- > TEST
-      {                     
+      {
         byteSem += (1 << 5);
       }
       // salvo infine variabile bit x invio
diff --git a/Jenkinsfile b/Jenkinsfile
index f6db8996..ad7203c6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=362']) {
+        withEnv(['NEXT_BUILD_NUMBER=363']) {
           // env.versionNumber = VersionNumber(versionNumberString : '2.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '2.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'