diff --git a/MP.MONO.ADAPTER.OPC/CONF/Alarms.demo.json b/MP.MONO.ADAPTER.OPC/CONF/Alarms.demo.json new file mode 100644 index 0000000..115c6c9 --- /dev/null +++ b/MP.MONO.ADAPTER.OPC/CONF/Alarms.demo.json @@ -0,0 +1,26 @@ +[ + { + "Order": 1, + "ExtCode": "ns=5;i=1274", + "Type": "ALARM", + "Title": "ALARM NC", + "Value": "", + "ValueNum": 0, + "MinVal": 0, + "MaxVal": 0, + "DisplFormat": "", + "IsNumeric": false + }, + { + "Order": 2, + "ExtCode": "ns=5;i=1259", + "Type": "ALARM", + "Title": "ALARM PLC 01", + "Value": "", + "ValueNum": 0, + "MinVal": 0, + "MaxVal": 0, + "DisplFormat": "", + "IsNumeric": false + } +] \ No newline at end of file diff --git a/MP.MONO.ADAPTER.OPC/CONF/Alarms.json b/MP.MONO.ADAPTER.OPC/CONF/Alarms.json index 6532f6f..115c6c9 100644 --- a/MP.MONO.ADAPTER.OPC/CONF/Alarms.json +++ b/MP.MONO.ADAPTER.OPC/CONF/Alarms.json @@ -1,7 +1,7 @@ [ { "Order": 1, - "ExtCode": "ns=1;s=3_1_ALARM NC", + "ExtCode": "ns=5;i=1274", "Type": "ALARM", "Title": "ALARM NC", "Value": "", @@ -13,7 +13,7 @@ }, { "Order": 2, - "ExtCode": "ns=1;s=3_2_ALARM PLC 1", + "ExtCode": "ns=5;i=1259", "Type": "ALARM", "Title": "ALARM PLC 01", "Value": "", @@ -22,113 +22,5 @@ "MaxVal": 0, "DisplFormat": "", "IsNumeric": false - }, - { - "Order": 3, - "ExtCode": "ns=1;s=3_3_ALARM PLC 2", - "Type": "ALARM", - "Title": "ALARM PLC 02", - "Value": "", - "ValueNum": 0, - "MinVal": 0, - "MaxVal": 0, - "DisplFormat": "", - "IsNumeric": false - }, - { - "Order": 4, - "ExtCode": "ns=1;s=3_4_ALARM PLC 3", - "Type": "ALARM", - "Title": "ALARM PLC 03", - "Value": "", - "ValueNum": 0, - "MinVal": 0, - "MaxVal": 0, - "DisplFormat": "", - "IsNumeric": false - }, - { - "Order": 5, - "ExtCode": "ns=1;s=3_5_ALARM PLC 4", - "Type": "ALARM", - "Title": "ALARM PLC 04", - "Value": "", - "ValueNum": 0, - "MinVal": 0, - "MaxVal": 0, - "DisplFormat": "", - "IsNumeric": false - }, - { - "Order": 6, - "ExtCode": "ns=1;s=3_6_ALARM PLC 5", - "Type": "ALARM", - "Title": "ALARM PLC 05", - "Value": "", - "ValueNum": 0, - "MinVal": 0, - "MaxVal": 0, - "DisplFormat": "", - "IsNumeric": false - }, - { - "Order": 7, - "ExtCode": "ns=1;s=3_7_ALARM PLC 6", - "Type": "ALARM", - "Title": "ALARM PLC 06", - "Value": "", - "ValueNum": 0, - "MinVal": 0, - "MaxVal": 0, - "DisplFormat": "", - "IsNumeric": false - }, - { - "Order": 8, - "ExtCode": "ns=1;s=3_8_ALARM PLC 7", - "Type": "ALARM", - "Title": "ALARM PLC 07", - "Value": "", - "ValueNum": 0, - "MinVal": 0, - "MaxVal": 0, - "DisplFormat": "", - "IsNumeric": false - }, - { - "Order": 9, - "ExtCode": "ns=1;s=3_9_ALARM PLC 8", - "Type": "ALARM", - "Title": "ALARM PLC 08", - "Value": "", - "ValueNum": 0, - "MinVal": 0, - "MaxVal": 0, - "DisplFormat": "", - "IsNumeric": false - }, - { - "Order": 10, - "ExtCode": "ns=1;s=3_10_ALARM PLC 9", - "Type": "ALARM", - "Title": "ALARM PLC 09", - "Value": "", - "ValueNum": 0, - "MinVal": 0, - "MaxVal": 0, - "DisplFormat": "", - "IsNumeric": false - }, - { - "Order": 11, - "ExtCode": "ns=1;s=3_11_ALARM PLC 10", - "Type": "ALARM", - "Title": "ALARM PLC 10", - "Value": "", - "ValueNum": 0, - "MinVal": 0, - "MaxVal": 0, - "DisplFormat": "", - "IsNumeric": false } ] \ No newline at end of file diff --git a/MP.MONO.ADAPTER.OPC/CONF/Alarms.multiax.json b/MP.MONO.ADAPTER.OPC/CONF/Alarms.multiax.json new file mode 100644 index 0000000..6532f6f --- /dev/null +++ b/MP.MONO.ADAPTER.OPC/CONF/Alarms.multiax.json @@ -0,0 +1,134 @@ +[ + { + "Order": 1, + "ExtCode": "ns=1;s=3_1_ALARM NC", + "Type": "ALARM", + "Title": "ALARM NC", + "Value": "", + "ValueNum": 0, + "MinVal": 0, + "MaxVal": 0, + "DisplFormat": "", + "IsNumeric": false + }, + { + "Order": 2, + "ExtCode": "ns=1;s=3_2_ALARM PLC 1", + "Type": "ALARM", + "Title": "ALARM PLC 01", + "Value": "", + "ValueNum": 0, + "MinVal": 0, + "MaxVal": 0, + "DisplFormat": "", + "IsNumeric": false + }, + { + "Order": 3, + "ExtCode": "ns=1;s=3_3_ALARM PLC 2", + "Type": "ALARM", + "Title": "ALARM PLC 02", + "Value": "", + "ValueNum": 0, + "MinVal": 0, + "MaxVal": 0, + "DisplFormat": "", + "IsNumeric": false + }, + { + "Order": 4, + "ExtCode": "ns=1;s=3_4_ALARM PLC 3", + "Type": "ALARM", + "Title": "ALARM PLC 03", + "Value": "", + "ValueNum": 0, + "MinVal": 0, + "MaxVal": 0, + "DisplFormat": "", + "IsNumeric": false + }, + { + "Order": 5, + "ExtCode": "ns=1;s=3_5_ALARM PLC 4", + "Type": "ALARM", + "Title": "ALARM PLC 04", + "Value": "", + "ValueNum": 0, + "MinVal": 0, + "MaxVal": 0, + "DisplFormat": "", + "IsNumeric": false + }, + { + "Order": 6, + "ExtCode": "ns=1;s=3_6_ALARM PLC 5", + "Type": "ALARM", + "Title": "ALARM PLC 05", + "Value": "", + "ValueNum": 0, + "MinVal": 0, + "MaxVal": 0, + "DisplFormat": "", + "IsNumeric": false + }, + { + "Order": 7, + "ExtCode": "ns=1;s=3_7_ALARM PLC 6", + "Type": "ALARM", + "Title": "ALARM PLC 06", + "Value": "", + "ValueNum": 0, + "MinVal": 0, + "MaxVal": 0, + "DisplFormat": "", + "IsNumeric": false + }, + { + "Order": 8, + "ExtCode": "ns=1;s=3_8_ALARM PLC 7", + "Type": "ALARM", + "Title": "ALARM PLC 07", + "Value": "", + "ValueNum": 0, + "MinVal": 0, + "MaxVal": 0, + "DisplFormat": "", + "IsNumeric": false + }, + { + "Order": 9, + "ExtCode": "ns=1;s=3_9_ALARM PLC 8", + "Type": "ALARM", + "Title": "ALARM PLC 08", + "Value": "", + "ValueNum": 0, + "MinVal": 0, + "MaxVal": 0, + "DisplFormat": "", + "IsNumeric": false + }, + { + "Order": 10, + "ExtCode": "ns=1;s=3_10_ALARM PLC 9", + "Type": "ALARM", + "Title": "ALARM PLC 09", + "Value": "", + "ValueNum": 0, + "MinVal": 0, + "MaxVal": 0, + "DisplFormat": "", + "IsNumeric": false + }, + { + "Order": 11, + "ExtCode": "ns=1;s=3_11_ALARM PLC 10", + "Type": "ALARM", + "Title": "ALARM PLC 10", + "Value": "", + "ValueNum": 0, + "MinVal": 0, + "MaxVal": 0, + "DisplFormat": "", + "IsNumeric": false + } +] \ No newline at end of file diff --git a/MP.MONO.ADAPTER.OPC/CONF/Demo.json b/MP.MONO.ADAPTER.OPC/CONF/Demo.json index 4fc5515..feea9ff 100644 --- a/MP.MONO.ADAPTER.OPC/CONF/Demo.json +++ b/MP.MONO.ADAPTER.OPC/CONF/Demo.json @@ -92,6 +92,5 @@ "fdovrd": "PATH FEED OVERRIDE", "rovrd": "PATH RAPID OVERRIDE" }, - "subscribedItems": [ - ] + "subscribedItems": [] } \ No newline at end of file diff --git a/MP.MONO.ADAPTER.OPC/CONF/Tools.local.json b/MP.MONO.ADAPTER.OPC/CONF/Tools.demo.json similarity index 100% rename from MP.MONO.ADAPTER.OPC/CONF/Tools.local.json rename to MP.MONO.ADAPTER.OPC/CONF/Tools.demo.json diff --git a/MP.MONO.ADAPTER.OPC/CONF/Tools.json b/MP.MONO.ADAPTER.OPC/CONF/Tools.json index 7b85e9a..c7b2b88 100644 --- a/MP.MONO.ADAPTER.OPC/CONF/Tools.json +++ b/MP.MONO.ADAPTER.OPC/CONF/Tools.json @@ -1,7 +1,7 @@ [ { "Order": 0, - "ExtCode": "ns=1;s=4_1_TOOL 1 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_1_TOOL 1 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 01", "Value": "0", @@ -13,7 +13,7 @@ }, { "Order": 1, - "ExtCode": "ns=1;s=4_2_TOOL 2 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_2_TOOL 2 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 02", "Value": "0", @@ -25,7 +25,7 @@ }, { "Order": 2, - "ExtCode": "ns=1;s=4_3_TOOL 3 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_3_TOOL 3 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 03", "Value": "0", @@ -37,7 +37,7 @@ }, { "Order": 3, - "ExtCode": "ns=1;s=4_4_TOOL 4 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_4_TOOL 4 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 04", "Value": "0", @@ -49,7 +49,7 @@ }, { "Order": 4, - "ExtCode": "ns=1;s=4_5_TOOL 11 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_5_TOOL 11 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 05", "Value": "0", @@ -61,7 +61,7 @@ }, { "Order": 5, - "ExtCode": "ns=1;s=4_6_TOOL 12 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_6_TOOL 12 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 06", "Value": "0", @@ -73,7 +73,7 @@ }, { "Order": 6, - "ExtCode": "ns=1;s=4_7_TOOL 13 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_7_TOOL 13 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 07", "Value": "0", @@ -85,7 +85,7 @@ }, { "Order": 7, - "ExtCode": "ns=1;s=4_8_TOOL 14 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_8_TOOL 14 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 08", "Value": "0", @@ -97,7 +97,7 @@ }, { "Order": 8, - "ExtCode": "ns=1;s=4_9_TOOL 21 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_9_TOOL 21 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 09", "Value": "0", @@ -109,7 +109,7 @@ }, { "Order": 9, - "ExtCode": "ns=1;s=4_10_TOOL 22 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_10_TOOL 22 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 10", "Value": "0", @@ -121,7 +121,7 @@ }, { "Order": 10, - "ExtCode": "ns=1;s=4_11_TOOL 23 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_11_TOOL 23 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 11", "Value": "0", @@ -133,7 +133,7 @@ }, { "Order": 11, - "ExtCode": "ns=1;s=4_12_TOOL 24 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_12_TOOL 24 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 12", "Value": "0", @@ -145,7 +145,7 @@ }, { "Order": 12, - "ExtCode": "ns=1;s=4_13_TOOL 31 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_13_TOOL 31 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 13", "Value": "0", @@ -157,7 +157,7 @@ }, { "Order": 13, - "ExtCode": "ns=1;s=4_14_TOOL 32 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_14_TOOL 32 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 14", "Value": "0", @@ -169,7 +169,7 @@ }, { "Order": 14, - "ExtCode": "ns=1;s=4_15_TOOL 33 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_15_TOOL 33 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 15", "Value": "0", @@ -181,7 +181,7 @@ }, { "Order": 15, - "ExtCode": "ns=1;s=4_16_TOOL 34 CURRENT LIFE PC", + "ExtCode": "ns=1;s=5_16_TOOL 34 CURRENT LIFE PC", "Type": "TOOL", "Title": "TOOL 16", "Value": "0", diff --git a/MP.MONO.ADAPTER.OPC/CONF/Tools.multiax.json b/MP.MONO.ADAPTER.OPC/CONF/Tools.multiax.json new file mode 100644 index 0000000..c7b2b88 --- /dev/null +++ b/MP.MONO.ADAPTER.OPC/CONF/Tools.multiax.json @@ -0,0 +1,194 @@ +[ + { + "Order": 0, + "ExtCode": "ns=1;s=5_1_TOOL 1 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 01", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 1, + "ExtCode": "ns=1;s=5_2_TOOL 2 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 02", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 2, + "ExtCode": "ns=1;s=5_3_TOOL 3 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 03", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 3, + "ExtCode": "ns=1;s=5_4_TOOL 4 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 04", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 4, + "ExtCode": "ns=1;s=5_5_TOOL 11 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 05", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 5, + "ExtCode": "ns=1;s=5_6_TOOL 12 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 06", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 6, + "ExtCode": "ns=1;s=5_7_TOOL 13 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 07", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 7, + "ExtCode": "ns=1;s=5_8_TOOL 14 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 08", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 8, + "ExtCode": "ns=1;s=5_9_TOOL 21 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 09", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 9, + "ExtCode": "ns=1;s=5_10_TOOL 22 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 10", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 10, + "ExtCode": "ns=1;s=5_11_TOOL 23 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 11", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 11, + "ExtCode": "ns=1;s=5_12_TOOL 24 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 12", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 12, + "ExtCode": "ns=1;s=5_13_TOOL 31 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 13", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 13, + "ExtCode": "ns=1;s=5_14_TOOL 32 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 14", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 14, + "ExtCode": "ns=1;s=5_15_TOOL 33 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 15", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + }, + { + "Order": 15, + "ExtCode": "ns=1;s=5_16_TOOL 34 CURRENT LIFE PC", + "Type": "TOOL", + "Title": "TOOL 16", + "Value": "0", + "ValueNum": 0, + "MinVal": -9999, + "MaxVal": 9999, + "DisplFormat": "N2", + "IsNumeric": true + } +] \ No newline at end of file diff --git a/MP.MONO.ADAPTER.OPC/IobGeneric.cs b/MP.MONO.ADAPTER.OPC/IobGeneric.cs index c1277bd..21a7bbc 100644 --- a/MP.MONO.ADAPTER.OPC/IobGeneric.cs +++ b/MP.MONO.ADAPTER.OPC/IobGeneric.cs @@ -494,7 +494,10 @@ namespace MP.MONO.ADAPTER.OPC Regex rgxPre = new Regex(CleanupRegexpPre); temp = rgxPre.Replace(rawData, ""); } - + else + { + temp = rawData; + } // Step 02: se è abilitato filt/split... if (ForceSplit) { diff --git a/MP.MONO.ADAPTER.OPC/IobOpcUa.cs b/MP.MONO.ADAPTER.OPC/IobOpcUa.cs index 1305f7c..6c92445 100644 --- a/MP.MONO.ADAPTER.OPC/IobOpcUa.cs +++ b/MP.MONO.ADAPTER.OPC/IobOpcUa.cs @@ -241,7 +241,7 @@ namespace MP.MONO.ADAPTER.OPC bool changed = false; if (MonIt != null) { - if (!string.IsNullOrEmpty(NotifyValue)) + if (NotifyValue != null) { string sVal = ""; string descr = ""; @@ -267,13 +267,13 @@ namespace MP.MONO.ADAPTER.OPC } else { - logTrace($"NON ACCODATO sample per {MonIt.DisplayName} - verifica variazione ha dato esito negativo"); + logTrace($"NON ACCODATO sample per {MonIt.StartNodeId} - verifica variazione ha dato esito negativo"); } } } else { - logTrace($"checkAndSend ERROR | MonIt: {MonIt.DisplayName} | NotifyValue Null!!!"); + logTrace($"checkAndSend ERROR | MonIt: {MonIt.StartNodeId} | NotifyValue Null!!!"); } } else @@ -438,7 +438,7 @@ namespace MP.MONO.ADAPTER.OPC else { // prendo il valore bonificato dei caratteri che vogliamo ignorare - var rawVar = stringCleanup($"{e.CurrNotify.Value}"); + currVal = stringCleanup($"{e.CurrNotify.Value}"); #if false // se è abilitato filt/split... if (!string.IsNullOrEmpty(FiltSplitChar)) @@ -534,7 +534,7 @@ namespace MP.MONO.ADAPTER.OPC double newVal = 0; if (dataItem != null) { - if (!string.IsNullOrEmpty(NotifyValue)) + if (NotifyValue != null) { logTrace($"Richiesta checkSaveValue | id: {dataItem.StartNodeId} | {dataItem.DisplayName} | Valore: {NotifyValue}"); // verifico in memoria se ho l'oggetto condition ed il suo valore.. diff --git a/MP.MONO.ADAPTER.OPC/MP.MONO.ADAPTER.OPC.csproj b/MP.MONO.ADAPTER.OPC/MP.MONO.ADAPTER.OPC.csproj index 980cc7a..bf99056 100644 --- a/MP.MONO.ADAPTER.OPC/MP.MONO.ADAPTER.OPC.csproj +++ b/MP.MONO.ADAPTER.OPC/MP.MONO.ADAPTER.OPC.csproj @@ -50,6 +50,12 @@ Always + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -59,7 +65,10 @@ Always - + + PreserveNewest + + PreserveNewest diff --git a/MP.MONO.ADAPTER.OPC/Program.cs b/MP.MONO.ADAPTER.OPC/Program.cs index bfbfb18..55e19a7 100644 --- a/MP.MONO.ADAPTER.OPC/Program.cs +++ b/MP.MONO.ADAPTER.OPC/Program.cs @@ -95,7 +95,7 @@ namespace MP.MONO.ADAPTER.OPC setupConfRedis(); // modalità gestione allarmi - alarmMode = config.GetValue("SimPar:AlarmMode"); + alarmMode = config.GetValue("OptPar:AlarmMode"); await redisDb.StringSetAsync(Constants.ALARMS_MODE_KEY, JsonConvert.SerializeObject(alarmMode)); // avvio il vero e proprio programma di comunicaizone OPC-UA diff --git a/MP.MONO.ADAPTER.OPC/appsettings.json b/MP.MONO.ADAPTER.OPC/appsettings.json index 0b2dadc..c2152eb 100644 --- a/MP.MONO.ADAPTER.OPC/appsettings.json +++ b/MP.MONO.ADAPTER.OPC/appsettings.json @@ -55,8 +55,9 @@ "Log2Console": true, "Log2File": true, "ForceSplit": true, - "CleanupRegexpPre": "[^a-zA-Z0-9 %,.\\-\\+\\r\\n]", - "CleanupRegexpPost": "[^a-zA-Z0-9 %,.\\-\\+]", + //"ForceSplit": false, + "CleanupRegexpPre": "[^a-zA-Z0-9 %/,.\\-\\+\\r\\n]", + "CleanupRegexpPost": "[^a-zA-Z0-9 %/,.\\-\\+]", "FiltCrLf": true, "FiltSplitChar": [] }, diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj index d477edc..6b646ba 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.12206.2020 + 1.12206.2111 diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html index 7132183..f8379ee 100644 --- a/MP.MONO.ANALYZER/Resources/ChangeLog.html +++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

Version: 1.12206.2020

+

Version: 1.12206.2111


Release Note:
  • diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt index 9424b77..964c0e8 100644 --- a/MP.MONO.ANALYZER/Resources/VersNum.txt +++ b/MP.MONO.ANALYZER/Resources/VersNum.txt @@ -1 +1 @@ -1.12206.2020 +1.12206.2111 diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml index d0ebf8a..1792e63 100644 --- a/MP.MONO.ANALYZER/Resources/manifest.xml +++ b/MP.MONO.ANALYZER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.12206.2020 + 1.12206.2111 http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html false diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj index 7b9265d..a1410db 100644 --- a/MP.MONO.DECODER/MP.MONO.DECODER.csproj +++ b/MP.MONO.DECODER/MP.MONO.DECODER.csproj @@ -6,7 +6,7 @@ enable enable AnyCPU;x86;x64 - 1.12206.2020 + 1.12206.2111 diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html index 7132183..f8379ee 100644 --- a/MP.MONO.DECODER/Resources/ChangeLog.html +++ b/MP.MONO.DECODER/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

    Version: 1.12206.2020

    +

    Version: 1.12206.2111


    Release Note:
    • diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt index 9424b77..964c0e8 100644 --- a/MP.MONO.DECODER/Resources/VersNum.txt +++ b/MP.MONO.DECODER/Resources/VersNum.txt @@ -1 +1 @@ -1.12206.2020 +1.12206.2111 diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml index 7521f73..af14fba 100644 --- a/MP.MONO.DECODER/Resources/manifest.xml +++ b/MP.MONO.DECODER/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.12206.2020 + 1.12206.2111 http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html false diff --git a/MP.MONO.DECODER/appsettings.json b/MP.MONO.DECODER/appsettings.json index 12d7629..cd49bff 100644 --- a/MP.MONO.DECODER/appsettings.json +++ b/MP.MONO.DECODER/appsettings.json @@ -31,5 +31,8 @@ "SenderName": "Steamware Email BOT" } } + }, + "OptPar": { + "AlarmMode": "RawList" } } diff --git a/MP.MONO.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj index c1b28a5..71157fe 100644 --- a/MP.MONO.SIM/MP.MONO.SIM.csproj +++ b/MP.MONO.SIM/MP.MONO.SIM.csproj @@ -6,7 +6,7 @@ enable enable AnyCPU;x86;x64 - 1.12206.2020 + 1.12206.2111 diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html index 7132183..f8379ee 100644 --- a/MP.MONO.SIM/Resources/ChangeLog.html +++ b/MP.MONO.SIM/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

      Version: 1.12206.2020

      +

      Version: 1.12206.2111


      Release Note:
      • diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt index 9424b77..964c0e8 100644 --- a/MP.MONO.SIM/Resources/VersNum.txt +++ b/MP.MONO.SIM/Resources/VersNum.txt @@ -1 +1 @@ -1.12206.2020 +1.12206.2111 diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml index 224e8a9..8c414a2 100644 --- a/MP.MONO.SIM/Resources/manifest.xml +++ b/MP.MONO.SIM/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.12206.2020 + 1.12206.2111 http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html false diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj index c70c463..023bf58 100644 --- a/MP.MONO.UI/MP.MONO.UI.csproj +++ b/MP.MONO.UI/MP.MONO.UI.csproj @@ -5,7 +5,7 @@ enable enable AnyCPU;x86;x64 - 1.12206.2020 + 1.12206.2111 diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html index 7132183..f8379ee 100644 --- a/MP.MONO.UI/Resources/ChangeLog.html +++ b/MP.MONO.UI/Resources/ChangeLog.html @@ -1,6 +1,6 @@ MAPO-MONO -

        Version: 1.12206.2020

        +

        Version: 1.12206.2111


        Release Note:
        • diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt index 9424b77..964c0e8 100644 --- a/MP.MONO.UI/Resources/VersNum.txt +++ b/MP.MONO.UI/Resources/VersNum.txt @@ -1 +1 @@ -1.12206.2020 +1.12206.2111 diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml index 105358e..a8c30d5 100644 --- a/MP.MONO.UI/Resources/manifest.xml +++ b/MP.MONO.UI/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.12206.2020 + 1.12206.2111 http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html false