Merge commit '6099d07650acb28df1a5c9659479351daa7c2d27'
This commit is contained in:
@@ -17,6 +17,8 @@ static uint16_t datif_OutCmdpara5;
|
||||
static uint32_t datif_OutCmdpara6;
|
||||
static uint8_t cycl_running;
|
||||
|
||||
//static bool datif_DCdataValid;
|
||||
|
||||
T_datif::T_datif(QWidget *parent) : QMainWindow(parent)
|
||||
{
|
||||
|
||||
@@ -46,6 +48,8 @@ T_datif::T_datif(QWidget *parent) : QMainWindow(parent)
|
||||
dif_scanStep=0;
|
||||
selectedSlaveAddr=FIX_SLAVE_ADDR;
|
||||
cycl_running=0;
|
||||
//datif_DCdataValid=0;
|
||||
gpi_storeDcDataValid(0);
|
||||
}
|
||||
|
||||
void T_datif::resetChain(void)
|
||||
@@ -1478,6 +1482,10 @@ char T_datif::loadRecDataFromFrame()
|
||||
|
||||
*/
|
||||
|
||||
if (RdDleng>40)
|
||||
//datif_DCdataValid=1; // das hier sind die wichtigsten Daten, deshalb hierrein!
|
||||
gpi_storeDcDataValid(1);
|
||||
|
||||
gpi_storeDynMachineConditions(RdDleng, receivedData);
|
||||
|
||||
prnResult=receivedData[52];
|
||||
|
Reference in New Issue
Block a user