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

Merge branch 'develop' into IobMan

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-03-04 17:56:19 +01:00
parent 7ba4e4684a 0ec9485f19
commit ca36e3b10a
9 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CVCncLib/CVCncLib.dll
BIN
View File
Binary file not shown.
IOB-MAN/IOBManPanel.cs
+4 -5
View File
@@ -15,8 +15,6 @@ using System.Windows.Forms;
namespace IOB_MAN
{
public partial class IOBManPanel : Form
{
#region area gestione hide/maximize finestre
@@ -454,7 +452,8 @@ namespace IOB_MAN
List<iobAdapt> proc2restart = new List<iobAdapt>();
foreach (iobAdapt item in ElencoIOB.List)
{
if (!item.isRunning)
// se NON E' running oppure se ultimo comunicazione è > 5 minuti fa...
if (!item.isRunning || !item.plcOnline)
{
// segno da eliminare e riavviare
proc2restart.Add(item);
@@ -468,7 +467,7 @@ namespace IOB_MAN
foreach (var item in proc2restart)
{
ElencoIOB.Remove(item);
utils.lgInfo($"Chiusura processo non running | IOB: {item.CodIOB} | pid: {item.pID}");
utils.lgInfo($"Chiusura processo non running / online | IOB: {item.CodIOB} | pid: {item.pID}");
}
// li faccio ripartire!
foreach (var item in proc2restart)
@@ -604,7 +603,7 @@ namespace IOB_MAN
closeAllChild(true);
closeTimers();
}
private void closeTimers()
{
MainTimer.Dispose();
IOB-MAN/RedisMan.cs
+2 -2
View File
@@ -1081,11 +1081,11 @@ namespace IOB_MAN
/// Lungh coda MESSAGGI in uscita
/// </summary>
public int queueMsLen { get; set; } = 0;
#if false
/// <summary>
/// DataOra ultima comunicazione IN (con PLC)
/// </summary>
public DateTime lastDataIn { get; set; } = DateTime.Now.AddDays(-1);
public DateTime lastDataIn { get; set; } = DateTime.Now.AddMinutes(-1);
#if false
/// <summary>
/// DataOra ultima comunicazione OUT (con MP Server)
/// </summary>
IOB-MAN/iobAdapt.cs
+14 -1
View File
@@ -77,7 +77,7 @@ namespace IOB_MAN
/// </summary>
public RedisIobCache redisMan;
/// <summary>
/// Stato online dell'IOB
/// Stato online dell'IOB (rispetto server MP-IO)
/// </summary>
[DisplayName("Online")]
public bool iobOnline
@@ -88,6 +88,19 @@ namespace IOB_MAN
}
}
/// <summary>
/// Determina se sia online il PLC cioè non sia fermo alla comunicazione per oltre 5 minuti
/// </summary>
[DisplayName("PlcOnline")]
public bool plcOnline
{
get
{
DateTime adesso = DateTime.Now;
bool plcOnline = Math.Abs(adesso.Subtract(currIobStatus.lastDataIn).TotalSeconds) < 300;
return plcOnline;
}
}
/// <summary>
/// Counter dell'IOB
/// </summary>
[DisplayName("pz.IOB")]
IOB-UT/Objects.cs
+2 -2
View File
@@ -534,11 +534,11 @@ namespace IOB_UT
/// Lungh coda MESSAGGI in uscita
/// </summary>
public int queueMsLen { get; set; } = 0;
#if false
/// <summary>
/// DataOra ultima comunicazione IN (con PLC)
/// </summary>
public DateTime lastDataIn { get; set; } = DateTime.Now.AddDays(-1);
public DateTime lastDataIn { get; set; } = DateTime.Now.AddMinutes(-1);
#if false
/// <summary>
/// DataOra ultima comunicazione OUT (con MP Server)
/// </summary>
IOB-WIN/AdapterForm.cs
+2 -1
View File
@@ -497,7 +497,8 @@ namespace IOB_WIN
counterIOB = iobObj.contapezzi,
counterMAC = iobObj.lastCountCNC,
lastUpdate = lastIobStatus.lastUpdate,
online = utils.IOB_Online
online = utils.IOB_Online,
lastDataIn = iobObj.lastReadPLC
};
// se diverso SALVO!
if (lastIobStatus.online != currIobStatus.online || lastIobStatus.counterIOB != currIobStatus.counterIOB || lastIobStatus.counterMAC != currIobStatus.counterMAC || lastIobStatus.queueEvLen != currIobStatus.queueEvLen || lastIobStatus.queueFlLen != currIobStatus.queueFlLen || lastIobStatus.queueAlLen != currIobStatus.queueAlLen || lastIobStatus.queueMsLen != currIobStatus.queueMsLen)
IOB-WIN/IobGeneric.cs
+8 -1
View File
@@ -220,9 +220,13 @@ namespace IOB_WIN
/// </summary>
public DateTime lastDisconnCheck;
/// <summary>
/// dataOra ultimo PING inviato...
/// dataOra ultimo PING inviato verso il PLC...
/// </summary>
public DateTime lastPING;
/// <summary>
/// DataOra ultima lettura da PLC
/// </summary>
public DateTime lastReadPLC;
/// <summary>
/// Oggetto della coda degli elementi letti (e non ancora trasmessi)
/// </summary>
@@ -1101,6 +1105,7 @@ namespace IOB_WIN
dtAvvioAdp = DateTime.Now;
lastWatchDog = dtAvvioAdp;
lastPING = dtAvvioAdp;
lastReadPLC = dtAvvioAdp.AddMinutes(-1);
lastDisconnCheck = dtAvvioAdp;
TimingData.resetData();
// aggiungo altri defaults
@@ -3268,6 +3273,7 @@ namespace IOB_WIN
if (connectionOk)
{
readSemafori(ref currDispData);
lastReadPLC = DateTime.Now;
}
else
{
@@ -3725,6 +3731,7 @@ namespace IOB_WIN
/// </summary>
public virtual void readSemafori(ref newDisplayData currDispData)
{
lastReadPLC = DateTime.Now;
}
/// <summary>
IOB-WIN/IobKawasaki.cs
+1 -1
View File
@@ -460,7 +460,7 @@ namespace IOB_WIN
}
}
}
// se non è ancora connesso faccio procesisng memoria caso disconnesso...
// se non è ancora connesso faccio processing memoria caso disconnesso...
if (!connectionOk)
{
// processo semafori ed invio...
Jenkinsfile
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=683']) {
withEnv(['NEXT_BUILD_NUMBER=684']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'