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

Update gestione scrittura x Siemens INGENIA

Browse Source
This commit is contained in:
Samuele Locatelli
2022-02-22 13:22:36 +01:00
parent 63527f911b
commit b6c60eb4db
4 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/DATA/CONF/MAIN.ini
+2 -1
View File
@@ -73,6 +73,7 @@ CLI_INST=SteamWareSim
;STARTLIST=MECART_80
;STARTLIST=PING
;STARTLIST=PIZ09
STARTLIST=VL25
;STARTLIST=VL25
STARTLIST=SIMUL_02
MAXCNC=10
IOB-WIN-NEXT/IobGeneric.cs
+28 -25
View File
@@ -1637,7 +1637,7 @@ namespace IOB_WIN_NEXT
}
catch (Exception exc)
{
lgError(exc, "Errore in composizione urlSaveMemConf");
lgError(exc, "Errore in composizione urlUpdateWriteParams");
}
return answ;
}
@@ -1905,28 +1905,31 @@ namespace IOB_WIN_NEXT
// se devo scrivere --> riporto
if (needWrite)
{
// preparo obj da scrivere
objItem newWrite = new objItem()
if (memMap.mMapWrite.ContainsKey(item.Key))
{
uid = item.Key,
name = item.Key,
reqValue = memMap.mMapWrite[item.Key].value,
lastRequest = DateTime.Now,
writable = true
};
updatedPar.Add(newWrite);
// preparo obj da scrivere
objItem newWrite = new objItem()
{
uid = item.Key,
name = item.Key,
reqValue = memMap.mMapWrite[item.Key].value,
lastRequest = DateTime.Now,
writable = true
};
updatedPar.Add(newWrite);
}
}
}
// se ho da scrivere... scrivo TUTTI!
if (updatedPar.Count > 0)
{
// scrivo valore!
lgInfo("Chiamate processMem2Write --> plcWriteParams");
lgInfo("Chiamata di plcWriteParams da processMem2Write");
plcWriteParams(ref updatedPar);
// invio su cloud parametri!
string rawData = JsonConvert.SerializeObject(updatedPar);
utils.callUrl($"{urlUpdateWriteParams}", rawData);
lgInfo("Notifica a server scrittura parametri");
lgInfo($"Notificato a server scrittura {updatedPar.Count} parametri");
}
}
@@ -2590,12 +2593,12 @@ namespace IOB_WIN_NEXT
{
//if (isVerboseLog)
//{
lg.Factory.Configuration.Variables["codIOB"] = cIobConf.codIOB;
lg.Debug(message);
if (sendToForm)
{
sendToLogWatch("DEBUG", message);
}
lg.Factory.Configuration.Variables["codIOB"] = cIobConf.codIOB;
lg.Debug(message);
if (sendToForm)
{
sendToLogWatch("DEBUG", message);
}
//}
}
/// <summary>
@@ -2607,9 +2610,9 @@ namespace IOB_WIN_NEXT
{
//if (isVerboseLog)
//{
lg.Factory.Configuration.Variables["codIOB"] = cIobConf.codIOB;
lg.Debug(message, args);
sendToLogWatch("DEBUG", message, args);
lg.Factory.Configuration.Variables["codIOB"] = cIobConf.codIOB;
lg.Debug(message, args);
sendToLogWatch("DEBUG", message, args);
//}
}
@@ -2820,7 +2823,7 @@ namespace IOB_WIN_NEXT
answ += $" | Parameter {item.uid} --> {item.reqValue}";
// sistemo valori
item.value = item.reqValue;
lgInfo($"Effettuato update parametro: actVal = {item.value} | reqVal = {item.reqValue}");
lgInfo($"Richiesta update parametro {item.uid} | actVal = {item.value} | reqVal = {item.reqValue}");
item.reqValue = "";
// salvo in lista da ritrasmettere
updatedPar.Add(item);
@@ -3054,7 +3057,7 @@ namespace IOB_WIN_NEXT
if (memMap != null)
{
// invio su cloud conf memoria...
string rawData = JsonConvert.SerializeObject(memMap);
string rawData = JsonConvert.SerializeObject(memMap, Formatting.Indented);
var resp = utils.callUrlNow($"{urlSaveMemMap}", rawData);
// salvo ANCHE come parametri i valori...
objItem currItem = new objItem();
@@ -3088,7 +3091,7 @@ namespace IOB_WIN_NEXT
allParam.Add(currItem);
}
// invio su cloud parametri!
rawData = JsonConvert.SerializeObject(allParam);
rawData = JsonConvert.SerializeObject(allParam, Formatting.Indented);
utils.callUrl($"{urlSaveAllParams}", rawData);
lgInfo($"setupMemMap | salvata conf memoria R/W");
}
@@ -3473,7 +3476,7 @@ namespace IOB_WIN_NEXT
bool fatto = false;
if (vetoSplit < DateTime.Now)
{
lgInfo("Richiesto forceSplitOdl");
lgInfo("Richiesto forceSplitOdl");
// imposto veto x 1 minuto ad altre chiamate...
vetoSplit = DateTime.Now.AddMinutes(1);
// eseguo SOLO SE sono online...
IOB-WIN-NEXT/IobSiemens.cs
+2 -2
View File
@@ -492,7 +492,7 @@ namespace IOB_WIN_NEXT
default:
break;
}
lgInfo($"---------------MemBlock data---------------{Environment.NewLine}{BitConverter.ToString(MemBlock)}{Environment.NewLine}--------------- END data ---------------");
lgInfo($"Preparo scrittura{Environment.NewLine}---------------MemBlock data---------------{Environment.NewLine}{BitConverter.ToString(MemBlock)}{Environment.NewLine}--------------- END data ---------------");
if (!string.IsNullOrEmpty(memAddrWrite))
{
// scrivo su siemens
@@ -1176,7 +1176,7 @@ namespace IOB_WIN_NEXT
{
case ErrorCode.NoError:
answ = true;
maybeLogWrite(memAddrWrite, $"S7WriteBB-01 Effettuata correttamente scrittura su PLC: MEMORIA {memAddrWrite} | numByte: {Value.Length} | ValOriginale: {Value}");
maybeLogWrite(memAddrWrite, $"S7WriteBB-01 Effettuata correttamente scrittura su PLC: MEMORIA {memAddrWrite} | numByte: {Value.Length} | ValOriginale: {BitConverter.ToString(Value)}");
break;
case ErrorCode.WrongCPU_Type:
IOB-WIN-NEXT/IobSiemensIngenia.cs
+4 -2
View File
@@ -188,8 +188,6 @@ namespace IOB_WIN_NEXT
case taskType.fixStopSetup:
case taskType.forceResetPzCount:
case taskType.forceSetPzCount:
case taskType.setArt:
case taskType.setComm:
case taskType.setProg:
case taskType.startSetup:
case taskType.stopSetup:
@@ -207,6 +205,9 @@ namespace IOB_WIN_NEXT
}
break;
case taskType.setArt:
case taskType.setComm:
case taskType.setPzComm:
case taskType.setParameter:
// richiedo da URL i parametri WRITE da popolare
lgInfo("Chiamata processMemWriteRequests");
@@ -225,6 +226,7 @@ namespace IOB_WIN_NEXT
taskVal = $"WRONG REQUEST FOR SET PARAMETERS: {item.Value} doesnt contain pipe for splitting key/value";
}
}
taskOk = true;
break;
default: