diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll index c7888afb..b4970795 100644 Binary files a/CVCncLib/testSam.dll and b/CVCncLib/testSam.dll differ diff --git a/IOB-WIN/IobSiemens.cs b/IOB-WIN/IobSiemens.cs index 63e048d2..e28b9ebc 100644 --- a/IOB-WIN/IobSiemens.cs +++ b/IOB-WIN/IobSiemens.cs @@ -116,7 +116,7 @@ namespace IOB_WIN /// Blocco memoria come byte[] dove scrivere /// Valore scrivere /// Posizione inizio scrittura - public void saveIntOnMemBlock(ref byte[] MemBlock, string stringValue, int startPos)//, int totLen) + public void saveIntOnMemBlock(ref byte[] MemBlock, string stringValue, int startPos) { if (currProdData.ContainsKey(stringValue)) { @@ -143,7 +143,7 @@ namespace IOB_WIN /// Blocco memoria come byte[] dove scrivere /// Valore scrivere /// Posizione inizio scrittura - public void saveRealOnMemBlock(ref byte[] MemBlock, string stringValue, int startPos)//, int totLen) + public void saveRealOnMemBlock(ref byte[] MemBlock, string stringValue, int startPos) { if (currProdData.ContainsKey(stringValue)) { @@ -229,22 +229,6 @@ namespace IOB_WIN /// public bool S7WriteBB(ref byte[] Value) { -#if false - bool answ = false; - sw.Restart(); - if (testCncConn()) - { - // decodifico memoria... - memAreaSiemens memoria = new memAreaSiemens(parametri.memAddrWrite); - int numByte = Value.Length; - var errorCode = currPLC.WriteBytes(DataType.DataBlock, memoria.DbNum, memoria.indiceMem, Value); - - answ = true; - } - sw.Stop(); - //tslRTime.Text = string.Format("{0}", sw.Elapsed); - return answ; -#endif return S7WriteBB(ref Value, parametri.memAddrWrite); } /// diff --git a/IOB-WIN/IobSiemensAt2001.cs b/IOB-WIN/IobSiemensAt2001.cs index 5339d02f..f06b009b 100644 --- a/IOB-WIN/IobSiemensAt2001.cs +++ b/IOB-WIN/IobSiemensAt2001.cs @@ -73,62 +73,7 @@ namespace IOB_WIN public override void processOverride() { } - - public override void processWhatchDog() - { - //NON SERVE!!!! -#if false - // scrivo 1 volta al secondo il contatore incrementale su area apposita - DateTime adesso = DateTime.Now; - if (adesso.Subtract(lastPLCWatchDog).TotalSeconds > 1) - { - // incremento - counterMes2Plc++; - // salvo su DB - Dictionary task2exe = new Dictionary(); - Dictionary taskDone = new Dictionary(); - task2exe.Add("sendWatchDogMes2Plc", counterMes2Plc.ToString()); - taskDone = executeTasks(task2exe); - // salvo watchdog PLC - lastPLCWatchDog = adesso; - } -#endif - - bool taskOk = false; - // inizio VUOTO - byte[] MemBlock = new byte[parametri.memSizeWrite]; - - // !!!FIXME!!! rendere parametrico - // SE HO un valore ART scrivo... - if (currProdData.ContainsKey("setArt")) - { - if (currProdData["setArt"] != "") - { - // imposto i valori... - upsertKey("kgParz", "1234"); - saveIntOnMemBlock(ref MemBlock, "kgParz", 66); - upsertKey("set_th", "601"); - saveIntOnMemBlock(ref MemBlock, "set_th", 72); - upsertKey("set_c", "101"); - saveRealOnMemBlock(ref MemBlock, "set_c", 74); - upsertKey("aria_1", "1801"); - saveIntOnMemBlock(ref MemBlock, "aria_1", 78); - upsertKey("aria_2", "1851"); - saveIntOnMemBlock(ref MemBlock, "aria_2", 80); - upsertKey("setMmH20", "9"); - saveRealOnMemBlock(ref MemBlock, "setMmH20", 82); - upsertKey("rpmci", "101"); - saveIntOnMemBlock(ref MemBlock, "rpmci", 86); - } - } - - // fare un controllo x forzare update... - - // scrivo comunque! - taskOk = S7WriteBB(ref MemBlock); - - } - + /// /// Processo i task richiesti e li elimino dalla coda 1:1 /// @@ -198,21 +143,38 @@ namespace IOB_WIN saveStringOnMemBlock(ref MemBlock, "setProg", 44, 20, false); - // imposto i valori... - upsertKey("kgParz", "1234"); - saveIntOnMemBlock(ref MemBlock, "kgParz", 66); - upsertKey("set_th", "601"); - saveIntOnMemBlock(ref MemBlock, "set_th", 72); - upsertKey("set_c", "101"); - saveRealOnMemBlock(ref MemBlock, "set_c", 74); - upsertKey("aria_1", "1801"); - saveIntOnMemBlock(ref MemBlock, "aria_1", 78); - upsertKey("aria_2", "1851"); - saveIntOnMemBlock(ref MemBlock, "aria_2", 80); - upsertKey("setMmH20", "9"); - saveRealOnMemBlock(ref MemBlock, "setMmH20", 82); - upsertKey("rpmci", "101"); - saveIntOnMemBlock(ref MemBlock, "rpmci", 86); + + // !!!FIXME!!! rendere parametrico + // SE HO un valore ART scrivo... + if (currProdData.ContainsKey("setArt")) + { + if (currProdData["setArt"] != "") + { + // imposto i valori... + upsertKey("kgParz", "1234"); + saveIntOnMemBlock(ref MemBlock, "kgParz", 66); + upsertKey("set_th", "601"); + saveIntOnMemBlock(ref MemBlock, "set_th", 72); + upsertKey("set_c", "101"); + saveRealOnMemBlock(ref MemBlock, "set_c", 74); + upsertKey("aria_1", "1801"); + saveIntOnMemBlock(ref MemBlock, "aria_1", 78); + upsertKey("aria_2", "1851"); + saveIntOnMemBlock(ref MemBlock, "aria_2", 80); + upsertKey("setMmH20", "9"); + saveRealOnMemBlock(ref MemBlock, "setMmH20", 82); + upsertKey("rpmci", "101"); + saveIntOnMemBlock(ref MemBlock, "rpmci", 86); + } + } + + // fare un controllo x forzare update... + + // scrivo comunque! + taskOk = S7WriteBB(ref MemBlock); + + + return taskDone; } diff --git a/Jenkinsfile b/Jenkinsfile index 5615ba81..271b8e15 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=466']) { + withEnv(['NEXT_BUILD_NUMBER=467']) { // env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'