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

Test in produzione

Browse Source 
- fix lettura part program
- fix timing avvio e veto send dati
- fix config vari
This commit is contained in:
Samuele E. Locatelli
2022-06-23 14:27:53 +02:00
parent fd9df11711
commit 4f4eafd5a2
31 changed files with 327 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.MONO.ADAPTER.OPC/CONF/Counters.json
+12
View File
@@ -98,5 +98,17 @@
"EnablePlot": true,
"ShowBar": true,
"CssIcon": "fa-solid fa-bolt"
},
{
"Order": 7,
"ExtCode": "ns=1;s=502_1_RECIPE NAME",
"Type": "PROGRAM",
"Title": "RECIPE NAME",
"Value": "",
"ValueNum": 0,
"MinVal": 0,
"MaxVal": 10,
"DisplFormat": "N0",
"IsNumeric": true
}
]
MP.MONO.ADAPTER.OPC/CONF/MPStatus.json
+15 -6
View File
@@ -1,40 +1,49 @@
[
{
"Order": 1,
"ExtCode": "ns=3;i=11176",
"ExtCode": "ns=1;s=1_1_MACHINE STATUS",
"Type": "STATUS",
"Title": "MACHINE STATUS",
"Value": "",
"ValueNum": 0,
"MinVal": 0,
"MaxVal": 10,
"ScaleFactor": 0.1,
"DisplFormat": "N0",
"IsNumeric": true
},
{
"Order": 2,
"ExtCode": "ns=3;i=11230",
"ExtCode": "ns=1;s=500_1_STATUS",
"Type": "STATUS",
"Title": "PROCESS STATUS",
"Value": "",
"ValueNum": 0,
"MinVal": 0,
"MaxVal": 20,
"ScaleFactor": 0.1,
"DisplFormat": "N0",
"IsNumeric": true
},
{
"Order": 3,
"ExtCode": "ns=3;i=11236",
"ExtCode": "ns=1;s=501_1_MODE",
"Type": "MODE",
"Title": "PROCESS MODE",
"Value": "",
"ValueNum": 0,
"MinVal": 0,
"MaxVal": 10,
"ScaleFactor": 0.1,
"DisplFormat": "N0",
"IsNumeric": true
},
{
"Order": 4,
"ExtCode": "ns=1;s=502_1_RECIPE NAME",
"Type": "PROGRAM",
"Title": "RECIPE NAME",
"Value": "",
"ValueNum": 0,
"MinVal": 0,
"MaxVal": 10,
"DisplFormat": "N0",
"IsNumeric": true
}
MP.MONO.ADAPTER.OPC/CONF/Multiax.json
-65
View File
@@ -93,70 +93,5 @@
"rovrd": "PATH RAPID OVERRIDE"
},
"subscribedItems": [
"ns=1;s=45_P2 AXIS V SW OVT UPPER",
"ns=1;s=46_P2 AXIS V SW OVT LOWER",
"ns=1;s=47_P2 AXIS V ACTUAL POSITION",
"ns=1;s=48_P3 AXIS W SW OVT UPPER",
"ns=1;s=49_P3 AXIS W SW OVT LOWER",
"ns=1;s=50_P3 AXIS W ACTUAL POSITION",
"ns=1;s=515_PROC 1 FEED OVERRIDE",
"ns=1;s=516_PROC 1 FEED PROGRAMMED",
"ns=1;s=517_PROC 1 FEED ACTUAL",
"ns=1;s=518_PROC 1 SPEED OVERRIDE",
"ns=1;s=519_PROC 1 SPEED PROGRAMMED",
"ns=1;s=520_PROC 1 SPEED ACTUAL",
"ns=1;s=521_PROC 1 SPINDLE 1 LOAD PC",
"ns=1;s=522_PROC 1 SPINDLE 2 LOAD PC",
"ns=1;s=523_PROC 1 SPINDLE 3 LOAD PC",
"ns=1;s=524_PROC 1 SPINDLE 4 LOAD PC",
"ns=1;s=1_1_MACHINE STATUS",
"ns=1;s=3_1_ALARM NC",
"ns=1;s=3_2_ALARM PLC 1",
"ns=1;s=3_3_ALARM PLC 2",
"ns=1;s=3_4_ALARM PLC 3",
"ns=1;s=3_5_ALARM PLC 4",
"ns=1;s=3_6_ALARM PLC 5",
"ns=1;s=3_7_ALARM PLC 6",
"ns=1;s=3_8_ALARM PLC 7",
"ns=1;s=3_9_ALARM PLC 8",
"ns=1;s=3_10_ALARM PLC 9",
"ns=1;s=3_11_ALARM PLC 10",
"ns=1;s=4_1_AXIS 1 LOAD PC",
"ns=1;s=4_2_AXIS 2 LOAD PC",
"ns=1;s=4_3_AXIS 3 LOAD PC",
"ns=1;s=4_4_AXIS 4 LOAD PC",
"ns=1;s=4_5_AXIS 5 LOAD PC",
"ns=1;s=4_6_AXIS 6 LOAD PC",
"ns=1;s=4_7_AXIS 7 LOAD PC",
"ns=1;s=4_8_AXIS 8 LOAD PC",
"ns=1;s=4_9_AXIS 9 LOAD PC",
"ns=1;s=4_10_AXIS 10 LOAD PC",
"ns=1;s=4_11_AXIS 11 LOAD PC",
"ns=1;s=4_12_AXIS 12 LOAD PC",
"ns=1;s=4_13_AXIS 13 LOAD PC",
"ns=1;s=4_14_AXIS 14 LOAD PC",
"ns=1;s=4_15_AXIS 15 LOAD PC",
"ns=1;s=5_1_TOOL 1 CURRENT LIFE PC",
"ns=1;s=5_2_TOOL 2 CURRENT LIFE PC",
"ns=1;s=5_3_TOOL 3 CURRENT LIFE PC",
"ns=1;s=5_4_TOOL 4 CURRENT LIFE PC",
"ns=1;s=5_5_TOOL 11 CURRENT LIFE PC",
"ns=1;s=5_6_TOOL 12 CURRENT LIFE PC",
"ns=1;s=5_7_TOOL 13 CURRENT LIFE PC",
"ns=1;s=5_8_TOOL 14 CURRENT LIFE PC",
"ns=1;s=5_9_TOOL 21 CURRENT LIFE PC",
"ns=1;s=5_10_TOOL 22 CURRENT LIFE PC",
"ns=1;s=5_11_TOOL 23 CURRENT LIFE PC",
"ns=1;s=5_12_TOOL 24 CURRENT LIFE PC",
"ns=1;s=5_13_TOOL 31 CURRENT LIFE PC",
"ns=1;s=5_14_TOOL 32 CURRENT LIFE PC",
"ns=1;s=5_15_TOOL 33 CURRENT LIFE PC",
"ns=1;s=5_16_TOOL 34 CURRENT LIFE PC",
"ns=1;s=500_1_STATUS",
"ns=1;s=501_1_MODE",
"ns=1;s=502_1_RECIPE NAME",
"ns=1;s=507_1_WORKPIECE TIME",
"ns=1;s=507_2_WORKPIECE QTY",
"ns=1;s=507_3_CYCLE TIME"
]
}
MP.MONO.ADAPTER.OPC/IobGeneric.cs
+1 -1
View File
@@ -59,7 +59,7 @@ namespace MP.MONO.ADAPTER.OPC
CleanupRegexpPre = optPar.GetValue<string>("CleanupRegexpPre");
if (optPar.GetValue<bool>("FiltCrLf"))
{
FiltSplitChar = new char[] { '\n', '\r' };
FiltSplitChar = new char[] { '\n', '\r', '\0' };
}
else
{
MP.MONO.ADAPTER.OPC/IobOpcUa.cs
+4 -13
View File
@@ -397,7 +397,7 @@ namespace MP.MONO.ADAPTER.OPC
bool doSend = true;
if (LastSend.ContainsKey(memKey))
{
if (DateTime.Now.Subtract(LastSend[memKey]).TotalSeconds < msVetoRedCache)
if (DateTime.Now.Subtract(LastSend[memKey]).TotalMilliseconds < msVetoRedCache)
{
doSend = false;
}
@@ -629,12 +629,6 @@ namespace MP.MONO.ADAPTER.OPC
return rawByte;
}
// // log opzionale!
// if (verboseLog)
// {
// logDebug($"Trasformazione checkPing: {checkPing} | hasPowerOn: {hasPowerOn} | B_input: {B_input} | currRun = {currRun}");
// }
//}
/// <summary>
/// Effettua traduzione ITEM da LUT parametrica (key: tipo+id) del file di conf, se non
/// trovo uso key
@@ -663,10 +657,6 @@ namespace MP.MONO.ADAPTER.OPC
return answ;
}
// List<WriteValue> nodes2Write = new List<WriteValue>(); nodes2Write.Add(commWriteVal);
// UA_ref.WriteNodes(nodes2Write); logTrace("Effettuata scrittura WatchDog"); } catch
// (Exception exc) { logError($"Eccezione in gestione WatchDog, valore attuale
// {WatchDog}{Environment.NewLine}{exc}"); } } } else { logTrace("WatchDog disabilitato"); }
/// <summary>
/// Effettua lettura file di conf specifico OPC-UA da oggetto serializzato json <paramref
/// name="fileName">Nome file da cui leggere i parametri json</paramref>
@@ -796,7 +786,7 @@ namespace MP.MONO.ADAPTER.OPC
#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_ACT_KEY, Constants.PARAMS_RAW_QUEUE, payloadParams);
#endif
@@ -1409,7 +1399,8 @@ namespace MP.MONO.ADAPTER.OPC
else
{
currVal = UA_ref.ReadNode(item.StartNodeId);
changed = checkAndSend(item, stringCleanup(currVal), true);
var fixString = stringCleanup(currVal);
changed = checkAndSend(item, fixString, true);
}
}
// attesa x evitare problemi
MP.MONO.ADAPTER.OPC/MP.MONO.ADAPTER.OPC.csproj
+6
View File
@@ -42,6 +42,12 @@
<ProjectReference Include="..\MP.MONO.Core\MP.MONO.Core.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="appsettings.multiax.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="appsettings.office.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
MP.MONO.ADAPTER.OPC/appsettings.json
+9 -13
View File
@@ -32,33 +32,29 @@
}
},
"Endpoint": {
"ConfFile": "Demo.json",
"FullUrl": "opc.tcp://wrkst-r9-sam:62541/Quickstarts/ReferenceServer",
"ConfFile": "Multiax.json",
"FullUrl": "opc.tcp://192.168.0.2:4840",
"PingMsTimeout": 1500
},
//"Endpoint": {
// "ConfFile": "Multiax.json",
// "FullUrl": "opc.tcp://192.168.0.2:4840",
// "PingMsTimeout": 1500
//},
"OptPar": {
"AlarmMode": "RawList",
"Log2Console": true,
"Log2File": true,
"ForceSplit": true,
"CleanupRegexpPre": "[^a-zA-Z0-9 %/,.\\-\\+\\r\\n]",
"CleanupRegexpPre": "",
//"CleanupRegexpPre": "[^a-zA-Z0-9 %/,.\\-\\+\\r\\n]",
"CleanupRegexpPost": "[^a-zA-Z0-9 %/,.\\-\\+]",
"FiltCrLf": true,
"FiltSplitChar": [],
"VetoSendCache": 200,
"VetoSendCache": 50,
"MinWait": 50,
"MaxWait": 150
"MaxWait": 250
},
"Machine": {
"Manufacturer": "Multiax",
"Model": "M-D5",
"Name": "D5",
"SerialNumber": "03216549870"
"Model": "Model-D",
"Name": "D1521",
"SerialNumber": "1521"
},
"ENABLE_DATA_FILTER": true,
"ENABLE_CLI_RESTART": true,
MP.MONO.ADAPTER.OPC/appsettings.multiax.json
+67
View File
@@ -0,0 +1,67 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"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": "localhost",
"nKey": "MONO",
"sKey": "Calcium0xide-CaO"
},
"MachineId": 1,
"maxRecord": 15,
"ExternalProviders": {
"MailKit": {
"SMTP": {
"Address": "smtp.gmail.com",
"Port": "465",
"Account": "steamwarebot@gmail.com",
"Password": "drmfsls16",
"SenderEmail": "steamwarebot@gmail.com",
"SenderName": "Steamware Email BOT"
}
}
},
"Endpoint": {
"ConfFile": "Multiax.json",
"FullUrl": "opc.tcp://192.168.0.2:4840",
"PingMsTimeout": 1500
},
"OptPar": {
"AlarmMode": "RawList",
"Log2Console": true,
"Log2File": true,
"ForceSplit": true,
"CleanupRegexpPre": "[^a-zA-Z0-9 %/,.\\-\\+\\r\\n]",
"CleanupRegexpPost": "[^a-zA-Z0-9 %/,.\\-\\+]",
"FiltCrLf": true,
"FiltSplitChar": [],
"VetoSendCache": 50,
"MinWait": 50,
"MaxWait": 150
},
"Machine": {
"Manufacturer": "Multiax",
"Model": "Model-D",
"Name": "D1521",
"SerialNumber": "1521"
},
"ENABLE_DATA_FILTER": true,
"ENABLE_CLI_RESTART": true,
"logEvery": 10,
"OPC_PARAM_CONF": "Multiax.json",
"pingTestSec": 5,
"verbose": false,
"disconMaxSec": 30,
"verboseLogTOut": 60,
"waitRecMSec": 60000
}
MP.MONO.ADAPTER.OPC/appsettings.office.json
+72
View File
@@ -0,0 +1,72 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"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": "localhost",
"nKey": "MONO",
"sKey": "Calcium0xide-CaO"
},
"MachineId": 1,
"maxRecord": 15,
"ExternalProviders": {
"MailKit": {
"SMTP": {
"Address": "smtp.gmail.com",
"Port": "465",
"Account": "steamwarebot@gmail.com",
"Password": "drmfsls16",
"SenderEmail": "steamwarebot@gmail.com",
"SenderName": "Steamware Email BOT"
}
}
},
"Endpoint": {
"ConfFile": "Demo.json",
"FullUrl": "opc.tcp://wrkst-r9-sam:62541/Quickstarts/ReferenceServer",
"PingMsTimeout": 1500
},
//"Endpoint": {
// "ConfFile": "Multiax.json",
// "FullUrl": "opc.tcp://192.168.0.2:4840",
// "PingMsTimeout": 1500
//},
"OptPar": {
"AlarmMode": "RawList",
"Log2Console": true,
"Log2File": true,
"ForceSplit": true,
"CleanupRegexpPre": "[^a-zA-Z0-9 %/,.\\-\\+\\r\\n]",
"CleanupRegexpPost": "[^a-zA-Z0-9 %/,.\\-\\+]",
"FiltCrLf": true,
"FiltSplitChar": [],
"VetoSendCache": 50,
"MinWait": 50,
"MaxWait": 150
},
"Machine": {
"Manufacturer": "Multiax",
"Model": "M-D5",
"Name": "D5",
"SerialNumber": "03216549870"
},
"ENABLE_DATA_FILTER": true,
"ENABLE_CLI_RESTART": true,
"logEvery": 10,
"OPC_PARAM_CONF": "Multiax.json",
"pingTestSec": 5,
"verbose": false,
"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.2308</Version>
<Version>1.2.2206.2314</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.2308</h4>
<h4>Version: 1.2.2206.2314</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.ANALYZER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2206.2308
1.2.2206.2314
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.2308</version>
<version>1.2.2206.2314</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.DECODER/MP.MONO.DECODER.csproj
+7 -1
View File
@@ -6,14 +6,20 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2206.2308</Version>
<Version>1.2.2206.2314</Version>
</PropertyGroup>
<ItemGroup>
<None Remove="appsettings.json" />
<None Remove="appsettings.office.json" />
</ItemGroup>
<ItemGroup>
<Content Include="appsettings.office.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
MP.MONO.DECODER/Program.cs
+26 -23
View File
@@ -122,8 +122,6 @@ DateTime lastExecStatus = DateTime.Now.AddHours(-1);
// registro gestione eventi
mpStatusRecvPipe.EA_NewMessage += MpStatusRecvPipe_EA_NewMessage;
/* --------------------------------
* Setup Gestione Counters
* --------------------------------*/
@@ -136,7 +134,6 @@ DateTime lastExecCounters = DateTime.Now.AddHours(-1);
// registro gestione eventi
counterRecvPipe.EA_NewMessage += CounterRecvPipe_EA_NewMessage;
/* --------------------------------
* Funzioni / metodi accessori
* --------------------------------*/
@@ -153,7 +150,7 @@ void setupConf()
if (!string.IsNullOrEmpty(rawData))
{
var currData = JsonConvert.DeserializeObject<MachineDTO>(rawData);
machinePlate = currData != null ? currData: new MachineDTO();
machinePlate = currData != null ? currData : new MachineDTO();
}
// machine status (display) conf
@@ -215,7 +212,6 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
List<AlarmRecModel> alarmRecList = new List<AlarmRecModel>();
List<AlarmLogModel> alarmLogList = new List<AlarmLogModel>();
List<AlarmListModel>? mutedAlarmsList = new List<AlarmListModel>();
string rawData = redisDb.StringGet(Constants.ALARMS_SETT_RLIST_KEY);
if (!string.IsNullOrEmpty(rawData))
@@ -272,7 +268,6 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
{
if (foundAlarm != null)
{
// segno come iniziato...
AlarmRecModel newAlarmRec = new AlarmRecModel()
{
@@ -291,10 +286,8 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
alarmList.Remove(newAlarm);
}
}
}
// processo elenco allarmi già presenti
if (lastAlarms != null)
{
@@ -353,7 +346,6 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
// salvo nuovo elenco allarmi
lastAlarms = alarmList;
}
catch
{ }
@@ -528,17 +520,17 @@ void MpStatusRecvPipe_EA_NewMessage(object? sender, EventArgs e)
if (dataList != null)
{
/************************************************************************
*
*
* <BROADCAST_EVENT DESCRIPTION = "MACHINE STATUS" IDENTIFIER = "1" >
* <!--
* DESCRIPTION:
* DESCRIPTION:
* 0: MACHINE OFF
* 1: MACHINE ON
* -->
*
*
* <BROADCAST_EVENT DESCRIPTION = "PROC 1 STATUS" IDENTIFIER = "500" >
* <!--
* DESCRIPTION:
* DESCRIPTION:
* 1: IDLE
* 2: CYCLE (RUN)
* 3: HOLD (HOLD, RUNH, HRUN)
@@ -546,10 +538,10 @@ void MpStatusRecvPipe_EA_NewMessage(object? sender, EventArgs e)
* 8: RESET
* 11: PAUSE (WAIT, INPUT)
* -->
*
*
* <BROADCAST_EVENT DESCRIPTION = "PROC 1 MODE" IDENTIFIER = "501" >
* <!--
* DESCRIPTION:
* DESCRIPTION:
* 1: MDI
* 2: AUTO
* 3: STEP (BLK-BLK)
@@ -559,18 +551,16 @@ void MpStatusRecvPipe_EA_NewMessage(object? sender, EventArgs e)
* 7: HOME
* 8: HPG (HANDWHEEL)
* -->
*
*
*
*
*************************************************************************/
// recupero elenco parametri salvati in redis...
MachineDTO? machinePlate = new MachineDTO();
string rawData = redisDb.StringGet(Constants.MACHINE_CONF_PLATE);
if (!string.IsNullOrEmpty(rawData))
{
machinePlate = JsonConvert.DeserializeObject<MachineDTO>(rawData);
}
int machStatus = 0;
@@ -578,7 +568,6 @@ void MpStatusRecvPipe_EA_NewMessage(object? sender, EventArgs e)
int procMode = 0;
string currKey = "";
// ora processo il messaggio ricevuto x stati e modi vari
currKey = "MACHINE STATUS";
if (dataList.ContainsKey(currKey))
@@ -600,33 +589,42 @@ void MpStatusRecvPipe_EA_NewMessage(object? sender, EventArgs e)
{
machinePlate.StatusId = 7;
}
else {
else
{
switch (procMode)
{
case 1:
machinePlate.StatusId = 8;
break;
case 2:
machinePlate.StatusId = 2;
break;
case 3:
machinePlate.StatusId = 9;
break;
case 4:
machinePlate.StatusId = 5;
break;
case 5:
machinePlate.StatusId = 10;
break;
case 6:
machinePlate.StatusId = 11;
break;
case 7:
machinePlate.StatusId = 12;
break;
case 8:
machinePlate.StatusId = 13;
break;
default:
break;
}
@@ -638,21 +636,27 @@ void MpStatusRecvPipe_EA_NewMessage(object? sender, EventArgs e)
case 1:
machinePlate.ModeId = 2;
break;
case 2:
machinePlate.ModeId = 1;
break;
case 3:
machinePlate.ModeId = 3;
break;
case 6:
machinePlate.ModeId = 8;
break;
case 8:
machinePlate.ModeId = 9;
break;
case 11:
machinePlate.ModeId = 10;
break;
default:
break;
}
@@ -674,10 +678,9 @@ void MpStatusRecvPipe_EA_NewMessage(object? sender, EventArgs e)
/// </summary>
void CounterRecvPipe_EA_NewMessage(object? sender, EventArgs e)
{
throw new NotImplementedException();
// fare...
}
/* --------------------------------
* MAIN
* --------------------------------*/
MP.MONO.DECODER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2206.2308</h4>
<h4>Version: 1.2.2206.2314</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.DECODER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2206.2308
1.2.2206.2314
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.2308</version>
<version>1.2.2206.2314</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.DECODER/appsettings.json
+4 -4
View File
@@ -7,14 +7,14 @@
},
"AllowedHosts": "*",
"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;",
"AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=pwd-MAPO!;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"
},
@@ -35,4 +35,4 @@
"OptPar": {
"AlarmMode": "RawList"
}
}
}
MP.MONO.DECODER/appsettings.office.json
+38
View File
@@ -0,0 +1,38 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*",
"ConnectionStrings": {
"Redis": "nkcredis.steamware.net:6379,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,password=nkc.password",
"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",
"nKey": "MONO",
"sKey": "Calcium0xide-CaO"
},
"MachineId": 1,
"maxRecord": 15,
"ExternalProviders": {
"MailKit": {
"SMTP": {
"Address": "smtp.gmail.com",
"Port": "465",
"Account": "steamwarebot@gmail.com",
"Password": "drmfsls16",
"SenderEmail": "steamwarebot@gmail.com",
"SenderName": "Steamware Email BOT"
}
}
},
"OptPar": {
"AlarmMode": "RawList"
}
}
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.2308</Version>
<Version>1.2.2206.2314</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.2308</h4>
<h4>Version: 1.2.2206.2314</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.SIM/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2206.2308
1.2.2206.2314
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.2308</version>
<version>1.2.2206.2314</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.2308</Version>
<Version>1.2.2206.2314</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.2308</h4>
<h4>Version: 1.2.2206.2314</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2206.2308
1.2.2206.2314
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.2308</version>
<version>1.2.2206.2314</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>
MP.MONO.UI/appsettings.json
+4 -4
View File
@@ -7,14 +7,14 @@
},
"AllowedHosts": "*",
"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;",
"AdminConnection": "Server=localhost;port=3306;database=MAPO.MONO;user=root;pwd=user_MONO!;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"
},
@@ -35,4 +35,4 @@
"MaintPendingRefreshVetoMin": 5,
"AuthCode": "MultiaxD5"
}
}
}
MP.MONO.UI/appsettings.ufficio.Development.json
+9
View File
@@ -0,0 +1,9 @@
{
"DetailedErrors": true,
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
}
MP.MONO.UI/appsettings.ufficio.json
+38
View File
@@ -0,0 +1,38 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*",
"ConnectionStrings": {
"Redis": "nkcredis.steamware.net:6379,DefaultDatabase=7,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,password=nkc.password",
"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",
"nKey": "MONO",
"sKey": "Calcium0xide-CaO"
},
"maxRecord": 15,
"ExternalProviders": {
"MailKit": {
"SMTP": {
"Address": "smtp.gmail.com",
"Port": "465",
"Account": "steamwarebot@gmail.com",
"Password": "drmfsls16",
"SenderEmail": "steamwarebot@gmail.com",
"SenderName": "Steamware Email BOT"
}
}
},
"OptPar": {
"MaintPendingRefreshVetoMin": 5,
"AuthCode": "MultiaxD5"
}
}