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

update x salvataggio samples... e conf pzCount..

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-04-23 10:12:34 +02:00
parent 6d698b5d7f
commit 39d4f9d5c6
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/DATA/CONF/3003.ini
+1 -1
View File
@@ -28,7 +28,7 @@ AREAY_SIZE=8
; Red: Y3.7 | Yellow: Y3.6 | Green Y3.5 | All DoorsClosed: Y4.0 (X5.1) | ..........WrkZone Y8.7
;BIT0=CONN
BIT1=Y3.5
BIT2=PZCOUNT
BIT2=PZCOUNT.PAR.6711
BIT3=Y3.7
BIT4=Y3.6
AREAD_START=0
IOB-WIN/DATA/CONF/3004.ini
+1 -1
View File
@@ -28,7 +28,7 @@ AREAY_SIZE=12
; Red: Y3.2 | Yellow: !Y8.0 | Green Y4.5
;BIT0=CONN
BIT1=Y4.5
BIT2=PZCOUNT
BIT2=PZCOUNT.PAR.6711
BIT3=Y3.2
BIT4=Y8.0
AREAD_START=0
IOB-WIN/DATA/CONF/3005.ini
+1 -1
View File
@@ -28,7 +28,7 @@ AREAY_SIZE=12
; Red: Y3.2 | Yellow: !Y8.0 | Green Y4.5
;BIT0=CONN
BIT1=Y4.5
BIT2=PZCOUNT
BIT2=PZCOUNT.PAR.6711
BIT3=Y3.2
BIT4=Y8.0
AREAD_START=0
IOB-WIN/DATA/CONF/3006.ini
+1 -1
View File
@@ -28,7 +28,7 @@ AREAY_SIZE=56
; Red: Y53.0 | Yellow: Y53.1 | Green Y53.2
;BIT0=CONN
BIT1=Y53.2
BIT2=PZCOUNT
BIT2=PZCOUNT.PAR.6711
BIT3=Y53.0
BIT4=Y53.1
AREAD_START=0
IOB-WIN/IobFanuc.cs
+7 -7
View File
@@ -421,7 +421,7 @@ namespace IOB_WIN
// recupero nome variabile...
bVal = signLUT[bKey];
// se l'area è PZCOUNT... processo PUNTUALMENTE il CONTAPEZZI...
if (bVal == "PZCOUNT")
if (bVal.StartsWith("PZCOUNT"))
{
// controllo se è passato intervallo minimo tra 2 controlli/elaborazioni x distanziare invio e ridurre letture
if (DateTime.Now >= lastPzCountSend.AddMilliseconds(pzCountDelay))
@@ -777,16 +777,16 @@ namespace IOB_WIN
// seconda del tipo di lettura definisco i nomi delle variabili...
if (tipo == dumpType.SAMPLE)
{
nomeFileB = string.Format(@"{0}\SAMPLES\MemDumpD_Byte_{1:yyyyMMdd_HHmmss}.dat", utils.dataDatDir, adesso);
nomeFileW = string.Format(@"{0}\SAMPLES\MemDumpD_W_{1:yyyyMMdd_HHmmss}.dat", utils.dataDatDir, adesso);
nomeFileDW = string.Format(@"{0}\SAMPLES\MemDumpD_DW_{1:yyyyMMdd_HHmmss}.dat", utils.dataDatDir, adesso);
nomeFileB = string.Format(@"{0}\SAMPLES\{2}_MemDumpD_Byte_{1:yyyyMMdd_HHmmss}.dat", utils.dataDatDir, adesso, currIobConf.codIOB);
nomeFileW = string.Format(@"{0}\SAMPLES\{2}_MemDumpD_W_{1:yyyyMMdd_HHmmss}.dat", utils.dataDatDir, adesso, currIobConf.codIOB);
nomeFileDW = string.Format(@"{0}\SAMPLES\{2}_MemDumpD_DW_{1:yyyyMMdd_HHmmss}.dat", utils.dataDatDir, adesso, currIobConf.codIOB);
}
else
{
// salvo in file i dati letti come BYTE
nomeFileB = string.Format(@"{0}\MemDumpD_Byte.dat", utils.dataDatDir);
nomeFileW = string.Format(@"{0}\MemDumpD_W.dat", utils.dataDatDir);
nomeFileDW = string.Format(@"{0}\MemDumpD_DW.dat", utils.dataDatDir);
nomeFileB = string.Format(@"{0}\{1}_MemDumpD_Byte.dat", utils.dataDatDir, currIobConf.codIOB);
nomeFileW = string.Format(@"{0}\{1}_MemDumpD_W.dat", utils.dataDatDir, currIobConf.codIOB);
nomeFileDW = string.Format(@"{0}\{1}_MemDumpD_DW.dat", utils.dataDatDir, currIobConf.codIOB);
}
// salvo in file i dati letti come BYTE
Jenkinsfile
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=247']) {
withEnv(['NEXT_BUILD_NUMBER=248']) {
// 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'