From 1dd59ed73cb18dd40ff1a83bc12a00b1822b1698 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Sat, 2 Sep 2017 10:15:18 +0200 Subject: [PATCH] SocketCan: Rename to SerialBusConnection QtCanBus is not limited to SocketCAN, it also supports various Windows CAN adapters directly. Also, add the term Connection to describe the inheritance hierarchy better. --- SavvyCAN.pro | 4 +-- connections/canconfactory.cpp | 4 +-- ...{socketcan.cpp => serialbusconnection.cpp} | 34 +++++++++---------- .../{socketcan.h => serialbusconnection.h} | 12 +++---- 4 files changed, 27 insertions(+), 27 deletions(-) rename connections/{socketcan.cpp => serialbusconnection.cpp} (85%) rename connections/{socketcan.h => serialbusconnection.h} (77%) diff --git a/SavvyCAN.pro b/SavvyCAN.pro index 6bde517..1ccb096 100644 --- a/SavvyCAN.pro +++ b/SavvyCAN.pro @@ -32,7 +32,7 @@ SOURCES += main.cpp\ can_structs.cpp \ motorcontrollerconfigwindow.cpp \ connections/canconnection.cpp \ - connections/socketcan.cpp \ + connections/serialbusconnection.cpp \ connections/canconfactory.cpp \ connections/gvretserial.cpp \ connections/canconmanager.cpp \ @@ -84,7 +84,7 @@ HEADERS += mainwindow.h \ utils/lfqueue.h \ motorcontrollerconfigwindow.h \ connections/canconnection.h \ - connections/socketcan.h \ + connections/serialbusconnection.h \ connections/canconconst.h \ connections/canconfactory.h \ connections/gvretserial.h \ diff --git a/connections/canconfactory.cpp b/connections/canconfactory.cpp index 7926001..259fd29 100644 --- a/connections/canconfactory.cpp +++ b/connections/canconfactory.cpp @@ -1,6 +1,6 @@ #include #include "canconfactory.h" -#include "socketcan.h" +#include "serialbusconnection.h" #include "gvretserial.h" using namespace CANCon; @@ -9,7 +9,7 @@ CANConnection* CanConFactory::create(type pType, QString pPortName) { switch(pType) { case SOCKETCAN: - return new SocketCan(pPortName); + return new SerialBusConnection(pPortName); case GVRET_SERIAL: return new GVRetSerial(pPortName); default: {} diff --git a/connections/socketcan.cpp b/connections/serialbusconnection.cpp similarity index 85% rename from connections/socketcan.cpp rename to connections/serialbusconnection.cpp index d370784..f348d8a 100644 --- a/connections/socketcan.cpp +++ b/connections/serialbusconnection.cpp @@ -3,7 +3,7 @@ #include #include -#include "socketcan.h" +#include "serialbusconnection.h" @@ -11,7 +11,7 @@ /**** class definition ****/ /***********************************/ -SocketCan::SocketCan(QString portName) : +SerialBusConnection::SerialBusConnection(QString portName) : CANConnection(portName, CANCon::SOCKETCAN, 1, 4000, true), mDev_p(NULL), mTimer(this) /*NB: set connection as parent of timer to manage it from working thread */ @@ -19,13 +19,13 @@ SocketCan::SocketCan(QString portName) : } -SocketCan::~SocketCan() +SerialBusConnection::~SerialBusConnection() { stop(); } -void SocketCan::piStarted() +void SerialBusConnection::piStarted() { connect(&mTimer, SIGNAL(timeout()), this, SLOT(testConnection())); mTimer.setInterval(1000); @@ -36,7 +36,7 @@ void SocketCan::piStarted() } -void SocketCan::piSuspend(bool pSuspend) +void SerialBusConnection::piSuspend(bool pSuspend) { /* update capSuspended */ setCapSuspended(pSuspend); @@ -47,19 +47,19 @@ void SocketCan::piSuspend(bool pSuspend) } -void SocketCan::piStop() { +void SerialBusConnection::piStop() { mTimer.stop(); disconnectDevice(); } -bool SocketCan::piGetBusSettings(int pBusIdx, CANBus& pBus) +bool SerialBusConnection::piGetBusSettings(int pBusIdx, CANBus& pBus) { return getBusConfig(pBusIdx, pBus); } -void SocketCan::piSetBusSettings(int pBusIdx, CANBus bus) +void SerialBusConnection::piSetBusSettings(int pBusIdx, CANBus bus) { CANConStatus stats; /* sanity checks */ @@ -86,9 +86,9 @@ void SocketCan::piSetBusSettings(int pBusIdx, CANBus bus) } /* connect slots */ - connect(mDev_p, &QCanBusDevice::errorOccurred, this, &SocketCan::errorReceived); - connect(mDev_p, &QCanBusDevice::framesWritten, this, &SocketCan::framesWritten); - connect(mDev_p, &QCanBusDevice::framesReceived, this, &SocketCan::framesReceived); + connect(mDev_p, &QCanBusDevice::errorOccurred, this, &SerialBusConnection::errorReceived); + connect(mDev_p, &QCanBusDevice::framesWritten, this, &SerialBusConnection::framesWritten); + connect(mDev_p, &QCanBusDevice::framesReceived, this, &SerialBusConnection::framesReceived); /* set configuration */ /*if (p.useConfigurationEnabled) { @@ -107,7 +107,7 @@ void SocketCan::piSetBusSettings(int pBusIdx, CANBus bus) } -bool SocketCan::piSendFrame(const CANFrame& pFrame) +bool SerialBusConnection::piSendFrame(const CANFrame& pFrame) { /* sanity checks */ if(0 != pFrame.bus || pFrame.len>8) @@ -131,7 +131,7 @@ bool SocketCan::piSendFrame(const CANFrame& pFrame) /* disconnect device */ -void SocketCan::disconnectDevice() { +void SerialBusConnection::disconnectDevice() { if(mDev_p) { mDev_p->disconnectDevice(); delete mDev_p; @@ -140,7 +140,7 @@ void SocketCan::disconnectDevice() { } -void SocketCan::errorReceived(QCanBusDevice::CanBusError error) const +void SerialBusConnection::errorReceived(QCanBusDevice::CanBusError error) const { switch (error) { case QCanBusDevice::ReadError: @@ -155,13 +155,13 @@ void SocketCan::errorReceived(QCanBusDevice::CanBusError error) const } } -void SocketCan::framesWritten(qint64 count) +void SerialBusConnection::framesWritten(qint64 count) { Q_UNUSED(count); //qDebug() << "Number of frames written:" << count; } -void SocketCan::framesReceived() +void SerialBusConnection::framesReceived() { uint64_t timeBasis = CANConManager::getInstance()->getTimeBasis(); @@ -211,7 +211,7 @@ void SocketCan::framesReceived() } -void SocketCan::testConnection() { +void SerialBusConnection::testConnection() { QCanBusDevice* dev_p = QCanBus::instance()->createDevice("socketcan", getPort()); CANConStatus stats; diff --git a/connections/socketcan.h b/connections/serialbusconnection.h similarity index 77% rename from connections/socketcan.h rename to connections/serialbusconnection.h index debd091..dc6cecf 100644 --- a/connections/socketcan.h +++ b/connections/serialbusconnection.h @@ -1,5 +1,5 @@ -#ifndef SocketCan_H -#define SocketCan_H +#ifndef SERIALBUSCONNECTION_H +#define SERIALBUSCONNECTION_H #include #include @@ -11,13 +11,13 @@ #include "canconmanager.h" -class SocketCan : public CANConnection +class SerialBusConnection : public CANConnection { Q_OBJECT public: - SocketCan(QString portName); - virtual ~SocketCan(); + SerialBusConnection(QString portName); + virtual ~SerialBusConnection(); protected: @@ -42,4 +42,4 @@ protected: }; -#endif // SocketCan_H +#endif // SERIALBUSCONNECTION_H