t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaked debugging output for GVRET devices, fixed GVRET serial modes

Browse Source 
so that both ESP32 and standard mode automatically work and it finds
the proper one for the connected device.
This commit is contained in:
Collin Kidder
2019-02-17 10:54:33 -05:00
parent 86682f0390
commit b92b909fc4
2 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/gvretserial.cpp
+33 -33
View File
@@ -13,8 +13,7 @@ GVRetSerial::GVRetSerial(QString portName, bool useTcp) :
useTcp(useTcp), useTcp(useTcp),
mTimer(this) /*NB: set this as parent of timer to manage it from working thread */ mTimer(this) /*NB: set this as parent of timer to manage it from working thread */
{ {
qDebug() << "GVRetSerial()"; sendDebug("GVRetSerial()");
debugOutput("GVRetSerial()");
serial = NULL; serial = NULL;
tcpClient = NULL; tcpClient = NULL;
@@ -36,33 +35,38 @@ GVRetSerial::GVRetSerial(QString portName, bool useTcp) :
GVRetSerial::~GVRetSerial() GVRetSerial::~GVRetSerial()
{ {
stop(); stop();
qDebug() << "~GVRetSerial()"; sendDebug("~GVRetSerial()");
debugOutput("~GVRetSerial()"); }
void GVRetSerial::sendDebug(const QString debugText)
{
qDebug() << debugText;
debugOutput(debugText);
} }
void GVRetSerial::sendToSerial(const QByteArray &bytes) void GVRetSerial::sendToSerial(const QByteArray &bytes)
{ {
if (serial == NULL && tcpClient == NULL && udpClient == NULL) if (serial == NULL && tcpClient == NULL && udpClient == NULL)
{ {
debugOutput("Attempt to write to serial port when it has not been initialized!"); sendDebug("Attempt to write to serial port when it has not been initialized!");
return; return;
} }
if (serial && !serial->isOpen()) if (serial && !serial->isOpen())
{ {
debugOutput("Attempt to write to serial port when it is not open!"); sendDebug("Attempt to write to serial port when it is not open!");
return; return;
} }
if (tcpClient && !tcpClient->isOpen()) if (tcpClient && !tcpClient->isOpen())
{ {
debugOutput("Attempt to write to TCP/IP port when it is not open!"); sendDebug("Attempt to write to TCP/IP port when it is not open!");
return; return;
} }
if (udpClient && !udpClient->isOpen()) if (udpClient && !udpClient->isOpen())
{ {
debugOutput("Attempt to write to UDP Socket when it is not open!"); sendDebug("Attempt to write to UDP Socket when it is not open!");
return; return;
} }
@@ -72,7 +76,7 @@ void GVRetSerial::sendToSerial(const QByteArray &bytes)
byt = (unsigned char)byt; byt = (unsigned char)byt;
buildDebug = buildDebug % QString::number(byt, 16) % " "; buildDebug = buildDebug % QString::number(byt, 16) % " ";
} }
debugOutput(buildDebug); sendDebug(buildDebug);
if (serial) serial->write(bytes); if (serial) serial->write(bytes);
if (tcpClient) tcpClient->write(bytes); if (tcpClient) tcpClient->write(bytes);
@@ -185,8 +189,7 @@ void GVRetSerial::piSetBusSettings(int pBusIdx, CANBus bus)
if (pBusIdx < 2) { if (pBusIdx < 2) {
/* update baud rates */ /* update baud rates */
QByteArray buffer; QByteArray buffer;
qDebug() << "Got signal to update bauds. 1: " << (can0Baud & 0xFFFFFFF) <<" 2: " << (can1Baud & 0xFFFFFFF); sendDebug("Got signal to update bauds. 1: " + QString::number((can0Baud & 0xFFFFFFF)) + " 2: " + QString::number((can1Baud & 0xFFFFFFF)));
debugOutput("Got signal to update bauds. 1: " + QString::number((can0Baud & 0xFFFFFFF)) + " 2: " + QString::number((can1Baud & 0xFFFFFFF)));
buffer[0] = (char)0xF1; //start of a command over serial buffer[0] = (char)0xF1; //start of a command over serial
buffer[1] = 5; //setup canbus buffer[1] = 5; //setup canbus
buffer[2] = (unsigned char)(can0Baud & 0xFF); //four bytes of ID LSB first buffer[2] = (unsigned char)(can0Baud & 0xFF); //four bytes of ID LSB first
@@ -204,8 +207,7 @@ void GVRetSerial::piSetBusSettings(int pBusIdx, CANBus bus)
{ {
/* update baud rates */ /* update baud rates */
QByteArray buffer; QByteArray buffer;
qDebug() << "Got signal to update extended bus speeds SWCAN: " << swcanBaud <<" LIN1: " << lin1Baud << " LIN2: " << lin2Baud; sendDebug("Got signal to update extended bus speeds SWCAN: " + QString::number(swcanBaud) + " LIN1: " + QString::number(lin1Baud) + " LIN2: " + QString::number(lin2Baud));
debugOutput("Got signal to update extended bus speeds SWCAN: " + QString::number(swcanBaud) + " LIN1: " + QString::number(lin1Baud) + " LIN2: " + QString::number(lin2Baud));
buffer[0] = (char)0xF1; //start of a command over serial buffer[0] = (char)0xF1; //start of a command over serial
buffer[1] = 14; //setup extended buses buffer[1] = 14; //setup extended buses
buffer[2] = (unsigned char)(swcanBaud & 0xFF); //four bytes of ID LSB first buffer[2] = (unsigned char)(swcanBaud & 0xFF); //four bytes of ID LSB first
@@ -302,12 +304,12 @@ void GVRetSerial::connectDevice()
if (useTcp) if (useTcp)
{ {
// /* // /*
qDebug() << "TCP Connection to a GVRET device"; sendDebug("TCP Connection to a GVRET device");
tcpClient = new QTcpSocket(); tcpClient = new QTcpSocket();
tcpClient->connectToHost(getPort(), 23); tcpClient->connectToHost(getPort(), 23);
connect(tcpClient, SIGNAL(readyRead()), this, SLOT(readSerialData())); connect(tcpClient, SIGNAL(readyRead()), this, SLOT(readSerialData()));
connect(tcpClient, SIGNAL(connected()), this, SLOT(deviceConnected())); connect(tcpClient, SIGNAL(connected()), this, SLOT(deviceConnected()));
debugOutput("Created TCP Socket"); sendDebug("Created TCP Socket");
// */ // */
/* /*
qDebug() << "UDP Connection to a GVRET device"; qDebug() << "UDP Connection to a GVRET device";
@@ -320,14 +322,13 @@ void GVRetSerial::connectDevice()
*/ */
} }
else { else {
qDebug() << "Serial connection to a GVRET device"; sendDebug("Serial connection to a GVRET device");
serial = new QSerialPort(QSerialPortInfo(getPort())); serial = new QSerialPort(QSerialPortInfo(getPort()));
if(!serial) { if(!serial) {
qDebug() << "can't open serial port " << getPort(); sendDebug("can't open serial port " + getPort());
debugOutput("can't open serial port " + getPort());
return; return;
} }
debugOutput("Created Serial Port Object"); sendDebug("Created Serial Port Object");
/* connect reading event */ /* connect reading event */
connect(serial, SIGNAL(readyRead()), this, SLOT(readSerialData())); connect(serial, SIGNAL(readyRead()), this, SLOT(readSerialData()));
@@ -339,29 +340,31 @@ void GVRetSerial::connectDevice()
if (espSerialMode) if (espSerialMode)
{ {
sendDebug("Trying ESP32 Serial Mode");
serial->setFlowControl(serial->NoFlowControl);
if (!serial->open(QIODevice::ReadWrite)) if (!serial->open(QIODevice::ReadWrite))
{ {
//qDebug() << serial->errorString(); sendDebug("Error returned during port opening: " + serial->errorString());
} }
else else
{ {
serial->setDataTerminalReady(false); //ESP32 uses these for bootloader selection and reset so turn them off serial->setDataTerminalReady(false); //ESP32 uses these for bootloader selection and reset so turn them off
serial->setRequestToSend(false); serial->setRequestToSend(false);
serial->setFlowControl(serial->NoFlowControl);
QTimer::singleShot(3000, this, SLOT(deviceConnected())); //give ESP32 some time as it could have rebooted QTimer::singleShot(3000, this, SLOT(deviceConnected())); //give ESP32 some time as it could have rebooted
} }
} }
else else
{ {
sendDebug("Trying Standard Serial Mode");
serial->setFlowControl(serial->HardwareControl); //Most GVRET style devices use hardware flow control
if (!serial->open(QIODevice::ReadWrite)) if (!serial->open(QIODevice::ReadWrite))
{ {
//qDebug() << serial->errorString(); sendDebug("Error returned during port opening: " + serial->errorString());
} }
else else
{ {
serial->setFlowControl(serial->HardwareControl); //this is important though //serial->setDataTerminalReady(true); //Seemingly these two lines used to be needed
serial->setDataTerminalReady(true); //you do need to set these or the fan gets dirty //serial->setRequestToSend(true); //But, really both ends should automatically handle these
serial->setRequestToSend(true);
deviceConnected(); deviceConnected();
} }
} }
@@ -370,8 +373,7 @@ void GVRetSerial::connectDevice()
void GVRetSerial::deviceConnected() void GVRetSerial::deviceConnected()
{ {
qDebug() << "Connecting to GVRET Device!"; sendDebug("Connecting to GVRET Device!");
debugOutput("Connecting to GVRET Device!");
QByteArray output; QByteArray output;
output.append((unsigned char)0xE7); //this puts the device into binary comm mode output.append((unsigned char)0xE7); //this puts the device into binary comm mode
output.append((unsigned char)0xE7); output.append((unsigned char)0xE7);
@@ -525,8 +527,7 @@ void GVRetSerial::serialError(QSerialPort::SerialPortError err)
}*/ }*/
if (errMessage.length() > 1) if (errMessage.length() > 1)
{ {
qDebug() << errMessage; sendDebug(errMessage);
debugOutput(errMessage);
} }
if (killConnection) if (killConnection)
{ {
@@ -542,7 +543,7 @@ void GVRetSerial::connectionTimeout()
if (CANCon::NOT_CONNECTED==getStatus()) //no? if (CANCon::NOT_CONNECTED==getStatus()) //no?
{ {
//then emit the the failure signal and see if anyone cares //then emit the the failure signal and see if anyone cares
qDebug() << "Failed to connect to GVRET at that com port"; sendDebug("Failed to connect to GVRET at that com port");
//toggle the serial mode and try again //toggle the serial mode and try again
espSerialMode = !espSerialMode; espSerialMode = !espSerialMode;
@@ -570,8 +571,7 @@ void GVRetSerial::readSerialData()
if (tcpClient) data = tcpClient->readAll(); if (tcpClient) data = tcpClient->readAll();
if (udpClient) data = udpClient->readAll(); if (udpClient) data = udpClient->readAll();
debugOutput("Got data from serial. Len = " % QString::number(data.length())); sendDebug("Got data from serial. Len = " % QString::number(data.length()));
//qDebug() << (tr("Got data from serial. Len = %0").arg(data.length()));
for (int i = 0; i < data.length(); i++) for (int i = 0; i < data.length(); i++)
{ {
c = data.at(i); c = data.at(i);
@@ -999,7 +999,7 @@ void GVRetSerial::handleTick()
if (serial == NULL && tcpClient == NULL) return; if (serial == NULL && tcpClient == NULL) return;
if ( (serial && serial->isOpen()) || (tcpClient && tcpClient->isOpen()) || (udpClient && udpClient->isOpen())) //if it's still false we have a problem... if ( (serial && serial->isOpen()) || (tcpClient && tcpClient->isOpen()) || (udpClient && udpClient->isOpen())) //if it's still false we have a problem...
{ {
qDebug() << "Comm validation failed. "; sendDebug("Comm validation failed.");
setStatus(CANCon::NOT_CONNECTED); setStatus(CANCon::NOT_CONNECTED);
//emit status(getStatus()); //emit status(getStatus());
connections/gvretserial.h
+1
View File
@@ -74,6 +74,7 @@ private:
void sendCommValidation(); void sendCommValidation();
void rebuildLocalTimeBasis(); void rebuildLocalTimeBasis();
void sendToSerial(const QByteArray &bytes); void sendToSerial(const QByteArray &bytes);
void sendDebug(const QString debugText);
protected: protected:
QTimer mTimer; QTimer mTimer;