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

Lots of large changes to scripting support, changes to the way

Browse Source 
filtering works with ISOTP/UDS messages, updated version number.
This commit is contained in:
Collin Kidder
2017-08-22 21:42:30 -04:00
parent 6ef5757a4d
commit 162d79fbe9
12 changed files with 226 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/canconnection.cpp
+6 -6
View File
@@ -6,7 +6,7 @@
struct BusData {
CANBus mBus;
bool mConfigured;
QVector<CANFlt> mTargettedFrames;
QVector<CANFltObserver> mTargettedFrames;
};
@@ -28,7 +28,7 @@ CANConnection::CANConnection(QString pPort,
qRegisterMetaType<CANBus>("CANBus");
qRegisterMetaType<CANFrame>("CANFrame");
qRegisterMetaType<CANCon::status>("CANCon::status");
qRegisterMetaType<CANFlt>("CANFlt");
qRegisterMetaType<CANFltObserver>("CANFlt");
/* set queue size */
mQueue.setSize(pQueueLen); /*TODO add check on returned value */
@@ -289,7 +289,7 @@ bool CANConnection::addTargettedFrame(int pBusId, uint32_t ID, uint32_t mask, QO
return false;
qDebug() << "Connection is registering a new targetted frame filter, local bus " << pBusId;
CANFlt target;
CANFltObserver target;
target.id = ID;
target.mask = mask;
target.observer = receiver;
@@ -317,7 +317,7 @@ bool CANConnection::removeTargettedFrame(int pBusId, uint32_t ID, uint32_t mask,
if(pBusId < -1 || pBusId >= getNumBuses())
return false;
CANFlt target;
CANFltObserver target;
target.id = ID;
target.mask = mask;
target.observer = receiver;
@@ -329,7 +329,7 @@ bool CANConnection::removeTargettedFrame(int pBusId, uint32_t ID, uint32_t mask,
bool CANConnection::removeAllTargettedFrames(QObject *receiver)
{
for (int i = 0; i < getNumBuses(); i++) {
foreach (const CANFlt filt, mBusData_p[i].mTargettedFrames)
foreach (const CANFltObserver filt, mBusData_p[i].mTargettedFrames)
{
if (filt.observer == receiver) mBusData_p[i].mTargettedFrames.removeOne(filt);
}
@@ -345,7 +345,7 @@ void CANConnection::checkTargettedFrame(CANFrame &frame)
if (mBusData_p == 0) return;
if (mBusData_p[frame.bus].mTargettedFrames.length() == 0) return;
foreach (const CANFlt filt, mBusData_p[frame.bus].mTargettedFrames)
foreach (const CANFltObserver filt, mBusData_p[frame.bus].mTargettedFrames)
{
//qDebug() << "Checking filter with id " << filt.id << " mask " << filt.mask;
maskedID = frame.ID & filt.mask;