Temporary commit to make savvy can work with older GVRET versions.
This commit is contained in:
+7
-7
@@ -64,7 +64,7 @@ void SerialWorker::setSerialPort(QSerialPortInfo *port)
|
||||
output.append(0xF1); //another command to the GVRET
|
||||
output.append(0x07); //request device information
|
||||
serial->write(output);
|
||||
connected = false;
|
||||
connected = true; //should be false. only set true to test old firmware
|
||||
connect(serial, SIGNAL(readyRead()), this, SLOT(readSerialData()));
|
||||
QTimer::singleShot(1000, this, SLOT(connectionTimeout()));
|
||||
if (ticker == NULL)
|
||||
@@ -88,9 +88,9 @@ void SerialWorker::connectionTimeout()
|
||||
if (!connected) //no?
|
||||
{
|
||||
//then emit the the failure signal and see if anyone cares
|
||||
qDebug() << "Failed to connect to GVRET at that com port";
|
||||
ticker->stop();
|
||||
emit connectionFailure();
|
||||
//qDebug() << "Failed to connect to GVRET at that com port";
|
||||
//ticker->stop();
|
||||
//emit connectionFailure();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -112,10 +112,10 @@ void SerialWorker::sendFrame(const CANFrame *frame, int bus = 0)
|
||||
int c;
|
||||
int ID;
|
||||
|
||||
if (!connected) return;
|
||||
|
||||
//qDebug() << "Sending out frame with id " << frame->ID;
|
||||
|
||||
if (!connected) return;
|
||||
|
||||
ID = frame->ID;
|
||||
if (frame->extended) ID |= 1 << 31;
|
||||
|
||||
@@ -135,7 +135,7 @@ void SerialWorker::sendFrame(const CANFrame *frame, int bus = 0)
|
||||
|
||||
if (serial == NULL) return;
|
||||
if (!serial->isOpen()) return;
|
||||
qDebug() << "writing " << buffer.length() << " bytes to serial port";
|
||||
//qDebug() << "writing " << buffer.length() << " bytes to serial port";
|
||||
serial->write(buffer);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user