Merge pull request RfidResearchGroup#2476 from CiRIP/electra_decode

iceman1001 · web-flow · commit 94063607ae34 · 2024-08-27T08:02:29.000+02:00
Actually fix ELECTRA parsing
diff --git 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    : " PRIu64 " " PRIu64, (id >> 24) & 0xFFFF, id & 0xFFFFFF);
+        PrintAndLogEx(SUCCESS, "Pattern ELECTRA    : %" PRIu64 " %" PRIu64, (id >> 24) & 0xFFFF, id & 0xFFFFFF);
 
         PrintAndLogEx(INFO, "------------------------------------------------");
     }

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ void printEM410x(uint32_t hi, uint64_t id, bool verbose, int type) {`
`231`	`231`	`uint32_t sebury3 = id & 0x7FFFFF;`
`232`	`232`	`PrintAndLogEx(SUCCESS, "Pattern Sebury : %d %d %d [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3);`
`233`	`233`	`PrintAndLogEx(SUCCESS, "VD / ID : %03" PRIu64 " / %010" PRIu64, (id >> 32LL) & 0xFFFF, (id & 0xFFFFFFFF));`
`234`		`- PrintAndLogEx(SUCCESS, "Pattern ELECTRA : " PRIu64 " " PRIu64, (id >> 24) & 0xFFFF, id & 0xFFFFFF);`
	`234`	`+ PrintAndLogEx(SUCCESS, "Pattern ELECTRA : %" PRIu64 " %" PRIu64, (id >> 24) & 0xFFFF, id & 0xFFFFFF);`
`235`	`235`
`236`	`236`	`PrintAndLogEx(INFO, "------------------------------------------------");`
`237`	`237`	`}`