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

Watchdog avec date/time et reporting fonctionnel.

Browse Source
This commit is contained in:
jfmartel
2024-03-09 11:54:03 -05:00
parent 1f3a7dd270
commit ff6ae02ed5
19 changed files with 372 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/CANBus/CANDevice.cpp
+19 -11
View File
@@ -93,17 +93,6 @@ int CCANDevice::Init()
return RET_GENERAL_ERROR;
}
if(mDeviceConfigInfo.mDeviceWatchdogActivated == true)
{
if(mCANWatchdog.Init(mCANDriverIF,mDeviceHandle,mDeviceConfigInfo.mWatchdogPeriod,mDeviceConfigInfo.mWatchdogCANMsgID) != RET_OK)
{
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Impossible d'initialiser un watchdog CAN","CCANDevice",true,1,CGeneralMessagesLogDispatcher::GEN_MSG_TXT_ERROR_STATUS);
}
mCANWatchdog.StartWDT();
QString Log = QString("Watchdog CAN initialisé pour le module sur le channel %1").arg(mDeviceConfigInfo.mCANDeviceID);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(Log,"CCANDevice",true,1,CGeneralMessagesLogDispatcher::GEN_MSG_TXT_SUCCESS_STATUS);
}
mIsCANInitialized = true;
@@ -120,6 +109,25 @@ int CCANDevice::Init()
return RET_OK;
}
int CCANDevice::StartWatchdog(CDeviceDetectionConfig *DeviceMonitorConfig)
{
if(mDeviceConfigInfo.mDeviceWatchdogActivated == true)
{
if(mCANWatchdog.Init(mCANDriverIF,mDeviceHandle,mDeviceConfigInfo.mWatchdogPeriod,DeviceMonitorConfig) != RET_OK)
{
CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Impossible d'initialiser un watchdog CAN","CCANDevice",true,1,CGeneralMessagesLogDispatcher::GEN_MSG_TXT_ERROR_STATUS);
}
else
{
mCANWatchdog.StartWDT();
QString Log = QString("Watchdog CAN initialisé pour le module sur le channel %1").arg(mDeviceConfigInfo.mCANDeviceID);
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(Log,"CCANDevice",true,1,CGeneralMessagesLogDispatcher::GEN_MSG_TXT_SUCCESS_STATUS);
}
}
}
int CCANDevice::Init(QString DatabaseFileName, TPCANHandle CANDeviceID, TPCANBaudrate CANDeviceBaudRate, QString DevDescription, QString DeviceName, unsigned int DevicePollPeriod)
{
mDeviceConfigInfo.mCANDeviceID = CANDeviceID;