From c88a4ea8079f6514c3a3ff0ff259c21ca1bf38d0 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 18 Nov 2019 13:48:26 +0100
Subject: [PATCH] Fix test read Word/DWord x siemens (ingenia / pressoil)

---
 IOB-WIN/IobSiemens.cs | 8 ++++++++
 Jenkinsfile           | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/IOB-WIN/IobSiemens.cs b/IOB-WIN/IobSiemens.cs
index fa659335..1f173cad 100644
--- a/IOB-WIN/IobSiemens.cs
+++ b/IOB-WIN/IobSiemens.cs
@@ -1279,6 +1279,14 @@ namespace IOB_WIN
                     valore = ((double)S7.Net.Types.DInt.FromByteArray(RawInput.Skip(item.Value.index).Take(item.Value.size).ToArray())) / item.Value.factor;
                     saveValue(ref outVal, valore, item.Key);
                     break;
+                  case plcDataType.Word:
+                    valore = ((double)S7.Net.Types.Word.FromByteArray(RawInput.Skip(item.Value.index).Take(item.Value.size).ToArray())) / item.Value.factor;
+                    saveValue(ref outVal, valore, item.Key);
+                    break;
+                  case plcDataType.DWord:
+                    valore = ((double)S7.Net.Types.DWord.FromByteArray(RawInput.Skip(item.Value.index).Take(item.Value.size).ToArray())) / item.Value.factor;
+                    saveValue(ref outVal, valore, item.Key);
+                    break;
                   case plcDataType.Real:
                     valore = S7.Net.Types.Double.FromByteArray(RawInput.Skip(item.Value.index).Take(item.Value.size).ToArray()) / item.Value.factor;
                     saveValue(ref outVal, valore, item.Key);
diff --git a/Jenkinsfile b/Jenkinsfile
index 2fa2a910..99cb440c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=528']) {
+        withEnv(['NEXT_BUILD_NUMBER=529']) {
           // env.versionNumber = VersionNumber(versionNumberString : '2.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '2.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'