diff --git a/MP.MONO.ADAPTER.OPC/CONF/Tools.json b/MP.MONO.ADAPTER.OPC/CONF/Tools.json index 04e9d12..ff17632 100644 --- a/MP.MONO.ADAPTER.OPC/CONF/Tools.json +++ b/MP.MONO.ADAPTER.OPC/CONF/Tools.json @@ -111,7 +111,7 @@ "Order": 9, "ExtCode": "ns=1;s=5_10_TOOL 22 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 3 TOOL 2", + "Title": "SPINDLE 3 TOOL 02", "Value": "0", "ValueNum": 0, "MinVal": -9999, @@ -123,7 +123,7 @@ "Order": 10, "ExtCode": "ns=1;s=5_11_TOOL 23 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 3 TOOL 3", + "Title": "SPINDLE 3 TOOL 03", "Value": "0", "ValueNum": 0, "MinVal": -9999, @@ -135,7 +135,7 @@ "Order": 11, "ExtCode": "ns=1;s=5_12_TOOL 24 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 3 TOOL 4", + "Title": "SPINDLE 3 TOOL 04", "Value": "0", "ValueNum": 0, "MinVal": -9999, @@ -147,7 +147,7 @@ "Order": 12, "ExtCode": "ns=1;s=5_13_TOOL 31 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 4 TOOL 1", + "Title": "SPINDLE 4 TOOL 01", "Value": "0", "ValueNum": 0, "MinVal": -9999, @@ -159,7 +159,7 @@ "Order": 13, "ExtCode": "ns=1;s=5_14_TOOL 32 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 4 TOOL 2", + "Title": "SPINDLE 4 TOOL 02", "Value": "0", "ValueNum": 0, "MinVal": -9999, @@ -171,7 +171,7 @@ "Order": 14, "ExtCode": "ns=1;s=5_15_TOOL 33 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 4 TOOL 3", + "Title": "SPINDLE 4 TOOL 03", "Value": "0", "ValueNum": 0, "MinVal": -9999, @@ -183,7 +183,7 @@ "Order": 15, "ExtCode": "ns=1;s=5_16_TOOL 34 CURRENT LIFE PC", "Type": "TOOL", - "Title": "SPINDLE 4 TOOL 4", + "Title": "SPINDLE 4 TOOL 04", "Value": "0", "ValueNum": 0, "MinVal": -9999, diff --git a/MP.MONO.ADAPTER.OPC/IobOpcUa.cs b/MP.MONO.ADAPTER.OPC/IobOpcUa.cs index cb929b5..07508e5 100644 --- a/MP.MONO.ADAPTER.OPC/IobOpcUa.cs +++ b/MP.MONO.ADAPTER.OPC/IobOpcUa.cs @@ -764,10 +764,20 @@ namespace MP.MONO.ADAPTER.OPC currItem.Value = rawDataVal; } logTrace($"R&S | ToolKList | {uuid} | {currItem.Value}"); + +#if false // prendo tutti i valori del gruppo e li serializzo come DisplayDataDTO string payloadTools = JsonConvert.SerializeObject(ToolStatus); // invio - saveAndSendMessage(Constants.TOOLS_CURR_KEY, Constants.TOOLS_M_QUEUE, payloadTools); + saveAndSendMessage(Constants.TOOLS_CURR_KEY, Constants.TOOLS_M_QUEUE, payloadTools); +#endif + + // genero un dictionary di valori stringa / double e lo serializzo... + var dataDict = ToolStatus.ToDictionary(x => x.Title, x => x.Value); + string payloadTools = JsonConvert.SerializeObject(dataDict); + // invio + saveAndSendMessage(Constants.TOOLS_ACT_KEY, Constants.TOOLS_RAW_QUEUE, payloadTools); + } // Parameters diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index a95a8a4..8057d3e 100644 --- a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj +++ b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj @@ -6,7 +6,7 @@ enable enable AnyCPU;x86;x64 - 1.2.2209.2318 + 1.2.2210.419 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index 39c315b..5a11ffe 100644 --- a/MP.MONO.ANALYZER/Resources/ChangeLog.html +++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

Version: 1.2.2209.2318

+

Version: 1.2.2210.419


Release Note: