From 562764ef1a29fa5ac7910178c2a7b39e2e4ad222 Mon Sep 17 00:00:00 2001 From: Federico Cerutti Date: Tue, 1 Jan 2019 13:40:51 +0100 Subject: [PATCH] Fixed a bug with with addressed Custom/Proprietary commands --- Firmware/Chameleon-Mini/Application/ISO15693-A.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/Chameleon-Mini/Application/ISO15693-A.c b/Firmware/Chameleon-Mini/Application/ISO15693-A.c index 6fde0d9..b62f3e2 100644 --- a/Firmware/Chameleon-Mini/Application/ISO15693-A.c +++ b/Firmware/Chameleon-Mini/Application/ISO15693-A.c @@ -106,7 +106,8 @@ bool ISO15693PrepareFrame(uint8_t* FrameBuf, uint16_t FrameBytes, CurrentFrame* FrameStruct -> ParamLen = FrameBuf + (FrameBytes - ISO15693_CRC16_SIZE) - (FrameStruct -> Parameters); - if (FrameStruct -> Addressed && !ISO15693CompareUid(&FrameBuf[ISO15693_REQ_ADDR_PARAM], MyUid)) { + /* The UID, if present, always sits right befoore the parameters */ + if (FrameStruct -> Addressed && !ISO15693CompareUid(FrameStruct -> Parameters - ISO15693_GENERIC_UID_SIZE, MyUid)) { /* addressed request but we're not the addressee */ return false; } else if (FrameStruct -> Selected && !IsSelected) {