Index: sources/canbus/caninterface.h =================================================================== diff -u -rc933552983a659ca4cc351ff4d43d07319adab1e -rc6a09899d2e46dc0bda5a6b994aa257953626f97 --- sources/canbus/caninterface.h (.../caninterface.h) (revision c933552983a659ca4cc351ff4d43d07319adab1e) +++ sources/canbus/caninterface.h (.../caninterface.h) (revision c6a09899d2e46dc0bda5a6b994aa257953626f97) @@ -21,7 +21,7 @@ #include "main.h" // Define -#define _CanInterface CanInterface::I() +#define _CanInterface Can::CanInterface::I() // forward declarations class tst_canbus; @@ -56,17 +56,33 @@ QString _canStatus = ""; bool _enableConsoleOut = false; - // Singleton - SINGLETON_DECL(CanInterface) -public: + QThread *_thread = nullptr; + bool _init = false; + +// Singleton +SINGLETON(CanInterface) + +public slots: bool init(); + bool init(QThread &vThread); + +private slots: void quit(); +public: QString status() const; void enableConsoleOut(bool vEnabled) { _enableConsoleOut = vEnabled; } + + void quitDevice(); private: void initConnections(); + void initThread(QThread &vThread); + void quitThread(); + + bool initDevice(); + bool testDevice(); + void status (const QString &vDescription, QString vError = ""); bool transmit (const QCanBusFrame &vFrame); void consoleOut (const QCanBusFrame &vFrame); @@ -80,13 +96,15 @@ * \param vFrame - The Frame which has been received */ void didFrameReceive (const QCanBusFrame &vFrame ); + /*! * \brief didFrameError * \details If and error occurs on CanDevice after the error is processed * this signal can be used as a notifier. * \param vStatus - CanDevice status with some extra information. */ void didFrameError (const QString &vStatus); + /*! * \brief didFrameTransmit * \details After the frame has been transmitted this signal can be used as a notifier.