diff --git a/MP.MONO.ADAPTER.OPC/CONF/Alarms.json b/MP.MONO.ADAPTER.OPC/CONF/Alarms.json
index 115c6c9..6532f6f 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=5;i=1274",
+ "ExtCode": "ns=1;s=3_1_ALARM NC",
"Type": "ALARM",
"Title": "ALARM NC",
"Value": "",
@@ -13,7 +13,7 @@
},
{
"Order": 2,
- "ExtCode": "ns=5;i=1259",
+ "ExtCode": "ns=1;s=3_2_ALARM PLC 1",
"Type": "ALARM",
"Title": "ALARM PLC 01",
"Value": "",
@@ -22,5 +22,113 @@
"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/MPStatus.demo.json b/MP.MONO.ADAPTER.OPC/CONF/MPStatus.demo.json
index 115c6c9..a493844 100644
--- a/MP.MONO.ADAPTER.OPC/CONF/MPStatus.demo.json
+++ b/MP.MONO.ADAPTER.OPC/CONF/MPStatus.demo.json
@@ -1,26 +1,41 @@
[
{
"Order": 1,
- "ExtCode": "ns=5;i=1274",
- "Type": "ALARM",
- "Title": "ALARM NC",
+ "ExtCode": "ns=3;i=11176",
+ "Type": "STATUS",
+ "Title": "MACHINE STATUS",
"Value": "",
"ValueNum": 0,
"MinVal": 0,
- "MaxVal": 0,
- "DisplFormat": "",
- "IsNumeric": false
+ "MaxVal": 10,
+ "ScaleFactor": 0.1,
+ "DisplFormat": "N0",
+ "IsNumeric": true
},
{
"Order": 2,
- "ExtCode": "ns=5;i=1259",
- "Type": "ALARM",
- "Title": "ALARM PLC 01",
+ "ExtCode": "ns=3;i=11230",
+ "Type": "STATUS",
+ "Title": "PROCESS STATUS",
"Value": "",
"ValueNum": 0,
"MinVal": 0,
- "MaxVal": 0,
- "DisplFormat": "",
- "IsNumeric": false
+ "MaxVal": 20,
+ "ScaleFactor": 0.1,
+ "DisplFormat": "N0",
+ "IsNumeric": true
+ },
+ {
+ "Order": 3,
+ "ExtCode": "ns=3;i=11236",
+ "Type": "MODE",
+ "Title": "PROCESS MODE",
+ "Value": "",
+ "ValueNum": 0,
+ "MinVal": 0,
+ "MaxVal": 10,
+ "ScaleFactor": 0.1,
+ "DisplFormat": "N0",
+ "IsNumeric": true
}
]
\ No newline at end of file
diff --git a/MP.MONO.ADAPTER.OPC/CONF/MPStatus.json b/MP.MONO.ADAPTER.OPC/CONF/MPStatus.json
index 1b6edea..a493844 100644
--- a/MP.MONO.ADAPTER.OPC/CONF/MPStatus.json
+++ b/MP.MONO.ADAPTER.OPC/CONF/MPStatus.json
@@ -1,37 +1,40 @@
[
{
"Order": 1,
- "ExtCode": "ns=1;s=1_1_MACHINE STATUS",
+ "ExtCode": "ns=3;i=11176",
"Type": "STATUS",
"Title": "MACHINE STATUS",
"Value": "",
"ValueNum": 0,
"MinVal": 0,
"MaxVal": 10,
+ "ScaleFactor": 0.1,
"DisplFormat": "N0",
"IsNumeric": true
},
{
"Order": 2,
- "ExtCode": "ns=1;s=500_1_STATUS",
+ "ExtCode": "ns=3;i=11230",
"Type": "STATUS",
"Title": "PROCESS STATUS",
"Value": "",
"ValueNum": 0,
"MinVal": 0,
"MaxVal": 20,
+ "ScaleFactor": 0.1,
"DisplFormat": "N0",
"IsNumeric": true
},
{
"Order": 3,
- "ExtCode": "ns=1;s=501_1_MODE",
+ "ExtCode": "ns=3;i=11236",
"Type": "MODE",
"Title": "PROCESS MODE",
"Value": "",
"ValueNum": 0,
"MinVal": 0,
"MaxVal": 10,
+ "ScaleFactor": 0.1,
"DisplFormat": "N0",
"IsNumeric": true
}
diff --git a/MP.MONO.ADAPTER.OPC/IobOpcUa.cs b/MP.MONO.ADAPTER.OPC/IobOpcUa.cs
index abaac44..a3956f8 100644
--- a/MP.MONO.ADAPTER.OPC/IobOpcUa.cs
+++ b/MP.MONO.ADAPTER.OPC/IobOpcUa.cs
@@ -792,11 +792,17 @@ namespace MP.MONO.ADAPTER.OPC
currItem.Value = rawDataVal;
}
logTrace($"R&S | ParamKList | {uuid} | {currItem.Value}");
+ // parametri: inviati come DTO
+#if false
// genero un dictionary di valori stringa / double e lo serializzo...
var dataDict = ParamStatus.ToDictionary(x => x.Title, x => x.Value);
- string payloadParams = JsonConvert.SerializeObject(dataDict);
+ string payloadParams = JsonConvert.SerializeObject(dataDict);
// invio
- saveAndSendMessage(Constants.PARAMS_CURR_KEY, Constants.PARAMS_RAW_QUEUE, payloadParams);
+ saveAndSendMessage(Constants.PARAMS_ACT_KEY, Constants.PARAMS_RAW_QUEUE, payloadParams);
+#endif
+ string payloadParams = JsonConvert.SerializeObject(ParamStatus);
+ // invio
+ saveAndSendMessage(Constants.PARAMS_CURR_KEY, Constants.PARAMS_M_QUEUE, payloadParams);
}
// Allarmi
diff --git a/MP.MONO.ADAPTER.OPC/appsettings.json b/MP.MONO.ADAPTER.OPC/appsettings.json
index 1e4082a..92b5e00 100644
--- a/MP.MONO.ADAPTER.OPC/appsettings.json
+++ b/MP.MONO.ADAPTER.OPC/appsettings.json
@@ -6,21 +6,14 @@
}
},
"ConnectionStrings": {
- "Redis": "nkcredis.steamware.net:6379,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,password=nkc.password",
+ "Redis": "localhost:6379,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false",
"AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
"AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Egalware_24068!;sslmode=None;",
"MP.MONO.Data": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;"
},
- //"ConnectionStrings": {
- // "Redis": "localhost:6379,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false",
- // "AuthConnection": "Server=localhost;port=3306;database=GWMS;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
- // "DefaultConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;",
- // "AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=Egalware_24068!;sslmode=None;",
- // "MP.MONO.Data": "Server=localhost;port=3306;database=MAPO.MONO;user=GWMS;pwd=GWMS_secret_pwd;sslmode=None;"
- //},
"DbConfig": {
- "Server": "10.74.82.230",
+ "Server": "localhost",
"nKey": "MONO",
"sKey": "Calcium0xide-CaO"
},
@@ -40,14 +33,12 @@
},
"Endpoint": {
"ConfFile": "Demo.json",
- "FullUrl": "opc.tcp://localhost:62541/Quickstarts/ReferenceServer",
+ "FullUrl": "opc.tcp://wrkst-r9-sam:62541/Quickstarts/ReferenceServer",
"PingMsTimeout": 1500
},
//"Endpoint": {
// "ConfFile": "Multiax.json",
// "FullUrl": "opc.tcp://192.168.0.2:4840",
- //// "IpAddress": "192.168.0.2",
- //// "Port": "4840",
// "PingMsTimeout": 1500
//},
"OptPar": {
@@ -66,9 +57,9 @@
"Machine": {
"Manufacturer": "Multiax",
"Model": "M-D5",
- "Name": "D5,
+ "Name": "D5",
"SerialNumber": "03216549870"
- }
+ },
"ENABLE_DATA_FILTER": true,
"ENABLE_CLI_RESTART": true,
"logEvery": 10,
@@ -78,4 +69,4 @@
"disconMaxSec": 30,
"verboseLogTOut": 60,
"waitRecMSec": 60000
-}
+}
\ No newline at end of file
diff --git a/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj b/MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
index 7540ff5..e8b0145 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.2206.2217
+ 1.2.2206.2308
diff --git a/MP.MONO.ANALYZER/Resources/ChangeLog.html b/MP.MONO.ANALYZER/Resources/ChangeLog.html
index 7109e9f..323d68f 100644
--- a/MP.MONO.ANALYZER/Resources/ChangeLog.html
+++ b/MP.MONO.ANALYZER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
- Version: 1.2.2206.2217
+ Version: 1.2.2206.2308
Release Note:
-
diff --git a/MP.MONO.ANALYZER/Resources/VersNum.txt b/MP.MONO.ANALYZER/Resources/VersNum.txt
index 8dd2eb6..a324f66 100644
--- a/MP.MONO.ANALYZER/Resources/VersNum.txt
+++ b/MP.MONO.ANALYZER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2206.2217
+1.2.2206.2308
diff --git a/MP.MONO.ANALYZER/Resources/manifest.xml b/MP.MONO.ANALYZER/Resources/manifest.xml
index ca79c2f..1472332 100644
--- a/MP.MONO.ANALYZER/Resources/manifest.xml
+++ b/MP.MONO.ANALYZER/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2206.2217
+ 1.2.2206.2308
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.Core/DTO/DisplayDataDTO.cs b/MP.MONO.Core/DTO/DisplayDataDTO.cs
index b016e89..36970f0 100644
--- a/MP.MONO.Core/DTO/DisplayDataDTO.cs
+++ b/MP.MONO.Core/DTO/DisplayDataDTO.cs
@@ -37,6 +37,10 @@ namespace MP.MONO.Core.DTO
///
public double ValueNum { get; set; } = 0;
///
+ /// Valore scala (da moltiplicare, > 1 aumenta, 0>x>1 riduce)
+ ///
+ public double ScaleFactor { get; set; } = 1;
+ ///
/// Display format
///
public string DisplFormat { get; set; } = "N0";
diff --git a/MP.MONO.DECODER/MP.MONO.DECODER.csproj b/MP.MONO.DECODER/MP.MONO.DECODER.csproj
index 589f70f..dcec232 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.2.2206.2217
+ 1.2.2206.2308
diff --git a/MP.MONO.DECODER/Resources/ChangeLog.html b/MP.MONO.DECODER/Resources/ChangeLog.html
index 7109e9f..323d68f 100644
--- a/MP.MONO.DECODER/Resources/ChangeLog.html
+++ b/MP.MONO.DECODER/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2206.2217
+ Version: 1.2.2206.2308
Release Note:
-
diff --git a/MP.MONO.DECODER/Resources/VersNum.txt b/MP.MONO.DECODER/Resources/VersNum.txt
index 8dd2eb6..a324f66 100644
--- a/MP.MONO.DECODER/Resources/VersNum.txt
+++ b/MP.MONO.DECODER/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2206.2217
+1.2.2206.2308
diff --git a/MP.MONO.DECODER/Resources/manifest.xml b/MP.MONO.DECODER/Resources/manifest.xml
index 581c8f1..cbc4d55 100644
--- a/MP.MONO.DECODER/Resources/manifest.xml
+++ b/MP.MONO.DECODER/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2206.2217
+ 1.2.2206.2308
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.SIM/MP.MONO.SIM.csproj b/MP.MONO.SIM/MP.MONO.SIM.csproj
index 54d6715..3b69285 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.2.2206.2217
+ 1.2.2206.2308
diff --git a/MP.MONO.SIM/Resources/ChangeLog.html b/MP.MONO.SIM/Resources/ChangeLog.html
index 7109e9f..323d68f 100644
--- a/MP.MONO.SIM/Resources/ChangeLog.html
+++ b/MP.MONO.SIM/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2206.2217
+ Version: 1.2.2206.2308
Release Note:
-
diff --git a/MP.MONO.SIM/Resources/VersNum.txt b/MP.MONO.SIM/Resources/VersNum.txt
index 8dd2eb6..a324f66 100644
--- a/MP.MONO.SIM/Resources/VersNum.txt
+++ b/MP.MONO.SIM/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2206.2217
+1.2.2206.2308
diff --git a/MP.MONO.SIM/Resources/manifest.xml b/MP.MONO.SIM/Resources/manifest.xml
index c5e9d3d..a2f77e2 100644
--- a/MP.MONO.SIM/Resources/manifest.xml
+++ b/MP.MONO.SIM/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2206.2217
+ 1.2.2206.2308
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 95c4cd8..9393776 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.2.2206.2217
+ 1.2.2206.2308
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index 7109e9f..323d68f 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
-
Version: 1.2.2206.2217
+ Version: 1.2.2206.2308
Release Note:
-
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index 8dd2eb6..a324f66 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2206.2217
+1.2.2206.2308
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index 4d66109..29ed0be 100644
--- a/MP.MONO.UI/Resources/manifest.xml
+++ b/MP.MONO.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2206.2217
+ 1.2.2206.2308
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