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

pulizia commenti + fix prima lettura val TS..

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-04-26 21:17:13 +02:00
parent 5402830218
commit 5cd9e4a45c
2 changed files with 4 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/IobSiemensAprochim.cs
+3 -40
View File
@@ -63,7 +63,7 @@ namespace IOB_WIN
{
Funzione = funz,
Periodo = periodo,
DTStart = DateTime.Now,
DTStart = DateTime.Now.AddHours(-1),
dataArray = new List<double>()
};
TSVC_Data.Add(item.Key.Replace("TSVC_", ""), currConf);
@@ -75,41 +75,7 @@ namespace IOB_WIN
// salvo i valori PREC...
LastTSVC.Add(item.Key, 0);
}
}
#if false
// leggo in test iniziale
for (int i = 0; i < 3; i++)
{
if (connectionOk)
{
try
{
Byte[] memByteRead = currPLC.ReadBytes(DataType.DataBlock, 60, 0, 18);
double pressCamFilt = S7.Net.Types.Double.FromByteArray(memByteRead.Skip(6).Take(4).ToArray());
double pressLinUt = S7.Net.Types.Double.FromByteArray(memByteRead.Skip(10).Take(4).ToArray());
double tempH2O = S7.Net.Types.Double.FromByteArray(memByteRead.Skip(14).Take(4).ToArray());
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($"statusByte: {statusByte}");
}
catch (Exception exc)
{
lgError(exc, "Errore nel ciclo for iniziale");
}
}
else
{
lgInfo($"NO PLC Connection! sleep");
Thread.Sleep(500);
}
}
#endif
}
}
#region Metodi specifici (da verificare/completare in implementazione)
@@ -163,10 +129,7 @@ namespace IOB_WIN
LastTSVC["tempH2O"] = tempH2O;
}
else
{
pressCamFilt = 0;
pressLinUt = 0;
tempH2O = 0;
{
outVal.Add("DYNDATA", $"pressCamFilt {LastTSVC["pressCamFilt"]:N6} | pressLinUt {LastTSVC["pressLinUt"]:N6} | tempH2O {LastTSVC["tempH2O"]:N3}");
}
}
Jenkinsfile
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=399']) {
withEnv(['NEXT_BUILD_NUMBER=400']) {
// 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'