From ea52b4c51285d91da6f509c9297939c4865e67ac Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Sun, 21 May 2017 20:18:59 -0400 Subject: [PATCH] Fixes for OSX --- SavvyCAN.pro.user.4d16b92 | 448 ++++++++++++++++++++++++++++++++++ connections/canconnection.cpp | 3 + 2 files changed, 451 insertions(+) create mode 100644 SavvyCAN.pro.user.4d16b92 diff --git a/SavvyCAN.pro.user.4d16b92 b/SavvyCAN.pro.user.4d16b92 new file mode 100644 index 0000000..f6a227a --- /dev/null +++ b/SavvyCAN.pro.user.4d16b92 @@ -0,0 +1,448 @@ + + + + + + EnvironmentId + {4d16b929-8ed6-4c97-9e6c-66f0036d54be} + + + ProjectExplorer.Project.ActiveTarget + 1 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.4.1 MSVC2012 OpenGL 32bit + Desktop Qt 5.4.1 MSVC2012 OpenGL 32bit + qt.54.win32_msvc2012_opengl_kit + 0 + 0 + 0 + + C:/Users/Collin/Documents/build-ReverseCAN-Desktop_Qt_5_4_1_MSVC2012_OpenGL_32bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Users/Collin/Documents/build-ReverseCAN-Desktop_Qt_5_4_1_MSVC2012_OpenGL_32bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + SavvyCAN + SavvyCAN2 + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Collin/Desktop/SavvyCAN/SavvyCAN.pro + + SavvyCAN.pro + false + false + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.4.1 MSVC2013 64bit + Desktop Qt 5.4.1 MSVC2013 64bit + qt.54.win64_msvc2013_64_kit + 0 + 0 + 0 + + C:/Users/Collin/Documents/build-ReverseCAN-Desktop_Qt_5_4_1_MSVC2013_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Users/Collin/Documents/build-ReverseCAN-Desktop_Qt_5_4_1_MSVC2013_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + SavvyCAN + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Collin/Desktop/SavvyCAN/SavvyCAN.pro + + SavvyCAN.pro + false + false + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/connections/canconnection.cpp b/connections/canconnection.cpp index cdfb748..1335534 100644 --- a/connections/canconnection.cpp +++ b/connections/canconnection.cpp @@ -344,6 +344,9 @@ void CANConnection::checkTargettedFrame(CANFrame &frame) { unsigned int maskedID; qDebug() << "Got frame with ID " << frame.ID << " on bus " << frame.bus; + if (mBusData_p == 0) return; + + if (mBusData_p[frame.bus].mTargettedFrames == 0) return; foreach (const CANFlt filt, mBusData_p[frame.bus].mTargettedFrames) { qDebug() << "Checking filter with id " << filt.id << " mask " << filt.mask;