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

Merge branch 'release/TestWriteGwms05'

Browse Source
This commit is contained in:
Samuele Locatelli
2021-10-26 17:28:58 +02:00
parent 68ef848197 ad4a555865
commit e9ebea0216
5 changed files with 133 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-UT-NEXT/Objects.cs
+2
View File
@@ -167,6 +167,8 @@ namespace IOB_UT_NEXT
public string func { get; set; } = "";
public string key { get; set; } = "";
public int maxVal { get; set; }
public int minVal { get; set; }
public string name { get; set; } = "";
public int sPeriod { get; set; } = 60;
public string unit { get; set; } = "";
IOB-WIN-NEXT/DATA/CONF/PIZ03.json
+42 -21
View File
@@ -6,7 +6,8 @@
"tipoMem": "Real",
"memAddr": "DB85.DBB280",
"index": 280,
"size": 4
"size": 4,
"unit": "°C"
},
"MinTemp02": {
"name": "MinTemp02",
@@ -14,7 +15,8 @@
"tipoMem": "Real",
"memAddr": "DB85.DBB284",
"index": 284,
"size": 4
"size": 4,
"unit": "°C"
}
},
"mMapRead": {
@@ -27,7 +29,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE1A": {
"name": "TE1A",
@@ -38,7 +41,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE3A": {
"name": "TE3A",
@@ -49,7 +53,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"Temp01": {
"name": "Temp01",
@@ -60,7 +65,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"Level": {
"name": "Level",
@@ -71,7 +77,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "Kg"
},
"PressBH": {
"name": "PressBH",
@@ -82,7 +89,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "bar"
},
"PressBL": {
"name": "PressBL",
@@ -93,7 +101,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "bar"
},
"MainPress": {
"name": "MainPress",
@@ -104,7 +113,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "bar"
},
"Temp02": {
"name": "Temp02",
@@ -115,7 +125,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE06": {
"name": "TE06",
@@ -126,7 +137,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE05": {
"name": "TE05",
@@ -137,7 +149,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE2B ": {
"name": "TE2B",
@@ -148,7 +161,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE1B ": {
"name": "TE1B",
@@ -159,7 +173,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE3B": {
"name": "TE3B",
@@ -170,7 +185,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"PressH": {
"name": "PressH",
@@ -181,7 +197,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "bar"
},
"PressM": {
"name": "PressM",
@@ -192,7 +209,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "bar"
},
"LivelloPerc": {
"name": "LivelloPerc",
@@ -203,7 +221,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "%"
},
"MinTemp01": {
"name": "MinTemp01",
@@ -214,7 +233,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"MinTemp02": {
"name": "MinTemp02",
@@ -225,7 +245,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
}
}
}
IOB-WIN-NEXT/DATA/CONF/PIZ08.json
+42 -21
View File
@@ -6,7 +6,8 @@
"tipoMem": "Real",
"memAddr": "DB85.DBB280",
"index": 280,
"size": 4
"size": 4,
"unit": "°C"
},
"MinTemp02": {
"name": "MinTemp02",
@@ -14,7 +15,8 @@
"tipoMem": "Real",
"memAddr": "DB85.DBB284",
"index": 284,
"size": 4
"size": 4,
"unit": "°C"
}
},
"mMapRead": {
@@ -27,7 +29,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE1A": {
"name": "TE1A",
@@ -38,7 +41,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE3A": {
"name": "TE3A",
@@ -49,7 +53,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"Temp01": {
"name": "Temp01",
@@ -60,7 +65,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"Level": {
"name": "Level",
@@ -71,7 +77,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "Kg"
},
"PressBH": {
"name": "PressBH",
@@ -82,7 +89,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "bar"
},
"PressBL": {
"name": "PressBL",
@@ -93,7 +101,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "bar"
},
"MainPress": {
"name": "MainPress",
@@ -104,7 +113,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "bar"
},
"Temp02": {
"name": "Temp02",
@@ -115,7 +125,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE06": {
"name": "TE06",
@@ -126,7 +137,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE05": {
"name": "TE05",
@@ -137,7 +149,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE2B ": {
"name": "TE2B",
@@ -148,7 +161,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE1B ": {
"name": "TE1B",
@@ -159,7 +173,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"TE3B": {
"name": "TE3B",
@@ -170,7 +185,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"PressH": {
"name": "PressH",
@@ -181,7 +197,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "bar"
},
"PressM": {
"name": "PressM",
@@ -192,7 +209,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "bar"
},
"LivelloPerc": {
"name": "LivelloPerc",
@@ -203,7 +221,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "%"
},
"MinTemp01": {
"name": "MinTemp01",
@@ -214,7 +233,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
},
"MinTemp02": {
"name": "MinTemp02",
@@ -225,7 +245,8 @@
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1
"factor": 1,
"unit": "°C"
}
}
}
IOB-WIN-NEXT/IobGeneric.cs
+4 -5
View File
@@ -2032,7 +2032,7 @@ namespace IOB_WIN_NEXT
/// </summary>
private void svuotaCodaFLog()
{
//controllo se è passato oltre watchdog e non ho inviato nulla --> RE-INVIO (ultimo inviato)!!!!
// controllo se è passato oltre watchdog e non ho inviato nulla --> RE-INVIO (ultimo inviato)!!!!
if (DateTime.Now.Subtract(lastWatchDog).TotalSeconds > utils.CRI("watchdogMaxSec"))
{
string wdStatus = "elapsed";
@@ -2069,6 +2069,7 @@ namespace IOB_WIN_NEXT
listaValori.Add(currVal);
}
sendDataBlock(urlType.FLog, listaValori);
lastWatchDog = DateTime.Now;
}
else
{
@@ -2078,6 +2079,7 @@ namespace IOB_WIN_NEXT
sendDataBlock(urlType.FLog, listaValori);
// svuoto!
QueueFLog = new ConcurrentQueue<string>();
lastWatchDog = DateTime.Now;
}
}
else
@@ -2085,6 +2087,7 @@ namespace IOB_WIN_NEXT
// INVIO SINGOLO...!!!
QueueFLog.TryDequeue(out currVal);
sendToMoonPro(urlType.FLog, currVal);
lastWatchDog = DateTime.Now;
}
}
else
@@ -4753,10 +4756,6 @@ namespace IOB_WIN_NEXT
lgInfo(string.Format("{0} -> [SIM]", queueVal));
}
nSendOut++;
// riporto cosa inviato
#if false
displayOutData();
#endif
currDispData.newUrlCallData = lastUrl;
// aggiorno data ultimo watchdog...
lastWatchDog = DateTime.Now;
IOB-WIN-NEXT/IobSiemensComeca.cs
+43
View File
@@ -35,6 +35,12 @@ namespace IOB_WIN_NEXT
*
* -------------------------------------------------------------------------------- */
#region Protected Fields
protected int strobeVal = 0;
#endregion Protected Fields
#region Public Constructors
/// <summary>
@@ -91,6 +97,35 @@ namespace IOB_WIN_NEXT
#endregion Protected Properties
#region Private Methods
private void checkStrobeHack()
{
// verifico SE ho un hack sulla var DB85.DB268
byte[] byteCtrlW = new byte[2];
bool fatto = S7ReadBB(ref byteCtrlW, "DB85.DBB268", 2);
ushort valCtrlW = S7.Net.Types.Word.FromByteArray(byteCtrlW.ToArray());
// se vale 1 --> resetto strobe!
if (valCtrlW == 1)
{
// aggiunta finale bit a 0 x chiusura processing..
var MemBlock = S7.Net.Types.Int.ToByteArray(0);
var memAddrWrite = "DB85.DBB308";
// imposto valore strobe x check successivi
var taskOk = S7WriteBB(ref MemBlock, memAddrWrite);
if (taskOk)
{
strobeVal = 0;
}
}
else
{
lgInfo("SiemensComeca: Strobe attivo su DBB308, ack non rilevato su DBB268");
}
}
#endregion Private Methods
#region Protected Methods
/// <summary>
@@ -133,6 +168,11 @@ namespace IOB_WIN_NEXT
byteSignals += (1 << 1);
}
// verifico SE ho strobe/hack da chiudere
if (strobeVal != 0)
{
checkStrobeHack();
}
// salvo!
B_input = byteSignals;
}
@@ -185,6 +225,7 @@ namespace IOB_WIN_NEXT
case taskType.setParameter:
// richiedo da URL i parametri WRITE da popolare
lgInfo("Chiamata processMemWriteRequests");
taskVal = processMemWriteRequests();
// se restituiscce "" faccio altra prova...
if (string.IsNullOrEmpty(taskVal))
@@ -204,6 +245,8 @@ namespace IOB_WIN_NEXT
// aggiunta finale bit a 1 x richiesta processing..
MemBlock = S7.Net.Types.Int.ToByteArray(1);
memAddrWrite = "DB85.DBB308";
// imposto valore strobe x check successivi
strobeVal = 1;
break;