From d96e76e7bde4d5beb186effd31e431efa7a026cc Mon Sep 17 00:00:00 2001
From: bcostm <bco.stm@gmail.com>
Date: Fri, 5 Jan 2018 10:11:17 +0100
Subject: [PATCH] STM32 CAN: fix wrong ID and MASK filter

---
 targets/TARGET_STM/can_api.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/targets/TARGET_STM/can_api.c b/targets/TARGET_STM/can_api.c
index 1f0d977b1a..246f5d1971 100644
--- a/targets/TARGET_STM/can_api.c
+++ b/targets/TARGET_STM/can_api.c
@@ -468,11 +468,11 @@ int can_filter(can_t *obj, uint32_t id, uint32_t mask, CANFormat format, int32_t
             sFilterConfig.FilterIdLow =  0x0;
             sFilterConfig.FilterMaskIdHigh = mask << 5;
             sFilterConfig.FilterMaskIdLow = 0x0; // allows both remote and data frames
-        } else if (format == CANExtended) {
+        } else { // format == CANExtended
             sFilterConfig.FilterIdHigh = id >> 13; // EXTID[28:13]
-            sFilterConfig.FilterIdLow = (0x00FF & (id << 3)) | (1 << 2);  // EXTID[12:0]
+            sFilterConfig.FilterIdLow = (0xFFFF & (id << 3)) | (1 << 2); // EXTID[12:0] + IDE
             sFilterConfig.FilterMaskIdHigh = mask >> 13;
-            sFilterConfig.FilterMaskIdLow = (0x00FF & (mask << 3)) | (1 << 2);
+            sFilterConfig.FilterMaskIdLow = (0xFFFF & (mask << 3)) | (1 << 2);
         }
 
         sFilterConfig.FilterFIFOAssignment = 0;