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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-12-06 08:23:29 +01:00
parent 5141aaf32c f60fb74dbe
commit af96aaa981
3 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/IobSiemensLasco.cs
+19
View File
@@ -219,6 +219,25 @@ namespace IOB_WIN
MemBlock[0] = (byte)valore;
taskVal = $"VALUE DB1002.92 --> {valore} | counter interno {counterMes2Plc}";
break;
case taskType.setParameter:
// richiedo da URL i parametri WRITE da popolare
lgInfo("Chiamata processMemWriteRequests");
taskVal = processMemWriteRequests();
// se restituiscce "" faccio altra prova...
if (string.IsNullOrEmpty(taskVal))
{
// i parametri me li aspetto come stringa composta paramName|paramvalue
if (item.Value.Contains("|"))
{
string[] paramsJob = item.Value.Split('|');
taskVal = $"REQUEST SET PARAMETERS: {paramsJob[0]} --> {paramsJob[1]}";
}
else
{
taskVal = $"WRONG REQUEST FOR SET PARAMETERS: {item.Value} doesnt contain pipe for splitting key/value";
}
}
break;
case taskType.startSetup:
// salvo che SONO IN SETUP!
inSetup = true;
IOB-WIN/IobSiemensSaet.cs
+22 -3
View File
@@ -162,10 +162,29 @@ namespace IOB_WIN
MemBlock = S7.Net.Types.DInt.ToByteArray(numPz);
memAddrWrite = "DB1275.DBB144";
break;
//case taskType.setParameter:
// // deserializzo il valore del parametro in primis
// var paramData = JsonConvert.DeserializeObject<dataConf>(item.Value);
// // !!!FIXME!!! fare!!!
// break;
case taskType.setParameter:
// deserializzo il valore del parametro in primis
var paramData = JsonConvert.DeserializeObject<dataConf>(item.Value);
// !!!FIXME!!! fare!!!
// richiedo da URL i parametri WRITE da popolare
lgInfo("Chiamata processMemWriteRequests");
taskVal = processMemWriteRequests();
// se restituiscce "" faccio altra prova...
if (string.IsNullOrEmpty(taskVal))
{
// i parametri me li aspetto come stringa composta paramName|paramvalue
if (item.Value.Contains("|"))
{
string[] paramsJob = item.Value.Split('|');
taskVal = $"REQUEST SET PARAMETERS: {paramsJob[0]} --> {paramsJob[1]}";
}
else
{
taskVal = $"WRONG REQUEST FOR SET PARAMETERS: {item.Value} doesnt contain pipe for splitting key/value";
}
}
break;
case taskType.sendWatchDogMes2Plc:
MemBlock = new byte[2];
Jenkinsfile
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=580']) {
withEnv(['NEXT_BUILD_NUMBER=581']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'