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

Merge branch 'release/FixExecuteEmptyMemMap'

Browse Source
This commit is contained in:
Samuele Locatelli
2021-12-03 14:31:02 +01:00
parent 3edd761c34 20a2f81933
commit f114fd1758
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/IobGeneric.cs
+15 -7
View File
@@ -3320,17 +3320,25 @@ namespace IOB_WIN_NEXT
case taskType.setProg:
case taskType.setPzComm:
// recupero dati da memMap...
if (memMap.mMapWrite.ContainsKey(item.Key))
// recupero dati da memMap...
if (memMap != null && memMap.mMapWrite != null)
{
dataConf currMem = memMap.mMapWrite[item.Key];
string addr = currMem.memAddr;
taskVal = $"SET task: {item.Key} --> {item.Value} | mem: {currMem.memAddr} - {currMem.size} byte";
// salvo il nuovo valore nella memoria... così prox invio lo trasmetterà
memMap.mMapWrite[item.Key].value = item.Value;
if (memMap.mMapWrite.ContainsKey(item.Key))
{
dataConf currMem = memMap.mMapWrite[item.Key];
string addr = currMem.memAddr;
taskVal = $"SET task: {item.Key} --> {item.Value} | mem: {currMem.memAddr} - {currMem.size} byte";
// salvo il nuovo valore nella memoria... così prox invio lo trasmetterà
memMap.mMapWrite[item.Key].value = item.Value;
}
else
{
taskVal = $"NO DATA MEM, SET task: {item.Key} --> {item.Value}";
}
}
else
{
taskVal = $"NO DATA MEM, SET task: {item.Key} --> {item.Value}";
taskVal = $"NO MemMap found, SET task: {item.Key} --> {item.Value}";
}
// salvo in currProd..
saveProdData(new KeyValuePair<string, string>(item.Key, item.Value));
IOB-WIN/IobGeneric.cs
+14 -7
View File
@@ -2964,17 +2964,24 @@ namespace IOB_WIN
case taskType.setProg:
case taskType.setPzComm:
// recupero dati da memMap...
if (memMap.mMapWrite.ContainsKey(item.Key))
if (memMap != null && memMap.mMapWrite != null)
{
dataConf currMem = memMap.mMapWrite[item.Key];
string addr = currMem.memAddr;
taskVal = $"SET task: {item.Key} --> {item.Value} | mem: {currMem.memAddr} - {currMem.size} byte";
// salvo il nuovo valore nella memoria... così prox invio lo trasmetterà
memMap.mMapWrite[item.Key].value = item.Value;
if (memMap.mMapWrite.ContainsKey(item.Key))
{
dataConf currMem = memMap.mMapWrite[item.Key];
string addr = currMem.memAddr;
taskVal = $"SET task: {item.Key} --> {item.Value} | mem: {currMem.memAddr} - {currMem.size} byte";
// salvo il nuovo valore nella memoria... così prox invio lo trasmetterà
memMap.mMapWrite[item.Key].value = item.Value;
}
else
{
taskVal = $"NO DATA MEM, SET task: {item.Key} --> {item.Value}";
}
}
else
{
taskVal = $"NO DATA MEM, SET task: {item.Key} --> {item.Value}";
taskVal = $"NO MemMap found, SET task: {item.Key} --> {item.Value}";
}
break;