Désactivation du driver Axiomtek de marde

Otarcik_CAN/Sources/Gui/GeneralStatusPage.cpp

@@ -23,9 +23,14 @@ CGeneralStatusPage::CGeneralStatusPage(QWidget *parent) :
     mCPUStateUpdtTimer->setSingleShot(false);
     mCPUStateUpdtTimer->setInterval(5000);
     connect(mCPUStateUpdtTimer,&QTimer::timeout,this,&CGeneralStatusPage::UpdateBoardStatusTimerExpired);
-    mCPUStateUpdtTimer->start();
 
+#ifndef ENABLE_CHIPSET_DRIVER
+    ui->mSystemStateGroupBox->setVisible(false);
+#endif
+
+#ifdef ENABLE_CHIPSET_DRIVER
     mCPUInterface = 0;
+#endif
 
 #ifndef ENABLE_DEVELOPMENT_DEBUG_TOOLS
     ui->mDevDebugToolsGroupBx->hide();
@@ -33,6 +38,8 @@ CGeneralStatusPage::CGeneralStatusPage(QWidget *parent) :
     connect(ui->mForceMQTTDisconnectChkBx,&QCheckBox::toggled,this,&CGeneralStatusPage::ForceMQTTDisconnectCheckBoxClicked);
 #endif
 
+
+
 }
 
 CGeneralStatusPage::~CGeneralStatusPage()
@@ -40,7 +47,15 @@ CGeneralStatusPage::~CGeneralStatusPage()
     delete ui;
     delete mCPUStateUpdtTimer;
 }
+#ifdef ENABLE_CHIPSET_DRIVER
+int CGeneralStatusPage::SetCPUInterfaceHandle(CComputerBoardInterface *Handle)
+{
 
+    mCPUInterface = Handle;
+
+    mCPUStateUpdtTimer->start();
+}
+#endif
 int CGeneralStatusPage::SetGeneralMsgText(QStringList Txt)
 {
     Q_UNUSED(Txt)
@@ -211,6 +226,7 @@ void CGeneralStatusPage::QuitAppBtnPressed()
     mProgramPtr->QuitApplicationRequest();
 }
 
+#ifdef ENABLE_CHIPSET_DRIVER
 int CGeneralStatusPage::UpdateBoardStatus(CComputerBoardState CPUState)
 {
     QString BoardState = QString("System Temp: %1C\nCPU VCore: %2V\nSystem 3.3V: %3V\nSystem 5V: %4V").arg(CPUState.mSystemTemperature).arg(CPUState.mCPUVcore).arg(CPUState.mSystem3V3).arg(CPUState.mSystem5V);
@@ -218,6 +234,7 @@ int CGeneralStatusPage::UpdateBoardStatus(CComputerBoardState CPUState)
 
     return RET_OK;
 }
+#endif
 
 void CGeneralStatusPage::InternetStatusChanged(bool InternetConnected)
 {
@@ -239,7 +256,12 @@ void CGeneralStatusPage::InternetStatusChanged(bool InternetConnected)
 
 void CGeneralStatusPage::UpdateBoardStatusTimerExpired()
 {
-    UpdateBoardStatus(mCPUInterface->GetComputerBoardState());
+#ifdef ENABLE_CHIPSET_DRIVER
+    if(mCPUInterface != 0)
+    {
+        UpdateBoardStatus(mCPUInterface->GetComputerBoardState());
+    }
+#endif
 }
 
 #ifdef ENABLE_DEVELOPMENT_DEBUG_TOOLS

Otarcik_CAN/Sources/Gui/GeneralStatusPage.h

@@ -3,7 +3,9 @@
 
 #include <QWidget>
 #include "defines.h"
+#ifdef ENABLE_CHIPSET_DRIVER
 #include "ComputerBoardInterface.h"
+#endif
 #include <QTimer>
 
 
@@ -30,12 +32,16 @@ public:
 
     COtarcikCan *mProgramPtr;
     QTimer *mCPUStateUpdtTimer;
+#ifdef ENABLE_CHIPSET_DRIVER
     CComputerBoardInterface *mCPUInterface;
+#endif
 
 
     explicit CGeneralStatusPage(QWidget *parent = 0);
     ~CGeneralStatusPage();
-
+#ifdef ENABLE_CHIPSET_DRIVER
+    int SetCPUInterfaceHandle(CComputerBoardInterface *Handle);
+#endif
     int SetGeneralMsgText(QStringList Txt);
     int AddGeneralMsgBoxLineEntry(QString LineTxt);
 
@@ -44,7 +50,9 @@ public:
     int UpdateCANModuleStatus(QString ModuleName, QString ModuleStatus, QString Buffer);
     int ClearCANModuleStatusTable();
     int UpdateMQTTBufferingStatus(QString Mode, QString FIFOSize, QString RemainingTime);
+#ifdef ENABLE_CHIPSET_DRIVER
     int UpdateBoardStatus(CComputerBoardState CPUState);
+#endif
 
 
 private:

Otarcik_CAN/Sources/Gui/GeneralStatusPage.ui

@@ -251,7 +251,7 @@
     </property>
    </widget>
   </widget>
-  <widget class="QGroupBox" name="groupBox">
+  <widget class="QGroupBox" name="mSystemStateGroupBox">
    <property name="geometry">
     <rect>
      <x>1210</x>
@@ -286,6 +286,9 @@
    </widget>
   </widget>
   <widget class="QGroupBox" name="mDevDebugToolsGroupBx">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
    <property name="geometry">
     <rect>
      <x>1489</x>

Otarcik_CAN/Sources/Gui/LoggingSettingsPage.cpp

@@ -74,6 +74,11 @@ CLoggingSettingsPage::CLoggingSettingsPage(QWidget *parent) :
 //    ui->mDevicePresenceBit4ComboBox->addItems(BitsList);
 //    ui->mDevicePresenceBit5ComboBox->addItems(BitsList);
 
+#ifndef ENABLE_CHIPSET_DRIVER
+    ui->mWDActiveChkBx->setEnabled(false);
+    ui->mWDTimerTimeoutSpinBx->setEnabled(false);
+#endif
+
     mDevicePresenceEditMode = false;
 
     connect(ui->mCancelBtn,&QPushButton::clicked,this,&CLoggingSettingsPage::CancelBtnPressed);