|
@@ -18,7 +18,7 @@ DataUpdateThread::DataUpdateThread(QObject *parent)
|
|
|
nMaxCh=0;
|
|
nMaxCh=0;
|
|
|
nReadType=0;
|
|
nReadType=0;
|
|
|
m_shmData=0;
|
|
m_shmData=0;
|
|
|
- bTacStatus=false;
|
|
|
|
|
|
|
+ bTacStatus=0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
DataUpdateThread::~DataUpdateThread()
|
|
DataUpdateThread::~DataUpdateThread()
|
|
@@ -174,7 +174,9 @@ int DataUpdateThread::initShm()
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/* 设置共享内存对象的大小 */
|
|
/* 设置共享内存对象的大小 */
|
|
|
-
|
|
|
|
|
|
|
+ qDebug()<<"=======================================";
|
|
|
|
|
+ qDebug()<<"SHM_SizeOf="<<sizeof(smartPDU_shm_data);
|
|
|
|
|
+ qDebug()<<"=======================================";
|
|
|
if (ftruncate(shm_fd, sizeof(smartPDU_shm_data)) == -1) {
|
|
if (ftruncate(shm_fd, sizeof(smartPDU_shm_data)) == -1) {
|
|
|
perror("ftruncate");
|
|
perror("ftruncate");
|
|
|
return 2;
|
|
return 2;
|
|
@@ -210,12 +212,19 @@ void DataUpdateThread::setShmChRead(int nCh,int nPhID)
|
|
|
{
|
|
{
|
|
|
if(m_shmData->nSelectPowerCH!=nCh)
|
|
if(m_shmData->nSelectPowerCH!=nCh)
|
|
|
{
|
|
{
|
|
|
|
|
+
|
|
|
m_shmData->nSelectPowerCH=nCh;
|
|
m_shmData->nSelectPowerCH=nCh;
|
|
|
|
|
+ qDebug()<<"ShmData_____bT_ACType:"<<bTacStatus<<"nSelectPowerCH:"<<m_shmData->nSelectPowerCH;
|
|
|
bTacStatus=m_shmData->bT_ACType;
|
|
bTacStatus=m_shmData->bT_ACType;
|
|
|
pdu_Ctrl::instance()->isT_ACType=bTacStatus;
|
|
pdu_Ctrl::instance()->isT_ACType=bTacStatus;
|
|
|
- if(bTacStatus)
|
|
|
|
|
|
|
+ if(bTacStatus==1)
|
|
|
{
|
|
{
|
|
|
- m_shmData->nSelectPh=nPhID;
|
|
|
|
|
|
|
+ if(m_shmData->nSelectPh!=nPhID)
|
|
|
|
|
+ {
|
|
|
|
|
+ m_shmData->nSelectPh=nPhID;
|
|
|
|
|
+ qDebug()<<"ShmData_____nSelectPowerCH:"<<m_shmData->nSelectPowerCH<<"nSelectPh:"<<m_shmData->nSelectPh;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}else
|
|
}else
|
|
|
{
|
|
{
|
|
|
m_shmData->nSelectPh=0;
|
|
m_shmData->nSelectPh=0;
|
|
@@ -283,7 +292,7 @@ void DataUpdateThread::ReadShmMaxch()
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-bool DataUpdateThread::isT_ACType()
|
|
|
|
|
|
|
+int DataUpdateThread::isT_ACType()
|
|
|
{
|
|
{
|
|
|
return bTacStatus;
|
|
return bTacStatus;
|
|
|
}
|
|
}
|