From bc91796d150021c69e4a6d2a3651baeb3159a887 Mon Sep 17 00:00:00 2001
From: Paul Hollinsky <phollinsky@intrepidcs.com>
Date: Mon, 22 Oct 2018 18:25:01 -0400
Subject: [PATCH] Proper detection for RTR CAN frames

---
 communication/decoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/communication/decoder.cpp b/communication/decoder.cpp
index 86b7393..b8a44ae 100644
--- a/communication/decoder.cpp
+++ b/communication/decoder.cpp
@@ -79,7 +79,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 			
 			// Data
 			// The first 8 bytes are always in the standard place
-			if(data->dlc.RTR) { // Remote Request Frame
+			if((data->dlc.RTR && data->header.IDE) || (!data->header.IDE && data->header.SRR)) { // Remote Request Frame
 				msg->data.resize(length); // This data will be all zeros, but the length will be set
 				msg->isRemote = true;
 			} else {