GerhardHoffmann/DCLibraries
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: T.S.: set DCdataValid

Browse Source
This commit is contained in:
Siegfried Siegert 2024-07-24 17:22:17 +02:00
parent 03d21c62b6
commit 492d30aaf0
Signed by untrusted user: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/datIf.h
View File

@ -161,6 +161,8 @@ class T_datif : public QObject
// blockNr=transmitted in WRITEADDRESS low byte // blockNr=transmitted in WRITEADDRESS low byte
int datif_noResponseCtr; int datif_noResponseCtr;
int datif_nowNewDyns;
int datif_nowNewStats;
T_prot *myDCIF; T_prot *myDCIF;
QTimer *datif_trigger; QTimer *datif_trigger;

25
src/datIf.cpp
View File

@ -91,6 +91,8 @@ T_datif::T_datif(QObject *parent) : QObject(parent)
epi_resetDcDataValid(1); // data are not yet valid, no response from DC by now epi_resetDcDataValid(1); // data are not yet valid, no response from DC by now
datif_noResponseCtr=0; datif_noResponseCtr=0;
datif_nowNewDyns=0;
datif_nowNewStats=0;
datif_repeatCtr=0; datif_repeatCtr=0;
datif_cmdWasPerformed=0; // 0: no response by now datif_cmdWasPerformed=0; // 0: no response by now
@ -151,13 +153,24 @@ char T_datif::datif_cycleSend()
{ {
//qDebug() << "com port not available"; // wird ununterbrochen ausgegeben //qDebug() << "com port not available"; // wird ununterbrochen ausgegeben
epi_resetDcDataValid(2); // DC data not valid epi_resetDcDataValid(2); // DC data not valid
datif_nowNewDyns=0;
datif_nowNewStats=0;
return 0; return 0;
} }
// supervise if DC data are valid // supervise if DC data are valid
datif_noResponseCtr++; // inc every 20ms datif_noResponseCtr++; // inc every 20ms
if (datif_noResponseCtr>250) // no life sign from device controller (DC) for about 3s if (datif_noResponseCtr>50) // no life sign from device controller (DC) for about a sec
{
epi_resetDcDataValid(3); // DC data has not updated for >=5s -> no longer valid! epi_resetDcDataValid(3); // DC data has not updated for >=5s -> no longer valid!
datif_nowNewDyns=0;
datif_nowNewStats=0;
}
// 24.7.24 new, data are valid if dynamic machine conditions AND dyn machine states came in
if (datif_nowNewDyns && datif_nowNewStats && !epi_areDcDataValid() )
epi_setDcDataValid();
// Ueberwachung ob ein oder mehrere Commands am Stueck erfolgreich waren // Ueberwachung ob ein oder mehrere Commands am Stueck erfolgreich waren
if (gpi_wantToResetSupervision()) if (gpi_wantToResetSupervision())
@ -360,6 +373,9 @@ char T_datif::datif_cycleSend()
{ {
dif_scanStep=0; // always start from beginning dif_scanStep=0; // always start from beginning
epi_resetDcDataValid(4); epi_resetDcDataValid(4);
datif_nowNewDyns=0;
datif_nowNewStats=0;
} }
datif_cmdWasPerformed=0; // 0: no response by now datif_cmdWasPerformed=0; // 0: no response by now
@ -1035,6 +1051,7 @@ char T_datif::loadRecDataFromFrame()
if (RdDleng>28) if (RdDleng>28)
{ {
gpi_storeDeviceConditions(RdDleng, receivedData); gpi_storeDeviceConditions(RdDleng, receivedData);
datif_nowNewStats=1; // 24.7.24 new
} }
break; break;
@ -1043,9 +1060,9 @@ char T_datif::loadRecDataFromFrame()
if (RdDleng>60) if (RdDleng>60)
{ {
epi_setDcDataValid(); // DC-Data are valid as DC responded. //epi_setDcDataValid(); // 24.7.24 remove here
// Could be set to every response but this (31) datif_nowNewDyns=1; // 24.7.24 new
// is a very common and very important request
gpi_storeDynMachineConditions(RdDleng, receivedData); gpi_storeDynMachineConditions(RdDleng, receivedData);
gpi_storeDI_CoinAttach(receivedData[6]); // new, 14.2.24 needed for direct coin insertion gpi_storeDI_CoinAttach(receivedData[6]); // new, 14.2.24 needed for direct coin insertion