jfmartel/YULTek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fuck-up de config...

Browse Source
This commit is contained in:
jfmartel
2023-07-31 12:07:34 -04:00
parent 41b19a7b58
commit 2cdb87405c
22 changed files with 547 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/CANBus/CANAnalyzer.cpp
+33 -26
View File
@@ -7,8 +7,8 @@
CCANAnalyzer::CCANAnalyzer(QObject *parent) : QObject(parent)
{
mCANDriverIF = new CPCANInterface;
mIsCANInitialized = false;
// mCANDriverIF = new CPCANInterface;
// mIsCANInitialized = false;
mDevicePtr = 0;
mDeviceMessagesList = 0;
mCANPollPeriod = 0;
@@ -17,16 +17,18 @@ CCANAnalyzer::CCANAnalyzer(QObject *parent) : QObject(parent)
mCANReadTimer->setInterval(1000);
mCANReadTimer->setSingleShot(true);
connect(mCANReadTimer,SIGNAL(timeout()),this,SLOT(CANTimerExpired()));
mCANDriverIF = 0;
}
CCANAnalyzer::~CCANAnalyzer()
{
mCANDriverIF->DeInit();
delete mCANDriverIF;
// mCANDriverIF->DeInit();
// delete mCANDriverIF;
delete mCANReadTimer;
}
int CCANAnalyzer::Init(quint8 CANDeviceChannel, TPCANBaudrate CANDeviceBaudrate, QList<CCANMessage *> *MsgList, unsigned int PollPeriod)
int CCANAnalyzer::Init(CPCANInterface *CANDriverIF, quint8 CANDeviceChannel, QList<CCANMessage *> *MsgList, unsigned int PollPeriod)
{
if(MsgList == 0)
{
@@ -38,33 +40,35 @@ int CCANAnalyzer::Init(quint8 CANDeviceChannel, TPCANBaudrate CANDeviceBaudrate,
qDebug("CANAnalyzer:: Trying to init with poll period lower tan 200ms");
}
mCANDeviceChannel = CANDeviceChannel;
mCANPollPeriod = PollPeriod;
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Démarrage d'un module CAN...");
mCANDriverIF = CANDriverIF;
// CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Démarrage d'un module CAN...");
mDeviceMessagesList = MsgList;
if(mCANDriverIF->GetDeviceHandle(mCANDeviceChannel,mCANDeviceHandle) != RET_OK)
{
QString Log = QString("Impossible de trouver le module CAN sur le channel %1").arg(mCANDeviceChannel);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(Log,true,1,CGeneralMessagesLogDispatcher::GEN_MSG_TXT_ERROR_STATUS);
mIsCANInitialized = false;
return RET_GENERAL_ERROR;
}
// if(mCANDriverIF->GetDeviceHandle(mCANDeviceChannel,mCANDeviceHandle) != RET_OK)
// {
// QString Log = QString("Impossible de trouver le module CAN sur le channel %1").arg(mCANDeviceChannel);
// CGeneralMessagesLogDispatcher::instance()->AddLogMessage(Log,true,1,CGeneralMessagesLogDispatcher::GEN_MSG_TXT_ERROR_STATUS);
// mIsCANInitialized = false;
// return RET_GENERAL_ERROR;
// }
if(mCANDriverIF->Init(mCANDeviceHandle,CANDeviceBaudrate) != RET_OK)
{
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Impossible d'initialiser le matériel CAN",true,1,CGeneralMessagesLogDispatcher::GEN_MSG_TXT_ERROR_STATUS);
mIsCANInitialized = false;
return RET_GENERAL_ERROR;
}
else
{
mCANReadTimer->start(mCANPollPeriod);
mIsCANInitialized = true;
}
// if(mCANDriverIF->Init(mCANDeviceHandle,CANDeviceBaudrate) != RET_OK)
// {
// CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Impossible d'initialiser le matériel CAN",true,1,CGeneralMessagesLogDispatcher::GEN_MSG_TXT_ERROR_STATUS);
// mIsCANInitialized = false;
// return RET_GENERAL_ERROR;
// }
// else
// {
// mCANReadTimer->start(mCANPollPeriod);
// mIsCANInitialized = true;
// }
mCANReadTimer->start(mCANPollPeriod);
// mIsCANInitialized = true;
return RET_OK;
}
@@ -89,6 +93,9 @@ int CCANAnalyzer::ReadCAN()
void CCANAnalyzer::CANTimerExpired()
{
if(mCANDriverIF == 0)
return;
QList<CCANMessage *> NewMessagesList = mCANDriverIF->ReadCANFullBuffer(mCANDeviceHandle);
int BufferSize = NewMessagesList.size();