Index: sources/canbus/CanInterface.h
===================================================================
diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r6c6f1f5d466badd9b4fd67be7c907234c342b2a2
--- sources/canbus/CanInterface.h	(.../CanInterface.h)	(revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997)
+++ sources/canbus/CanInterface.h	(.../CanInterface.h)	(revision 6c6f1f5d466badd9b4fd67be7c907234c342b2a2)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file CanInterface.h
- * \author (last) Behrouz NematiPour
- * \date (last) 20-Aug-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 28-Oct-2019
+ * \file    CanInterface.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      10-Feb-2023
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  26-Aug-2020
  *
  */
 #pragma once
@@ -19,10 +19,9 @@
 #include <QCanBus>
 
 // Project
-#include "main.h" // Doxygen : don't remove
+#include "main.h" // Doxygen : do not remove
 #include "MessageGlobals.h"
 
-
 // Define
 #define _CanInterface Can::CanInterface::I()
 
@@ -35,11 +34,11 @@
 
 /*!
  * \brief   CANBus interface
- * \details This class contains the interface to CANBUS
- *          And utilizes Qt QCanBus to interact with the CANBUS
+ * \details This class contains the interface to CANBus
+ *          And utilizes Qt QCanBus to interact with the CANBus
  *          This class works only with the QCanBusFrame frames.
  *          On the OS side there is a driver installed to convert SPI to CAN
- *          Since the GUI Board by itself doesn't contain the CAN Bus.
+ *          Since the GUI Board by itself does not contain the CANBus.
  *          Application would know nothing about the SPI-TO-CAN
  */
 class CanInterface : public QObject
@@ -55,8 +54,9 @@
 
     // constants
     const char    *_canType             = "socketcan";
-          QString  _canInterface        = "can0";
+          QString  _canInterface        = gActiveCANBus; // can0 by default, can be altered by -A(--active-can-bus)
     const int      _canBitRate          = 250000;
+    const bool     _canFDKey            = false;
 
     // member variables
     QCanBusDevice *_canDevice           = nullptr;
@@ -73,8 +73,6 @@
 public slots:
     bool init();
     bool init(QThread &vThread);
-
-private slots:
     void quit();
 
 public: