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

Cambio init stringhe all'avvio

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-04-26 15:32:11 +02:00
parent c98ebf9e6d
commit 67c5bec383
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/AdapterForm.cs
+2
View File
@@ -479,6 +479,7 @@ namespace IOB_WIN
kvp = item.Split('=');
optParRead.Add(kvp[0], kvp[1]);
}
lgInfo($"Caricati {optParRead.Count} parametri opzionali da OPTPAR");
}
catch (Exception exc)
{
@@ -505,6 +506,7 @@ namespace IOB_WIN
MAX_COUNTER_BLINK = Convert.ToInt32(fIni.ReadString("BLINK", "MAX_COUNTER_BLINK", "1")),
BLINK_FILT = Convert.ToInt32(fIni.ReadString("BLINK", "BLINK_FILT", "0"))
};
lgInfo($"Creato IOBConf!");
loadIobType();
// avvio macchina con adapter specificato...
IOB-WIN/DATA/CONF/3017.ini
+5 -4
View File
@@ -30,10 +30,10 @@ ADDR_WRITE=DB60.DBB18
SIZE_READ=18
SIZE_WRITE=0
;BIT0=CONN
BIT1=DB60.DBB1
;BIT1=DB60.DBB1
;BIT2=PZCOUNT.STD.DB700.DBW22
BIT3=DB60.DBB3
BIT4=DB60.DBB4
;BIT3=DB60.DBB3
;BIT4=DB60.DBB4
[BLINK]
@@ -52,8 +52,9 @@ BLINK_FILT=0
[OPTPAR]
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
; attenzione memoria sempre base BYTE (1604 DW --> 6416...)
; attenzione memoria sempre base BYTE (1604 DW --> 6416...)
;PZCOUNT_MODE=STD.DB550.DBDW0
PZCOUNT_MODE=NONE
;PZ_CAD_MADDR=1602
;PZ_REQ_MADDR=1603
;PZ_DONE_MADDR=1604
IOB-WIN/IobSiemensAprochim.cs
+4 -4
View File
@@ -42,7 +42,7 @@ namespace IOB_WIN
lgInfo("NEW IOB SIEMENS versione APROCHIM");
// leggo 1 byte
for (int i = 0; i < 10; i++)
for (int i = 0; i < 3; i++)
{
Byte[] memByteRead = currPLC.ReadBytes(DataType.DataBlock, 60, 0, 18);
double pressCamFilt = S7.Net.Types.Double.FromByteArray(memByteRead.Skip(6).Take(4).ToArray());
@@ -52,9 +52,9 @@ namespace IOB_WIN
byte statusByte = S7.Net.Types.Byte.FromByteArray(memByteRead.Skip(3).Take(1).ToArray());
// log!
lgInfo($"pressCamFilt: {pressCamFilt:N6}");
lgInfo($"pressLinUt: {pressLinUt:N6}");
lgInfo($"tempH2O: {tempH2O:N3}");
lgInfo($"pressCamFilt: {pressCamFilt}");
lgInfo($"pressLinUt: {pressLinUt}");
lgInfo($"tempH2O: {tempH2O}");
lgInfo($"statusByte: {statusByte}");
Jenkinsfile
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=388']) {
withEnv(['NEXT_BUILD_NUMBER=389']) {
// 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'