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

Refactor CodeMaid classi ultime toccate

Browse Source
This commit is contained in:
Samuele Locatelli
2022-09-08 18:47:43 +02:00
parent 1e9fe1be3d
commit 3a7eff3554
5 changed files with 574 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-UT-NEXT/ToMapo.cs
+6 -7
View File
@@ -234,6 +234,11 @@ namespace IOB_UT_NEXT
/// </summary>
public List<string> fluxLogVeto { get; set; } = new List<string>();
/// <summary>
/// Indica se il controllo di ping sia OK (x controllo prima della connessione)
/// </summary>
public bool forcePingOk { get; set; } = false;
/// <summary>
/// Array degli elementi di traduzione item
/// </summary>
@@ -280,12 +285,7 @@ namespace IOB_UT_NEXT
public bool pingAsPowerOn { get; set; } = true;
/// <summary>
/// Indica se il controllo di ping sia OK (x controllo prima della connessione)
/// </summary>
public bool forcePingOk { get; set; } = false;
/// <summary>
/// Indica se venga richiesta invio del run mode
/// Indica se venga richiesta invio del run mode
/// </summary>
public bool runModeSend { get; set; } = false;
@@ -294,7 +294,6 @@ namespace IOB_UT_NEXT
/// </summary>
public bool runModeTrad { get; set; } = false;
#endregion Public Properties
}
IOB-WIN-NEXT/AdapterForm.cs
+530 -530
View File
File diff suppressed because it is too large Load Diff
IOB-WIN-NEXT/IobOpcUa.cs
+29 -29
View File
@@ -421,35 +421,6 @@ namespace IOB_WIN_NEXT
return changed;
}
internal void procRunMode(ref string currRun)
{
// variabili RUN... se richiesto invio runMode
if (opcUaParams.runModeSend)
{
if (!string.IsNullOrEmpty(opcUaParams.keyRunMode))
{
currRun = getDataItemValue(opcUaParams.keyRunMode);
if (!string.IsNullOrEmpty(currRun))
{
// se ho valore --> invio
string sVal = "";
string descr = $"RunModeVal";
DateTime locTStamp = DateTime.Now;
sVal = $"Change: {locTStamp.ToString()} | descr: {descr} | Id: {opcUaParams.keyRunMode} | Val: {currRun}";
accodaFLog(sVal, qEncodeFLog(descr, currRun));
// se richiesto provo a tradurre
if (opcUaParams.runModeTrad)
{
string RunModeDescr = itemTranslation("RunMode", currRun);
descr = $"RunMode";
accodaFLog(sVal, qEncodeFLog(descr, RunModeDescr));
}
}
}
}
}
/// <summary>
/// Verifica ed invia variazioni DAL FORMATO RAW data (byte[])
/// </summary>
@@ -511,6 +482,35 @@ namespace IOB_WIN_NEXT
return changed;
}
internal void procRunMode(ref string currRun)
{
// variabili RUN... se richiesto invio runMode
if (opcUaParams.runModeSend)
{
if (!string.IsNullOrEmpty(opcUaParams.keyRunMode))
{
currRun = getDataItemValue(opcUaParams.keyRunMode);
if (!string.IsNullOrEmpty(currRun))
{
// se ho valore --> invio
string sVal = "";
string descr = $"RunModeVal";
DateTime locTStamp = DateTime.Now;
sVal = $"Change: {locTStamp.ToString()} | descr: {descr} | Id: {opcUaParams.keyRunMode} | Val: {currRun}";
accodaFLog(sVal, qEncodeFLog(descr, currRun));
// se richiesto provo a tradurre
if (opcUaParams.runModeTrad)
{
string RunModeDescr = itemTranslation("RunMode", currRun);
descr = $"RunMode";
accodaFLog(sVal, qEncodeFLog(descr, RunModeDescr));
}
}
}
}
}
internal void sendDataItemListToServer(NodeId StartNodeId)
{
// converto gli attuali nell'elenco dataitem...
IOB-WIN-NEXT/IobOpcUaMBH.cs
+1 -2
View File
@@ -202,7 +202,7 @@ namespace IOB_WIN_NEXT
}
}
}
}
}
#endif
// salvo running come = working...
@@ -233,7 +233,6 @@ namespace IOB_WIN_NEXT
// se NON ready --> manual
B_input += (1 << 4);
}
}
// se abilitato watchdog...
if (opcUaParams.WatchDog.IsEnabled)
IOB-WIN-NEXT/IobOpcUaMBHCimolai.cs
+8 -9
View File
@@ -111,6 +111,14 @@ namespace IOB_WIN_NEXT
return writeResult;
}
/// <summary>
/// Effettua vero processing contapezzi
/// </summary>
public override void processContapezzi()
{
// non fa nulal (non ha contapezzi)
}
public override bool resetcontapezziPLC()
{
bool answ = false;
@@ -199,14 +207,5 @@ namespace IOB_WIN_NEXT
}
#endregion Private Methods
/// <summary>
/// Effettua vero processing contapezzi
/// </summary>
public override void processContapezzi()
{
// non fa nulal (non ha contapezzi)
}
}
}