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

Merge branch 'release/Fanuc_dedup_04'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-07-10 07:16:26 +02:00
parent e9a2694ba0 a982658414
commit c476c9fd9d
5 changed files with 78 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-FANUC/DATA/CONF/3004.json
+2 -14
View File
@@ -28,7 +28,7 @@
"index": 0,
"size": 4,
"func": "MAX",
"period": 60,
"period": 3600,
"factor": 1,
"displOrdinal": 7
},
@@ -40,21 +40,9 @@
"index": 0,
"size": 4,
"func": "MAX",
"period": 60,
"period": 3600,
"factor": 1,
"displOrdinal": 8
},
"PROG": {
"name": "PROG",
"description": "Programma",
"memAddr": "",
"tipoMem": "Int",
"index": 0,
"size": 4,
"func": "MAX",
"period": 60,
"factor": 1,
"displOrdinal": 9
}
}
}
IOB-WIN-FANUC/DATA/CONF/3005.json
+48
View File
@@ -0,0 +1,48 @@
{
"mMapWrite": {
"setPzComm": {
"name": "setPzComm",
"description": "Qta Richiesta",
"memAddr": "STD.PAR.6713",
"tipoMem": "Int",
"index": 6713,
"size": 4,
"displOrdinal": 3
},
"forceSetPzCount": {
"name": "forceSetPzCount",
"description": "Contapezzi",
"memAddr": "STD.PAR.6711",
"tipoMem": "Int",
"index": 6711,
"size": 4,
"displOrdinal": 3
}
},
"mMapRead": {
"PZ_GTOT": {
"name": "PZ_GTOT",
"description": "Contatore GTot",
"memAddr": "STD.PAR.6712",
"tipoMem": "Int",
"index": 0,
"size": 4,
"func": "MAX",
"period": 3600,
"factor": 1,
"displOrdinal": 7
},
"PZ_COUNT": {
"name": "PZ_COUNT",
"description": "Contatore",
"memAddr": "STD.PAR.6711",
"tipoMem": "Int",
"index": 0,
"size": 4,
"func": "MAX",
"period": 3600,
"factor": 1,
"displOrdinal": 8
}
}
}
IOB-WIN-FANUC/IOB-WIN-FANUC.csproj
+3
View File
@@ -179,6 +179,9 @@
<None Include="DATA\CONF\3025.json" />
<None Include="DATA\CONF\3027.json" />
<None Include="DATA\CONF\3027.ini" />
<None Include="DATA\CONF\3005.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\3028.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
IOB-WIN-FANUC/Iob/Fanuc.cs
-3
View File
@@ -640,8 +640,6 @@ namespace IOB_WIN_FANUC.Iob
{
string prgName = "";
DateTime adesso = DateTime.Now;
int minVetoPrg = 2;
// recupero NUOVO prgName...
try
{
// recupero nome programma MAIN
@@ -653,7 +651,6 @@ namespace IOB_WIN_FANUC.Iob
catch (Exception exc)
{
lgError(string.Format("Eccezione in recupero PRG NAME MAIN:{0}{1}", Environment.NewLine, exc));
vetoPrgName = adesso.AddMinutes(minVetoPrg * 5);
//connectionOk = false;
}
return prgName;
IOB-WIN-FORM/Iob/Generic.Protected.cs
+25 -33
View File
@@ -4857,7 +4857,6 @@ namespace IOB_WIN_FORM.Iob
}
}
protected DateTime vetoPrgName = DateTime.Now;
/// <summary>
/// Effettua gestioen programma: legge e mostra su display...
@@ -4865,49 +4864,42 @@ namespace IOB_WIN_FORM.Iob
private void processProgram()
{
currPrgName = "";
DateTime adesso = DateTime.Now;
int minVetoPrg = 2;
if (adesso > vetoPrgName)
// se abilitata lettura prgName
if (enablePrgName)
{
// se abilitata lettura prgName
if (enablePrgName)
if (connectionOk)
{
if (connectionOk)
try
{
try
{
currPrgName = getPrgName();
vetoPrgName = adesso.AddMinutes(minVetoPrg);
}
catch (Exception exc)
{
lgError($"Eccezione in getPrgName{Environment.NewLine}{exc}");
vetoPrgName = adesso.AddMinutes(minVetoPrg * 5);
}
currPrgName = getPrgName();
}
else
catch (Exception exc)
{
lgError("Errore connessione mancante x getPrgName");
lgError($"Eccezione in getPrgName{Environment.NewLine}{exc}");
}
}
else
{
currPrgName = lastPrgName;
lgError("Errore connessione mancante x getPrgName");
}
// verifico SE sia cambiato il programma...
if (lastPrgName != currPrgName)
{
// salvo!
lastPrgName = currPrgName;
string sVal = $"[PROG]{currPrgName}";
}
else
{
currPrgName = lastPrgName;
}
// verifico SE sia cambiato il programma...
if (lastPrgName != currPrgName)
{
// salvo!
lastPrgName = currPrgName;
string sVal = $"[PROG]{currPrgName}";
// chiamo accodamento...
bool sent = accodaFLog("PROG", sVal, qEncodeFLog("PROG", currPrgName));
if (sent)
{
// traccio valore DynData x analisi
trackDynData("PROG", currPrgName);
}
// chiamo accodamento...
bool sent = accodaFLog("PROG", sVal, qEncodeFLog("PROG", currPrgName));
if (sent)
{
// traccio valore DynData x analisi
trackDynData("PROG", currPrgName);
}
}
}