Dev...

Otarcik_CAN/Sources/OtarcikCan.cpp

@@ -15,21 +15,21 @@
 */
 
 #include "OtarcikCan.h"
+#include "PCANBasic.h"
 
 COtarcikCan::COtarcikCan(QObject *parent) : QObject(parent)
 {
-//    mPCANInterface = new CPCANInterface;
-//    mCANDatabase = new CCANDatabase;
-//    mCANAnalyzer = new CCANAnalyzer(mPCANInterface);
 
-    //mCANAnalyzer->mProgramPtr = this;
 }
 
 COtarcikCan::~COtarcikCan()
 {
-//    delete mCANAnalyzer;
-//    delete mPCANInterface;
-//    delete mCANDatabase;
+
+    while (!mCANDevicesList.isEmpty())
+    {
+          delete mCANDevicesList.takeFirst();
+    }
+    mCANDevicesList.clear();
 
 }
 
@@ -40,10 +40,17 @@ int COtarcikCan::Start()
     CGeneralMessagesLogDispatcher::instance()->BindGuiPageHandle(mMainWindow.mGeneralStatusPage);
     CGeneralMessagesLogDispatcher::instance()->Init();
 
-//    mCANAnalyzer->Init(mPCANInterface,mCANDatabase);
+    CCANDevice *NewCANDevice = new CCANDevice();
+    mCANDevicesList.append(NewCANDevice);
 
-//    mCANDatabase->Init();
-//    mCANDatabase->LoadDatabaseFile("");
+    NewCANDevice->Init("IVT-S_all-variations_12082020.dbc",PCAN_USBBUS1,PCAN_BAUD_500K,"Puck CAN USB branchée sur le module Parker qui contrôle la patente", "Module Parker");
+
+    NewCANDevice = new CCANDevice();
+    mCANDevicesList.append(NewCANDevice);
+
+    NewCANDevice->Init("Database.dbc",PCAN_USBBUS3,PCAN_BAUD_800K,"Puck CAN USB branchée sur une autre patente", "Module Cossin");
+
+    mMainWindow.mProgramSettingsPage->SetDevicesList(&mCANDevicesList);
 
 
     return 0;