github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #2475 from CiRIP/electra_decode

Browse source 
Add ELECTRA pattern to EM410x print output
This commit is contained in:
Iceman 2024-08-26 17:25:10 +02:00 • committed by GitHub
commit 30a2b5065f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -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... 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] ## [unreleased][unreleased]
- Added ELECTRA pattern decoding in `lf search` (@CiRIP)
- Firmware size optimization, skipping unused FPGA bitstreams (@douniwan5788) - Firmware size optimization, skipping unused FPGA bitstreams (@douniwan5788)
- Added pretty Hitag S config parsing (@CiRIP) - Added pretty Hitag S config parsing (@CiRIP)
- Moved Hitag S operations into separate submenu: `lf hitag s` (@CiRIP) - Moved Hitag S operations into separate submenu: `lf hitag s` (@CiRIP)

1
client/src/cmdlfem410x.c
View file

@ -231,6 +231,7 @@ void printEM410x(uint32_t hi, uint64_t id, bool verbose, int type) {
uint32_t sebury3 = id & 0x7FFFFF; 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, "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, "VD / ID : %03" PRIu64 " / %010" PRIu64, (id >> 32LL) & 0xFFFF, (id & 0xFFFFFFFF));
PrintAndLogEx(SUCCESS, "Pattern ELECTRA : " PRIu64 " " PRIu64, (id >> 24) & 0xFFFF, id & 0xFFFFFF);
PrintAndLogEx(INFO, "------------------------------------------------"); PrintAndLogEx(INFO, "------------------------------------------------");
} }