From 8cf021982c5fb0384bb8a5750fb8da3ac7ba92a0 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 4 Dec 2019 14:48:13 +0100 Subject: [PATCH] Inserito process parameters x ingenia, lasco, pressoil... --- CVCncLib/testSam.dll | Bin 967680 -> 967680 bytes IOB-WIN/IobSiemensAt2001.cs | 3 ++- IOB-WIN/IobSiemensComur.cs | 1 + IOB-WIN/IobSiemensIngenia.cs | 26 ++++++++++++++++++++++---- IOB-WIN/IobSiemensLasco.cs | 20 ++++++++++++++++++++ IOB-WIN/IobSiemensPressoilCei.cs | 19 +++++++++++++++++++ Jenkinsfile | 2 +- 7 files changed, 65 insertions(+), 6 deletions(-) diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll index d61256abeadabdace13268b85e9be917fd9c6fc9..e6715908bc20c17738493c235fa932f83bfa24a6 100644 GIT binary patch delta 152 zcmZqZux{wEp3uSEz5RJ(cWXCeYd2GCH*;$@OKUf4Yd2eKH+yS0M{74{Yd2SGH}}?V z9>awKn>dwj9O?Vww1MeNxzs&ApY}5gd4QOA`=InVqmEQDGB7YWTg8MHrxq2*6es4ErskyT6_=zY=9W+A*vKb0U40|p`R#u;^05d3 E05>c@C;$Ke delta 150 zcmV;H0BQe#h&zCYJCKM2)yd|8i-n5;g^L1(ivxv=1ci$Qg^LD-iwA{^2!)FYg^LP> ziwm`j3^Ab)0_Cf#c2hs>c3x6Gjq{0;-u$>x{Kunrj{Im0l3 zr=-V8xMY^?GU<1m0RR91Lpoelb7gXKTytS 9999 --> 0 - if (counterMes2Plc > 9999) counterMes2Plc = 0; + // se > 999'999'999 --> 0 + if (counterMes2Plc > 999999999) counterMes2Plc = 0; // salvo su DB Dictionary task2exe = new Dictionary(); Dictionary taskDone = new Dictionary(); @@ -129,7 +129,6 @@ namespace IOB_WIN taskType tName = taskType.nihil; Enum.TryParse(item.Key, out tName); // controllo sulla KEY - //!!!FIXME!!! totalmente da rivedere switch (tName) { case taskType.nihil: @@ -146,13 +145,32 @@ namespace IOB_WIN case taskType.sendWatchDogMes2Plc: memAddrWrite = "DB701.DBB12"; saveProdData(item); - MemBlock = wordToByte(counterMes2Plc.ToString()); + MemBlock = dwordToByte(counterMes2Plc.ToString()); taskVal = $"VALUE DB701.DBB12 --> {counterMes2Plc} ({MemBlock})"; if (verboseLog) { lgInfo(taskVal); } break; + case taskType.setParameter: + // richiedo da URL i parametri WRITE da popolare + lgInfo("Chiamata processMemWriteRequests"); + taskVal = processMemWriteRequests(); + // se restituiscce "" faccio altra prova... + if (string.IsNullOrEmpty(taskVal)) + { + // i parametri me li aspetto come stringa composta paramName|paramvalue + if (item.Value.Contains("|")) + { + string[] paramsJob = item.Value.Split('|'); + taskVal = $"REQUEST SET PARAMETERS: {paramsJob[0]} --> {paramsJob[1]}"; + } + else + { + taskVal = $"WRONG REQUEST FOR SET PARAMETERS: {item.Value} doesnt contain pipe for splitting key/value"; + } + } + break; default: taskVal = "SKIPPED | NO EXEC"; break; diff --git a/IOB-WIN/IobSiemensLasco.cs b/IOB-WIN/IobSiemensLasco.cs index 0084feb0..bca24966 100644 --- a/IOB-WIN/IobSiemensLasco.cs +++ b/IOB-WIN/IobSiemensLasco.cs @@ -275,6 +275,26 @@ namespace IOB_WIN MemBlock[0] = (byte)valore; taskVal = $"VALUE DB1002.92 --> {counterMes2Plc}"; break; + + case taskType.setParameter: + // richiedo da URL i parametri WRITE da popolare + lgInfo("Chiamata processMemWriteRequests"); + taskVal = processMemWriteRequests(); + // se restituiscce "" faccio altra prova... + if (string.IsNullOrEmpty(taskVal)) + { + // i parametri me li aspetto come stringa composta paramName|paramvalue + if (item.Value.Contains("|")) + { + string[] paramsJob = item.Value.Split('|'); + taskVal = $"REQUEST SET PARAMETERS: {paramsJob[0]} --> {paramsJob[1]}"; + } + else + { + taskVal = $"WRONG REQUEST FOR SET PARAMETERS: {item.Value} doesnt contain pipe for splitting key/value"; + } + } + break; default: taskVal = "SKIPPED | NO EXEC"; break; diff --git a/IOB-WIN/IobSiemensPressoilCei.cs b/IOB-WIN/IobSiemensPressoilCei.cs index 611a8aaf..a60b9c30 100644 --- a/IOB-WIN/IobSiemensPressoilCei.cs +++ b/IOB-WIN/IobSiemensPressoilCei.cs @@ -120,6 +120,25 @@ namespace IOB_WIN MemBlock[0] = (byte)valore; taskVal = $"VALUE DB67.0 --> {valore} | counter interno {counterMes2Plc}"; break; + case taskType.setParameter: + // richiedo da URL i parametri WRITE da popolare + lgInfo("Chiamata processMemWriteRequests"); + taskVal = processMemWriteRequests(); + // se restituiscce "" faccio altra prova... + if (string.IsNullOrEmpty(taskVal)) + { + // i parametri me li aspetto come stringa composta paramName|paramvalue + if (item.Value.Contains("|")) + { + string[] paramsJob = item.Value.Split('|'); + taskVal = $"REQUEST SET PARAMETERS: {paramsJob[0]} --> {paramsJob[1]}"; + } + else + { + taskVal = $"WRONG REQUEST FOR SET PARAMETERS: {item.Value} doesnt contain pipe for splitting key/value"; + } + } + break; case taskType.startSetup: // salvo che SONO IN SETUP! inSetup = true; diff --git a/Jenkinsfile b/Jenkinsfile index 29eca053..2af507b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=564']) { + withEnv(['NEXT_BUILD_NUMBER=565']) { // env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'