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

Merge branch 'release/TrackShellyData_01'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-06-04 17:09:12 +02:00
parent 3358ef9f79 a7dfaf423e
commit 8dfcd9b3f9
5 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-FORM/Iob/Generic.Protected.cs
+20
View File
@@ -3614,6 +3614,26 @@ namespace IOB_WIN_FORM.Iob
}
}
/// <summary>
/// Track dati ricevuti generici (serializzando)
/// </summary>
/// <param name="genObj"></param>
protected void trackExchDataRaw(object genObj, long val2rec = 256)
{
try
{
// salvo indicazione valore ricevuto
string rawVal = JsonConvert.SerializeObject(genObj);
// salvo dim caratteri ricevuti
trackExchData(rawVal.Length, val2rec);
}
catch (Exception exc)
{
lgError($"trackExchDataRaw | errore in fase di track obj ricevuto{Environment.NewLine}{exc}");
}
}
/// <summary>
/// Accumulatore counter byte x inviare meno record in REDIS
/// </summary>
IOB-WIN-FORM/Iob/Simula.cs
+5 -5
View File
@@ -405,7 +405,7 @@ namespace IOB_WIN_FORM.Iob
taskDone.Add(item.Key, taskVal);
// salvo SIMULAZIONE dati scambiati: lunghezza string
trackExchData(taskVal.Length, 256);
trackExchData(taskVal.Length, 1792);
}
}
}
@@ -817,7 +817,7 @@ namespace IOB_WIN_FORM.Iob
answ = true;
// salvo SIMULAZIONE dati scambiati: lunghezza string
trackExchData(rawVal.Length, 256);
trackExchData(rawVal.Length, 1280);
}
}
return answ;
@@ -1157,7 +1157,7 @@ namespace IOB_WIN_FORM.Iob
}
lgInfo($"S01: Valori contatori: contapezzi macchina contapezziPLC: {contapezziPLC} | contapezziIOB: {contapezziIOB} | contapezziPLC > contapezziIOB");
// salvo SIMULAZIONE dati scambiati: contapezzi 8 byte (parziale, totale, richiesti, mancanti)
trackExchData(32, 256);
trackExchData(16, 768);
}
}
}
@@ -1718,7 +1718,7 @@ namespace IOB_WIN_FORM.Iob
trackDynData(kvpFlux[0], kvpFlux[1]);
// salvo SIMULAZIONE dati scambiati: lunghezza val string
trackExchData(fLog2send.valString.Length, 256);
trackExchData(fLog2send.valString.Length, 1536);
}
}
}
@@ -1867,7 +1867,7 @@ namespace IOB_WIN_FORM.Iob
trackDynData(currData[0], currData[1]);
// salvo SIMULAZIONE dati scambiati: lunghezza val string
trackExchData(fLog2send.valString.Length, 256);
trackExchData(fLog2send.valString.Length, 1024);
}
}
}
IOB-WIN-MTC/IOB-WIN-MTC.csproj
+9 -3
View File
@@ -310,9 +310,15 @@
<None Include="DATA\CONF\MAIN.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_01.ini" />
<None Include="DATA\CONF\SIMUL_01.json" />
<None Include="DATA\CONF\SIMUL_01_alarm.json" />
<None Include="DATA\CONF\SIMUL_01.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_01.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_01_alarm.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_01_WD.ini" />
<None Include="packages.config" />
<None Include="postBuildTgt.bat" />
IOB-WIN-MTC/Iob/MTConn.cs
+14
View File
@@ -1,6 +1,7 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using MapoSDK;
using MTConnect.Assets;
using MTConnect.Clients;
using MTConnect.Devices;
using MTConnect.Observations;
@@ -16,6 +17,7 @@ using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Xml.Linq;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
namespace IOB_WIN_MTC.Iob
{
@@ -1028,6 +1030,7 @@ namespace IOB_WIN_MTC.Iob
{
processObservation(observation, forceSend);
}
}
}
}
@@ -1559,11 +1562,17 @@ namespace IOB_WIN_MTC.Iob
queueInEnabCurr = true;
connectionOk = true;
lastCurrent = DateTime.Now;
int docSize = 0;
string rawVal = "";
foreach (var asset in doc.Assets)
{
// Print AssetId to the Console
lgInfo($"Asset: {asset.AssetId}");
rawVal = JsonConvert.SerializeObject(asset);
docSize += rawVal.Length;
}
// salvo dim caratteri ricevuti
trackExchData(docSize, 1024);
}
private void MTC_ref_ClientStarted(object sender, EventArgs e)
@@ -1685,6 +1694,8 @@ namespace IOB_WIN_MTC.Iob
{
lgInfo($"STEP 03 invio dati di {elencoDataItems.Count} records");
sendDataItemsList(elencoDataItems);
// provoa a tracciare dataitems...
trackExchDataRaw(elencoDataItems, 1024);
}
hasReadItems = true;
lgInfo($"STEP 04: memorizzati {dataItemMem.Count} oggetti in memoria");
@@ -1705,6 +1716,7 @@ namespace IOB_WIN_MTC.Iob
lastCurrent = DateTime.Now;
lgTrace("SAMPLE received");
checkAndSend(document, false);
trackExchDataRaw(document, 1024);
}
/// <summary>
@@ -1865,6 +1877,7 @@ namespace IOB_WIN_MTC.Iob
}
}
lgTrace(sMsg);
trackExchDataRaw(observ, 1024);
}
/// <summary>
@@ -1892,6 +1905,7 @@ namespace IOB_WIN_MTC.Iob
}
}
lgTrace(sMsg);
trackExchDataRaw(observation, 1024);
}
#endregion Private Methods
IOB-WIN-SHELLY/Iob/ShellyClient.cs
+2
View File
@@ -124,6 +124,8 @@ namespace IOB_WIN_SHELLY.Iob
//outData.Add(item.Key, outValDbl.ToString("F3", CultureInfo.InvariantCulture));
}
}
// traccio dati ricevuti
trackExchDataRaw(lastShellyResp, 1024);
}
return outData;
}