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

Merge branch 'master' of github.com:collin80/SavvyCAN

Browse Source
This commit is contained in:
Collin Kidder
2022-10-04 19:59:46 -04:00
parent 61b49c9126 ce9701c4a0
commit 7678a498db
30 changed files with 676 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/canconfactory.cpp
+3
View File
@@ -14,6 +14,9 @@ CANConnection* CanConFactory::create(type pType, QString pPortName, QString pDri
case SERIALBUS:
return new SerialBusConnection(pPortName, pDriverName);
case GVRET_SERIAL:
if(pPortName.contains("."))
return new GVRetSerial(pPortName, true);
else
return new GVRetSerial(pPortName, false);
case REMOTE:
return new GVRetSerial(pPortName, true); //it's a special case of GVRET connected over TCP/IP so it uses the same class
connections/canconnection.cpp
+2 -2
View File
@@ -250,11 +250,11 @@ CANCon::type CANConnection::getType() {
CANCon::status CANConnection::getStatus() {
return (CANCon::status) mStatus.load();
return (CANCon::status) mStatus.loadRelaxed();
}
void CANConnection::setStatus(CANCon::status pStatus) {
mStatus.store(pStatus);
mStatus.storeRelaxed(pStatus);
}
bool CANConnection::isCapSuspended() {
connections/connectionwindow.cpp
+2
View File
@@ -508,8 +508,10 @@ CANConnection* ConnectionWindow::create(CANCon::type pTye, QString pPortName, QS
void ConnectionWindow::loadConnections()
{
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
qRegisterMetaTypeStreamOperators<CANBus>();
qRegisterMetaTypeStreamOperators<QList<CANBus>>();
#endif
QSettings settings;
connections/gvretserial.cpp
+2
View File
@@ -485,6 +485,7 @@ void GVRetSerial::serialError(QSerialPort::SerialPortError err)
killConnection = true;
piStop();
break;
#if QT_VERSION <= QT_VERSION_CHECK( 6, 0, 0 )
case QSerialPort::ParityError:
errMessage = "Parity error on serial port";
break;
@@ -494,6 +495,7 @@ void GVRetSerial::serialError(QSerialPort::SerialPortError err)
case QSerialPort::BreakConditionError:
errMessage = "Break error on serial port";
break;
#endif
case QSerialPort::WriteError:
errMessage = "Write error on serial port";
piStop();
connections/socketcand.cpp
+94 -44
View File
@@ -32,6 +32,7 @@ SocketCANd::SocketCANd(QString portName) :
for (int i = 0; i < mNumBuses; i++)
{
rx_state.append(IDLE);
unprocessedData.append("");
}
}
@@ -249,62 +250,89 @@ void SocketCANd::switchToRawMode(int busNum)
QCoreApplication::processEvents();
}
void SocketCANd::decodeFrames(QString data, int busNum)
QString SocketCANd::decodeFrames(QString data, int busNum)
{
if (data.indexOf("< frame ") == -1)
if (data.indexOf("<") == -1)
return "";
else if(data.length() >= 8 && data.indexOf("< frame ") == -1)
return "";
int firstIndex = data.indexOf("< frame ");
if(firstIndex > 0)
{
qDebug() << "Received datagramm doesn't contain any frame: " << data;
return;
QString framePartial = data.left(firstIndex);
qDebug() << "Received datagramm that starts with fragment (missing '< frame'), this should only occur on startup, removing...: " << framePartial;
}
else
QString framePart = data.mid(firstIndex); //remove starting beginning of payload if not < frame >
const QString frameStrConst = framePart.left(framePart.indexOf(">")+1);
QString frameStr = frameStrConst;
QStringList frameParsed = (frameStr.remove(QRegExp("^<")).remove(QRegExp(">$"))).simplified().split(' ');
if(frameParsed.length() < 3)
{
QString framePart = data.mid(data.indexOf("< frame "), data.length()); //remove starting beginning of payload if not < frame >
const QString frameStrConst = framePart.left(framePart.indexOf(">")+1);
QString frameStr = frameStrConst;
QStringList frameParsed = (frameStr.remove(QRegExp("^<")).remove(QRegExp(">$"))).simplified().split(' ');
//qDebug() << "Received datagramm is an incomplete frame: " << data;
buildFrame.setFrameId(frameParsed[1].toUInt(nullptr, 16));
buildFrame.bus = busNum;
//ok great, need to leave it in the buffer in case it can be combined with what comes next
//but if there was a fragment that did not have a starting token then we don't want it so only return
//known good data...again this should only happen on startup, but just in case we need to remove it
//so the data buffer doesn't grow uncontrolled.
return framePart;
}
if (buildFrame.frameId() > 0x7FF) buildFrame.setExtendedFrameFormat(true);
else buildFrame.setExtendedFrameFormat(false);
buildFrame.setFrameId(frameParsed[1].toUInt(nullptr, 16));
buildFrame.bus = busNum;
buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, frameParsed[2].toDouble() * 1000000l));
//buildFrame.len = frameParsed[3].length() * 0.5;
int framelength = frameParsed[3].length() * 0.5;
if (buildFrame.frameId() > 0x7FF) buildFrame.setExtendedFrameFormat(true);
else buildFrame.setExtendedFrameFormat(false);
buildData.resize(framelength);
buildFrame.setTimeStamp(QCanBusFrame::TimeStamp(0, frameParsed[2].toDouble() * 1000000l));
//buildFrame.len = frameParsed[3].length() * 0.5;
int c;
for (c = 0; c < framelength; c++)
{
bool ok;
unsigned char byteVal = frameParsed[3].mid(c*2, 2).toUInt(&ok, 16);
buildData[c] = byteVal;
}
buildFrame.setPayload(buildData);
if(frameParsed.length() < 4)
{
qDebug() << "Received frame doesn't contain any data: " << data;
return data;
}
int framelength = frameParsed[3].length() * 0.5;
buildData.resize(framelength);
int c;
for (c = 0; c < framelength; c++)
{
bool ok;
unsigned char byteVal = frameParsed[3].mid(c*2, 2).toUInt(&ok, 16);
buildData[c] = byteVal;
}
buildFrame.setPayload(buildData);
// buildFrame.isReceived = true;
if (!isCapSuspended())
{
/* get frame from queue */
CANFrame* frame_p = getQueue().get();
if(frame_p) {
/* copy frame */
*frame_p = buildFrame;
//frame_p->remote = false;
frame_p->setFrameType(QCanBusFrame::DataFrame);
checkTargettedFrame(buildFrame);
/* enqueue frame */
getQueue().queue();
}
if (!isCapSuspended())
{
/* get frame from queue */
CANFrame* frame_p = getQueue().get();
if(frame_p) {
/* copy frame */
*frame_p = buildFrame;
//frame_p->remote = false;
frame_p->setFrameType(QCanBusFrame::DataFrame);
checkTargettedFrame(buildFrame);
/* enqueue frame */
getQueue().queue();
}
else
qDebug() << "can't get a frame, capture suspended";
if (framePart.length() > frameStrConst.length())
decodeFrames(framePart.right(framePart.length() - frameStrConst.length()), busNum);
}
else
qDebug() << "can't get a frame, capture suspended";
//take out the data that we just processed and anything that is in front of it
//this should keep broken frames from accumulating at in the data buffer
if (framePart.length() > frameStrConst.length())
{
return decodeFrames(framePart.right(framePart.length() - frameStrConst.length()), busNum);
}
return "";
}
void SocketCANd::disconnectDevice() {
@@ -374,6 +402,7 @@ void SocketCANd::procRXData(QString data, int busNum)
{
switchToRawMode(busNum);
rx_state[busNum] = SWITCHING2RAW;
unprocessedData[busNum].clear();
}
else qInfo() << hostCanIDs[busNum] << ": Could not open bus. Host did not respond with ""< ok >"": " << data;
break;
@@ -383,9 +412,30 @@ void SocketCANd::procRXData(QString data, int busNum)
{
rx_state[busNum] = RAWMODE;
}
else if(data.indexOf("< ok >", 0, Qt::CaseSensitivity::CaseInsensitive) == 0)
{
qDebug() << "Ok found at start of compound message, switching to RAW and decoding immediately";
rx_state[busNum] = RAWMODE;
unprocessedData[busNum] = decodeFrames(data, busNum);
}
else if(data.indexOf("< ok >", 0, Qt::CaseSensitivity::CaseInsensitive) > 0)
{
qDebug() << "Ok found at in middle of compound message, switching to RAW and decoding immediately";
rx_state[busNum] = RAWMODE;
unprocessedData[busNum] = decodeFrames(data, busNum);
}
break;
case RAWMODE:
decodeFrames(data, busNum);
unprocessedData[busNum] = decodeFrames(unprocessedData[busNum] + data, busNum);
if(unprocessedData[busNum].length() > 128)
{
//the buffer has grown too much we need to clear it out, but what is good logic for that?
//the decodeFrames function strips out datat that doesn't have a '< frame' starting token, and in its
//recursive calling of itself it strips out data that preceedes valid frames, so this should never happen
qDebug() << "busNum: " << busNum << "- " << unprocessedData[busNum].length() << " bytes in unprocessedData, something is wrong, clearing...";
unprocessedData[busNum].clear();
}
break;
case ISOTP:
break;
connections/socketcand.h
+2 -1
View File
@@ -57,7 +57,7 @@ private slots:
void invokeReadTCPData();
void deviceConnected(int busNum);
void switchToRawMode(int busNum);
void decodeFrames(QString, int busNum);
QString decodeFrames(QString, int busNum);
private:
void procRXData(QString, int busNum);
@@ -76,6 +76,7 @@ protected:
QByteArray buildData;
QVarLengthArray<MODE> rx_state;
CANFrame buildFrame;
QVarLengthArray<QString> unprocessedData;
};