Egalware/mapo-mono
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rapid hotfix x parametri

Browse Source
This commit is contained in:
Samuele Locatelli
2022-06-23 08:06:25 +02:00
parent 275061adb6
commit fd9df11711
22 changed files with 177 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.MONO.ADAPTER.OPC/CONF/Alarms.json
+110 -2
View File
@@ -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
}
]
MP.MONO.ADAPTER.OPC/CONF/MPStatus.demo.json
+27 -12
View File
@@ -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
}
]
MP.MONO.ADAPTER.OPC/CONF/MPStatus.json
+6 -3
View File
@@ -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
}
MP.MONO.ADAPTER.OPC/IobOpcUa.cs
+8 -2
View File
@@ -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
MP.MONO.ADAPTER.OPC/appsettings.json
+6 -15
View File
@@ -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
}
}
MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2206.2217</Version>
<Version>1.2.2206.2308</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.ANALYZER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2206.2217</h4>
<h4>Version: 1.2.2206.2308</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.ANALYZER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2206.2217
1.2.2206.2308
MP.MONO.ANALYZER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2206.2217</version>
<version>1.2.2206.2308</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.Core/DTO/DisplayDataDTO.cs
+4
View File
@@ -37,6 +37,10 @@ namespace MP.MONO.Core.DTO
/// </summary>
public double ValueNum { get; set; } = 0;
/// <summary>
/// Valore scala (da moltiplicare, > 1 aumenta, 0>x>1 riduce)
/// </summary>
public double ScaleFactor { get; set; } = 1;
/// <summary>
/// Display format
/// </summary>
public string DisplFormat { get; set; } = "N0";
MP.MONO.DECODER/MP.MONO.DECODER.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2206.2217</Version>
<Version>1.2.2206.2308</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.DECODER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2206.2217</h4>
<h4>Version: 1.2.2206.2308</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.DECODER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2206.2217
1.2.2206.2308
MP.MONO.DECODER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2206.2217</version>
<version>1.2.2206.2308</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.SIM/MP.MONO.SIM.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2206.2217</Version>
<Version>1.2.2206.2308</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.SIM/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2206.2217</h4>
<h4>Version: 1.2.2206.2308</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.SIM/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2206.2217
1.2.2206.2308
MP.MONO.SIM/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2206.2217</version>
<version>1.2.2206.2308</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.UI/MP.MONO.UI.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2206.2217</Version>
<Version>1.2.2206.2308</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.UI/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2206.2217</h4>
<h4>Version: 1.2.2206.2308</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2206.2217
1.2.2206.2308
MP.MONO.UI/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2206.2217</version>
<version>1.2.2206.2308</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>