From e0b1e90f6caa2d6deb8af0ba1290b9dea1f226d9 Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 5 Jan 2026 17:57:13 +0100 Subject: [PATCH] Cosmetcis. --- .gitignore | 2 ++ bcdrivertinycan.cpp | 3 --- bcdrivertinycan.h | 6 ------ bcmainwindow.cpp | 4 ++-- bctransmitter.cpp | 18 +++++++++++++----- bctransmitter.h | 5 +++-- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 22e03bb..6763cc6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,8 @@ bcvalue.cpp.autosave # Objektdateien ignorieren *.o +.qtc_clangd/ + # Von Qt generierte MOC-Dateien (Meta-Object Compiler) ignorieren moc_* diff --git a/bcdrivertinycan.cpp b/bcdrivertinycan.cpp index 0012ae3..4461173 100644 --- a/bcdrivertinycan.cpp +++ b/bcdrivertinycan.cpp @@ -43,9 +43,6 @@ static const char* cMHS_DRIVERNAME = "libmhstcan.so"; #endif -//const char* CBCDLL_LIN = "libmhstcan.so"; -//const char* CBCDLL_WIN = "mhstcan.dll"; - /** * @brief Destruktor. Entlädt den CAN-Bus Treiber wieder. */ diff --git a/bcdrivertinycan.h b/bcdrivertinycan.h index e6c42fa..76b0ae0 100644 --- a/bcdrivertinycan.h +++ b/bcdrivertinycan.h @@ -40,7 +40,6 @@ class BCDriverTinyCan : public BCDriver public: - virtual ~BCDriverTinyCan(); BCDriver::DriverStateResult loadAndStartDriver() override; @@ -54,16 +53,11 @@ private: BCDriver::DriverStateResult loadDriver(); BCDriver::DriverStateResult setConsoleSlaveMode(); - - static constexpr int cRetries = 5; static constexpr int cTimeOuts = 20; static constexpr int cTIMEOUT_MS = 10; // 10ms static constexpr int cTIMEOUT_COUNT = 10; - - }; - #endif // BCDRIVERTINYCAN_H diff --git a/bcmainwindow.cpp b/bcmainwindow.cpp index 313a413..5f7353f 100644 --- a/bcmainwindow.cpp +++ b/bcmainwindow.cpp @@ -150,7 +150,7 @@ void BCMainWindow::initMainWindow() connect( _syncButton, &QToolButton::clicked, this, &BCMainWindow::onSyncDeviceView ); connect( &_transmitter, &BCTransmitter::valueUpdated, this, &BCMainWindow::onValueUpdated ); - connect(this, &BCMainWindow::requestValueUpdate, &_transmitter, &BCTransmitter::enqueueValue); + connect(this, &BCMainWindow::requestValueUpdate, &_transmitter, &BCTransmitter::onEnqueueValue); connect(&_worker, &QThread::finished, &_transmitter, &QObject::deleteLater); connect( &_transmitter, &BCTransmitter::driverStateChanged, this, &BCMainWindow::onDriverStateChanged ); @@ -265,7 +265,7 @@ void BCMainWindow::onSyncDeviceView() qDebug() << " --- begin sync of value: " << value->label; // wir setzen auf 'lesen' value->state.setFlag( BCValue::State::ReadMe ); - // statt '_transmitter.enqueueValueCommand( value )' entkoppeln + // statt '_transmitter.onEnqueueValueCommand( value )' entkoppeln // wir das eleganter über emit requestValueUpdate() emit requestValueUpdate( value); diff --git a/bctransmitter.cpp b/bctransmitter.cpp index 0b45489..af9150b 100644 --- a/bctransmitter.cpp +++ b/bctransmitter.cpp @@ -47,6 +47,8 @@ BCTransmitter::BCTransmitter(QObject *parent) } + + /** * @brief Steuert die Verbindung mit dem 'echten' CAN-Bus Treiber. * @param connect true: Vesuche den CAN-Bus Treiber zu laden und zu verbinden @@ -66,6 +68,12 @@ void BCTransmitter::onToggleDriverConnection( bool connect ) _isBusy = false; } + +void BCTransmitter::onStartNativeDirver() +{ + +} + void BCTransmitter::connectCanDriver() { // hier gehts nur um den echten Treiber @@ -110,7 +118,7 @@ void BCTransmitter::disconnectCanDriver() } -void BCTransmitter::enqueueValue( BCValuePtrConst value) +void BCTransmitter::onEnqueueValue( BCValuePtrConst value) { // Hier sind wir noch in GUI Thread QMutexLocker locker(&_mutex); @@ -122,19 +130,19 @@ void BCTransmitter::enqueueValue( BCValuePtrConst value) // Trigger processing im Event-Loop des Worker Threads // invokeMethod mit QueuedConnection entkoppelt den Aufruf, - // damit enqueueValue sofort zurückkehrt (non-blocking für den Aufrufer). + // damit onEnqueueValue sofort zurückkehrt (non-blocking für den Aufrufer). - QMetaObject::invokeMethod(this, "processValue", Qt::QueuedConnection); + QMetaObject::invokeMethod(this, "onProcessValue", Qt::QueuedConnection); /* QMetaObject::invokeMethod(this, [this]() { - processValue(); + onProcessValue(); }, Qt::QueuedConnection ); */ } -void BCTransmitter::processValue() +void BCTransmitter::onProcessValue() { if (_isBusy) diff --git a/bctransmitter.h b/bctransmitter.h index 186f793..f47e58c 100644 --- a/bctransmitter.h +++ b/bctransmitter.h @@ -63,8 +63,9 @@ public: public slots: void onToggleDriverConnection( bool connect ); - void enqueueValue(BCValuePtrConst value ); - void processValue(); + void onEnqueueValue(BCValuePtrConst value ); + void onProcessValue(); + void onStartNativeDirver(); signals: