mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-01-23 08:27:51 +08:00
simpler branching
This commit is contained in:
parent
a89ae9cb35
commit
8d2c02878b
1 changed files with 7 additions and 8 deletions
|
@ -224,16 +224,15 @@ int CmdPyramidDemod(const char *Cmd) {
|
|||
fc = bytebits_to_byte(bits + 53, 10);
|
||||
cardnum = bytebits_to_byte(bits + 63, 32);
|
||||
PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);
|
||||
} else if (fmtLen > 32) {
|
||||
cardnum = bytebits_to_byte(bits + 81, 16);
|
||||
//code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
|
||||
//code2 = bytebits_to_byte(bits+(size-32),32);
|
||||
PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
|
||||
} else {
|
||||
cardnum = bytebits_to_byte(bits + 81, 16);
|
||||
if (fmtLen > 32) {
|
||||
//code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen-32);
|
||||
//code2 = bytebits_to_byte(bits+(size-32),32);
|
||||
PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
|
||||
} else {
|
||||
//code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);
|
||||
PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
|
||||
}
|
||||
//code1 = bytebits_to_byte(bits+(size-fmtLen),fmtLen);
|
||||
PrintAndLogEx(SUCCESS, "Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
|
||||
}
|
||||
|
||||
PrintAndLogEx(DEBUG, "DEBUG: Pyramid: checksum : 0x%02X - %02X - %s"
|
||||
|
|
Loading…
Reference in a new issue