#if 0
This commit is contained in:
+16
-8
@@ -5,6 +5,7 @@
|
|||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QSettings>
|
#include <QSettings>
|
||||||
|
|
||||||
|
#if 0
|
||||||
SerialWorker::SerialWorker(CANFrameModel *model, int base) : CANConnection(model, base)
|
SerialWorker::SerialWorker(CANFrameModel *model, int base) : CANConnection(model, base)
|
||||||
{
|
{
|
||||||
qDebug() << "Serial Worker constructor";
|
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)
|
void SerialWorker::updateBusSettings(CANBus bus)
|
||||||
{
|
{
|
||||||
@@ -638,3 +631,18 @@ void SerialWorker::updateBusSettings(CANBus bus)
|
|||||||
|
|
||||||
updateBaudRates(can0Baud,can1Baud);
|
updateBaudRates(can0Baud,can1Baud);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/************************************/
|
||||||
|
|
||||||
|
int SerialWorker::getNumBuses()
|
||||||
|
{
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString SerialWorker::getConnTypeName()
|
||||||
|
{
|
||||||
|
return QString("GVRET");
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|||||||
+3
-2
@@ -8,7 +8,7 @@
|
|||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include "can_structs.h"
|
#include "can_structs.h"
|
||||||
#include "canframemodel.h"
|
#include "canframemodel.h"
|
||||||
#include "canconnection.h"
|
//#include "canconnection_old.h"
|
||||||
|
|
||||||
|
|
||||||
namespace SERIALSTATE {
|
namespace SERIALSTATE {
|
||||||
@@ -30,6 +30,7 @@ enum STATE //keep this enum synchronized with the Arduino firmware project
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
using namespace SERIALSTATE;
|
using namespace SERIALSTATE;
|
||||||
class SerialWorker : public CANConnection
|
class SerialWorker : public CANConnection
|
||||||
{
|
{
|
||||||
@@ -84,5 +85,5 @@ private:
|
|||||||
void procRXChar(unsigned char);
|
void procRXChar(unsigned char);
|
||||||
void sendCommValidation();
|
void sendCommValidation();
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
#endif // SERIALTHREAD_H
|
#endif // SERIALTHREAD_H
|
||||||
|
|||||||
Reference in New Issue
Block a user