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

chg: cleanup

Browse source
This commit is contained in:
iceman1001 2019-03-09 21:43:03 +01:00
commit 38503b55d5
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/cmdlfparadox.c
View file

@ -79,15 +79,15 @@ int detectParadox(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint
//print full Paradox Prox ID and some bit format details if found //print full Paradox Prox ID and some bit format details if found
int CmdParadoxDemod(const char *Cmd) { int CmdParadoxDemod(const char *Cmd) {
//raw fsk demod no manchester decoding no start bit finding just get binary from wave //raw fsk demod no manchester decoding no start bit finding just get binary from wave
uint8_t bits[MAX_GRAPH_TRACE_LEN]={0}; uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
size_t size = getFromGraphBuf(bits); size_t size = getFromGraphBuf(bits);
if (size == 0) { if (size == 0) {
PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox not enough samples"); PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox not enough samples");
return 0; return 0;
} }
uint32_t hi2=0, hi=0, lo=0; uint32_t hi2 = 0, hi = 0, lo = 0;
int waveIdx=0; int waveIdx = 0;
//get binary from fsk wave //get binary from fsk wave
int idx = detectParadox(bits, &size, &hi2, &hi, &lo, &waveIdx); int idx = detectParadox(bits, &size, &hi2, &hi, &lo, &waveIdx);
if (idx < 0){ if (idx < 0){
@ -109,24 +109,24 @@ int CmdParadoxDemod(const char *Cmd) {
} }
setDemodBuf(bits, size, idx); setDemodBuf(bits, size, idx);
setClockGrid(50, waveIdx + (idx*50)); setClockGrid(50, waveIdx + (idx * 50));
if (hi2==0 && hi==0 && lo==0){ if (hi2 == 0 && hi == 0 && lo == 0){
if (g_debugMode) PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox no value found"); PrintAndLogEx(DEBUG, "DEBUG: Error - Paradox no value found");
return 0; return 0;
} }
uint32_t fc = ((hi & 0x3)<<6) | (lo>>26); uint32_t fc = ((hi & 0x3) << 6) | (lo >> 26);
uint32_t cardnum = (lo>>10) & 0xFFFF; uint32_t cardnum = (lo >> 10) & 0xFFFF;
uint32_t rawLo = bytebits_to_byte(bits + idx + 64, 32); uint32_t rawLo = bytebits_to_byte(bits + idx + 64, 32);
uint32_t rawHi = bytebits_to_byte(bits + idx + 32, 32); uint32_t rawHi = bytebits_to_byte(bits + idx + 32, 32);
uint32_t rawHi2 = bytebits_to_byte(bits + idx, 32); uint32_t rawHi2 = bytebits_to_byte(bits + idx, 32);
PrintAndLogEx(NORMAL, "Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x - RAW: %08x%08x%08x", PrintAndLogEx(NORMAL, "Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x - RAW: %08x%08x%08x",
hi >> 10, hi >> 10,
(hi & 0x3)<<26 | (lo>>10), (hi & 0x3) << 26 | (lo >> 10),
fc, cardnum, fc, cardnum,
(lo>>2) & 0xFF, (lo >> 2) & 0xFF,
rawHi2, rawHi2,
rawHi, rawHi,
rawLo rawLo
@ -193,6 +193,7 @@ static command_t CommandTable[] = {
}; };
int CmdLFParadox(const char *Cmd) { int CmdLFParadox(const char *Cmd) {
clearCommandBuffer();
CmdsParse(CommandTable, Cmd); CmdsParse(CommandTable, Cmd);
return 0; return 0;
} }