Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MTC'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-12-04 12:27:16 +01:00
parent 293fdb05c0 7b903f70f1
commit c8182028d8
5 changed files with 114 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/DATA/CONF/VL22.json
+54 -54
View File
@@ -26,59 +26,59 @@
}
},
"mMapRead": {
//"RamPosition": {
// "name": "RamPosition",
// "tipoMem": "Int",
// "index": 18,
// "size": 2,
// "func": "MAX",
// "period": 60,
// "factor": 10
//},
//"LowerEjectorPosition": {
// "name": "LowerEjectorPosition",
// "tipoMem": "Int",
// "index": 20,
// "size": 2,
// "func": "MAX",
// "period": 60,
// "factor": 10
//},
//"UpperTool": {
// "name": "UpperTool",
// "tipoMem": "Int",
// "index": 22,
// "size": 2,
// "func": "MAX",
// "period": 60,
// "factor": 10
//},
//"TempMainMotorU": {
// "name": "TempMainMotorU",
// "tipoMem": "Int",
// "index": 24,
// "size": 2,
// "func": "MAX",
// "period": 60,
// "factor": 1
//},
//"TempMainMotorV": {
// "name": "TempMainMotorV",
// "tipoMem": "Int",
// "index": 26,
// "size": 2,
// "func": "MAX",
// "period": 60,
// "factor": 1
//},
//"TempMainMotorW": {
// "name": "TempMainMotorW",
// "tipoMem": "Int",
// "index": 28,
// "size": 2,
// "func": "MAX",
// "period": 60,
// "factor": 1
//}
"RamPosition": {
"name": "RamPosition",
"tipoMem": "Int",
"index": 18,
"size": 2,
"func": "MAX",
"period": 60,
"factor": 10
},
"LowerEjectorPosition": {
"name": "LowerEjectorPosition",
"tipoMem": "Int",
"index": 20,
"size": 2,
"func": "MAX",
"period": 60,
"factor": 10
},
"UpperTool": {
"name": "UpperTool",
"tipoMem": "Int",
"index": 22,
"size": 2,
"func": "MAX",
"period": 60,
"factor": 10
},
"TempMainMotorU": {
"name": "TempMainMotorU",
"tipoMem": "Int",
"index": 24,
"size": 2,
"func": "MAX",
"period": 60,
"factor": 1
},
"TempMainMotorV": {
"name": "TempMainMotorV",
"tipoMem": "Int",
"index": 26,
"size": 2,
"func": "MAX",
"period": 60,
"factor": 1
},
"TempMainMotorW": {
"name": "TempMainMotorW",
"tipoMem": "Int",
"index": 28,
"size": 2,
"func": "MAX",
"period": 60,
"factor": 1
}
}
}
IOB-WIN/DATA/CONF/VL25.ini
+1 -1
View File
@@ -28,7 +28,7 @@ CMDREBO=/sendReboot.aspx?idxMacchina=
ADDR_READ=DB700.DBB0
ADDR_WRITE=DB01.DBB0
SIZE_READ=44
SIZE_WRITE=44
SIZE_WRITE=68
[BLINK]
IOB-WIN/DATA/CONF/VL25.json
+49 -16
View File
@@ -1,31 +1,42 @@
{
"mMapWrite": {
"setArt": {
"name": "setArt",
"description": "Articolo",
"memAddr": "DB701.DBB20",
"setPzComm": {
"name": "setPzComm",
"description": "Qty",
"tipoMem": "DInt",
"memAddr": "DB701.DBB20",
"index": 20,
"size": 4
},
"setComm": {
"name": "setComm",
"description": "Commessa",
"tipoMem": "String",
"memAddr": "DB701.DBB24",
"tipoMem": "DInt",
"index": 24,
"size": 4
"size": 22
},
"setPzComm": {
"name": "setPzComm",
"description": "Qty",
"memAddr": "DB701.DBB28",
"tipoMem": "DInt",
"index": 28,
"size": 4
"setArt": {
"name": "setArt",
"description": "Articolo",
"tipoMem": "String",
"memAddr": "DB701.DBB46",
"index": 46,
"size": 22
}
},
"mMapRead": {
"ContatoreAssoluto": {
"name": "ContatoreAssoluto",
"description": "Contapezzi ASSOLUTO",
"memAddr": "DB700.DBB24",
"tipoMem": "DInt",
"index": 24,
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
},
"ContaBuoni": {
"name": "ContaBuoni",
"description": "Contapezzi BUONI",
@@ -37,9 +48,9 @@
"period": 60,
"factor": 1
},
"ContaScarti": {
"name": "ContaScarti",
"description": "Contapezzi SCARTO",
"ContaScartiSaet": {
"name": "ContaScartiSaet",
"description": "Contapezzi SCARTO da SAET",
"memAddr": "DB700.DBB32",
"tipoMem": "DInt",
"index": 32,
@@ -47,6 +58,28 @@
"func": "MAX",
"period": 60,
"factor": 1
},
"ContaScartiFreddi": {
"name": "ContaScartiFreddi",
"description": "Contapezzi SCARTO FREDDI",
"memAddr": "DB700.DBB36",
"tipoMem": "DInt",
"index": 36,
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
},
"ContaScartiCollaudo": {
"name": "ContaScartiCollaudo",
"description": "Contapezzi SCARTO per Collaudo",
"memAddr": "DB700.DBB40",
"tipoMem": "DInt",
"index": 40,
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
}
}
}
IOB-WIN/IobMTC.cs
+8 -1
View File
@@ -1022,8 +1022,15 @@ namespace IOB_WIN
// RUN = LAVORA!
B_input += (1 << 1);
}
else
{
lgInfo($"Stato variabili: currRun: {currRun} | currExe: {currExe} | currUnOpStatus: {currUnOpStatus}");
}
}
else
{
lgInfo($"Stato variabili: currRun: {currRun} | currExe: {currExe} | currUnOpStatus: {currUnOpStatus}");
}
}
// se ho almeno 1 allarme E NON SONO IN AUTO --> ALARM!
else if (hasError)
IOB-WIN/IobSiemensIngenia.cs
+2
View File
@@ -92,6 +92,8 @@ namespace IOB_WIN
{
// incremento
counterMes2Plc++;
// se > 9999 --> 0
if (counterMes2Plc > 9999) counterMes2Plc = 0;
// salvo su DB
Dictionary<string, string> task2exe = new Dictionary<string, string>();
Dictionary<string, string> taskDone = new Dictionary<string, string>();