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

Merge branch 'release/FixParamReloadOnBoot03'

Browse Source
This commit is contained in:
Samuele Locatelli
2023-09-20 10:11:00 +02:00
parent 589b4e3dd4 1b4d4a0aae
commit 3be61ea91f
8 changed files with 160 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/DATA/CONF/SIMUL_02.json
+22 -11
View File
@@ -6,7 +6,8 @@
"memAddr": "DB150.DBB12",
"tipoMem": "String",
"index": 12,
"size": 20
"size": 20,
"displOrdinal": 1
},
"setComm": {
"name": "setComm",
@@ -14,7 +15,8 @@
"memAddr": "DB150.DBB32",
"tipoMem": "String",
"index": 32,
"size": 20
"size": 20,
"displOrdinal": 2
},
"setPzComm": {
"name": "setPzComm",
@@ -22,7 +24,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 3
},
"forceSetPzCount": {
"name": "forceSetPzCount",
@@ -30,7 +33,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 11
}
},
"mMapRead": {
@@ -39,49 +43,56 @@
"description": "Temperatura 01",
"tipoMem": "Real",
"minVal": 18,
"maxVal": 24
"maxVal": 24,
"displOrdinal": 4
},
"POWER_01": {
"name": "POWER_01",
"description": "Potenza impianto",
"tipoMem": "Int",
"minVal": 40,
"maxVal": 80
"maxVal": 80,
"displOrdinal": 5
},
"FEED_OVER": {
"name": "FEED_OVER",
"description": "FEED override",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 100
"maxVal": 100,
"displOrdinal": 6
},
"RAPID_OVER": {
"name": "RAPID_OVER",
"description": "RAPID override",
"tipoMem": "Int",
"minVal": 50,
"maxVal": 120
"maxVal": 120,
"displOrdinal": 7
},
"POS_X": {
"name": "POS_X",
"description": "Asse X",
"tipoMem": "Int",
"minVal": -2000,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 8
},
"POS_Y": {
"name": "POS_Y",
"description": "Asse Y",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 9
},
"POS_Z": {
"name": "POS_Z",
"description": "Asse Z",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 1500
"maxVal": 1500,
"displOrdinal": 10
}
}
}
IOB-WIN-NEXT/DATA/CONF/SIMUL_03.json
+22 -11
View File
@@ -6,7 +6,8 @@
"memAddr": "DB150.DBB12",
"tipoMem": "String",
"index": 12,
"size": 20
"size": 20,
"displOrdinal": 1
},
"setComm": {
"name": "setComm",
@@ -14,7 +15,8 @@
"memAddr": "DB150.DBB32",
"tipoMem": "String",
"index": 32,
"size": 20
"size": 20,
"displOrdinal": 2
},
"setPzComm": {
"name": "setPzComm",
@@ -22,7 +24,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 3
},
"forceSetPzCount": {
"name": "forceSetPzCount",
@@ -30,7 +33,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 11
}
},
"mMapRead": {
@@ -39,49 +43,56 @@
"description": "Temperatura 01",
"tipoMem": "Real",
"minVal": 18,
"maxVal": 24
"maxVal": 24,
"displOrdinal": 4
},
"POWER_01": {
"name": "POWER_01",
"description": "Potenza impianto",
"tipoMem": "Int",
"minVal": 40,
"maxVal": 80
"maxVal": 80,
"displOrdinal": 5
},
"FEED_OVER": {
"name": "FEED_OVER",
"description": "FEED override",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 100
"maxVal": 100,
"displOrdinal": 6
},
"RAPID_OVER": {
"name": "RAPID_OVER",
"description": "RAPID override",
"tipoMem": "Int",
"minVal": 50,
"maxVal": 120
"maxVal": 120,
"displOrdinal": 7
},
"POS_X": {
"name": "POS_X",
"description": "Asse X",
"tipoMem": "Int",
"minVal": -2000,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 8
},
"POS_Y": {
"name": "POS_Y",
"description": "Asse Y",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 9
},
"POS_Z": {
"name": "POS_Z",
"description": "Asse Z",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 1500
"maxVal": 1500,
"displOrdinal": 10
}
}
}
IOB-WIN-NEXT/DATA/CONF/SIMUL_04.json
+21 -11
View File
@@ -6,7 +6,8 @@
"memAddr": "DB150.DBB12",
"tipoMem": "String",
"index": 12,
"size": 20
"size": 20,
"displOrdinal": 1
},
"setComm": {
"name": "setComm",
@@ -14,7 +15,8 @@
"memAddr": "DB150.DBB32",
"tipoMem": "String",
"index": 32,
"size": 20
"size": 20,
"displOrdinal": 2
},
"setPzComm": {
"name": "setPzComm",
@@ -22,7 +24,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 3
},
"forceSetPzCount": {
"name": "forceSetPzCount",
@@ -30,7 +33,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 11
}
},
"mMapRead": {
@@ -39,49 +43,55 @@
"description": "Temperatura 01",
"tipoMem": "Real",
"minVal": 18,
"maxVal": 24
"maxVal": 24,
"displOrdinal": 4
},
"POWER_01": {
"name": "POWER_01",
"description": "Potenza impianto",
"tipoMem": "Int",
"minVal": 40,
"maxVal": 80
"maxVal": 80,
"displOrdinal": 5
},
"FEED_OVER": {
"name": "FEED_OVER",
"description": "FEED override",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 100
"maxVal": 100,
"displOrdinal": 6
},
"RAPID_OVER": {
"name": "RAPID_OVER",
"description": "RAPID override",
"tipoMem": "Int",
"minVal": 50,
"maxVal": 120
"maxVal": 120,
"displOrdinal": 7
},
"POS_X": {
"name": "POS_X",
"description": "Asse X",
"tipoMem": "Int",
"minVal": -2000,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 8
},
"POS_Y": {
"name": "POS_Y",
"description": "Asse Y",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 9
},
"POS_Z": {
"name": "POS_Z",
"description": "Asse Z",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 1500
"maxVal": 1500,
}
}
}
IOB-WIN-NEXT/DATA/CONF/SIMUL_05.json
+22 -11
View File
@@ -6,7 +6,8 @@
"memAddr": "DB150.DBB12",
"tipoMem": "String",
"index": 12,
"size": 20
"size": 20,
"displOrdinal": 1
},
"setComm": {
"name": "setComm",
@@ -14,7 +15,8 @@
"memAddr": "DB150.DBB32",
"tipoMem": "String",
"index": 32,
"size": 20
"size": 20,
"displOrdinal": 2
},
"setPzComm": {
"name": "setPzComm",
@@ -22,7 +24,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 3
},
"forceSetPzCount": {
"name": "forceSetPzCount",
@@ -30,7 +33,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 11
}
},
"mMapRead": {
@@ -39,49 +43,56 @@
"description": "Temperatura 01",
"tipoMem": "Real",
"minVal": 18,
"maxVal": 24
"maxVal": 24,
"displOrdinal": 4
},
"POWER_01": {
"name": "POWER_01",
"description": "Potenza impianto",
"tipoMem": "Int",
"minVal": 40,
"maxVal": 80
"maxVal": 80,
"displOrdinal": 5
},
"FEED_OVER": {
"name": "FEED_OVER",
"description": "FEED override",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 100
"maxVal": 100,
"displOrdinal": 6
},
"RAPID_OVER": {
"name": "RAPID_OVER",
"description": "RAPID override",
"tipoMem": "Int",
"minVal": 50,
"maxVal": 120
"maxVal": 120,
"displOrdinal": 7
},
"POS_X": {
"name": "POS_X",
"description": "Asse X",
"tipoMem": "Int",
"minVal": -2000,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 8
},
"POS_Y": {
"name": "POS_Y",
"description": "Asse Y",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 9
},
"POS_Z": {
"name": "POS_Z",
"description": "Asse Z",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 1500
"maxVal": 1500,
"displOrdinal": 10
}
}
}
IOB-WIN-NEXT/DATA/CONF/SIMUL_06.json
+22 -11
View File
@@ -6,7 +6,8 @@
"memAddr": "DB150.DBB12",
"tipoMem": "String",
"index": 12,
"size": 20
"size": 20,
"displOrdinal": 1
},
"setComm": {
"name": "setComm",
@@ -14,7 +15,8 @@
"memAddr": "DB150.DBB32",
"tipoMem": "String",
"index": 32,
"size": 20
"size": 20,
"displOrdinal": 2
},
"setPzComm": {
"name": "setPzComm",
@@ -22,7 +24,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 3
},
"forceSetPzCount": {
"name": "forceSetPzCount",
@@ -30,7 +33,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 11
}
},
"mMapRead": {
@@ -39,49 +43,56 @@
"description": "Temperatura 01",
"tipoMem": "Real",
"minVal": 18,
"maxVal": 24
"maxVal": 24,
"displOrdinal": 4
},
"POWER_01": {
"name": "POWER_01",
"description": "Potenza impianto",
"tipoMem": "Int",
"minVal": 40,
"maxVal": 80
"maxVal": 80,
"displOrdinal": 5
},
"FEED_OVER": {
"name": "FEED_OVER",
"description": "FEED override",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 100
"maxVal": 100,
"displOrdinal": 6
},
"RAPID_OVER": {
"name": "RAPID_OVER",
"description": "RAPID override",
"tipoMem": "Int",
"minVal": 50,
"maxVal": 120
"maxVal": 120,
"displOrdinal": 7
},
"POS_X": {
"name": "POS_X",
"description": "Asse X",
"tipoMem": "Int",
"minVal": -2000,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 8
},
"POS_Y": {
"name": "POS_Y",
"description": "Asse Y",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 9
},
"POS_Z": {
"name": "POS_Z",
"description": "Asse Z",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 1500
"maxVal": 1500,
"displOrdinal": 10
}
}
}
IOB-WIN-NEXT/DATA/CONF/SIMUL_07.json
+22 -11
View File
@@ -6,7 +6,8 @@
"memAddr": "DB150.DBB12",
"tipoMem": "String",
"index": 12,
"size": 20
"size": 20,
"displOrdinal": 1
},
"setComm": {
"name": "setComm",
@@ -14,7 +15,8 @@
"memAddr": "DB150.DBB32",
"tipoMem": "String",
"index": 32,
"size": 20
"size": 20,
"displOrdinal": 2
},
"setPzComm": {
"name": "setPzComm",
@@ -22,7 +24,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 3
},
"forceSetPzCount": {
"name": "forceSetPzCount",
@@ -30,7 +33,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 11
}
},
"mMapRead": {
@@ -39,49 +43,56 @@
"description": "Temperatura 01",
"tipoMem": "Real",
"minVal": 18,
"maxVal": 24
"maxVal": 24,
"displOrdinal": 4
},
"POWER_01": {
"name": "POWER_01",
"description": "Potenza impianto",
"tipoMem": "Int",
"minVal": 40,
"maxVal": 80
"maxVal": 80,
"displOrdinal": 5
},
"FEED_OVER": {
"name": "FEED_OVER",
"description": "FEED override",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 100
"maxVal": 100,
"displOrdinal": 6
},
"RAPID_OVER": {
"name": "RAPID_OVER",
"description": "RAPID override",
"tipoMem": "Int",
"minVal": 50,
"maxVal": 120
"maxVal": 120,
"displOrdinal": 7
},
"POS_X": {
"name": "POS_X",
"description": "Asse X",
"tipoMem": "Int",
"minVal": -2000,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 8
},
"POS_Y": {
"name": "POS_Y",
"description": "Asse Y",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 9
},
"POS_Z": {
"name": "POS_Z",
"description": "Asse Z",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 1500
"maxVal": 1500,
"displOrdinal": 10
}
}
}
IOB-WIN-NEXT/DATA/CONF/SIMUL_08.json
+22 -11
View File
@@ -6,7 +6,8 @@
"memAddr": "DB150.DBB12",
"tipoMem": "String",
"index": 12,
"size": 20
"size": 20,
"displOrdinal": 1
},
"setComm": {
"name": "setComm",
@@ -14,7 +15,8 @@
"memAddr": "DB150.DBB32",
"tipoMem": "String",
"index": 32,
"size": 20
"size": 20,
"displOrdinal": 2
},
"setPzComm": {
"name": "setPzComm",
@@ -22,7 +24,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 3
},
"forceSetPzCount": {
"name": "forceSetPzCount",
@@ -30,7 +33,8 @@
"memAddr": "DB150.DBB8",
"tipoMem": "Int",
"index": 8,
"size": 4
"size": 4,
"displOrdinal": 11
}
},
"mMapRead": {
@@ -39,49 +43,56 @@
"description": "Temperatura 01",
"tipoMem": "Real",
"minVal": 18,
"maxVal": 24
"maxVal": 24,
"displOrdinal": 4
},
"POWER_01": {
"name": "POWER_01",
"description": "Potenza impianto",
"tipoMem": "Int",
"minVal": 40,
"maxVal": 80
"maxVal": 80,
"displOrdinal": 5
},
"FEED_OVER": {
"name": "FEED_OVER",
"description": "FEED override",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 100
"maxVal": 100,
"displOrdinal": 6
},
"RAPID_OVER": {
"name": "RAPID_OVER",
"description": "RAPID override",
"tipoMem": "Int",
"minVal": 50,
"maxVal": 120
"maxVal": 120,
"displOrdinal": 7
},
"POS_X": {
"name": "POS_X",
"description": "Asse X",
"tipoMem": "Int",
"minVal": -2000,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 8
},
"POS_Y": {
"name": "POS_Y",
"description": "Asse Y",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 2000
"maxVal": 2000,
"displOrdinal": 9
},
"POS_Z": {
"name": "POS_Z",
"description": "Asse Z",
"tipoMem": "Int",
"minVal": 0,
"maxVal": 1500
"maxVal": 1500,
"displOrdinal": 10
}
}
}
IOB-WIN-NEXT/IobSoap/Gomba.cs
+7 -8
View File
@@ -41,7 +41,6 @@ namespace IOB_WIN_NEXT.IobSoap
public override Dictionary<string, string> executeTasks(Dictionary<string, string> task2exe)
{
/*---------------------------------------
* fixme todo fare !!!
* gestione execute task SPECIFICI x pesa:
* - salva i parametri richiesta (RM, cod1..cod6)
* - esegue metodo richiesta (IN/OUT)
@@ -52,9 +51,7 @@ namespace IOB_WIN_NEXT.IobSoap
Dictionary<string, string> taskDone = new Dictionary<string, string>();
if (task2exe != null)
{
// FIXME TODO FARE !!!
// va inserita la richiesta di pesatura IN piuttosto che OUT (2 comandi)
lgTrace($"executeTasks: richiesta esecuzione {task2exe.Count} task");
// controllo se memMap != null...
if (memMap != null)
{
@@ -63,6 +60,7 @@ namespace IOB_WIN_NEXT.IobSoap
// cerco task specifici: qui sono NON standard...
foreach (var item in task2exe)
{
lgInfo($"TASK | {item.Key} --> {item.Value}");
taskOk = false;
taskVal = "";
// converto richiesta in enum...
@@ -335,8 +333,10 @@ namespace IOB_WIN_NEXT.IobSoap
/// <param name="updatedPar"></param>
protected override void plcWriteParams(ref List<objItem> updatedPar)
{
lgTrace($"plcWriteParams: richiesta per {updatedPar.Count} params");
foreach (var item in updatedPar)
{
lgInfo($"ITEM | {item.uid} | {item.value}");
// salvo i valori di setup x prox pesata...
upsertKey(item.uid, item.value);
bool fatto = false;
@@ -347,13 +347,11 @@ namespace IOB_WIN_NEXT.IobSoap
{
isPesata = true;
answ = reqWeight(true);
fatto = answ.feedback == "C";
}
else if (item.uid == "reqOUT")
{
isPesata = true;
answ = reqWeight(false);
fatto = answ.feedback == "C";
}
else if (item.uid == "RM" || item.uid.StartsWith("Cod"))
{
@@ -365,7 +363,7 @@ namespace IOB_WIN_NEXT.IobSoap
if (isPesata)
{
// se è OK
if (fatto)
if (answ.feedback == "C")
{
item.value = $"{answ.feedback} | {answ.notes}";
item.reqValue = "";
@@ -402,6 +400,7 @@ namespace IOB_WIN_NEXT.IobSoap
/// <returns></returns>
protected gestWeightOut reqWeight(bool reqIN)
{
lgInfo($"reqWeight | IN: {reqIN}");
gestWeightOut answ = null;
try
{
@@ -419,7 +418,7 @@ namespace IOB_WIN_NEXT.IobSoap
// faccio chiamata
answ = gombaConn.memWeight(tipoRic, rm, Cod1, Cod2, Cod3, Cod4, Cod5, Cod6);
sw.Stop();
lgInfo($"SOAP: effettuata chiamata reqWeightList in {sw.Elapsed.TotalMilliseconds}ms | {dataFrom} --> {dataTo}");
lgInfo($"reqWeight: effettuata chiamata SOAP in {sw.Elapsed.TotalMilliseconds}ms | {dataFrom} --> {dataTo}");
}
catch (Exception exc)
{