From 65528fdf121862a5d734076075a5e164511d1621 Mon Sep 17 00:00:00 2001 From: canpadawan Date: Wed, 15 Jun 2016 18:40:36 +0200 Subject: [PATCH] #if 0 --- serialworker.cpp | 24 ++++++++++++++++-------- serialworker.h | 5 +++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/serialworker.cpp b/serialworker.cpp index 281c050..f3b35d1 100644 --- a/serialworker.cpp +++ b/serialworker.cpp @@ -5,6 +5,7 @@ #include #include +#if 0 SerialWorker::SerialWorker(CANFrameModel *model, int base) : CANConnection(model, base) { qDebug() << "Serial Worker constructor"; @@ -576,15 +577,7 @@ void SerialWorker::updatePortName(QString portName) } } -int SerialWorker::getNumBuses() -{ - return 2; -} -QString SerialWorker::getConnTypeName() -{ - return QString("GVRET"); -} void SerialWorker::updateBusSettings(CANBus bus) { @@ -638,3 +631,18 @@ void SerialWorker::updateBusSettings(CANBus bus) updateBaudRates(can0Baud,can1Baud); } + + +/************************************/ + +int SerialWorker::getNumBuses() +{ + return 2; +} + +QString SerialWorker::getConnTypeName() +{ + return QString("GVRET"); +} + +#endif diff --git a/serialworker.h b/serialworker.h index f9e57ec..dc1a9a9 100644 --- a/serialworker.h +++ b/serialworker.h @@ -8,7 +8,7 @@ #include #include "can_structs.h" #include "canframemodel.h" -#include "canconnection.h" +//#include "canconnection_old.h" namespace SERIALSTATE { @@ -30,6 +30,7 @@ enum STATE //keep this enum synchronized with the Arduino firmware project } +#if 0 using namespace SERIALSTATE; class SerialWorker : public CANConnection { @@ -84,5 +85,5 @@ private: void procRXChar(unsigned char); void sendCommValidation(); }; - +#endif #endif // SERIALTHREAD_H