diff --git a/IOB-WIN-NEXT/DATA/CONF/2014.json b/IOB-WIN-NEXT/DATA/CONF/2014.json index 22af356a..b3ed4135 100644 --- a/IOB-WIN-NEXT/DATA/CONF/2014.json +++ b/IOB-WIN-NEXT/DATA/CONF/2014.json @@ -80,7 +80,6 @@ "rovrd": "PATH RAPID OVERRIDE" }, "paramsEndThresh": { - "actFeedRateIpo": 100, "actFeedRateIpoOvr": 10, "feedRateIpoOvr": 10 }, @@ -89,6 +88,7 @@ "filterItemsNodeId": [ "ns=2;s=/Axis", "ns=2;s=/Bag", + "ns=2;s=/Channel/State/actFeedRateIpo", "ns=2;s=/Channel/State/actProgNetTime", "ns=2;s=/Channel/AuxiliaryFunctions", "ns=2;s=/Channel/GenericCoupling", @@ -199,7 +199,6 @@ "ns=2;s=/Channel/State/actTNumber", "ns=2;s=/Channel/ProgramInfo/selectedWorkPProg", "ns=2;s=/Channel/ProgramInfo/progName", - "ns=2;s=/Channel/State/actFeedRateIpo", "ns=2;s=/Channel/State/actFeedRateIpoOvr", "ns=2;s=/Channel/State/feedRateIpoOvr", "ns=2;s=/Nck/State/aStopesi", @@ -283,14 +282,6 @@ "index": 0, "size": 50 }, - "OPC_ActFeedRate": { - "name": "OPC_ActFeedRate", - "description": "FeedRate Act", - "tipoMem": "Int", - "memAddr": "ns=2;s=/Channel/State/actFeedRateIpo", - "index": 0, - "size": 1 - }, "OPC_ActFeedRateOvr": { "name": "OPC_ActFeedRateOvr", "description": "FeedRate Act Override", diff --git a/IOB-WIN-NEXT/Iob/Generic.cs b/IOB-WIN-NEXT/Iob/Generic.cs index 87ec2c29..5eab93a8 100644 --- a/IOB-WIN-NEXT/Iob/Generic.cs +++ b/IOB-WIN-NEXT/Iob/Generic.cs @@ -1586,7 +1586,6 @@ namespace IOB_WIN_NEXT.Iob case taskType.setComm: case taskType.setProg: case taskType.setPzComm: - case taskType.forceSetPzCount: // recupero dati da memMap... if (memMap != null && memMap.mMapWrite != null) { @@ -1612,6 +1611,30 @@ namespace IOB_WIN_NEXT.Iob break; + case taskType.forceSetPzCount: + // recupero dati da memMap... + if (memMap != null && memMap.mMapWrite != null) + { + 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 MemMap found, SET task: {item.Key} --> {item.Value}"; + } + + break; + case taskType.setArtNum: // in primis faccio una chiamata per tutta la tab SE fosse vuoto il // dict di traduzione