Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MTC'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-12-04 18:59:05 +01:00
parent f2abf6d8ef 777b5f3c53
commit 12ff3cb83f
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/IobSiemens.cs
+1 -1
View File
@@ -585,7 +585,7 @@ namespace IOB_WIN
switch (errorCode)
{
case ErrorCode.NoError:
lgInfo($"Effettuata correttamente scrittura su PLC: MEMORIA {memAddrWrite} | numByte: {Value.Length} | value: {Value} | BIN: {Value.ValToBinString()}");
lgInfo($"Effettuata correttamente scrittura su PLC: MEMORIA {memAddrWrite} | numByte: {Value.Length} | BIN: {Value.ValToBinString()}");
answ = true;
break;
case ErrorCode.WrongCPU_Type:
IOB-WIN/IobSiemensIngenia.cs
+1
View File
@@ -99,6 +99,7 @@ namespace IOB_WIN
Dictionary<string, string> taskDone = new Dictionary<string, string>();
task2exe.Add("sendWatchDogMes2Plc", counterMes2Plc.ToString());
taskDone = executeTasks(task2exe);
lgInfo($"Scritto watchdog: {counterMes2Plc} | watchDog MES: {counterPlc2Mes}");
// salvo watchdog PLC
lastPLCWatchDog = adesso;
}
Jenkinsfile
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=578']) {
withEnv(['NEXT_BUILD_NUMBER=579']) {
// 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'