Désactivation du driver Axiomtek de marde
This commit is contained in:
@@ -53,7 +53,10 @@ int COtarcikCan::Start()
|
||||
mMainWindow.mCANbusSettingsPage->mProgramPtr = this;
|
||||
mMainWindow.mDataLoggingSettingsPage->mProgramHandle = this;
|
||||
mMainWindow.mGeneralStatusPage->mProgramPtr = this;
|
||||
mMainWindow.mGeneralStatusPage->mCPUInterface = &mCPUInterface;
|
||||
// mMainWindow.mGeneralStatusPage->mCPUInterface = &mCPUInterface; //JFM 2024-08-27 disable Axiomtek driver
|
||||
#ifdef ENABLE_CHIPSET_DRIVER
|
||||
mMainWindow.mGeneralStatusPage->SetCPUInterfaceHandle(&mCPUInterface);
|
||||
#endif
|
||||
mLANDevicesPresenceMonitor.mProgramPtr = this;
|
||||
// mMainWindow.mCANWatchdogSettingsPage->mProgramHandle = this;
|
||||
|
||||
@@ -62,8 +65,9 @@ int COtarcikCan::Start()
|
||||
mSysLogger.Start("10.8.0.6",514);
|
||||
CGeneralMessagesLogDispatcher::instance()->BindGuiPageHandle(mMainWindow.mGeneralStatusPage);
|
||||
CGeneralMessagesLogDispatcher::instance()->Init(&mSysLogger);
|
||||
|
||||
#ifdef ENABLE_CHIPSET_DRIVER
|
||||
mCPUInterface.Init();
|
||||
#endif
|
||||
|
||||
if(mSystemConfig.LoadConfig() == RET_OK)
|
||||
{
|
||||
@@ -82,7 +86,9 @@ int COtarcikCan::Start()
|
||||
mMainWindow.mDataLoggingSettingsPage->SetCloudParams(&mCloudLoggingParams);
|
||||
mCANBusMQTTClient.SetMQTTParams(&mCloudLoggingParams);
|
||||
mCANBusMQTTClient.SetCANDevicesList(&mCANDevicesList);
|
||||
#ifdef ENABLE_CHIPSET_DRIVER
|
||||
mCANBusMQTTClient.SetCPUInterface(&mCPUInterface);
|
||||
#endif
|
||||
mCANBusMQTTClient.SetMQTTServerPresenceCANBit(mSystemConfig.GetDeviceDetectionConfig()->mMQTTDetectionCANStatusBit);
|
||||
|
||||
mGeneralSystemParams = *mSystemConfig.GetGeneralSystemSettings();
|
||||
@@ -90,7 +96,9 @@ int COtarcikCan::Start()
|
||||
CGeneralMessagesLogDispatcher::instance()->SetLogVerbosities(mGeneralSystemParams.mLogFileVerbosity,mGeneralSystemParams.mLocalLogVerbosity);
|
||||
|
||||
mCPUWatchdogParams = *mSystemConfig.GetCPUWatchdogSettings();
|
||||
#ifdef ENABLE_CHIPSET_DRIVER
|
||||
mCPUInterface.SetWatchdogSettings(&mCPUWatchdogParams);
|
||||
#endif
|
||||
mMainWindow.mDataLoggingSettingsPage->SetCPUWatchdogSettings(mSystemConfig.GetCPUWatchdogSettings());
|
||||
|
||||
mDeviceDetectionConfigParams = *mSystemConfig.GetDeviceDetectionConfig();
|
||||
@@ -109,16 +117,23 @@ int COtarcikCan::Start()
|
||||
// mGPTimer->setSingleShot(false);
|
||||
// mGPTimer->start(5000);
|
||||
|
||||
|
||||
|
||||
#ifdef ENABLE_CHIPSET_DRIVER
|
||||
mCPUInterface.StartCPUWatchdog();
|
||||
mWatchdogTimer->start();
|
||||
|
||||
mMainWindow.mGeneralStatusPage->UpdateBoardStatusTimerExpired();
|
||||
#endif
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef ENABLE_CHIPSET_DRIVER
|
||||
mCPUInterface.StartCPUWatchdog();
|
||||
mWatchdogTimer->start();
|
||||
#endif
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -249,14 +264,14 @@ int COtarcikCan::SaveCPUWatchdogSettingsRequest(CCPUWatchdogConfig *CPUWatchdogP
|
||||
mCPUWatchdogParams = *CPUWatchdogParams;
|
||||
mSystemConfig.SetCPUWatchdogPArams(&mCPUWatchdogParams);
|
||||
mSystemConfig.SaveConfig();
|
||||
|
||||
#ifdef ENABLE_CHIPSET_DRIVER
|
||||
mCPUInterface.SetWatchdogSettings(&mCPUWatchdogParams);
|
||||
mCPUInterface.StopCPUWatchdog();
|
||||
if(mCPUWatchdogParams.mWatchdogEnabled == true)
|
||||
{
|
||||
mCPUInterface.StartCPUWatchdog();
|
||||
}
|
||||
|
||||
#endif
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
@@ -313,15 +328,19 @@ int COtarcikCan::SaveCANWatchdogSettingsRequest(CCANWatchdogConfig *CANWatchdogC
|
||||
|
||||
void COtarcikCan::WatchdogUpdateTimerExpired() //Time to kick the CPU watchdog
|
||||
{
|
||||
#ifdef ENABLE_CHIPSET_DRIVER
|
||||
mCPUInterface.KickCPUWatchdog();
|
||||
#endif
|
||||
}
|
||||
|
||||
void COtarcikCan::QuitApplicationRequest()
|
||||
{
|
||||
qDebug("Quit app request");
|
||||
mWatchdogTimer->stop();
|
||||
#ifdef ENABLE_CHIPSET_DRIVER
|
||||
mCPUInterface.StopCPUWatchdog();
|
||||
mCPUInterface.DeInit();
|
||||
#endif
|
||||
|
||||
QCoreApplication::exit(69);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user