From 5c9138db53a7b597b5e967ca66c02309404c2f56 Mon Sep 17 00:00:00 2001 From: gregjhogan Date: Sun, 18 Feb 2018 19:58:04 -0600 Subject: [PATCH] fixed 11 bit address issue --- drivers/windows/pandaJ2534DLL/J2534Connection_ISO15765.cpp | 2 +- drivers/windows/pandaJ2534DLL/J2534Connection_ISO15765.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/windows/pandaJ2534DLL/J2534Connection_ISO15765.cpp b/drivers/windows/pandaJ2534DLL/J2534Connection_ISO15765.cpp index 2b9d97c..d50988a 100644 --- a/drivers/windows/pandaJ2534DLL/J2534Connection_ISO15765.cpp +++ b/drivers/windows/pandaJ2534DLL/J2534Connection_ISO15765.cpp @@ -43,7 +43,7 @@ std::shared_ptr J2534Connection_ISO15765::parseMessageTx(PASSTHRU_MSG void J2534Connection_ISO15765::processMessage(const J2534Frame& msg) { if (msg.ProtocolID != CAN) return; - int fid = get_matching_in_fc_filter_id(msg); + int fid = get_matching_in_fc_filter_id(msg, this->Flags); if (fid == -1) return; auto filter = this->filters[fid]; diff --git a/drivers/windows/pandaJ2534DLL/J2534Connection_ISO15765.h b/drivers/windows/pandaJ2534DLL/J2534Connection_ISO15765.h index ddbf2dc..beb9f01 100644 --- a/drivers/windows/pandaJ2534DLL/J2534Connection_ISO15765.h +++ b/drivers/windows/pandaJ2534DLL/J2534Connection_ISO15765.h @@ -25,7 +25,7 @@ public: int get_matching_out_fc_filter_id(const std::string & msgdata, unsigned long flags, unsigned long flagmask); - int get_matching_in_fc_filter_id(const J2534Frame& msg, unsigned long flagmask = CAN_29BIT_ID); + int get_matching_in_fc_filter_id(const J2534Frame& msg, unsigned long flagmask); virtual unsigned long validateTxMsg(PASSTHRU_MSG* msg);