From 54d18074757a9352010522b9ceb49ab7e9ec6e1e Mon Sep 17 00:00:00 2001 From: Ciprian Ionescu Date: Mon, 26 Aug 2024 16:44:09 +0200 Subject: [PATCH 1/3] add ELECTRA pattern to EM410x print output --- client/src/cmdlfem410x.c | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/cmdlfem410x.c b/client/src/cmdlfem410x.c index 0182083c5..b28bf6eab 100644 --- a/client/src/cmdlfem410x.c +++ b/client/src/cmdlfem410x.c @@ -231,6 +231,7 @@ void printEM410x(uint32_t hi, uint64_t id, bool verbose, int type) { uint32_t sebury3 = id & 0x7FFFFF; PrintAndLogEx(SUCCESS, "Pattern Sebury : %d %d %d [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3); PrintAndLogEx(SUCCESS, "VD / ID : %03" PRIu64 " / %010" PRIu64, (id >> 32LL) & 0xFFFF, (id & 0xFFFFFFFF)); + PrintAndLogEx(SUCCESS, "Pattern ELECTRA : %d %d", (id >> 24) & 0xFFFF, id & 0xFFFFFF); PrintAndLogEx(INFO, "------------------------------------------------"); } From c2771da6a012144c7377de3098ef3fbefbe7035b Mon Sep 17 00:00:00 2001 From: Ciprian Ionescu Date: Mon, 26 Aug 2024 16:45:58 +0200 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca8053022..6b2dac419 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] +- Added ELECTRA pattern decoding in `lf search` (@CiRIP) - Added pretty Hitag S config parsing (@CiRIP) - Moved Hitag S operations into separate submenu: `lf hitag s` (@CiRIP) - Added MFC keys for Sofia public transport cards (@user890104) From b13227a64532cd4ca6ae3ee8d097cc0581c21f55 Mon Sep 17 00:00:00 2001 From: Ciprian Ionescu Date: Mon, 26 Aug 2024 17:16:30 +0200 Subject: [PATCH 3/3] fix format specifier --- client/src/cmdlfem410x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/cmdlfem410x.c b/client/src/cmdlfem410x.c index b28bf6eab..35bf408fe 100644 --- a/client/src/cmdlfem410x.c +++ b/client/src/cmdlfem410x.c @@ -231,7 +231,7 @@ void printEM410x(uint32_t hi, uint64_t id, bool verbose, int type) { uint32_t sebury3 = id & 0x7FFFFF; PrintAndLogEx(SUCCESS, "Pattern Sebury : %d %d %d [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3); PrintAndLogEx(SUCCESS, "VD / ID : %03" PRIu64 " / %010" PRIu64, (id >> 32LL) & 0xFFFF, (id & 0xFFFFFFFF)); - PrintAndLogEx(SUCCESS, "Pattern ELECTRA : %d %d", (id >> 24) & 0xFFFF, id & 0xFFFFFF); + PrintAndLogEx(SUCCESS, "Pattern ELECTRA : " PRIu64 " " PRIu64, (id >> 24) & 0xFFFF, id & 0xFFFFFF); PrintAndLogEx(INFO, "------------------------------------------------"); }