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

update x invio 50 FLog alla volta

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-11-04 14:36:41 +01:00
parent 049c8466a4
commit 2d76692049
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/AdapterForm.cs
+2 -2
View File
@@ -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
/// </summary>
public int commSrvActive
{
IOB-WIN/App.config
+1 -1
View File
@@ -37,7 +37,7 @@
<add key="pauseSendMSec" value="1000" />
<!--gestione invio dati in blocchi Json-->
<add key="minJsonData" value="2" />
<add key="maxJsonData" value="10" />
<add key="maxJsonData" value="50" />
<add key="sendDataByThread" value="false" />
<!--Modalità DEMO: DemoOUT indica che NON invia davvero al server e DemoIN che simula e NON legge da PLC-->
<add key="DemoIn" value="false" />
IOB-WIN/IobGeneric.cs
+3 -2
View File
@@ -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...
IOB-WIN/MainForm.cs
+1 -1
View File
@@ -488,7 +488,7 @@ namespace IOB_WIN
}
else
{
lgInfo("SERVER OFFLINE");
lgInfo("SERVER OFFLINE in MainForm:testServer");
}
// salvo nuovo status...
utils.MPIO_Online = answ;
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'