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

tolto update contapezzi su modalità BIT tornoss...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-04-27 09:29:19 +02:00
parent c61c815a58
commit 780c989894
8 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/App.config
+1 -1
View File
@@ -12,7 +12,7 @@
<add key="enableOverrides" value="true" />
<add key="enableDynData" value="false" />
<add key="enableSysInfo" value="false" />
<add key="doStartMemDump" value="false" />
<add key="doStartMemDump" value="true" />
<add key="doSampleMemory" value="false" />
<add key="basePrgMemPath" value="CNCMEMUSER" />
<!--gestione TIMERS e periodi multipli x thread lenti-->
IOB-WIN/DATA/CONF/3001.ini
+1 -1
View File
@@ -13,7 +13,7 @@ PORT=8193
GETPRGNAME=true
[SERVER]
MPIP=http://10.74.82.219
MPIP=http://192.168.1.7
MPURL=/MP/IO
CMDBASE=/IOB/input/
CMDFLOG=/IOB/flog/
IOB-WIN/DATA/CONF/3002.ini
+1 -1
View File
@@ -13,7 +13,7 @@ PORT=8193
GETPRGNAME=true
[SERVER]
MPIP=http://10.74.82.219
MPIP=http://192.168.1.7
MPURL=/MP/IO
CMDBASE=/IOB/input/
CMDFLOG=/IOB/flog/
IOB-WIN/DATA/CONF/3004.ini
+1 -1
View File
@@ -60,7 +60,7 @@ BLINK_FILT=8
[OPTPAR]
;PZCOUNT_MODE=STD|BIT
PZCOUNT_MODE=STD
PZCOUNT_MODE=STD.PAR.6711
PZ_CAD_MADDR=1602
PZ_REQ_MADDR=1603
PZ_DONE_MADDR=1604
IOB-WIN/DATA/CONF/3005.ini
+1 -1
View File
@@ -60,7 +60,7 @@ BLINK_FILT=8
[OPTPAR]
;PZCOUNT_MODE=STD|BIT
PZCOUNT_MODE=STD
PZCOUNT_MODE=STD.PAR.6711
PZ_CAD_MADDR=1602
PZ_REQ_MADDR=1603
PZ_DONE_MADDR=1604
IOB-WIN/DATA/CONF/MAIN.ini
+3 -3
View File
@@ -4,13 +4,13 @@
NAME=develop
[SERVER]
#MPIP=192.168.1.7
MPIP=10.74.82.219
MPIP=192.168.1.7
#MPIP=10.74.82.219
MPURL=/MP/IO
CMDREBO=/IOB/sendRebootGateway?GWIP=
CMDIOB2CALL=/IOB/getIob2call?GWIP=
[IOB]
STARTLIST=3007
STARTLIST=3001
MAXCNC=4
;STARTLIST=3001,3002,3003,3004,3005
IOB-WIN/IobFanuc.cs
+5 -2
View File
@@ -546,8 +546,10 @@ namespace IOB_WIN
}
}
#if false
// da rivedere x gestione contapezzi a bit...
// verifico se si tratta di un segnale contapezzo... nel qual caso conteggio ed invio...
if(currIobConf.optPar["PZCOUNT_MODE"].StartsWith("BIT"))
if (currIobConf.optPar["PZCOUNT_MODE"].StartsWith("BIT"))
{
// salvo nuovo contapezzi (incremento di 1...)
contapezzi++;
@@ -556,7 +558,8 @@ namespace IOB_WIN
lgInfo("Aggiornato contapezzi: {0}", contapezzi);
// resetto timer...
lastPzCountSend = DateTime.Now;
}
}
#endif
}
}
Jenkinsfile
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=258']) {
withEnv(['NEXT_BUILD_NUMBER=259']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'