diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs index bd35b0b5..bb046f56 100644 --- a/IOB-WIN/AdapterForm.cs +++ b/IOB-WIN/AdapterForm.cs @@ -281,7 +281,7 @@ namespace IOB_WIN } else { - displayTaskAndLog("Server OFFLINE"); + displayTaskAndLog("AdapterForm: Server OFFLINE"); } } catch (Exception exc) @@ -820,7 +820,7 @@ namespace IOB_WIN /// Visualizzazione stato di comunicazione attiva con PLC: /// 0 = NO PING /// 1 = PING OK - /// 2 = MP/IO OK + /// 2 = IOB enabled /// public int commSrvActive { diff --git a/IOB-WIN/App.config b/IOB-WIN/App.config index 1ae3d120..7b873f19 100644 --- a/IOB-WIN/App.config +++ b/IOB-WIN/App.config @@ -37,7 +37,7 @@ - + diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index 8c2b73ea..3791a27a 100644 --- a/IOB-WIN/IobGeneric.cs +++ b/IOB-WIN/IobGeneric.cs @@ -782,6 +782,7 @@ namespace IOB_WIN public virtual void startAdapter(bool resetQueue) { lgInfo("Starting adapter..."); + maxJsonData = utils.CRI("maxJsonData"); parentForm.commPlcActive = false; adpRunning = true; dtAvvioAdp = DateTime.Now; @@ -2161,13 +2162,13 @@ namespace IOB_WIN // se ORA sono online riporto... if (answ) { - lgInfo("SERVER ONLINE"); + lgInfo("SERVER ONLINE in checkServerAlive"); parentForm.commSrvActive = 1; dtVetoPing = DateTime.Now.AddMilliseconds(baseUtils.nextPauseSendMSec); } else { - lgInfo("SERVER OFFLINE"); + lgInfo("SERVER OFFLINE in checkServerAlive"); parentForm.commSrvActive = 0; } // salvo nuovo status... diff --git a/IOB-WIN/MainForm.cs b/IOB-WIN/MainForm.cs index 8201fce9..e6a35e7d 100644 --- a/IOB-WIN/MainForm.cs +++ b/IOB-WIN/MainForm.cs @@ -488,7 +488,7 @@ namespace IOB_WIN } else { - lgInfo("SERVER OFFLINE"); + lgInfo("SERVER OFFLINE in MainForm:testServer"); } // salvo nuovo status... utils.MPIO_Online = answ; diff --git a/Jenkinsfile b/Jenkinsfile index 9d39edb1..330ebdbb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=490']) { + withEnv(['NEXT_BUILD_NUMBER=491']) { // 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'